字段修改

web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/MeterpointController.java

@@ -0,0 +1,57 @@
+package com.gyee.backconfig.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.Meterpoint;
+import com.gyee.backconfig.model.auto.Square;
+import com.gyee.backconfig.service.auto.IMeterpointService;
+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;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>电计量点表
+ * 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-18
+ */
+@RestController
+@RequestMapping("//meterpoint")
+public class MeterpointController {
+    @Resource
+    private IMeterpointService meterpointService;
+
+    /**
+     * 查询
+     * @param id
+     * @param code
+     * @param windpowerstationid
+     * @param name
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/listByPage")
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "code", required = false) String code,
+                      @RequestParam(value = "windpowerstationid", required = false) String windpowerstationid,
+                      @RequestParam(value = "name", required = false) String name,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<Meterpoint> list = meterpointService.list(id, code, windpowerstationid, name, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+
+}

web/backmanagerconfig/src/main/java/com/gyee/backconfig/mapper/auto/MeterpointMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.backconfig.mapper.auto;
+
+import com.gyee.backconfig.model.auto.Meterpoint;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-18
+ */
+public interface MeterpointMapper extends BaseMapper<Meterpoint> {
+
+}

web/backmanagerconfig/src/main/java/com/gyee/backconfig/model/auto/Meterpoint.java

@@ -0,0 +1,66 @@
+package com.gyee.backconfig.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Meterpoint extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String code;
+
+    private String name;
+
+    private String description;
+
+    private String windpowerstationid;
+
+    private String projectid;
+
+    private String lineid;
+
+    private String metertype;
+
+    private String metercode;
+
+    private String metersort;
+
+    private String displaytype;
+
+    private String uniformcode;
+
+    private BigDecimal magnification;
+
+    private String shortid;
+
+    private String longid;
+
+    private String realtimeid;
+
+    private BigDecimal initialvalue;
+
+    private BigDecimal xs;
+
+    private BigDecimal magnificationxs;
+
+    private BigDecimal othervalue;
+
+    private LocalDate otherdate;
+
+
+}

web/backmanagerconfig/src/main/java/com/gyee/backconfig/model/auto/Project.java

@@ -42,7 +42,7 @@ public class Project extends Model {
     private String windpowerstationid;
 
     @TableField("CAPACITY")
-    private Integer capacity;
+    private Double capacity;
 
     @TableField("CAPACITYUNIT")
     private String capacityunit;

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/BackConfigService.java

@@ -408,8 +408,6 @@ public class BackConfigService {
                 List<Project> projects = prols.stream().filter(l -> l.getWindpowerstationid().equals(wpl.getId())).collect(Collectors.toList());
                 wpl.getChildren().addAll(projects);
             });
-        HashMap<Integer,String> Map = new HashMap<>();
-        Map.put(1,cpls.get(0).getId());
         return cpls;
     }
 

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/IMeterpointService.java

@@ -0,0 +1,18 @@
+package com.gyee.backconfig.service.auto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.model.auto.Meterpoint;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.backconfig.model.auto.Square;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-18
+ */
+public interface IMeterpointService extends IService<Meterpoint> {
+    IPage<Meterpoint> list(String id, String code, String windpowerstationid, String name, String pageNum, String pageSize);
+}

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/MeterpointServiceImpl.java

@@ -0,0 +1,44 @@
+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.Meterpoint;
+import com.gyee.backconfig.mapper.auto.MeterpointMapper;
+import com.gyee.backconfig.model.auto.Square;
+import com.gyee.backconfig.service.auto.IMeterpointService;
+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-10-18
+ */
+@Service
+public class MeterpointServiceImpl extends ServiceImpl<MeterpointMapper, Meterpoint> implements IMeterpointService {
+
+    @Override
+    public IPage<Meterpoint> list(String id, String code, String windpowerstationid, String name, String pageNum, String pageSize) {
+        QueryWrapper<Meterpoint> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)) {
+            qw.like("id", id);
+        }
+        if (StringUtils.isNotEmpty(code)) {
+            qw.like("code", code);
+        }
+        if (StringUtils.isNotEmpty(windpowerstationid)) {
+            qw.like("windpowerstationid", windpowerstationid);
+        }
+        if (StringUtils.isNotEmpty(name)) {
+            qw.like("name", name);
+        }
+        Page<Meterpoint> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<Meterpoint> MeterPage =getBaseMapper().selectPage(page, qw);
+        return MeterPage;
+    }
+}