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

日志导出csv功能、报告按照修改时间倒序排列

Browse Source
This commit is contained in:
caozehui
2025-04-15 10:14:52 +08:00
parent 7ac01b0f5e
commit 55bf90d0af
7 changed files with 56 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java
View File

@@ -149,6 +149,7 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
wrapper.like(StrUtil.isNotBlank(queryParam.getName()), "name", queryParam.getName())
.eq(StrUtil.isNotBlank(queryParam.getVersion()), "version", queryParam.getVersion())
.eq("state", DataStateEnum.ENABLE.getCode());
wrapper.orderByDesc("Update_Time");
Page<PqReport> page1 = this.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), wrapper);
List<PqReportVO> pqReportVOList = page1.getRecords().stream().map(pqReport -> {

13
detection/src/main/java/com/njcn/gather/script/controller/PqScriptController.java
View File

@@ -4,12 +4,9 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.constant.OperateType;
import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.LogUtil;
import com.njcn.gather.detection.pojo.param.DevPhaseSequenceParam;
import com.njcn.gather.detection.pojo.param.PreDetectionParam;
import com.njcn.gather.script.pojo.param.PqScriptDtlsParam;
import com.njcn.gather.script.pojo.param.PqScriptIssueParam;
import com.njcn.gather.script.pojo.param.PqScriptParam;
@@ -62,15 +59,11 @@ public class PqScriptController extends BaseController {
@PostMapping("/add")
@ApiOperation("新增检测脚本")
@ApiImplicitParam(name = "pqDevParam", value = "检测脚本", required = true)
public HttpResult<Boolean> add(@RequestBody @Validated PqScriptParam param) {
public HttpResult<String> add(@RequestBody @Validated PqScriptParam param) {
String methodDescribe = getMethodDescribe("add");
LogUtil.njcnDebug(log, "{}，新增数据为：{}", methodDescribe, param);
Boolean result = pqScriptService.addPqScript(param);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
String id = pqScriptService.addPqScript(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, id, methodDescribe);
}
@OperateInfo(operateType = OperateType.UPDATE)

4
detection/src/main/java/com/njcn/gather/script/service/IPqScriptService.java
View File

@@ -34,9 +34,9 @@ public interface IPqScriptService extends IService<PqScript> {
* 新增检测脚本
*
* @param param 检测脚本
* @return 成功返回true, 失败返回false
* @return 成功返回ScriptId, 失败返回null
*/
Boolean addPqScript(PqScriptParam param);
String addPqScript(PqScriptParam param);
/**
* 删除检测脚本

5
detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptServiceImpl.java
View File

@@ -61,13 +61,14 @@ public class PqScriptServiceImpl extends ServiceImpl<PqScriptMapper, PqScript> i
@Override
@Transactional
public Boolean addPqScript(PqScriptParam param) {
public String addPqScript(PqScriptParam param) {
this.checkRepeat(param, false);
PqScript pqScript = new PqScript();
BeanUtils.copyProperties(param, pqScript);
pqScript.setStandardTime(LocalDate.of(Integer.parseInt(param.getStandardTime()), 1, 1));
pqScript.setState(DataStateEnum.ENABLE.getCode());
return this.save(pqScript);
this.save(pqScript);
return pqScript.getId();
}
@Override