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-12 19:26:12 +08:00
parent 2075d90760
commit b546128183
20 changed files with 58 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@ public class PqDevController extends BaseController {
@PostMapping("/list")
@ApiOperation("分页查询被检设备")
@ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
public HttpResult<Page<PqDev>> list(@RequestBody @Validated PqDevParam.PqDevQueryParam queryParam) {
public HttpResult<Page<PqDev>> list(@RequestBody @Validated PqDevParam.QueryParam queryParam) {
String methodDescribe = getMethodDescribe("list");
LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
Page<PqDev> result = pqDevService.listPqDevs(queryParam);
@@ -77,7 +77,7 @@ public class PqDevController extends BaseController {
@PutMapping("/update")
@ApiOperation("修改被检设备")
@ApiImplicitParam(name = "updateParam", value = "被检设备", required = true)
public HttpResult<Object> update(@RequestBody @Validated PqDevParam.PqDevUpdateParam updateParam) {
public HttpResult<Object> update(@RequestBody @Validated PqDevParam.UpdateParam updateParam) {
String methodDescribe = getMethodDescribe("update");
LogUtil.njcnDebug(log, "{}，修改数据为：{}", methodDescribe, updateParam);
boolean result = pqDevService.updatePqDev(updateParam);
@@ -143,7 +143,7 @@ public class PqDevController extends BaseController {
@PostMapping("/export")
@ApiOperation("导出被检设备数据")
@ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
public void export(@RequestBody @Validated PqDevParam.PqDevQueryParam queryParam) {
public void export(@RequestBody @Validated PqDevParam.QueryParam queryParam) {
pqDevService.exportPqDevData(queryParam);
}
@@ -175,7 +175,7 @@ public class PqDevController extends BaseController {
@ApiImplicitParam(name = "planId", value = "计划id", required = true),
@ApiImplicitParam(name = "pqDevId", value = "被检设备id", required = true)
})
public HttpResult<Object> bindPlan(@RequestBody @Validated PqDevParam.PqDevBindPlanParam bindPlanParam) {
public HttpResult<Object> bindPlan(@RequestBody @Validated PqDevParam.BindPlanParam bindPlanParam) {
String methodDescribe = getMethodDescribe("bindPlan");
LogUtil.njcnDebug(log, "{}，绑定计划数据为：planId={}, pqDevId={}", methodDescribe, bindPlanParam.getPlanId(), String.join(StrUtil.COMMA, bindPlanParam.getPqDevIds()));
boolean result = pqDevService.bindPlan(bindPlanParam.getPlanId(), bindPlanParam.getPqDevIds());

6
device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java
View File

@@ -133,7 +133,7 @@ public class PqDevParam {
*/
@Data
@EqualsAndHashCode(callSuper = true)
public static class PqDevUpdateParam extends PqDevParam {
public static class UpdateParam extends PqDevParam {
@ApiModelProperty("id")
@NotBlank(message = DeviceValidMessage.ID_NOT_BLANK)
@@ -147,7 +147,7 @@ public class PqDevParam {
*/
@Data
@EqualsAndHashCode(callSuper = true)
public static class PqDevQueryParam extends BaseParam {
public static class QueryParam extends BaseParam {
@ApiModelProperty("名称")
@Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = DeviceValidMessage.NAME_FORMAT_ERROR)
private String name;
@@ -157,7 +157,7 @@ public class PqDevParam {
}
@Data
public static class PqDevBindPlanParam {
public static class BindPlanParam {
@ApiModelProperty("planId")
@NotNull(message = DeviceValidMessage.PLAN_ID_NOT_NULL)
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DeviceValidMessage.ID_FORMAT_ERROR)

6
device/src/main/java/com/njcn/gather/device/device/service/IPqDevService.java
View File

@@ -20,7 +20,7 @@ public interface IPqDevService extends IService<PqDev> {
* @param queryParam 查询参数
* @return 分页数据，包含被检设备列表
*/
Page<PqDev> listPqDevs(PqDevParam.PqDevQueryParam queryParam);
Page<PqDev> listPqDevs(PqDevParam.QueryParam queryParam);
/**
* 新增被检设备信息
@@ -36,7 +36,7 @@ public interface IPqDevService extends IService<PqDev> {
* @param updateParam 被检设备信息
* @return 修改成功返回true，否则返回false
*/
boolean updatePqDev(PqDevParam.PqDevUpdateParam updateParam);
boolean updatePqDev(PqDevParam.UpdateParam updateParam);
/**
* 删除被检设备信息
@@ -63,7 +63,7 @@ public interface IPqDevService extends IService<PqDev> {
*
* @param queryParam 查询参数
*/
void exportPqDevData(PqDevParam.PqDevQueryParam queryParam);
void exportPqDevData(PqDevParam.QueryParam queryParam);
/**

6
device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java
View File

@@ -35,7 +35,7 @@ import java.util.stream.Collectors;
public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements IPqDevService {
@Override
public Page<PqDev> listPqDevs(PqDevParam.PqDevQueryParam queryParam) {
public Page<PqDev> listPqDevs(PqDevParam.QueryParam queryParam) {
QueryWrapper<PqDev> queryWrapper = new QueryWrapper<>();
if (ObjectUtil.isNotNull(queryParam)) {
queryWrapper.like(StrUtil.isNotBlank(queryParam.getName()), "pq_dev.name", queryParam.getName())
@@ -71,7 +71,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
}
@Override
public boolean updatePqDev(PqDevParam.PqDevUpdateParam updateParam) {
public boolean updatePqDev(PqDevParam.UpdateParam updateParam) {
PqDev pqDev = new PqDev();
BeanUtil.copyProperties(updateParam, pqDev);
if (Objects.nonNull(pqDev.getSeries())) {
@@ -113,7 +113,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
}
@Override
public void exportPqDevData(PqDevParam.PqDevQueryParam queryParam) {
public void exportPqDevData(PqDevParam.QueryParam queryParam) {
QueryWrapper<PqDev> queryWrapper = new QueryWrapper<>();
if (ObjectUtil.isNotNull(queryParam)) {
queryWrapper.like(StrUtil.isNotBlank(queryParam.getName()), "pq_dev.name", queryParam.getName())