代码合并

pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictTreeController.java

@@ -5,6 +5,7 @@ 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.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.common.utils.LogUtil;
@@ -192,8 +193,11 @@ public class DictTreeController extends BaseController {
         @ApiImplicitParam(name = "lineId", value = "监测点id", required = true),
         @ApiImplicitParam(name = "conType", value = "接线方式", required = true)
     })
-    public HttpResult<List<SysDicTreePO>> queryDictType(@RequestParam @Validated String lineId, @RequestParam @Validated Integer conType) {
+    public HttpResult<List<SysDicTreePO>> queryDictType(@RequestParam @Validated String lineId, @RequestParam(required = false) @Validated Integer conType) {
         String methodDescribe = getMethodDescribe("queryDictType");
+        if (conType == null) {
+            throw new BusinessException("监测点缺失接线方式");
+        }
         List<SysDicTreePO> result = sysDicTreePOService.queryDictType(lineId,conType);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }

pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/SpThroughTaskRunner.java

@@ -0,0 +1,22 @@
+package com.njcn.system.timer.tasks;
+
+import com.njcn.system.timer.TimerTaskRunner;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * 高低电压穿越算法执行定时任务
+ * @author guofeihu
+ * @date 2024/8/21
+ */
+@Component
+@RequiredArgsConstructor
+public class SpThroughTaskRunner implements TimerTaskRunner {
+
+//    private final SpThroughFeignClient spThroughFeignClient;
+
+    @Override
+    public void action(String date) {
+//        spThroughFeignClient.record();
+    }
+}