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
2025-03-26 15:43:39 +08:00
parent 9a7d841d9c
commit 55208ecf69
36 changed files with 174 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,6 @@ package com.njcn.gather.device.controller;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.constant.OperateType;
@@ -15,7 +14,6 @@ import com.njcn.common.utils.LogUtil;
import com.njcn.gather.device.pojo.param.PqDevParam;
import com.njcn.gather.device.pojo.po.PqDev;
import com.njcn.gather.device.pojo.vo.PqDevVO;
import com.njcn.gather.device.pojo.vo.PreDetection;
import com.njcn.gather.device.service.IPqDevService;
import com.njcn.gather.type.pojo.po.DevType;
import com.njcn.gather.type.service.IDevTypeService;
@@ -33,8 +31,6 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -79,14 +75,14 @@ public class PqDevController extends BaseController {
@PostMapping("/add")
@ApiOperation("新增被检设备")
@ApiImplicitParam(name = "pqDevParam", value = "被检设备", required = true)
public HttpResult<Object> add(@RequestBody @Validated PqDevParam pqDevParam) {
public HttpResult<Boolean> add(@RequestBody @Validated PqDevParam pqDevParam) {
String methodDescribe = getMethodDescribe("add");
LogUtil.njcnDebug(log, "{}，新增数据为：{}", methodDescribe, pqDevParam);
boolean result = pqDevService.addPqDev(pqDevParam);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}
@@ -94,14 +90,14 @@ public class PqDevController extends BaseController {
@PostMapping("/update")
@ApiOperation("修改被检设备")
@ApiImplicitParam(name = "updateParam", value = "被检设备", required = true)
public HttpResult<Object> update(@RequestBody @Validated PqDevParam.UpdateParam updateParam) {
public HttpResult<Boolean> update(@RequestBody @Validated PqDevParam.UpdateParam updateParam) {
String methodDescribe = getMethodDescribe("update");
LogUtil.njcnDebug(log, "{}，修改数据为：{}", methodDescribe, updateParam);
boolean result = pqDevService.updatePqDev(updateParam);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}
@@ -109,14 +105,14 @@ public class PqDevController extends BaseController {
@PostMapping("/delete")
@ApiOperation("删除被检设备")
@ApiImplicitParam(name = "ids", value = "被检设备id", required = true)
public HttpResult<Object> delete(@RequestBody @Validated PqDevParam.DeleteParam param) {
public HttpResult<Boolean> delete(@RequestBody @Validated PqDevParam.DeleteParam param) {
String methodDescribe = getMethodDescribe("delete");
LogUtil.njcnDebug(log, "{}，删除ID数据为：{}", methodDescribe, String.join(StrUtil.COMMA, param.getIds()));
boolean result = pqDevService.deletePqDev(param);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}

12
detection/src/main/java/com/njcn/gather/device/mapper/PqDevMapper.java
View File

@@ -26,8 +26,20 @@ public interface PqDevMapper extends MPJBaseMapper<PqDev> {
void updateReportState(@Param("id")String id);
/**
* 修改检测计划的检测结果
*
* @param planId
* @param checkResult
*/
void updatePlanCheckResult(@Param("planId")String planId, @Param("checkResult")Integer checkResult);
/**
* 修改检测计划的检测状态
*
* @param planId
* @param testState
*/
void updatePlanTestState(@Param("planId")String planId, @Param("testState")Integer testState);
}

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

@@ -518,7 +518,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
.set(PqDev::getReCheckNum, i)
.set(PqDev::getCheckState, checkState)
.set(PqDev::getCheckResult, result.get(pqDev.getId()))
.set(PqDev::getCheckBy, RequestUtil.getUserName())
.set(PqDev::getCheckBy, RequestUtil.getUserId())
.set(PqDev::getCheckTime, LocalDateTime.now())
.set(PqDev::getReportState, DevReportStateEnum.NOT_GENERATED.getValue())
.eq(PqDev::getId, pqDev.getId()));

24
detection/src/main/java/com/njcn/gather/err/controller/PqErrSysController.java
View File

@@ -63,14 +63,14 @@ public class PqErrSysController extends BaseController {
@PostMapping("/add")
@ApiOperation("新增误差体系")
@ApiImplicitParam(name = "param", value = "误差体系", required = true)
public HttpResult<Object> add(@RequestBody @Validated PqErrSysParam param) {
public HttpResult<Boolean> add(@RequestBody @Validated PqErrSysParam param) {
String methodDescribe = getMethodDescribe("add");
LogUtil.njcnDebug(log, "{}，新增数据为：{}", methodDescribe, param);
boolean result = pqErrSysService.addPqErrSys(param);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}
@@ -78,14 +78,14 @@ public class PqErrSysController extends BaseController {
@PostMapping("/update")
@ApiOperation("修改误差体系")
@ApiImplicitParam(name = "param", value = "误差体系", required = true)
public HttpResult<Object> update(@RequestBody @Validated PqErrSysParam.UpdateParam param) {
public HttpResult<Boolean> update(@RequestBody @Validated PqErrSysParam.UpdateParam param) {
String methodDescribe = getMethodDescribe("update");
LogUtil.njcnDebug(log, "{}，修改数据为：{}", methodDescribe, param);
boolean result = pqErrSysService.updatePqErrSys(param);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}
@@ -93,14 +93,14 @@ public class PqErrSysController extends BaseController {
@PostMapping("/delete")
@ApiOperation("删除误差体系")
@ApiImplicitParam(name = "ids", value = "误差体系id", required = true)
public HttpResult<Object> delete(@RequestBody List<String> ids) {
public HttpResult<Boolean> delete(@RequestBody List<String> ids) {
String methodDescribe = getMethodDescribe("delete");
LogUtil.njcnDebug(log, "{}，删除ID数据为：{}", methodDescribe, String.join(StrUtil.COMMA, ids));
boolean result = pqErrSysService.deletePqErrSys(ids);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}
@@ -129,14 +129,14 @@ public class PqErrSysController extends BaseController {
@GetMapping("/copy")
@ApiOperation("复制误差体系")
@ApiImplicitParam(name = "id", value = "误差体系id", required = true)
public HttpResult<Object> copy(@RequestParam("id") String id) {
public HttpResult<Boolean> copy(@RequestParam("id") String id) {
String methodDescribe = getMethodDescribe("copy");
LogUtil.njcnDebug(log, "{}，复制ID为：{}", methodDescribe, id);
boolean result = pqErrSysService.copyPqErrSys(id);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}
}

25
detection/src/main/java/com/njcn/gather/icd/controller/PqIcdPathController.java
View File

@@ -11,8 +11,6 @@ import com.njcn.common.utils.LogUtil;
import com.njcn.gather.icd.pojo.param.PqIcdPathParam;
import com.njcn.gather.icd.pojo.po.PqIcdPath;
import com.njcn.gather.icd.service.IPqIcdPathService;
import com.njcn.gather.type.pojo.param.DevTypeParam;
import com.njcn.gather.type.pojo.po.DevType;
import com.njcn.web.controller.BaseController;
import com.njcn.web.utils.HttpResultUtil;
import io.swagger.annotations.Api;
@@ -27,16 +25,15 @@ import java.util.List;
/**
*
* @author caozehui
* @date 2025-02-10
*/
@Slf4j
@Api(tags="icd管理")
@Api(tags = "icd管理")
@RestController
@RequestMapping("/icd")
@RequiredArgsConstructor
public class PqIcdPathController extends BaseController{
public class PqIcdPathController extends BaseController {
private final IPqIcdPathService pqIcdPathService;
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -63,15 +60,15 @@ public class PqIcdPathController extends BaseController{
@PostMapping("/add")
@ApiOperation("新增icd")
@ApiImplicitParam(name = "param", value = "icd新增参数", required = true)
public HttpResult<String> add(@RequestBody @Validated PqIcdPathParam param) {
public HttpResult<Boolean> add(@RequestBody @Validated PqIcdPathParam param) {
String methodDescribe = getMethodDescribe("add");
LogUtil.njcnDebug(log, "{}，新增数据为：{}", methodDescribe, param);
boolean result = pqIcdPathService.addIcd(param);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}
@@ -79,15 +76,15 @@ public class PqIcdPathController extends BaseController{
@PostMapping("/update")
@ApiOperation("修改icd")
@ApiImplicitParam(name = "param", value = "icd修改参数", required = true)
public HttpResult<String> update(@RequestBody @Validated PqIcdPathParam.UpdateParam param) {
public HttpResult<Boolean> update(@RequestBody @Validated PqIcdPathParam.UpdateParam param) {
String methodDescribe = getMethodDescribe("update");
LogUtil.njcnDebug(log, "{}，修改数据为：{}", methodDescribe, param);
boolean result = pqIcdPathService.updateIcd(param);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}
@@ -95,14 +92,14 @@ public class PqIcdPathController extends BaseController{
@PostMapping("/delete")
@ApiOperation("删除icd")
@ApiImplicitParam(name = "ids", value = "icd的id列表", required = true)
public HttpResult<String> delete(@RequestBody List<String> ids) {
public HttpResult<Boolean> delete(@RequestBody List<String> ids) {
String methodDescribe = getMethodDescribe("delete");
LogUtil.njcnDebug(log, "{}，删除数据为：{}", methodDescribe, String.join(StrUtil.COMMA, ids));
boolean result = pqIcdPathService.deleteIcd(ids);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}

18
detection/src/main/java/com/njcn/gather/plan/controller/AdPlanController.java
View File

@@ -58,14 +58,14 @@ public class AdPlanController extends BaseController {
@PostMapping("/add")
@ApiOperation("新增检测计划")
@ApiImplicitParam(name = "param", value = "检测计划", required = true)
public HttpResult<Object> add(@RequestBody @Validated AdPlanParam param) {
public HttpResult<Boolean> add(@RequestBody @Validated AdPlanParam param) {
String methodDescribe = getMethodDescribe("add");
LogUtil.njcnDebug(log, "{}，新增数据为：{}", methodDescribe, param);
boolean result = adPlanService.addAdPlan(param);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}
@@ -73,14 +73,14 @@ public class AdPlanController extends BaseController {
@PostMapping("/update")
@ApiOperation("修改检测计划")
@ApiImplicitParam(name = "updateParam", value = "检测计划", required = true)
public HttpResult<Object> update(@RequestBody @Validated AdPlanParam.UpdateParam updateParam) {
public HttpResult<Boolean> update(@RequestBody @Validated AdPlanParam.UpdateParam updateParam) {
String methodDescribe = getMethodDescribe("update");
LogUtil.njcnDebug(log, "{}，修改数据为：{}", methodDescribe, updateParam);
boolean result = adPlanService.updateAdPlan(updateParam);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}
@@ -88,14 +88,14 @@ public class AdPlanController extends BaseController {
@PostMapping("/delete")
@ApiOperation("删除检测计划")
@ApiImplicitParam(name = "ids", value = "检测计划id", required = true)
public HttpResult<Object> delete(@RequestBody List<String> ids) {
public HttpResult<Boolean> delete(@RequestBody List<String> ids) {
String methodDescribe = getMethodDescribe("delete");
LogUtil.njcnDebug(log, "{}，删除ID数据为：{}", methodDescribe, String.join(StrUtil.COMMA, ids));
boolean result = adPlanService.deleteAdPlan(ids);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}

24
detection/src/main/java/com/njcn/gather/pojo/enums/DetectionResponseEnum.java
View File

@@ -18,13 +18,13 @@ public enum DetectionResponseEnum {
RAW_DATA_NOT_EXIST("A02004", "原始数据不存在"),
PLAN_REPEATED("A02005", "当前模式下，该计划已存在"),
PLAN_NOT_EXIST("A02006", "该计划不存在"),
SCRIPT_RELATE_DICT_NOT_EXIST("A02007","脚本关联的字典不存在"),
NOT_CHECKED_PLAN_CANNOT_ANALYSE("A02008","只有检测状态为检测完成的计划才能进行统计分析" ),
CANNOT_CHANGE_SCRIPT_WHEN_CHECKING("A02009","只有检测状态为未检时，才能修改检测脚本" ),
CANNOT_CHANGE_ERROR_SYS_WHEN_CHECKING("A02010","只有检测状态为未检时，才能修改误差体系" ),
CANNOT_CHANGE_REPORT_WHEN_CHECKING("A02011","只有检测状态为未检时，才能修改绑定报告模板"),
SCRIPT_RELATE_DICT_NOT_EXIST("A02007", "脚本关联的字典不存在"),
NOT_CHECKED_PLAN_CANNOT_ANALYSE("A02008", "只有检测状态为检测完成的计划才能进行统计分析"),
CANNOT_CHANGE_SCRIPT_WHEN_CHECKING("A02009", "只有检测状态为未检时，才能修改检测脚本"),
CANNOT_CHANGE_ERROR_SYS_WHEN_CHECKING("A02010", "只有检测状态为未检时，才能修改误差体系"),
CANNOT_CHANGE_REPORT_WHEN_CHECKING("A02011", "只有检测状态为未检时，才能修改绑定报告模板"),
ICD_PATH_NAME_REPEAT("A02012", "icd名称重复"),
ERR_SYS_BOUND_NOT_DELETE("A02013","误差体系已被计划所绑定，无法删除！"),
ERR_SYS_BOUND_NOT_DELETE("A02013", "误差体系已被计划所绑定，无法删除！"),
IMPORT_DATA_FAIL("A02014", "导入数据失败"),
@@ -38,12 +38,12 @@ public enum DetectionResponseEnum {
HAS_NOT_UNCHECKED_DEVICE("A02022", "设备在检测中或已被检测过，请勿解除绑定"),
IMPORT_PLAN_DATA_FAIL("A02023", "导入的检测计划为空"),
IMPORT_DATA_FORMAT_FAIL("A02024", "导入数据格式错误"),
IMPORT_SOURCE_ERROR("A02025","当前模式下一个检测计划只能有一个检测源" ),
IMPORT_DATASOURCE_ERROR("A02026","当前模式下一个检测计划只能有一个数据源" ),
DEV_UN_CHECKED("A02027","装置还未检测完成！" ),
DEV_UN_REPORT("A02028","装置报告未生成！" ),
DEVICE_DIS_ERROR("A02029","装置配置异常" ),
DEVICE_DELETE("A02030","设备无法删除，已绑定计划！" );
IMPORT_SOURCE_ERROR("A02025", "当前模式下一个检测计划只能有一个检测源"),
IMPORT_DATASOURCE_ERROR("A02026", "当前模式下一个检测计划只能有一个数据源"),
DEV_UN_CHECKED("A02027", "装置还未检测完成！"),
DEV_UN_REPORT("A02028", "装置报告未生成！"),
DEVICE_DIS_ERROR("A02029", "装置配置异常"),
DEVICE_DELETE("A02030", "设备无法删除，已绑定计划！");
private final String code;

21
detection/src/main/java/com/njcn/gather/report/controller/ReportController.java
View File

@@ -90,42 +90,45 @@ public class ReportController extends BaseController {
@PostMapping("/add")
@ApiOperation("新增报告模板")
@ApiImplicitParam(name = "param", value = "报告模板参数", required = true)
public HttpResult<Object> add(ReportParam reportParam) {
public HttpResult<Boolean> add(ReportParam reportParam) {
String methodDescribe = getMethodDescribe("add");
LogUtil.njcnDebug(log, "{}，新增参数为：{}", methodDescribe, reportParam);
boolean result = pqReportService.add(reportParam);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
}
@OperateInfo(operateType = OperateType.UPDATE)
@PostMapping("/update")
@ApiOperation("更新报告模板")
@ApiImplicitParam(name = "param", value = "报告模板参数", required = true)
public HttpResult<Object> update(ReportParam.UpdateParam reportParam) {
public HttpResult<Boolean> update(ReportParam.UpdateParam reportParam) {
String methodDescribe = getMethodDescribe("update");
LogUtil.njcnDebug(log, "{}，修改参数为：{}", methodDescribe, reportParam);
boolean result = pqReportService.update(reportParam);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
}
@OperateInfo(operateType = OperateType.DELETE)
@PostMapping("/delete")
@ApiOperation("删除报告模板")
@ApiImplicitParam(name = "param", value = "报告模板参数", required = true)
public HttpResult<Object> delete(@RequestBody List<String> ids) {
public HttpResult<Boolean> delete(@RequestBody List<String> ids) {
String methodDescribe = getMethodDescribe("delete");
LogUtil.njcnDebug(log, "{}，删除参数为：{}", methodDescribe, ids);
boolean result = pqReportService.delete(ids);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
}
@OperateInfo

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

@@ -53,6 +53,8 @@ import com.njcn.gather.system.dictionary.service.IDictTreeService;
import com.njcn.gather.system.pojo.enums.DicDataEnum;
import com.njcn.gather.type.pojo.po.DevType;
import com.njcn.gather.type.service.IDevTypeService;
import com.njcn.gather.user.user.pojo.po.SysUser;
import com.njcn.gather.user.user.service.ISysUserService;
import com.njcn.web.factory.PageFactory;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -120,6 +122,8 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
private final IResultService resultService;
private final ISysUserService sysUserService;
@Override
public Page<PqReportVO> list(ReportParam.QueryParam queryParam) {
QueryWrapper<PqReport> wrapper = new QueryWrapper<>();
@@ -496,7 +500,8 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
baseModelMap.put("${device_type}", devType.getName());
// 调试人员，todo... 待咨询曹泽辉如何获取当前用户信息，目前先写死
//String userName = RequestUtil.getUserName();
baseModelMap.put("${userName}", pqDevVO.getCheckBy());
SysUser user = sysUserService.getById(pqDevVO.getCheckBy());
baseModelMap.put("${userName}", user.getName());
// 调试日期
if (pqDevVO.getCheckTime() != null) {
baseModelMap.put("${testDate}", DateUtil.format(pqDevVO.getCheckTime(), DatePattern.CHINESE_DATE_PATTERN));
@@ -530,7 +535,7 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
baseModelMap.put("${sample_id}", pqDevVO.getSampleId());
baseModelMap.put("${arrived_date}", String.valueOf(pqDevVO.getArrivedDate()));
baseModelMap.put("${check_date}", String.valueOf(pqDevVO.getCheckTime()).substring(0, 10));
baseModelMap.put("${tested_by}", pqDevVO.getCheckBy());
baseModelMap.put("${tested_by}", user.getName());
// 替换模板中的信息，避免信息丢失，段落和表格均参与替换
WordUtil.replacePlaceholdersInParagraphs(baseModelDocument, baseModelMap);

2
detection/src/main/java/com/njcn/gather/result/service/IResultService.java
View File

@@ -50,6 +50,7 @@ public interface IResultService {
/**
* 导出原始数据
*
* @param param
*/
void exportRawData(ResultParam param);
@@ -70,6 +71,7 @@ public interface IResultService {
/**
* 重新计算
*
* @param param
*/
void reCalculate(ResultParam.ChangeErrorSystemParam param);

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

@@ -60,14 +60,14 @@ public class PqScriptController extends BaseController {
@PostMapping("/add")
@ApiOperation("新增检测脚本")
@ApiImplicitParam(name = "pqDevParam", value = "检测脚本", required = true)
public HttpResult<String> add(@RequestBody @Validated PqScriptParam param) {
public HttpResult<Boolean> add(@RequestBody @Validated PqScriptParam param) {
String methodDescribe = getMethodDescribe("add");
LogUtil.njcnDebug(log, "{}，新增数据为：{}", methodDescribe, param);
String result = pqScriptService.addPqScript(param);
if (StrUtil.isNotBlank(result)) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
Boolean result = pqScriptService.addPqScript(param);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}
@@ -75,14 +75,14 @@ public class PqScriptController extends BaseController {
@PostMapping("/update")
@ApiOperation("修改检测脚本")
@ApiImplicitParam(name = "updateParam", value = "检测脚本", required = true)
public HttpResult<Object> update(@RequestBody @Validated PqScriptParam.UpdateParam param) {
public HttpResult<Boolean> update(@RequestBody @Validated PqScriptParam.UpdateParam param) {
String methodDescribe = getMethodDescribe("update");
LogUtil.njcnDebug(log, "{}，修改数据为：{}", methodDescribe, param);
boolean result = pqScriptService.updatePqScript(param);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}
@@ -90,14 +90,14 @@ public class PqScriptController extends BaseController {
@PostMapping("/delete")
@ApiOperation("删除检测脚本")
@ApiImplicitParam(name = "ids", value = "检测脚本id", required = true)
public HttpResult<Object> delete(@RequestBody List<String> ids) {
public HttpResult<Boolean> delete(@RequestBody List<String> ids) {
String methodDescribe = getMethodDescribe("delete");
LogUtil.njcnDebug(log, "{}，删除ID数据为：{}", methodDescribe, String.join(StrUtil.COMMA, ids));
boolean result = pqScriptService.deletePqScript(ids);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}
@@ -116,14 +116,14 @@ public class PqScriptController extends BaseController {
@GetMapping("/upgradeToTemplate")
@ApiOperation("升级为模板")
@ApiImplicitParam(name = "id", value = "检测脚本id", required = true)
public HttpResult<Object> upgradeToTemplate(@RequestParam("id") String id, HttpServletRequest request) {
public HttpResult<Boolean> upgradeToTemplate(@RequestParam("id") String id, HttpServletRequest request) {
String methodDescribe = getMethodDescribe("upgradeToTemplate");
LogUtil.njcnDebug(log, "{}，升级ID数据为：{}", methodDescribe, id);
boolean result = pqScriptService.upgradeToTemplate(id);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}
@@ -159,7 +159,7 @@ public class PqScriptController extends BaseController {
String methodDescribe = getMethodDescribe("addScriptDtls");
LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, sourceIssue);
Boolean b = pqScriptDtlsService.saveScriptDtls(sourceIssue);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b , methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
}
@OperateInfo
@@ -170,7 +170,7 @@ public class PqScriptController extends BaseController {
String methodDescribe = getMethodDescribe("scriptDtlsCheckDataList");
LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, sourceIssue);
List<PqScriptDtlsParam.CheckData> checkData = pqScriptDtlsService.scriptDtlsCheckDataList(sourceIssue);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, checkData , methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, checkData, methodDescribe);
}
@@ -182,7 +182,7 @@ public class PqScriptController extends BaseController {
String methodDescribe = getMethodDescribe("deleteDtls");
LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, sourceIssue);
Boolean b = pqScriptDtlsService.deleteDtls(sourceIssue);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b , methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
}
@@ -194,7 +194,7 @@ public class PqScriptController extends BaseController {
String methodDescribe = getMethodDescribe("updateDtls");
LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, sourceIssue);
Boolean b = pqScriptDtlsService.updateDtls(sourceIssue);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b , methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
}
@OperateInfo

1
detection/src/main/java/com/njcn/gather/script/mapper/PqScriptDtlsMapper.java
View File

@@ -12,6 +12,7 @@ public interface PqScriptDtlsMapper extends MPJBaseMapper<PqScriptDtls> {
/**
* 获取当前检测脚本最大index值
*
* @param scriptId
* @return
*/

1
detection/src/main/java/com/njcn/gather/script/mapper/PqScriptMapper.java
View File

@@ -14,6 +14,7 @@ public interface PqScriptMapper extends MPJBaseMapper<PqScript> {
/**
* 获取检测脚本信息(先获取检测脚本类型是否相对值 true相对值 false绝对值（相对值要乘额定值,绝对值不需要处理))
*
* @param scriptId
* @return: com.njcn.gather.device.script.pojo.po.PqScript
* @Author: wr

9
detection/src/main/java/com/njcn/gather/script/mapper/mapping/PqScriptDtlsMapper.xml
View File

@@ -5,12 +5,9 @@
<select id="selectMaxIndex" resultType="java.lang.Integer">
SELECT
IFNULL( max( t.Script_Index ), -1 ) AS num
FROM
pq_script_dtls t
WHERE
Script_Id = #{scriptId}
SELECT IFNULL(max(t.Script_Index), -1) AS num
FROM pq_script_dtls t
WHERE Script_Id = #{scriptId}
</select>
</mapper>

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

@@ -18,17 +18,18 @@ public interface IPqScriptCheckDataService extends IService<PqScriptCheckData> {
/**
* 获取检测指标类型
*
* @param param
* @return
*/
List<String> getValueType(PqScriptCheckDataParam param);
Map<String,String> getValueTypeMap(String scriptId);
Map<String, String> getValueTypeMap(String scriptId);
/**
* 获取监测脚本code
*
* @param param
* @return
*/

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

@@ -76,6 +76,7 @@ public interface IPqScriptDtlsService extends IService<PqScriptDtls> {
/**
* 检测脚本单次小项数据新增
*
* @param sourceIssue
* @return
*/
@@ -83,12 +84,14 @@ public interface IPqScriptDtlsService extends IService<PqScriptDtls> {
/**
* 根据通讯参数生成装置下发原始数据公式
*
* @return
*/
List<PqScriptDtlsParam.CheckData> scriptDtlsCheckDataList(PqScriptDtlsParam sourceIssue);
/**
* 删除脚本
*
* @param param
* @return
*/
@@ -96,6 +99,7 @@ public interface IPqScriptDtlsService extends IService<PqScriptDtls> {
/**
* 启用关闭脚本
*
* @param param
* @return
*/
@@ -103,6 +107,7 @@ public interface IPqScriptDtlsService extends IService<PqScriptDtls> {
/**
* 通讯脚本回显
*
* @param param
* @return
*/

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

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

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

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

18
detection/src/main/java/com/njcn/gather/source/controller/PqSourceController.java
View File

@@ -65,14 +65,14 @@ public class PqSourceController extends BaseController {
@PostMapping("/add")
@ApiOperation("新增检测源")
@ApiImplicitParam(name = "param", value = "检测源", required = true)
public HttpResult<Object> add(@RequestBody @Validated PqSourceParam param) {
public HttpResult<Boolean> add(@RequestBody @Validated PqSourceParam param) {
String methodDescribe = getMethodDescribe("add");
LogUtil.njcnDebug(log, "{}，新增数据为：{}", methodDescribe, param);
boolean result = pqSourceService.addPqSource(param);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}
@@ -80,14 +80,14 @@ public class PqSourceController extends BaseController {
@PostMapping("/update")
@ApiOperation("修改检测源")
@ApiImplicitParam(name = "param", value = "检测源", required = true)
public HttpResult<Object> update(@RequestBody @Validated PqSourceParam.UpdateParam param) {
public HttpResult<Boolean> update(@RequestBody @Validated PqSourceParam.UpdateParam param) {
String methodDescribe = getMethodDescribe("update");
LogUtil.njcnDebug(log, "{}，修改数据为：{}", methodDescribe, param);
boolean result = pqSourceService.updatePqSource(param);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}
@@ -95,14 +95,14 @@ public class PqSourceController extends BaseController {
@PostMapping("/delete")
@ApiOperation("删除检测源")
@ApiImplicitParam(name = "ids", value = "检测源id", required = true)
public HttpResult<Object> delete(@RequestBody List<String> ids) {
public HttpResult<Boolean> delete(@RequestBody List<String> ids) {
String methodDescribe = getMethodDescribe("delete");
LogUtil.njcnDebug(log, "{}，删除ID数据为：{}", methodDescribe, String.join(StrUtil.COMMA, ids));
boolean result = pqSourceService.deletePqSource(ids);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}

18
detection/src/main/java/com/njcn/gather/type/controller/DevTypeController.java
View File

@@ -66,15 +66,15 @@ public class DevTypeController extends BaseController {
@PostMapping("/add")
@ApiOperation("新增设备类型")
@ApiImplicitParam(name = "devTypeParam", value = "设备类型", required = true)
public HttpResult<String> add(@RequestBody @Validated DevTypeParam devTypeParam) {
public HttpResult<Boolean> add(@RequestBody @Validated DevTypeParam devTypeParam) {
String methodDescribe = getMethodDescribe("add");
LogUtil.njcnDebug(log, "{}，新增数据为：{}", methodDescribe, devTypeParam);
boolean result = devTypeService.addDevType(devTypeParam);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}
@@ -82,15 +82,15 @@ public class DevTypeController extends BaseController {
@PostMapping("/update")
@ApiOperation("修改设备类型")
@ApiImplicitParam(name = "devTypeParam", value = "设备类型", required = true)
public HttpResult<String> update(@RequestBody @Validated DevTypeParam.UpdateParam updateParam) {
public HttpResult<Boolean> update(@RequestBody @Validated DevTypeParam.UpdateParam updateParam) {
String methodDescribe = getMethodDescribe("update");
LogUtil.njcnDebug(log, "{}，修改数据为：{}", methodDescribe, updateParam);
boolean result = devTypeService.updateDevType(updateParam);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}
@@ -98,14 +98,14 @@ public class DevTypeController extends BaseController {
@PostMapping("/delete")
@ApiOperation("删除设备类型")
@ApiImplicitParam(name = "ids", value = "设备类型id列表", required = true)
public HttpResult<String> delete(@RequestBody List<String> ids) {
public HttpResult<Boolean> delete(@RequestBody List<String> ids) {
String methodDescribe = getMethodDescribe("delete");
LogUtil.njcnDebug(log, "{}，删除数据为：{}", methodDescribe, String.join(StrUtil.COMMA, ids));
boolean result = devTypeService.deleteDevType(ids);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
}
}