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

微调

Browse Source
This commit is contained in:
caozehui
2024-11-27 14:44:14 +08:00
parent 2cffee4287
commit 43c1d56db3
5 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
device/src/main/java/com/njcn/gather/device/device/controller/PqDevController.java
View File

@@ -145,6 +145,8 @@ public class PqDevController extends BaseController {
@ApiOperation("导出被检设备数据")
@ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
public void export(@RequestBody @Validated PqDevParam.QueryParam queryParam) {
String methodDescribe = getMethodDescribe("export");
LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
pqDevService.exportPqDevData(queryParam);
}

12
device/src/main/java/com/njcn/gather/device/pojo/constant/DeviceValidMessage.java
View File

@@ -117,4 +117,16 @@ public interface DeviceValidMessage {
String PQ_SOURCE_TYPE_FORMAT_ERROR = "检测源类型格式错误，请检查pqSourceType参数";
String ENABLE_NOT_NULL = "状态不能为空，请检查enable参数";
String PQ_SOURCE_NAME_FORMAT_ERROR = "检测源名称格式错误，请检查pqSourceName参数";
String PQ_SOURCE_PARAMETER_ID_NOT_BLANK = "检测源参数ID不能为空，请检查pqSourceParameterId参数";
String PQ_SOURCE_PARAMETER_PID_NOT_BLANK = "检测源参数PID不能为空，请检查pqSourceParameterId参数";
String PQ_SOURCE_PARAMETER_TYPE_NOT_BLANK = "检测源参数类型不能为空，请检查pqSourceParameterType参数";
String PQ_SOURCE_PARAMETER_REMARK_NOT_BLANK = "检测源参数描述不能为空，请检查pqSourceParameterRemark参数";
String PQ_SOURCE_PARAMETER_VALUE_NOT_BLANK = "参数值不能为空，请检查pqSourceParameterValue参数";
}

1
device/src/main/java/com/njcn/gather/device/script/pojo/param/PqScriptParam.java
View File

@@ -66,6 +66,7 @@ public class PqScriptParam {
private String valueType;
@ApiModelProperty("模式")
@NotBlank(message = DeviceValidMessage.PATTERN_NOT_BLANK)
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DeviceValidMessage.PATTERN_FORMAT_ERROR)
private String pattern;
}

1
system/src/main/java/com/njcn/gather/system/auth/controller/AuthController.java
View File

@@ -82,6 +82,7 @@ public class AuthController extends BaseController {
token.setUserInfo(map);
CustomCacheUtil customCacheUtil = SpringUtil.getBean(CustomCacheUtil.CACHE_NAME);
customCacheUtil.putWithExpireTime(UserConstant.USER_ID, user.getId(), DateUnit.DAY.getMillis());
customCacheUtil.putWithExpireTime(UserConstant.USER_NAME, user.getName(), DateUnit.DAY.getMillis());
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, token, methodDescribe);
}
}

14
system/src/main/java/com/njcn/gather/system/reg/pojo/vo/SysRegResVO.java Normal file
View File

@@ -0,0 +1,14 @@
package com.njcn.gather.system.reg.pojo.vo;
import lombok.Data;
/**
* @author caozehui
* @data 2024-11-25
*/
@Data
public class SysRegResVO {
private String code;
private String expireDate;
}