调整接口注释

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

@@ -100,7 +100,7 @@ public class PqDevController extends BaseController {
     @OperateInfo(operateType = OperateType.DELETE)
     @PostMapping("/delete")
     @ApiOperation("删除被检设备")
-    @ApiImplicitParam(name = "ids", value = "被检设备id", required = true)
+    @ApiImplicitParam(name = "param", value = "删除参数", required = true)
     public HttpResult<Boolean> delete(@RequestBody @Validated PqDevParam.DeleteParam param) {
         String methodDescribe = getMethodDescribe("delete");
         LogUtil.njcnDebug(log, "{}，删除ID数据为：{}", methodDescribe, String.join(StrUtil.COMMA, param.getIds()));
@@ -162,7 +162,8 @@ public class PqDevController extends BaseController {
 
     @OperateInfo
     @GetMapping("/getSelectOptions")
-    @ApiOperation("根据历史记录信息来获取下拉框内容")
+    @ApiOperation("从历史数据中查询下拉框选项")
+    @ApiImplicitParam(name = "pattern", value = "模式id", required = true)
     public HttpResult<Map<String, List<String>>> getSelectOptions(@RequestParam("pattern") String pattern) {
         String methodDescribe = getMethodDescribe("getSelectOptions");
         Map<String, List<String>> result = pqDevService.listSelectOptions(pattern);

detection/src/main/java/com/njcn/gather/device/controller/PqStandardDevController.java

@@ -149,17 +149,17 @@ public class PqStandardDevController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/listByPlanId")
+//    @PostMapping("/listByPlanId")
-    @ApiOperation("查询出指定计划已关联的标准设备")
+//    @ApiOperation("查询出指定计划已关联的标准设备")
-    @ApiImplicitParam(name = "planId", value = "计划id", required = true)
+//    @ApiImplicitParam(name = "planId", value = "计划id", required = true)
-    public HttpResult<List<PqStandardDev>> listByPlanId(@RequestParam("planId") String planId) {
+//    public HttpResult<List<PqStandardDev>> listByPlanId(@RequestParam("planId") String planId) {
-        String methodDescribe = getMethodDescribe("listByPlanId");
+//        String methodDescribe = getMethodDescribe("listByPlanId");
-        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, planId);
+//        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, planId);
-        List<PqStandardDev> pqDevVOList = pqStandardDevService.listByPlanId(planId);
+//        List<PqStandardDev> pqDevVOList = pqStandardDevService.listByPlanId(planId);
-
+//
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pqDevVOList, methodDescribe);
+//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pqDevVOList, methodDescribe);
-    }
+//    }
 
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)

detection/src/main/java/com/njcn/gather/device/service/IPqStandardDevService.java

@@ -82,7 +82,7 @@ public interface IPqStandardDevService extends IService<PqStandardDev> {
      * @param planId
      * @return
      */
-    List<PqStandardDev> listByPlanId(String planId);
+//    List<PqStandardDev> listByPlanId(String planId);
 
     /**
      * 查询出标准设备所需的检测信息

detection/src/main/java/com/njcn/gather/device/service/impl/PqStandardDevServiceImpl.java

@@ -154,10 +154,10 @@ public class PqStandardDevServiceImpl extends ServiceImpl<PqStandardDevMapper, P
         this.importData(contrastDevExcelList);
     }
 
-    @Override
+//    @Override
-    public List<PqStandardDev> listByPlanId(String planId) {
+//    public List<PqStandardDev> listByPlanId(String planId) {
-        return adPlanStandardDevMapper.listByPlanId(Collections.singletonList(planId));
+//        return adPlanStandardDevMapper.listByPlanId(Collections.singletonList(planId));
-    }
+//    }
 
     @Override
     public List<PreDetection> listStandardDevPreDetection(List<String> ids) {

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

@@ -180,7 +180,7 @@ public class AdPlanController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getBigTestItem")
     @ApiOperation("获取检测大项数据")
-    @ApiImplicitParam(name = "id", value = "检测计划id", required = true)
+    @ApiImplicitParam(name = "checkParam", value = "检测计划id", required = true)
     public HttpResult<List<Map<String, String>>> getBigTestItem(@RequestBody AdPlanParam.CheckParam checkParam) {
         String methodDescribe = getMethodDescribe("getBigTestItem");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, checkParam);
@@ -191,7 +191,7 @@ public class AdPlanController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DOWNLOAD)
     @PostMapping("/analyse")
     @ApiOperation("检测数据分析")
-    @ApiImplicitParam(name = "planId", value = "检测计划id", required = true)
+    @ApiImplicitParam(name = "ids", value = "检测计划id", required = true)
     public void analyse(@RequestBody List<String> ids) {
         String methodDescribe = getMethodDescribe("analyse");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, String.join(StrUtil.COMMA, ids));
@@ -201,7 +201,7 @@ public class AdPlanController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/listByPlanId")
     @ApiOperation("查询出所有已绑定的设备")
-    @ApiImplicitParam(name = "planId", value = "计划id", required = true)
+    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
     public HttpResult<List<PqDevVO>> listByPlanId(@RequestBody @Validated PqDevParam.QueryParam param) {
         String methodDescribe = getMethodDescribe("listByPlanId");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, param);
@@ -241,7 +241,7 @@ public class AdPlanController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/listDevByPlanId")
     @ApiOperation("根据计划id分页查询被检设备")
-    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
+    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
     public HttpResult<Page<PqDevVO>> listDevByPlanId(@RequestBody @Validated PqDevParam.QueryParam param) {
         String methodDescribe = getMethodDescribe("listDevByPlanId");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, param);

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

@@ -31,7 +31,7 @@ import java.util.List;
  * @data 2025/1/9 14:02
  */
 @Slf4j
-@Api(tags = "报表管理")
+@Api(tags = "报告管理")
 @RestController
 @RequestMapping("/report")
 @RequiredArgsConstructor
@@ -46,7 +46,7 @@ public class  ReportController extends BaseController {
      */
     @OperateInfo
     @PostMapping("/generateReport")
-    @ApiOperation("生成测试报告")
+    @ApiOperation("生成报告")
     @ApiImplicitParam(name = "param", value = "查询参数", required = true)
     public HttpResult<Object> generateReport(@RequestBody DevReportParam devReportParam) {
         String methodDescribe = getMethodDescribe("generateReport");
@@ -60,7 +60,7 @@ public class  ReportController extends BaseController {
      */
     @OperateInfo
     @PostMapping("/downloadReport")
-    @ApiOperation("下载测试报告")
+    @ApiOperation("下载报告")
     @ApiImplicitParam(name = "param", value = "查询参数", required = true)
     public void downloadReport(@RequestBody DevReportParam devReportParam, HttpServletResponse response) {
         String methodDescribe = getMethodDescribe("downloadReport");
@@ -91,7 +91,7 @@ public class  ReportController extends BaseController {
     @OperateInfo(operateType = OperateType.ADD)
     @PostMapping("/add")
     @ApiOperation("新增报告模板")
-    @ApiImplicitParam(name = "param", value = "报告模板参数", required = true)
+    @ApiImplicitParam(name = "reportParam", value = "报告模板参数", required = true)
     public HttpResult<Boolean> add(ReportParam reportParam) {
         String methodDescribe = getMethodDescribe("add");
         LogUtil.njcnDebug(log, "{}，新增参数为：{}", methodDescribe, reportParam);
@@ -106,7 +106,7 @@ public class  ReportController extends BaseController {
     @OperateInfo(operateType = OperateType.UPDATE)
     @PostMapping("/update")
     @ApiOperation("更新报告模板")
-    @ApiImplicitParam(name = "param", value = "报告模板参数", required = true)
+    @ApiImplicitParam(name = "reportParam", value = "报告模板参数", required = true)
     public HttpResult<Boolean> update(ReportParam.UpdateParam reportParam) {
         String methodDescribe = getMethodDescribe("update");
         LogUtil.njcnDebug(log, "{}，修改参数为：{}", methodDescribe, reportParam);
@@ -136,7 +136,6 @@ public class  ReportController extends BaseController {
     @OperateInfo
     @GetMapping("/listAllName")
     @ApiOperation("查询所有报告模板名称")
-    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
     public HttpResult<List<String>> listAllName() {
         String methodDescribe = getMethodDescribe("listAllName");
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pqReportService.listAllName(), methodDescribe);
@@ -145,7 +144,7 @@ public class  ReportController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
     @PostMapping("/documented")
     @ApiOperation("设备归档")
-    @ApiImplicitParam(name = "id", value = "设备id", required = true)
+    @ApiImplicitParam(name = "ids", value = "设备id", required = true)
     public HttpResult<Boolean> documented(@RequestBody List<String> ids) {
         String methodDescribe = getMethodDescribe("documented");
         LogUtil.njcnDebug(log, "{}，设备id为：{}", methodDescribe, ids);

detection/src/main/java/com/njcn/gather/result/controller/ResultController.java

@@ -90,7 +90,7 @@ public class ResultController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
     @PostMapping("/reCalculate")
     @ApiOperation("重新计算检测结果")
-    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
+    @ApiImplicitParam(name = "param", value = "重新计算参数", required = true)
     public HttpResult<Object> reCalculate(@RequestBody @Validated ResultParam.ChangeErrorSystemParam param) {
         String methodDescribe = getMethodDescribe("reCalculate");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, param);
@@ -115,7 +115,7 @@ public class ResultController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DELETE)
     @GetMapping("/deleteTempTable")
     @ApiOperation("删除临时表")
-    @ApiImplicitParam(name = "param", value = "删除参数", required = true)
+    @ApiImplicitParam(name = "code", value = "计划对应的表后缀code", required = true)
     public HttpResult<Object> deleteTempTable(@RequestParam("code") String code) {
         String methodDescribe = getMethodDescribe("deleteTempTable");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, code);
@@ -127,7 +127,7 @@ public class ResultController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getContrastFormContent")
     @ApiOperation("获取比对式检测结果-表单内容")
-    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
+    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
     public HttpResult<FormContentVO> getContrastFormContent(@RequestBody @Validated ResultParam.QueryParam queryParam) {
         String methodDescribe = getMethodDescribe("getContrastFormContent");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
@@ -139,7 +139,7 @@ public class ResultController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getContrastResult")
     @ApiOperation("获取比对式检测结果")
-    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
+    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
     public HttpResult<ContrastResultVO> getContrastResult(@RequestBody @Validated ResultParam.QueryParam queryParam) {
         String methodDescribe = getMethodDescribe("getContrastResult");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
@@ -154,7 +154,7 @@ public class ResultController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getMonitorResult")
     @ApiOperation("获取监测点的检测结果")
-    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
+    @ApiImplicitParam(name = "devId", value = "设备id", required = true)
     public HttpResult<List<MonitorResultVO>> getMonitorResult(@RequestParam("devId") String devId) {
         String methodDescribe = getMethodDescribe("getMonitorResult");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, devId);
@@ -180,7 +180,7 @@ public class ResultController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/updateMonitorResult")
     @ApiOperation("更新监测点的检测结果")
-    @ApiImplicitParam(name = "result", value = "更新内容", required = true)
+    @ApiImplicitParam(name = "resultParams", value = "更新内容", required = true)
     public HttpResult<Boolean> updateMonitorResult(@RequestBody @Validated MonitorResultVO resultParams) {
         String methodDescribe = getMethodDescribe("updateMonitorResult");
         LogUtil.njcnDebug(log, "{}，更新数据为：{}", methodDescribe, resultParams);

detection/src/main/java/com/njcn/gather/result/pojo/param/ResultParam.java

@@ -83,7 +83,7 @@ public class ResultParam {
         @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.PLAN_ID_FORMAT_ERROR)
         private String planId;
 
-        @ApiModelProperty(value = "脚本Id", required = false)
+        @ApiModelProperty(value = "脚本Id")
         private String scriptId;
 
         @ApiModelProperty(value = "误差体系Id", required = true)
@@ -95,6 +95,7 @@ public class ResultParam {
         @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.DEV_ID_FORMAT_ERROR)
         private String deviceId;
 
+        @ApiModelProperty(value = "计划对应表后缀", required = true)
         private String code;
 
         @ApiModelProperty(value = "模式Id", required = true)

detection/src/main/java/com/njcn/gather/result/pojo/vo/MonitorResultVO.java

@@ -14,58 +14,38 @@ import javax.validation.constraints.NotNull;
 @Data
 public class MonitorResultVO implements Comparable<MonitorResultVO> {
 
-    /**
-     * 监测点id
-     */
     @ApiModelProperty(value = "监测点id", required = true)
     @NotBlank(message = DetectionValidMessage.DEV_MONITOR_ID_NOT_BLANK)
     private String monitorId;
 
-    /**
+    @ApiModelProperty(value = "监测点序号")
-     * 监测点序号
-     */
     private Integer monitorNum;
 
-    /**
+    @ApiModelProperty(value = "总检测次数")
-     * 总检测次数
-     */
     private Integer totalNum;
 
-    /**
+    @ApiModelProperty(value = "合格检测次数")
-     * 合格检测次数
-     */
     private Integer qualifiedNum;
 
-    /**
+    @ApiModelProperty(value = "不合格检测次数")
-     * 不合格检测次数
-     */
     private Integer unQualifiedNum;
 
-    /**
+    @ApiModelProperty(value = "误差体系名称")
-     * 误差体系名称
-     */
     private String errorSysName;
 
-    /**
-     * 检测结果
-     */
     @ApiModelProperty(value = "检测结果", required = true)
     @NotNull(message = DetectionValidMessage.DEV_MONITOR_RESULT_NOT_NULL)
     private Integer checkResult;
 
-    /**
+
-     * 结论来源
+    @ApiModelProperty(value = "结论来源")
-     */
     private String resultOrigin;
-    /**
+
-     * 哪次
-     */
     @ApiModelProperty(value = "使用哪次检测结果", required = true)
     @NotNull(message = DetectionValidMessage.DEV_MONITOR_RESULT_NUM_NOT_BLANK)
     private String whichTime;
-    /**
+
-     * 数据源类型
+
-     */
     @ApiModelProperty(value = "数据源类型", required = true)
     @NotBlank(message = DetectionValidMessage.DEV_MONITOR_RESULT_TYPE_NOT_BLANK)
     private String resultType;

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

@@ -58,7 +58,7 @@ public class PqScriptController extends BaseController {
     @OperateInfo(operateType = OperateType.ADD)
     @PostMapping("/add")
     @ApiOperation("新增检测脚本")
-    @ApiImplicitParam(name = "pqDevParam", value = "检测脚本", required = true)
+    @ApiImplicitParam(name = "param", value = "检测脚本", required = true)
     public HttpResult<String> add(@RequestBody @Validated PqScriptParam param) {
         String methodDescribe = getMethodDescribe("add");
         LogUtil.njcnDebug(log, "{}，新增数据为：{}", methodDescribe, param);
@@ -69,7 +69,7 @@ public class PqScriptController extends BaseController {
     @OperateInfo(operateType = OperateType.UPDATE)
     @PostMapping("/update")
     @ApiOperation("修改检测脚本")
-    @ApiImplicitParam(name = "updateParam", value = "检测脚本", required = true)
+    @ApiImplicitParam(name = "param", value = "检测脚本", required = true)
     public HttpResult<Boolean> update(@RequestBody @Validated PqScriptParam.UpdateParam param) {
         String methodDescribe = getMethodDescribe("update");
         LogUtil.njcnDebug(log, "{}，修改数据为：{}", methodDescribe, param);

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

@@ -127,17 +127,5 @@ public class PqSourceController extends BaseController {
         List<SourceParam> result = pqSourceService.getSourceParam(sourceId);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
-
-    @OperateInfo
-    @GetMapping("/aa")
-    @ApiOperation("按照检测源ID获取源参数")
-    @ApiImplicitParam(name = "pqSourceId", value = "检测源ID", required = true)
-    public HttpResult<SourceInitialize> aa(@RequestParam("sourceId") String sourceId) {
-        String methodDescribe = getMethodDescribe("getParam");
-        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, sourceId);
-        SourceInitialize sourceInitializeParam = pqSourceService.getSourceInitializeParam(sourceId);
-        String jsonString = JSON.toJSONString(sourceInitializeParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, sourceInitializeParam, methodDescribe);
-    }
 }
 

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

@@ -81,7 +81,7 @@ public class DevTypeController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
     @PostMapping("/update")
     @ApiOperation("修改设备类型")
-    @ApiImplicitParam(name = "devTypeParam", value = "设备类型", required = true)
+    @ApiImplicitParam(name = "updateParam", value = "设备类型参数", required = true)
     public HttpResult<Boolean> update(@RequestBody @Validated DevTypeParam.UpdateParam updateParam) {
         String methodDescribe = getMethodDescribe("update");
         LogUtil.njcnDebug(log, "{}，修改数据为：{}", methodDescribe, updateParam);

storage/src/main/java/com/njcn/gather/storage/controller/DataDealController.java

@@ -1,62 +0,0 @@
-package com.njcn.gather.storage.controller;
-
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.db.mybatisplus.handler.DynamicTableNameHandler;
-import com.njcn.gather.storage.pojo.po.SimAndDigHarmonicResult;
-import com.njcn.gather.storage.pojo.po.SimAndDigNonHarmonicResult;
-import com.njcn.gather.storage.service.DetectionDataDealService;
-import com.njcn.web.controller.BaseController;
-import com.njcn.web.utils.HttpResultUtil;
-import io.swagger.annotations.Api;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-@Slf4j
-@Api(tags = "处理数据")
-@RestController
-@RequestMapping("/dataDeal")
-@RequiredArgsConstructor
-public class DataDealController extends BaseController {
-
-    private final DetectionDataDealService detectionDataDealService;
-
-
-    @GetMapping("ttt")
-    public HttpResult<Object> dataDealAndInsert(){
-        String methodDescribe = getMethodDescribe("dataDealAndInsert");
-
-        List<SimAndDigHarmonicResult> list2 = new ArrayList<>();
-        SimAndDigHarmonicResult SimAndDigHarmonicResult = new SimAndDigHarmonicResult();
-        SimAndDigHarmonicResult.setDataType("aa");
-        SimAndDigHarmonicResult.setAdType("aaaa");
-
-        SimAndDigHarmonicResult.setDevMonitorId("ss");
-        SimAndDigHarmonicResult.setScriptId("ddd");
-        SimAndDigHarmonicResult.setTimeId(LocalDateTime.now());
-
-        list2.add(SimAndDigHarmonicResult);
-        SimAndDigHarmonicResult SimAndDigHarmonicResult2 = new SimAndDigHarmonicResult();
-        SimAndDigHarmonicResult2.setDataType("aabb");
-        SimAndDigHarmonicResult2.setAdType("aaaabb");
-
-        SimAndDigHarmonicResult2.setDevMonitorId("ssbb");
-        SimAndDigHarmonicResult2.setScriptId("dddbb");
-        SimAndDigHarmonicResult2.setTimeId(LocalDateTime.now());
-        list2.add(SimAndDigHarmonicResult2);
-
-        detectionDataDealService.acceptHarmonic(list2,"1");
-
-
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-
-    }
-
-}

storage/src/main/java/com/njcn/gather/storage/controller/TableGenController.java

@@ -1,36 +0,0 @@
-package com.njcn.gather.storage.controller;
-
-import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.gather.storage.service.TableGenService;
-import com.njcn.web.controller.BaseController;
-import com.njcn.web.utils.HttpResultUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-@Slf4j
-@Api(tags = "生成表")
-@RestController
-@RequestMapping("/genTable")
-@RequiredArgsConstructor
-public class TableGenController extends BaseController {
-
-    private final TableGenService tableGenService;
-
-
-    @GetMapping("genAdHarmonicTable")
-    @ApiOperation("生成表")
-    @OperateInfo
-    public HttpResult<Object> genAdHarmonicTable(@RequestParam("code") String code, @RequestParam("isContrast") boolean isContrast) {
-        String methodDescribe = getMethodDescribe("genAdHarmonicTable");
-        tableGenService.genTable(code, isContrast);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-    }
-}

system/src/main/java/com/njcn/gather/system/dictionary/controller/DictDataController.java

@@ -99,7 +99,7 @@ public class DictDataController extends BaseController {
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @GetMapping("/getDicDataById")
     @ApiOperation("根据字典id查询字典数据")
-    @ApiImplicitParam(name = "dicIndex", value = "查询参数", required = true)
+    @ApiImplicitParam(name = "dicIndex", value = "字典id", required = true)
     public HttpResult<DictData> getDicDataById(@RequestParam("dicIndex") String dicIndex) {
         String methodDescribe = getMethodDescribe("getDicDataById");
         DictData result = dictDataService.getDictDataById(dicIndex);
@@ -109,7 +109,7 @@ public class DictDataController extends BaseController {
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @GetMapping("/getDicDataByCode")
     @ApiOperation("根据字典code查询字典数据")
-    @ApiImplicitParam(name = "code", value = "查询参数", required = true)
+    @ApiImplicitParam(name = "code", value = "字典code", required = true)
     public HttpResult<DictData> getDicDataByCode(@RequestParam("code") String code) {
         String methodDescribe = getMethodDescribe("getDicDataByCode");
         DictData result = dictDataService.getDictDataByCode(code);

system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTreeController.java

@@ -45,7 +45,7 @@ public class DictTreeController extends BaseController {
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @GetMapping("/getTreeByCode")
     @ApiOperation("按照code查询字典树")
-    @ApiImplicitParam(name = "keyword", value = "查询参数", required = true)
+    @ApiImplicitParam(name = "code", value = "查询参数", required = true)
     public HttpResult<List<DictTree>> getTreeByCode(@RequestParam("code") String code) {
         String methodDescribe = getMethodDescribe("getTreeByCode");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, code);

system/src/main/java/com/njcn/gather/system/dictionary/pojo/param/DictTreeParam.java

@@ -34,6 +34,7 @@ public class DictTreeParam {
     /**
      * 编码
      */
+    @ApiModelProperty(value = "编码")
     @TableField(value = "编码")
     @NotBlank(message = SystemValidMessage.CODE_NOT_BLANK)
     @Pattern(regexp = PatternRegex.DICT_CODE_REGEX, message = SystemValidMessage.DICT_TYPE_CODE_FORMAT_ERROR)
@@ -42,21 +43,25 @@ public class DictTreeParam {
     /**
      * 用于区分多种类型的字典树 0.台账对象类型 1.自定义报表指标类型
      */
+    @ApiModelProperty(value = "0.台账对象类型 1.自定义报表指标类型")
     private Integer type;
 
     /**
      * 根据type自定义内容，type:0用于区分对象类型是101电网侧 102用户侧
      */
+    @ApiModelProperty(value = "根据type自定义内容，type:0用于区分对象类型是101电网侧 102用户侧")
     private String extend;
 
     /**
      * 排序
      */
+    @ApiModelProperty(value = "排序")
     private Integer sort;
 
     /**
      * 描述
      */
+    @ApiModelProperty(value = "描述")
     private String remark;
 
 

system/src/main/java/com/njcn/gather/system/reg/controller/SysRegResController.java

@@ -36,41 +36,41 @@ import java.util.Map;
 public class SysRegResController extends BaseController {
     private final ISysRegResService sysRegResService;
 
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+//    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @GetMapping("/list")
+//    @GetMapping("/list")
-    @ApiOperation("查询注册版本列表")
+//    @ApiOperation("查询注册版本列表")
-    public HttpResult<SysRegResVO> listRegRes() {
+//    public HttpResult<SysRegResVO> listRegRes() {
-        String methodDescribe = getMethodDescribe("listRegRes");
+//        String methodDescribe = getMethodDescribe("listRegRes");
-        LogUtil.njcnDebug(log, "{}，查询参数为空", methodDescribe);
+//        LogUtil.njcnDebug(log, "{}，查询参数为空", methodDescribe);
-        SysRegResVO result = sysRegResService.listRegRes();
+//        SysRegResVO result = sysRegResService.listRegRes();
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
-    }
+//    }
 
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @GetMapping("/getRegResByType")
     @ApiOperation("根据类型id查询配置")
-    @ApiImplicitParam(name = "type", value = "类型id，字典值", required = true)
+    @ApiImplicitParam(name = "typeId", value = "类型id，字典值", required = true)
-    public HttpResult<SysRegRes> getRegResByType(@RequestParam("id") String typeId) {
+    public HttpResult<SysRegRes> getRegResByType(@RequestParam("typeId") String typeId) {
         String methodDescribe = getMethodDescribe("listByTypeId");
         LogUtil.njcnDebug(log, "{}，查询参数为：{}", methodDescribe, typeId);
         SysRegRes result = sysRegResService.getRegResByType(typeId);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
+//    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
-    @PostMapping("/add")
+//    @PostMapping("/add")
-    @ApiOperation("新增注册版本")
+//    @ApiOperation("新增注册版本")
-    @ApiImplicitParam(name = "sysRegRes", value = "注册版本对象", required = true)
+//    @ApiImplicitParam(name = "sysRegRes", value = "注册版本对象", required = true)
-    public HttpResult<Boolean> addRegRes(@RequestBody @Validated SysRegResParam param) {
+//    public HttpResult<Boolean> addRegRes(@RequestBody @Validated SysRegResParam param) {
-        String methodDescribe = getMethodDescribe("addRegRes");
+//        String methodDescribe = getMethodDescribe("addRegRes");
-        LogUtil.njcnDebug(log, "{}，新增参数为：{}", methodDescribe, param);
+//        LogUtil.njcnDebug(log, "{}，新增参数为：{}", methodDescribe, param);
-        boolean result = sysRegResService.addRegRes(param);
+//        boolean result = sysRegResService.addRegRes(param);
-        if (result) {
+//        if (result) {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
+//            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
-        } else {
+//        } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
+//            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
-        }
+//        }
-    }
+//    }
 
     @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE)
     @PostMapping("/update")

tools/activate-tool/src/main/java/com/njcn/gather/tool/active/controller/ActivateController.java

@@ -87,7 +87,6 @@ public class ActivateController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, activationCodePlaintext, methodDescribe);
     }
 
-    @ApiModel("验证设备激活码参数")
     @Data
     public static class VerifyActivationCodeParams {
         @ApiModelProperty(value = "激活码")

user/src/main/java/com/njcn/gather/user/user/controller/AuthController.java

@@ -39,7 +39,7 @@ import java.util.Map;
 
 @Slf4j
 @RestController
-@Api(tags = "登录/注销")
+@Api(tags = "登录-注销")
 @RequestMapping("/admin")
 @RequiredArgsConstructor
 public class AuthController extends BaseController {

user/src/main/java/com/njcn/gather/user/user/controller/SysFunctionController.java

@@ -153,7 +153,7 @@ public class SysFunctionController extends BaseController {
     @OperateInfo(operateType = OperateType.UPDATE, info = LogEnum.SYSTEM_MEDIUM)
     @PostMapping("/assignFunctionByRoleId")
     @ApiOperation("角色分配菜单")
-    @ApiImplicitParam(name = "roleFunctionComponent", value = "角色信息", required = true)
+    @ApiImplicitParam(name = "param", value = "角色信息", required = true)
     public HttpResult<Boolean> assignFunctionByRoleId(@RequestBody @Validated SysRoleParam.RoleBindFunction param) {
         String methodDescribe = getMethodDescribe("assignFunctionByRoleId");
         LogUtil.njcnDebug(log, "{},传入的角色id和资源id集合为：{}", methodDescribe, param);

user/src/main/java/com/njcn/gather/user/user/controller/SysRoleController.java

@@ -49,7 +49,7 @@ public class SysRoleController extends BaseController {
     @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
     @PostMapping("/add")
     @ApiOperation("新增角色信息")
-    @ApiImplicitParam(name = "roleParam", value = "角色信息", required = true)
+    @ApiImplicitParam(name = "sysRoleParam", value = "角色信息", required = true)
     public HttpResult<Boolean> add(@RequestBody @Validated SysRoleParam sysRoleParam) {
         String methodDescribe = getMethodDescribe("add");
         LogUtil.njcnDebug(log, "{}，角色信息数据为：{}", methodDescribe, sysRoleParam);

user/src/main/java/com/njcn/gather/user/user/controller/SysUserController.java

@@ -102,11 +102,7 @@ public class SysUserController extends BaseController {
     @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE)
     @PostMapping("/updatePassword")
     @ApiOperation("修改密码")
-    @ApiImplicitParams({
+    @ApiImplicitParam(name = "param", value = "修改密码参数", required = true)
-            @ApiImplicitParam(name = "id", value = "用户id", required = true),
-            @ApiImplicitParam(name = "oldPassword", value = "旧密码", required = true),
-            @ApiImplicitParam(name = "newPassword", value = "新密码", required = true)
-    })
     public HttpResult<Boolean> updatePassword(@RequestBody @Validated SysUserParam.SysUserUpdatePasswordParam param) {
         String methodDescribe = getMethodDescribe("updatePassword");
         LogUtil.njcnDebug(log, "{}，用户id:{},用户旧密码:{},新密码:{}", methodDescribe, param.getId(), param.getOldPassword(), param.getNewPassword());