增加型号逻辑测点配置，并修改长停注册接口

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicTestingPointController.java

@@ -0,0 +1,69 @@
+package com.gyee.backconfig.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.ProBasicTestingPoint;
+import com.gyee.backconfig.service.auto.IProBasicTestingPointService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 型号逻辑测点 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-12-13
+ */
+@RestController
+@RequestMapping("//pro-basic-testing-point")
+public class ProBasicTestingPointController {
+
+    @Autowired
+    private IProBasicTestingPointService proBasicTestingPointService;
+
+    @GetMapping(value = "/list")
+    @ApiOperation(value = "型号逻辑-列表", notes = "型号逻辑-列表")
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "nemCode", required = false) String nemCode,
+                      @RequestParam(value = "name",required  = false) String name,
+                      @RequestParam(value = "uniformCode",required  = false) String uniformCode,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<ProBasicTestingPoint> list = proBasicTestingPointService.list( id,  nemCode,  name,uniformCode, pageNum,  pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+
+    @PostMapping(value = "/add")
+    @ApiOperation(value = "型号逻辑-新增or修改", notes = "型号逻辑-新增or修改")
+    public R addAll(@RequestBody ProBasicTestingPoint proBasicTestingPoint) {
+
+        boolean b = proBasicTestingPointService.saveOrUpdate(proBasicTestingPoint);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+    }
+
+    @DeleteMapping(value = "/{ids}")
+    @ApiOperation(value = "型号逻辑-删除", notes = "型号逻辑-删除")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = proBasicTestingPointService.removeByIds(Arrays.asList(strings));
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
+}

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/mapper/auto/ProBasicTestingPointMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.backconfig.mapper.auto;
+
+import com.gyee.backconfig.model.auto.ProBasicTestingPoint;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 型号逻辑测点 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-12-13
+ */
+public interface ProBasicTestingPointMapper extends BaseMapper<ProBasicTestingPoint> {
+
+}

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicTestingPoint.java

@@ -0,0 +1,103 @@
+package com.gyee.backconfig.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 型号逻辑测点
+ * </p>
+ *
+ * @author wang
+ * @since 2022-12-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicTestingPoint extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String nemCode;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 单位
+     */
+    private String valueUnit;
+
+    /**
+     * 英文名称
+     */
+    private String englishName;
+
+    /**
+     * 类型编号
+     */
+    private String typeId;
+
+    /**
+     * 最大值
+     */
+    private BigDecimal maxval;
+
+    /**
+     * 最小值
+     */
+    private BigDecimal minval;
+
+    /**
+     * 合理最大值
+     */
+    private BigDecimal reasonableMaxval;
+
+    /**
+     * 合理最小值
+     */
+    private BigDecimal reasonableMinval;
+
+    /**
+     * 统一编码
+     */
+    private String uniformCode;
+
+    /**
+     * 部件编号
+     */
+    private String logicalUnitId;
+
+    /**
+     * 扩展字段1
+     */
+    private String spare1;
+
+    /**
+     * 扩展字段2
+     */
+    private String spare2;
+
+    /**
+     * 扩展字段3
+     */
+    private String spare3;
+
+    /**
+     * 扩展字段4
+     */
+    private String spare4;
+
+
+}

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicTestingPointService.java

@@ -0,0 +1,18 @@
+package com.gyee.backconfig.service.auto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.model.auto.ProBasicTargetPlan;
+import com.gyee.backconfig.model.auto.ProBasicTestingPoint;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 型号逻辑测点 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-12-13
+ */
+public interface IProBasicTestingPointService extends IService<ProBasicTestingPoint> {
+    IPage<ProBasicTestingPoint> list(String id, String nemCode, String name,String uniformCode, String pageNum, String  pageSize);
+}

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicTestingPointServiceImpl.java

@@ -0,0 +1,46 @@
+package com.gyee.backconfig.service.auto.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gyee.backconfig.model.auto.ProBasicTestingPoint;
+import com.gyee.backconfig.mapper.auto.ProBasicTestingPointMapper;
+import com.gyee.backconfig.service.auto.IProBasicTestingPointService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 型号逻辑测点 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-12-13
+ */
+@Service
+public class ProBasicTestingPointServiceImpl extends ServiceImpl<ProBasicTestingPointMapper, ProBasicTestingPoint> implements IProBasicTestingPointService {
+
+    @Override
+    public IPage<ProBasicTestingPoint> list(String id, String nemCode, String name, String uniformCode, String pageNum, String pageSize) {
+        QueryWrapper<ProBasicTestingPoint> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)) {
+            qw.lambda().eq(ProBasicTestingPoint::getId, id);
+        }
+
+        if (StringUtils.isNotEmpty(nemCode)) {
+            qw.lambda().like(ProBasicTestingPoint::getNemCode, nemCode);
+        }
+        if (StringUtils.isNotEmpty(name)) {
+            qw.lambda().like(ProBasicTestingPoint::getName, name);
+        }
+
+        if (StringUtils.isNotEmpty(uniformCode)) {
+            qw.lambda().eq(ProBasicTestingPoint::getUniformCode, uniformCode);
+        }
+
+        Page<ProBasicTestingPoint> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<ProBasicTestingPoint> targetPlans = getBaseMapper().selectPage(page, qw);
+        return targetPlans;
+    }
+}

web/consumer-hb/src/main/java/com/gyee/consumer/controller/warn/WarningController.java

@@ -118,7 +118,7 @@ public class WarningController {
         return ajax;
     }
 
-    @PostMapping("/getLonShutdownevent")
+    @GetMapping("/getLonShutdownevent")
     @ResponseBody
     @ApiOperation(value = "长停事件查询", notes = "长停事件查询")
     public AjaxResult getLonShutdownevent(@RequestParam(value = "pageNum", required = true) Integer pageNum,