|
|
@@ -261,8 +261,8 @@ func (r *MQTTReporter) reportMcuCfg(cfg *mcu.Config) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- text := fmt.Sprintf(`{"imei": "%s", "version": "%s", "ctrlMode": "%d", "lightDuration": "%d", "startHour": "%d", "endHour": "%d", "takePhotoIntervalMinutes": "%d"}`,
|
|
|
- netmgrd.GetIMEI(), cfg.Version, cfg.CtrlMode, cfg.LightDuration, cfg.StartHour, cfg.EndHour, cfg.TakePhotoInterval)
|
|
|
+ text := fmt.Sprintf(`{"imei": "%s", "version": "%s", "ctrlMode": "%d", "lightDuration": "%d", "startHour": "%d", "endHour": "%d", "takePhotoIntervalMinutes": "%d", "takePhotoIntervalDays": "%d"}`,
|
|
|
+ netmgrd.GetIMEI(), cfg.Version, cfg.CtrlMode, cfg.LightDuration, cfg.StartHour, cfg.EndHour, cfg.TakePhotoIntervalMinutes, cfg.TakePhotoIntervalDays)
|
|
|
token := r.client.Publish(fmt.Sprintf("/yfkj/bxs-sy/notify/%s/mcuParams", r.dui), MqttQos1, false, text)
|
|
|
select {
|
|
|
case <-r.ctx.Done():
|
|
|
@@ -374,12 +374,32 @@ func (r *MQTTReporter) IsLogin() bool {
|
|
|
}
|
|
|
|
|
|
func (r *MQTTReporter) handleRequests(client mqtt.Client, msg mqtt.Message) {
|
|
|
- go r.execOneCmd(msg)
|
|
|
+ go func() {
|
|
|
+ if msg.Retained() { /////////////////// 历史缓存消息,先清除掉,避免重复处理
|
|
|
+ token := client.Publish(msg.Topic(), MqttQos1, true, []byte{})
|
|
|
+ select {
|
|
|
+ case <-r.ctx.Done():
|
|
|
+ return
|
|
|
+ case <-token.Done():
|
|
|
+ }
|
|
|
+
|
|
|
+ if token.Error() != nil {
|
|
|
+ baseapp.Logger.Errorf("[%s] 清除Retained消息失败: %v!!", MODULE_NAME, token.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ r.execOneCmd(msg)
|
|
|
+ }()
|
|
|
}
|
|
|
|
|
|
func (r *MQTTReporter) execOneCmd(msg mqtt.Message) {
|
|
|
str := string(msg.Payload())
|
|
|
- baseapp.Logger.Infof("[%s] 收到一个RPC请求: %s", MODULE_NAME, str)
|
|
|
+ if msg.Retained() {
|
|
|
+ baseapp.Logger.Infof("[%s] 收到一个保留RPC请求: %s", MODULE_NAME, str)
|
|
|
+ } else {
|
|
|
+ baseapp.Logger.Infof("[%s] 收到一个实时RPC请求: %s", MODULE_NAME, str)
|
|
|
+ }
|
|
|
|
|
|
var resp *jsonrpc2.Response // 预定义一个空的应答
|
|
|
|
|
|
@@ -404,17 +424,20 @@ func (r *MQTTReporter) execOneCmd(msg mqtt.Message) {
|
|
|
cfgParams.LightDuration, _ = strconv.Atoi(params.LightDuration)
|
|
|
cfgParams.StartHour, _ = strconv.Atoi(params.StartHour)
|
|
|
cfgParams.EndHour, _ = strconv.Atoi(params.EndHour)
|
|
|
- cfgParams.TakePhotoInterval, _ = strconv.Atoi(params.PhotoIntervalMinutes)
|
|
|
+ cfgParams.TakePhotoIntervalMinutes, _ = strconv.Atoi(params.PhotoIntervalMinutes)
|
|
|
+ cfgParams.TakePhotoIntervalDays, _ = strconv.Atoi(params.PhotoIntervalDays)
|
|
|
switch cfgParams.CtrlMode {
|
|
|
case 0: /// 光控
|
|
|
if cfgParams.LightDuration < 1 || cfgParams.LightDuration > 10 ||
|
|
|
- cfgParams.TakePhotoInterval > cfgParams.LightDuration*60 {
|
|
|
+ cfgParams.TakePhotoIntervalMinutes > cfgParams.LightDuration*60 ||
|
|
|
+ cfgParams.TakePhotoIntervalDays < 1 || cfgParams.TakePhotoIntervalDays > 7 {
|
|
|
resp = buildResp(req, nil, errors.New("光控参数错误"))
|
|
|
goto retp
|
|
|
}
|
|
|
case 1: /// 时控
|
|
|
if cfgParams.StartHour < 0 || cfgParams.StartHour > 23 || cfgParams.EndHour < 0 || cfgParams.EndHour > 23 ||
|
|
|
- cfgParams.StartHour > cfgParams.EndHour || cfgParams.TakePhotoInterval > (cfgParams.EndHour-cfgParams.StartHour)*60 {
|
|
|
+ cfgParams.StartHour > cfgParams.EndHour || cfgParams.TakePhotoIntervalMinutes > (cfgParams.EndHour-cfgParams.StartHour)*60 ||
|
|
|
+ cfgParams.TakePhotoIntervalDays < 1 || cfgParams.TakePhotoIntervalDays > 7 {
|
|
|
resp = buildResp(req, nil, errors.New("时控参数错误"))
|
|
|
goto retp
|
|
|
}
|
|
|
@@ -443,7 +466,8 @@ func (r *MQTTReporter) execOneCmd(msg mqtt.Message) {
|
|
|
params.LightDuration = fmt.Sprintf("%d", mcu.CfgParams.LightDuration)
|
|
|
params.StartHour = fmt.Sprintf("%d", mcu.CfgParams.StartHour)
|
|
|
params.EndHour = fmt.Sprintf("%d", mcu.CfgParams.EndHour)
|
|
|
- params.PhotoIntervalMinutes = fmt.Sprintf("%d", mcu.CfgParams.TakePhotoInterval)
|
|
|
+ params.PhotoIntervalMinutes = fmt.Sprintf("%d", mcu.CfgParams.TakePhotoIntervalMinutes)
|
|
|
+ params.PhotoIntervalDays = fmt.Sprintf("%d", mcu.CfgParams.TakePhotoIntervalDays)
|
|
|
resp = buildResp(req, params, nil)
|
|
|
// Call-3: 异步请求MCU获取当前实时的环境数据
|
|
|
case "getCurrentEnvData":
|