ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增PQ-COM设备类型报告模板、修改系数校准抛数据组数

Browse Source
This commit is contained in:
caozehui
2025-09-03 14:25:32 +08:00
parent 04a667531b
commit 4ecec5e6ef
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java
View File

@@ -199,7 +199,7 @@ public class SocketSourceResponseService {
phaseSequenceParam.setMoniterIdList(monitorIdList); phaseSequenceParam.setMoniterIdList(monitorIdList);
phaseSequenceParam.setDataType(Arrays.asList("real$VRMS", "real$IRMS")); phaseSequenceParam.setDataType(Arrays.asList("real$VRMS", "real$IRMS"));
phaseSequenceParam.setReadCount(3); phaseSequenceParam.setReadCount(3);
phaseSequenceParam.setIgnoreCount(4); phaseSequenceParam.setIgnoreCount(7);
socketMsg.setData(JSON.toJSONString(phaseSequenceParam)); socketMsg.setData(JSON.toJSONString(phaseSequenceParam));
SocketManager.sendMsg(s, JSON.toJSONString(socketMsg)); SocketManager.sendMsg(s, JSON.toJSONString(socketMsg));

BIN
entrance/src/main/resources/model/PQ-COM.docx Normal file
View File

Binary file not shown.

4
user/src/main/java/com/njcn/gather/user/user/controller/AuthController.java
View File

@@ -70,7 +70,7 @@ public class AuthController extends BaseController {
if (ObjectUtil.isNull(user)) { if (ObjectUtil.isNull(user)) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, UserValidMessage.LOGIN_FAILED); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, UserValidMessage.LOGIN_FAILED);
} else { } else {
String accessToken = JwtUtil.getAccessToken(user.getId()); String accessToken = JwtUtil.getAccessToken(user.getId(),user.getLoginName());
String refreshToken = JwtUtil.getRefreshToken(accessToken); String refreshToken = JwtUtil.getRefreshToken(accessToken);
Token token = new Token(); Token token = new Token();
token.setAccessToken(accessToken); token.setAccessToken(accessToken);
@@ -117,7 +117,7 @@ public class AuthController extends BaseController {
Map<String, Object> map = JwtUtil.parseToken(accessToken); Map<String, Object> map = JwtUtil.parseToken(accessToken);
String userId = (String) map.get(SecurityConstants.USER_ID); String userId = (String) map.get(SecurityConstants.USER_ID);
SysUser user = sysUserService.getById(userId); SysUser user = sysUserService.getById(userId);
String accessTokenNew = JwtUtil.getAccessToken(userId); String accessTokenNew = JwtUtil.getAccessToken(userId,user.getLoginName());
request.setAttribute(SecurityConstants.AUTHENTICATE_USERNAME, user.getLoginName()); request.setAttribute(SecurityConstants.AUTHENTICATE_USERNAME, user.getLoginName());
// String refreshTokenNew = JwtUtil.getRefreshToken(accessTokenNew); // String refreshTokenNew = JwtUtil.getRefreshToken(accessTokenNew);