ycl-common/src/main/java/com/ycl/utils/redis/RedisKey.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-platform/src/main/java/com/ycl/remote/dto/smoke/AlarmMsgDataVo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-platform/src/main/java/com/ycl/remote/dto/smoke/AlarmMsgParamDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-platform/src/main/java/com/ycl/remote/dto/smoke/AlarmMsgResponseDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-platform/src/main/java/com/ycl/remote/dto/smoke/LoginParamDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-platform/src/main/java/com/ycl/remote/dto/smoke/LoginResponseDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-platform/src/main/java/com/ycl/remote/dto/smoke/SmokeResultResponseDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-platform/src/main/java/com/ycl/remote/service/ISmokeDetectionService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-platform/src/test/java/com/ycl/sccgplatform/SccgPlatformApplicationTests.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ycl-common/src/main/java/com/ycl/utils/redis/RedisKey.java
@@ -21,4 +21,10 @@ * 遂昌行政区域 */ public static final String SCCG_REGION = "sccg-region"; /** * 烟感 */ public static final String SMOKE_TOKEN = "smoke-token"; } ycl-platform/src/main/java/com/ycl/remote/dto/smoke/AlarmMsgDataVo.java
New file @@ -0,0 +1,25 @@ package com.ycl.remote.dto.smoke; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; @Data @NoArgsConstructor public class AlarmMsgDataVo { @JsonProperty("Id") private String id; @JsonProperty("MN") private String mn; @JsonProperty("AcquitAt") private Long acquitAt; @JsonProperty("Owner") private String owner; @JsonProperty("Content") private String content; @JsonProperty("MsgType") private String msgType; @JsonProperty("Addr") private String addr; } ycl-platform/src/main/java/com/ycl/remote/dto/smoke/AlarmMsgParamDto.java
New file @@ -0,0 +1,37 @@ package com.ycl.remote.dto.smoke; import lombok.Builder; import lombok.Data; @Data @Builder public class AlarmMsgParamDto { /** * 起始位置 - 必填 */ private Integer StartAt; /** * 请求数量 - 必填 */ private Integer Size; /** * 1:超标2:异常 - 必填 */ private Integer Typ; /** * 查询创建报警日期 */ private ParamVo Param; @Data public class ParamVo { /** * 查询创建报警日期 */ private String CreatedAt; } } ycl-platform/src/main/java/com/ycl/remote/dto/smoke/AlarmMsgResponseDto.java
New file @@ -0,0 +1,23 @@ package com.ycl.remote.dto.smoke; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import java.util.List; @Data @NoArgsConstructor public class AlarmMsgResponseDto { @JsonProperty("content") private List<AlarmMsgDataVo> content; @JsonProperty("total") private Integer total; } ycl-platform/src/main/java/com/ycl/remote/dto/smoke/LoginParamDto.java
New file @@ -0,0 +1,24 @@ package com.ycl.remote.dto.smoke; import lombok.Builder; import lombok.Data; @Data @Builder public class LoginParamDto { /** * 账号 - 必填 */ private String username; /** * 密码 - 必填 */ private String password; /** * 选择true则无需验证码 */ private Boolean noCode; } ycl-platform/src/main/java/com/ycl/remote/dto/smoke/LoginResponseDto.java
New file @@ -0,0 +1,15 @@ package com.ycl.remote.dto.smoke; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; @Data @NoArgsConstructor public class LoginResponseDto { @JsonProperty("Token") private String token; @JsonProperty("Role") private String role; } ycl-platform/src/main/java/com/ycl/remote/dto/smoke/SmokeResultResponseDto.java
New file @@ -0,0 +1,20 @@ package com.ycl.remote.dto.smoke; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; @Data @NoArgsConstructor public class SmokeResultResponseDto<T> { @JsonProperty("Msg") private String msg; /** * 200 成功 114 token失效 */ @JsonProperty("Status") private Integer status; @JsonProperty("Data") private T data; } ycl-platform/src/main/java/com/ycl/remote/service/ISmokeDetectionService.java
New file @@ -0,0 +1,21 @@ package com.ycl.remote.service; import com.ycl.config.feign.FeignConfiguration; import com.ycl.remote.dto.smoke.*; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; @FeignClient(url = "http://116.62.234.187:8088", name = "smokeApi") public interface ISmokeDetectionService { @PostMapping(value = "/loginAction") SmokeResultResponseDto<LoginResponseDto> loginAction(@RequestBody LoginParamDto paramDto); @PostMapping(value = "/admin/listAlarmMsg") SmokeResultResponseDto<AlarmMsgResponseDto> getListAlarmMsg(@RequestBody AlarmMsgParamDto paramDto, @RequestHeader("Auth") String token); } ycl-platform/src/test/java/com/ycl/sccgplatform/SccgPlatformApplicationTests.java
@@ -2,12 +2,18 @@ import com.ycl.common.util.UtilNumber; import com.ycl.enums.common.DictTypeEnum; import com.ycl.remote.dto.smoke.*; import com.ycl.remote.service.ISmokeDetectionService; import com.ycl.service.caseHandler.IBaseCaseService; import com.ycl.service.redis.RedisService; import com.ycl.utils.MD5Util; import com.ycl.utils.redis.RedisKey; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import javax.annotation.Resource; import java.util.List; import java.util.Map; @SpringBootTest @@ -34,17 +40,17 @@ @Test void createCode() { String randomKey ="f83bf56491350983146a1e463f46e59d_7318061173768192"; String randomKey = "f83bf56491350983146a1e463f46e59d_7318061173768192"; String realm = "D62D265605378973"; String userName = "suichang"; /// 用户名 String password = "a12345677"; /// 该用户的明文密码 /// 一共计算五次MD5 String signature = MD5Util.md5Encrypt(password); signature = MD5Util.md5Encrypt(userName+signature); signature = MD5Util.md5Encrypt(userName + signature); signature = MD5Util.md5Encrypt(signature); signature = MD5Util.md5Encrypt(userName+":"+realm+":"+signature); signature = MD5Util.md5Encrypt(signature+":"+randomKey); signature = MD5Util.md5Encrypt(userName + ":" + realm + ":" + signature); signature = MD5Util.md5Encrypt(signature + ":" + randomKey); System.out.println(signature); } @@ -53,4 +59,39 @@ Map<String, String> s = DictTypeEnum.getAllToMap(); } @Autowired ISmokeDetectionService smokeDetectionService; @Resource private RedisService redisService; @Test void smokeLoginTest() { login(); } void login() { LoginParamDto loginParamDto = LoginParamDto.builder().username("connect_test2").password("test@234").noCode(true).build(); SmokeResultResponseDto<LoginResponseDto> responseDto = smokeDetectionService.loginAction(loginParamDto); if (responseDto.getStatus() == 200) { System.out.println(responseDto.getData().getToken()); redisService.set(RedisKey.SMOKE_TOKEN, responseDto.getData().getToken()); } } @Test void smokeAlarmMsgTest() { AlarmMsgParamDto paramDto = AlarmMsgParamDto.builder().StartAt(0).Size(100).build(); SmokeResultResponseDto<AlarmMsgResponseDto> responseDto = smokeDetectionService.getListAlarmMsg(paramDto, redisService.get(RedisKey.SMOKE_TOKEN).toString()); if (responseDto.getStatus() == 200) { AlarmMsgResponseDto dto = responseDto.getData(); List<AlarmMsgDataVo> list = dto.getContent(); System.out.println(list.size()); } else if (responseDto.getStatus() == 114) { login(); smokeAlarmMsgTest(); } } }