Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
traffic-signal-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
signal
traffic-signal-platform
Commits
eeb9d45d
Commit
eeb9d45d
authored
Nov 03, 2024
by
duanruiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[update] 代码优化
parent
9c528862
Changes
47
Hide whitespace changes
Inline
Side-by-side
Showing
47 changed files
with
207 additions
and
67 deletions
+207
-67
CommandResultSignEnum.java
...wanji/utc/hisense/common/enums/CommandResultSignEnum.java
+2
-1
TcpClient.java
.../src/main/java/net/wanji/utc/hisense/netty/TcpClient.java
+10
-13
TcpClientHandler.java
...net/wanji/utc/hisense/netty/handler/TcpClientHandler.java
+1
-1
UdpClientHandler.java
...net/wanji/utc/hisense/netty/handler/UdpClientHandler.java
+1
-1
CommandPojo.java
...in/java/net/wanji/utc/hisense/netty/pojo/CommandPojo.java
+1
-1
CommandRequestFactory.java
...anji/utc/hisense/netty/request/CommandRequestFactory.java
+14
-0
CommandResponseFactory.java
...ji/utc/hisense/netty/response/CommandResponseFactory.java
+1
-0
HeartBeatService.java
...nji/utc/hisense/netty/response/impl/HeartBeatService.java
+1
-1
GetAlarmInfoService.java
.../hisense/netty/response/impl/get/GetAlarmInfoService.java
+1
-1
GetBaseInfoService.java
...c/hisense/netty/response/impl/get/GetBaseInfoService.java
+1
-1
GetDailyPlanInfoService.java
...ense/netty/response/impl/get/GetDailyPlanInfoService.java
+1
-1
GetDetectorInfoService.java
...sense/netty/response/impl/get/GetDetectorInfoService.java
+1
-1
GetDeviceInfoService.java
...hisense/netty/response/impl/get/GetDeviceInfoService.java
+1
-1
GetFaultInfoService.java
.../hisense/netty/response/impl/get/GetFaultInfoService.java
+1
-1
GetLightsGroupInfoService.java
...se/netty/response/impl/get/GetLightsGroupInfoService.java
+1
-1
GetLightsStatusInfoService.java
...e/netty/response/impl/get/GetLightsStatusInfoService.java
+1
-1
GetPhaseInfoService.java
.../hisense/netty/response/impl/get/GetPhaseInfoService.java
+1
-1
GetPhaseSecurityInfoService.java
.../netty/response/impl/get/GetPhaseSecurityInfoService.java
+1
-1
GetRunningStateInfoService.java
...e/netty/response/impl/get/GetRunningStateInfoService.java
+1
-1
GetSchedulesInfoService.java
...ense/netty/response/impl/get/GetSchedulesInfoService.java
+1
-1
GetSchemeInfoService.java
...hisense/netty/response/impl/get/GetSchemeInfoService.java
+1
-1
GetSchemeNoService.java
...c/hisense/netty/response/impl/get/GetSchemeNoService.java
+31
-0
GetStageInfoService.java
.../hisense/netty/response/impl/get/GetStageInfoService.java
+1
-1
GetStageStatusService.java
...isense/netty/response/impl/get/GetStageStatusService.java
+1
-1
GetTrafficDataInfoService.java
...se/netty/response/impl/get/GetTrafficDataInfoService.java
+1
-1
SetAlarmInfoService.java
.../hisense/netty/response/impl/set/SetAlarmInfoService.java
+1
-1
SetBaseInfoService.java
...c/hisense/netty/response/impl/set/SetBaseInfoService.java
+1
-1
SetControlInfoService.java
...isense/netty/response/impl/set/SetControlInfoService.java
+1
-1
SetDailyPlanInfoService.java
...ense/netty/response/impl/set/SetDailyPlanInfoService.java
+1
-1
SetDetectorInfoService.java
...sense/netty/response/impl/set/SetDetectorInfoService.java
+1
-1
SetDeviceInfoService.java
...hisense/netty/response/impl/set/SetDeviceInfoService.java
+1
-1
SetFaultInfoService.java
.../hisense/netty/response/impl/set/SetFaultInfoService.java
+1
-1
SetLightsGroupInfoService.java
...se/netty/response/impl/set/SetLightsGroupInfoService.java
+1
-1
SetPhaseInfoService.java
.../hisense/netty/response/impl/set/SetPhaseInfoService.java
+1
-1
SetPhaseSecurityInfoService.java
.../netty/response/impl/set/SetPhaseSecurityInfoService.java
+1
-1
SetSchedulesInfoService.java
...ense/netty/response/impl/set/SetSchedulesInfoService.java
+1
-1
SetSchemeInfoService.java
...hisense/netty/response/impl/set/SetSchemeInfoService.java
+1
-1
SetStageInfoService.java
.../hisense/netty/response/impl/set/SetStageInfoService.java
+1
-1
SetTrafficDataInfoService.java
...se/netty/response/impl/set/SetTrafficDataInfoService.java
+1
-1
SystemScriptionRequest.java
...nji/utc/hisense/pojo/xml/pojo/SystemScriptionRequest.java
+1
-0
LogOnRequest.java
...tc/hisense/pojo/xml/pojo/messagecontent/LogOnRequest.java
+2
-2
StepControlMultiPhaseRequest.java
...xml/pojo/messagecontent/StepControlMultiPhaseRequest.java
+34
-0
StepControlRequest.java
...ense/pojo/xml/pojo/messagecontent/StepControlRequest.java
+29
-0
GetSchemeNoRequest.java
.../pojo/xml/pojo/messagecontent/get/GetSchemeNoRequest.java
+32
-0
XMLUtils.java
...ce/src/main/java/net/wanji/utc/hisense/util/XMLUtils.java
+1
-1
bootstrap-docker.yaml
...-hisense-service/src/main/resources/bootstrap-docker.yaml
+15
-15
bootstrap.yaml
signal-utc-hisense-service/src/main/resources/bootstrap.yaml
+1
-1
No files found.
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/common/enums/CommandResultSignEnum.java
View file @
eeb9d45d
...
@@ -11,7 +11,8 @@ import java.util.Objects;
...
@@ -11,7 +11,8 @@ import java.util.Objects;
*/
*/
@Getter
@Getter
public
enum
CommandResultSignEnum
{
public
enum
CommandResultSignEnum
{
GET_RUNNING_STATE_INFO
(
RunningLightsStatusPojo
.
class
,
"getRunningStateInfoService"
);
GET_RUNNING_STATE_INFO
(
RunningLightsStatusPojo
.
class
,
"getRunningStateInfoService"
),
GET_RUNNING_SCHEME_NO
(
RunningLightsStatusPojo
.
class
,
"getSchemeNoService"
);
private
final
Object
resultPojo
;
private
final
Object
resultPojo
;
private
final
String
className
;
private
final
String
className
;
...
...
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/TcpClient.java
View file @
eeb9d45d
...
@@ -65,19 +65,16 @@ public class TcpClient {
...
@@ -65,19 +65,16 @@ public class TcpClient {
}
}
//public static void sendMessage(String ip, Integer port, String msg) {
public
static
void
sendMessage
(
Object
msg
)
{
// byte[] bytes = HexUtil.decodeHex(msg);
try
{
// try {
ChannelFuture
sync
=
tcpChannelFuture
.
channel
().
writeAndFlush
(
msg
).
sync
();
// if (channelFutureMap.isEmpty()) {
if
(
sync
.
isSuccess
())
{
// return;
log
.
debug
(
"发送信号机命令消息:{}"
,
msg
);
// }
}
// tcpChannelFuture.channel()
}
catch
(
Exception
e
)
{
// .writeAndFlush(new DatagramPacket(Unpooled.copiedBuffer(bytes), new InetSocketAddress(ip, port))).sync();
log
.
error
(
"sendMsg is error"
,
e
);
// log.debug("发送信号机:{}/{}命令消息:{}", ip, port, msg);
}
// } catch (InterruptedException e) {
}
// log.error("sendMsg is error", e);
// }
//}
//public static MessageResultPojo sendMessage(String ip, Integer port, String msg, String command, int timeout) {
//public static MessageResultPojo sendMessage(String ip, Integer port, String msg, String command, int timeout) {
// try {
// try {
...
...
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/handler/TcpClientHandler.java
View file @
eeb9d45d
...
@@ -107,7 +107,7 @@ public class TcpClientHandler extends SimpleChannelInboundHandler<DatagramPacket
...
@@ -107,7 +107,7 @@ public class TcpClientHandler extends SimpleChannelInboundHandler<DatagramPacket
commandPojo
.
setSignalId
(
crossInfo
.
getCode
());
commandPojo
.
setSignalId
(
crossInfo
.
getCode
());
commandPojo
.
setSignalIp
(
crossInfo
.
getIp
());
commandPojo
.
setSignalIp
(
crossInfo
.
getIp
());
commandPojo
.
setPort
(
crossInfo
.
getPort
());
commandPojo
.
setPort
(
crossInfo
.
getPort
());
commandPojo
.
set
Response
Msg
(
data
);
commandPojo
.
setMsg
(
data
);
return
commandPojo
;
return
commandPojo
;
}
}
...
...
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/handler/UdpClientHandler.java
View file @
eeb9d45d
...
@@ -83,7 +83,7 @@ public class UdpClientHandler extends SimpleChannelInboundHandler<DatagramPacket
...
@@ -83,7 +83,7 @@ public class UdpClientHandler extends SimpleChannelInboundHandler<DatagramPacket
commandPojo
.
setSignalId
(
crossInfo
.
getCode
());
commandPojo
.
setSignalId
(
crossInfo
.
getCode
());
commandPojo
.
setSignalIp
(
crossInfo
.
getIp
());
commandPojo
.
setSignalIp
(
crossInfo
.
getIp
());
commandPojo
.
setPort
(
crossInfo
.
getPort
());
commandPojo
.
setPort
(
crossInfo
.
getPort
());
commandPojo
.
set
Response
Msg
(
data
);
commandPojo
.
setMsg
(
data
);
return
commandPojo
;
return
commandPojo
;
}
}
...
...
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/pojo/CommandPojo.java
View file @
eeb9d45d
...
@@ -12,5 +12,5 @@ public class CommandPojo {
...
@@ -12,5 +12,5 @@ public class CommandPojo {
private
String
signalId
;
private
String
signalId
;
private
String
signalIp
;
private
String
signalIp
;
private
Integer
port
;
private
Integer
port
;
private
Object
responseM
sg
;
private
Object
m
sg
;
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/request/CommandRequestFactory.java
0 → 100644
View file @
eeb9d45d
package
net
.
wanji
.
utc
.
hisense
.
netty
.
request
;
import
net.wanji.utc.hisense.netty.pojo.CommandPojo
;
/**
* @author duanruiming
* @date 2024/11/02 20:15
*/
public
interface
CommandRequestFactory
{
/**
* 发送海信请求
*/
void
sendCommandRequest
(
CommandPojo
commandPojo
);
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/CommandResponseFactory.java
View file @
eeb9d45d
...
@@ -7,5 +7,6 @@ import net.wanji.utc.hisense.netty.pojo.CommandPojo;
...
@@ -7,5 +7,6 @@ import net.wanji.utc.hisense.netty.pojo.CommandPojo;
* @date 2023/05/10 10:07
* @date 2023/05/10 10:07
*/
*/
public
interface
CommandResponseFactory
{
public
interface
CommandResponseFactory
{
Object
getCommandResponse
(
CommandPojo
commandPojo
);
Object
getCommandResponse
(
CommandPojo
commandPojo
);
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/HeartBeatService.java
View file @
eeb9d45d
...
@@ -17,7 +17,7 @@ public class HeartBeatService implements CommandResponseFactory {
...
@@ -17,7 +17,7 @@ public class HeartBeatService implements CommandResponseFactory {
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/get/GetAlarmInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
GetAlarmInfoService
implements
CommandResponseFactory
{
public
class
GetAlarmInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/get/GetBaseInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
GetBaseInfoService
implements
CommandResponseFactory
{
public
class
GetBaseInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/get/GetDailyPlanInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
GetDailyPlanInfoService
implements
CommandResponseFactory
{
public
class
GetDailyPlanInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/get/GetDetectorInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
GetDetectorInfoService
implements
CommandResponseFactory
{
public
class
GetDetectorInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/get/GetDeviceInfoService.java
View file @
eeb9d45d
...
@@ -13,6 +13,6 @@ import org.springframework.stereotype.Service;
...
@@ -13,6 +13,6 @@ import org.springframework.stereotype.Service;
public
class
GetDeviceInfoService
implements
CommandResponseFactory
{
public
class
GetDeviceInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/get/GetFaultInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
GetFaultInfoService
implements
CommandResponseFactory
{
public
class
GetFaultInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/get/GetLightsGroupInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
GetLightsGroupInfoService
implements
CommandResponseFactory
{
public
class
GetLightsGroupInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/get/GetLightsStatusInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
GetLightsStatusInfoService
implements
CommandResponseFactory
{
public
class
GetLightsStatusInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/get/GetPhaseInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
GetPhaseInfoService
implements
CommandResponseFactory
{
public
class
GetPhaseInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/get/GetPhaseSecurityInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
GetPhaseSecurityInfoService
implements
CommandResponseFactory
{
public
class
GetPhaseSecurityInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/get/GetRunningStateInfoService.java
View file @
eeb9d45d
...
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Service;
...
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Service;
public
class
GetRunningStateInfoService
implements
CommandResponseFactory
{
public
class
GetRunningStateInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
SignalDataCache
.
runningStateInfoCacheUdp
.
put
(
commandPojo
.
getCrossId
(),
(
RunningLightsStatusPojo
)
commandPojo
.
get
Response
Msg
());
SignalDataCache
.
runningStateInfoCacheUdp
.
put
(
commandPojo
.
getCrossId
(),
(
RunningLightsStatusPojo
)
commandPojo
.
getMsg
());
return
commandPojo
;
return
commandPojo
;
}
}
...
...
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/get/GetSchedulesInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
GetSchedulesInfoService
implements
CommandResponseFactory
{
public
class
GetSchedulesInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/get/GetSchemeInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
GetSchemeInfoService
implements
CommandResponseFactory
{
public
class
GetSchemeInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/get/GetSchemeNoService.java
0 → 100644
View file @
eeb9d45d
package
net
.
wanji
.
utc
.
hisense
.
netty
.
response
.
impl
.
get
;
import
net.wanji.utc.hisense.netty.TcpClient
;
import
net.wanji.utc.hisense.netty.pojo.CommandPojo
;
import
net.wanji.utc.hisense.netty.request.CommandRequestFactory
;
import
net.wanji.utc.hisense.netty.response.CommandResponseFactory
;
import
net.wanji.utc.hisense.pojo.xml.pojo.messagecontent.get.GetSchemeNoRequest
;
import
org.springframework.stereotype.Service
;
/**
* @author duanruiming
* @date 2024/11/02 19:51
* @description 获取海信当前运行方案号,对应【协调状态】
*/
@Service
public
class
GetSchemeNoService
implements
CommandResponseFactory
,
CommandRequestFactory
{
@Override
public
void
sendCommandRequest
(
CommandPojo
commandPojo
)
{
GetSchemeNoRequest
request
=
new
GetSchemeNoRequest
();
GetSchemeNoRequest
.
Content
content
=
new
GetSchemeNoRequest
.
Content
();
content
.
setSpot
(
String
.
valueOf
(
commandPojo
.
getMsg
()));
request
.
setMessageContent
(
content
);
TcpClient
.
sendMessage
(
request
);
}
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
getMsg
();
}
}
\ No newline at end of file
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/get/GetStageInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
GetStageInfoService
implements
CommandResponseFactory
{
public
class
GetStageInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/get/GetStageStatusService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
GetStageStatusService
implements
CommandResponseFactory
{
public
class
GetStageStatusService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/get/GetTrafficDataInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
GetTrafficDataInfoService
implements
CommandResponseFactory
{
public
class
GetTrafficDataInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/set/SetAlarmInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
SetAlarmInfoService
implements
CommandResponseFactory
{
public
class
SetAlarmInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/set/SetBaseInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
SetBaseInfoService
implements
CommandResponseFactory
{
public
class
SetBaseInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/set/SetControlInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
SetControlInfoService
implements
CommandResponseFactory
{
public
class
SetControlInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/set/SetDailyPlanInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
SetDailyPlanInfoService
implements
CommandResponseFactory
{
public
class
SetDailyPlanInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/set/SetDetectorInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
SetDetectorInfoService
implements
CommandResponseFactory
{
public
class
SetDetectorInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/set/SetDeviceInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
SetDeviceInfoService
implements
CommandResponseFactory
{
public
class
SetDeviceInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/set/SetFaultInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
SetFaultInfoService
implements
CommandResponseFactory
{
public
class
SetFaultInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/set/SetLightsGroupInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
SetLightsGroupInfoService
implements
CommandResponseFactory
{
public
class
SetLightsGroupInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/set/SetPhaseInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
SetPhaseInfoService
implements
CommandResponseFactory
{
public
class
SetPhaseInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/set/SetPhaseSecurityInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
SetPhaseSecurityInfoService
implements
CommandResponseFactory
{
public
class
SetPhaseSecurityInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/set/SetSchedulesInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
SetSchedulesInfoService
implements
CommandResponseFactory
{
public
class
SetSchedulesInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/set/SetSchemeInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
SetSchemeInfoService
implements
CommandResponseFactory
{
public
class
SetSchemeInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/set/SetStageInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
SetStageInfoService
implements
CommandResponseFactory
{
public
class
SetStageInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/netty/response/impl/set/SetTrafficDataInfoService.java
View file @
eeb9d45d
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +12,6 @@ import org.springframework.stereotype.Service;
public
class
SetTrafficDataInfoService
implements
CommandResponseFactory
{
public
class
SetTrafficDataInfoService
implements
CommandResponseFactory
{
@Override
@Override
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
public
Object
getCommandResponse
(
CommandPojo
commandPojo
)
{
return
commandPojo
.
get
Response
Msg
();
return
commandPojo
.
getMsg
();
}
}
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/pojo/xml/pojo/SystemScriptionRequest.java
View file @
eeb9d45d
...
@@ -12,6 +12,7 @@ import java.io.Serializable;
...
@@ -12,6 +12,7 @@ import java.io.Serializable;
* @author duanruiming
* @author duanruiming
* @date 2024/01/08 10:03
* @date 2024/01/08 10:03
*/
*/
@SuppressWarnings
(
"SpellCheckingInspection"
)
@Data
@Data
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
@XmlRootElement
(
name
=
"systemScription"
)
@XmlRootElement
(
name
=
"systemScription"
)
...
...
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/pojo/xml/pojo/messagecontent/LogOnRequest.java
View file @
eeb9d45d
...
@@ -16,11 +16,11 @@ import javax.xml.bind.annotation.XmlRootElement;
...
@@ -16,11 +16,11 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
(
name
=
"systemScription"
)
@XmlRootElement
(
name
=
"systemScription"
)
public
class
LogOnRequest
extends
SystemScriptionRequest
{
public
class
LogOnRequest
extends
SystemScriptionRequest
{
private
LogOn
Content
messageContent
;
private
Content
messageContent
;
@Data
@Data
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
static
class
LogOn
Content
{
public
static
class
Content
{
private
String
user
;
private
String
user
;
private
String
password
;
private
String
password
;
}
}
...
...
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/pojo/xml/pojo/messagecontent/StepControlMultiPhaseRequest.java
0 → 100644
View file @
eeb9d45d
package
net
.
wanji
.
utc
.
hisense
.
pojo
.
xml
.
pojo
.
messagecontent
;
import
lombok.Data
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlRootElement
;
/**
* @author duanruiming
* @date 2024/10/29 17:22
*/
@Data
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
@XmlRootElement
(
name
=
"systemScription"
)
public
class
StepControlMultiPhaseRequest
{
private
Content
messageContent
;
@Data
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
static
class
Content
{
private
String
spot
;
/** 相位数量 */
private
int
count
;
/** 相位号 */
private
String
holdPhase
;
private
String
holdPhase1
;
private
String
holdPhase2
;
private
String
holdPhase3
;
private
String
holdPhase4
;
private
String
holdPhase5
;
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/pojo/xml/pojo/messagecontent/StepControlRequest.java
0 → 100644
View file @
eeb9d45d
package
net
.
wanji
.
utc
.
hisense
.
pojo
.
xml
.
pojo
.
messagecontent
;
import
lombok.Data
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlRootElement
;
/**
* @author duanruiming
* @date 2024/10/29 16:56
*/
@Data
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
@XmlRootElement
(
name
=
"systemScription"
)
public
class
StepControlRequest
{
private
Content
messageContent
;
@Data
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
static
class
Content
{
private
String
spot
;
/** 1-开始步进 0-取消 */
private
String
command
;
/** 0 顺序步进,仅支持顺序 */
private
String
ctrlStep
;
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/pojo/xml/pojo/messagecontent/get/GetSchemeNoRequest.java
0 → 100644
View file @
eeb9d45d
package
net
.
wanji
.
utc
.
hisense
.
pojo
.
xml
.
pojo
.
messagecontent
.
get
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
net.wanji.utc.hisense.pojo.xml.pojo.SystemScriptionRequest
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlRootElement
;
/**
* @author duanruiming
* @date 2024/11/02 20:00
* @description 获取海信方案号请求实体,
*/
@Data
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
@XmlRootElement
(
name
=
"systemScription"
)
@AllArgsConstructor
@NoArgsConstructor
public
class
GetSchemeNoRequest
extends
SystemScriptionRequest
{
private
Content
messageContent
;
@Data
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
@AllArgsConstructor
@NoArgsConstructor
public
static
class
Content
{
private
String
spot
;
}
}
signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/util/XMLUtils.java
View file @
eeb9d45d
...
@@ -61,7 +61,7 @@ public class XMLUtils {
...
@@ -61,7 +61,7 @@ public class XMLUtils {
System
.
err
.
println
(
"================"
);
System
.
err
.
println
(
"================"
);
LogOnRequest
logOnMessageContent
=
new
LogOnRequest
();
LogOnRequest
logOnMessageContent
=
new
LogOnRequest
();
LogOnRequest
.
LogOnContent
body
=
new
LogOnRequest
.
LogOn
Content
();
LogOnRequest
.
Content
body
=
new
LogOnRequest
.
Content
();
body
.
setUser
(
"user"
);
body
.
setUser
(
"user"
);
body
.
setPassword
(
"123456"
);
body
.
setPassword
(
"123456"
);
logOnMessageContent
.
setMessageContent
(
body
);
logOnMessageContent
.
setMessageContent
(
body
);
...
...
signal-utc-hisense-service/src/main/resources/bootstrap-docker.yaml
View file @
eeb9d45d
spring
:
#spring:
application
:
# cloud:
# dubbo启动需要程序名称
# nacos:
name
:
utc-hisense
# config:
main
:
# server-addr: 10.102.1.182:8848
allow-circular-references
:
true
# file-extension: yaml
cloud
:
# group: signal
nacos
:
# namespace: signal
config
:
# username: nacos
server-addr
:
173.17.0.1:8848
# password: nacos
file-extension
:
yaml
# application:
group
:
signal
# # dubbo启动需要程序名称
namespace
:
signal
# name: utc-hisense
username
:
nacos
# main:
password
:
nacos
# allow-circular-references: true
\ No newline at end of file
\ No newline at end of file
signal-utc-hisense-service/src/main/resources/bootstrap.yaml
View file @
eeb9d45d
spring
:
spring
:
profiles
:
profiles
:
active
:
dev
active
:
docker
\ No newline at end of file
\ No newline at end of file
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