Commit 13275c8e by 李小龙

fix:发送公众号消息模板

parent 825e9ee5
package com.makeit.mqtt; package com.makeit.mqtt;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.makeit.common.dto.BaseIdDTO; import com.makeit.common.dto.BaseIdDTO;
import com.makeit.common.response.ApiResponseEntity; import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils; import com.makeit.common.response.ApiResponseUtils;
import com.makeit.entity.platform.alarm.PlatDayDurationRecord;
import com.makeit.global.annotation.AuthIgnore; import com.makeit.global.annotation.AuthIgnore;
import com.makeit.module.iot.vo.DeviceInfo;
import com.makeit.service.platform.alarm.PlatDayDurationRecordService;
import com.makeit.utils.msg.dto.MsgSendDTO; import com.makeit.utils.msg.dto.MsgSendDTO;
import com.makeit.utils.msg.sender.WxSpSender; import com.makeit.utils.msg.sender.WxSpSender;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -20,8 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -20,8 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.Collections; import java.util.Collections;
import java.util.Date;
import java.util.List;
@Api(tags = "告警记录2") @Api(tags = "告警记录2")
@RestController @RestController
...@@ -91,33 +85,33 @@ public class TestAlarmRecordController { ...@@ -91,33 +85,33 @@ public class TestAlarmRecordController {
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
@Autowired // @Autowired
private PushCallback pushCallback; // private PushCallback pushCallback;
//
@ApiOperation("测试跌倒") // @ApiOperation("测试跌倒")
@PostMapping("testFall") // @PostMapping("testFall")
@AuthIgnore // @AuthIgnore
public ApiResponseEntity<Void> testVoice(@RequestBody DeviceInfo info) throws Exception { // public ApiResponseEntity<Void> testVoice(@RequestBody DeviceInfo info) throws Exception {
//
pushCallback.checkAlarm(info); // pushCallback.checkAlarm(info);
return ApiResponseUtils.success(); // return ApiResponseUtils.success();
} // }
//
//
@Autowired // @Autowired
private PlatDayDurationRecordService platDayDurationRecordService; // private PlatDayDurationRecordService platDayDurationRecordService;
//
@ApiOperation("测试") // @ApiOperation("测试")
@PostMapping("test") // @PostMapping("test")
@AuthIgnore // @AuthIgnore
public ApiResponseEntity<List<PlatDayDurationRecord>> test(@RequestBody DeviceInfo info) throws Exception { // public ApiResponseEntity<List<PlatDayDurationRecord>> test(@RequestBody DeviceInfo info) throws Exception {
PlatDayDurationRecord platDayDurationRecord = new PlatDayDurationRecord(); // PlatDayDurationRecord platDayDurationRecord = new PlatDayDurationRecord();
platDayDurationRecord.setDay(new Date()); // platDayDurationRecord.setDay(new Date());
LambdaQueryWrapper<PlatDayDurationRecord> platDayDurationRecordLambdaQueryWrapper = new LambdaQueryWrapper<>(); // LambdaQueryWrapper<PlatDayDurationRecord> platDayDurationRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
platDayDurationRecordLambdaQueryWrapper.eq(PlatDayDurationRecord::getDay,platDayDurationRecord.getDay()); // platDayDurationRecordLambdaQueryWrapper.eq(PlatDayDurationRecord::getDay,platDayDurationRecord.getDay());
List<PlatDayDurationRecord> list = platDayDurationRecordService.list(); // List<PlatDayDurationRecord> list = platDayDurationRecordService.list();
return ApiResponseUtils.success(list); // return ApiResponseUtils.success(list);
} // }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment