增加关联表实体类

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

@@ -0,0 +1,20 @@
+package com.gyee.backconfig.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 部件 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-12-05
+ */
+@RestController
+@RequestMapping("//pro-basic-logical-unit")
+public class ProBasicLogicalUnitController {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.backconfig.mapper.auto;
+
+import com.gyee.backconfig.model.auto.ProBasicLogicalUnit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 部件 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-12-05
+ */
+public interface ProBasicLogicalUnitMapper extends BaseMapper<ProBasicLogicalUnit> {
+
+}

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

@@ -2,7 +2,15 @@ package com.gyee.backconfig.mapper.auto;
 
 import com.gyee.backconfig.model.auto.ProEconEquipmentmodel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
+@Repository
+@Mapper
 /**
  * <p>
  * 设备型号 Mapper 接口
@@ -12,5 +20,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2022-10-15
  */
 public interface ProEconEquipmentmodelMapper extends BaseMapper<ProEconEquipmentmodel> {
+    int updateByExampleSelective(@Param("id")  ProEconEquipmentmodel id, @Param("example") ProEconEquipmentmodelMapper example);
+
+    List<ProEconEquipmentmodel> selectByExample(ProEconEquipmentmodelMapper example);
 
+    @Select("select emm.id,emm.name,emm.aname,emm.windturbine_manufacturer_id,emm.spare1,lu.nem_code,lu.type_id,lu.name\n" +
+            " from pro_econ_equipmentmodel emm left join pro_basic_logical_unit lu on emm.spare1=lu.type_id")
+    List<ProEconEquipmentmodel> selectByExamplegl(@Param("id") String id, @Param("name") String name);
 }

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

@@ -0,0 +1,55 @@
+package com.gyee.backconfig.model.auto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "型号部件关联表", description = "型号部件关联表")
+public class EquipmentLogical extends Model {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "ID", type = IdType.INPUT)
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String nemCode;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 名称
+     */
+    private String aname;
+
+    /**
+     * 厂商编号
+     */
+    private String windturbineManufacturerId;
+
+    /**
+     * 类型（风电，光伏）
+     */
+    private String typeId;
+
+    private Integer orderNum;
+
+    /**
+     * 备用1
+     */
+    private String spare1;
+}

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

@@ -0,0 +1,89 @@
+package com.gyee.backconfig.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 部件
+ * </p>
+ *
+ * @author wang
+ * @since 2022-12-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicLogicalUnit extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String nemCode;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 别名
+     */
+    private String aname;
+
+    /**
+     * 拼音编码
+     */
+    private String pycode;
+
+    /**
+     * 规格类型
+     */
+    private String specificationType;
+
+    /**
+     * 父编号
+     */
+    private String parentId;
+
+    /**
+     * 图片
+     */
+    private String photo;
+
+    /**
+     * 类型（风电，光伏）
+     */
+    private String typeId;
+
+    private Integer orderNum;
+
+    /**
+     * 备用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/EquipmentLogicalService.java

@@ -0,0 +1,4 @@
+package com.gyee.backconfig.service.auto;
+
+public class EquipmentLogicalService {
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.backconfig.service.auto;
+
+import com.gyee.backconfig.model.auto.ProBasicLogicalUnit;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 部件 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-12-05
+ */
+public interface IProBasicLogicalUnitService extends IService<ProBasicLogicalUnit> {
+
+}

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

@@ -163,8 +163,11 @@ public class SttreeService {
         wpls.forEach(pl -> {
             List<ProBasicProject> cz = prols.stream().filter(p -> null != p.getWindpowerstationId() &&
                     p.getWindpowerstationId().equals(pl.getId())).collect(Collectors.toList());
-            cz.stream().forEach(c -> {
-                c.getChildren().clear();
+            if (null != pl.getChildren()) {
+                pl.getChildren().clear();
+            }
+            cz.stream().forEach(r -> {
+                r.getChildren().clear();
             });
             pl.getChildren().addAll(cz);
         });

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

@@ -0,0 +1,20 @@
+package com.gyee.backconfig.service.auto.impl;
+
+import com.gyee.backconfig.model.auto.ProBasicLogicalUnit;
+import com.gyee.backconfig.mapper.auto.ProBasicLogicalUnitMapper;
+import com.gyee.backconfig.service.auto.IProBasicLogicalUnitService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 部件 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-12-05
+ */
+@Service
+public class ProBasicLogicalUnitServiceImpl extends ServiceImpl<ProBasicLogicalUnitMapper, ProBasicLogicalUnit> implements IProBasicLogicalUnitService {
+
+}