逻辑部件部分代码提交，增加逻辑部件配置

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/config/CacheContext.java

@@ -65,6 +65,9 @@ public class CacheContext implements CommandLineRunner {
     @Autowired
     private IProEconTestingPointService proEconTestingPointService;//逻辑测点
 
+    @Autowired
+    private IProBasicLogicalUnitService proBasicLogicalUnitService;//部件
+
     //集团
     public static Map<String, ProBasicEnergyGroup> energymap = new HashMap<>();
     public static List<ProBasicEnergyGroup> groups = new ArrayList<>();
@@ -136,6 +139,10 @@ public class CacheContext implements CommandLineRunner {
     public static List<ProEconTestingPoint> tpls = new ArrayList<>();
     public static Map<String, ProEconTestingPoint> tpMap = new HashMap<>();
 
+    //部件
+    public static List<ProBasicLogicalUnit> unitls = new ArrayList<>();
+    public static Map<String, ProBasicLogicalUnit> unitMap = new HashMap<>();
+
 
     @Override
     public void run(String... args) throws Exception {
@@ -181,6 +188,8 @@ public class CacheContext implements CommandLineRunner {
         //初始化逻辑测点
         initProEconTestingPointList();
 
+        initProBasicLogicalUnitList();
+
         System.out.println(">>>>>>>>>>>>>>>数据缓存完成<<<<<<<<<<<<<<");
 
     }
@@ -407,4 +416,14 @@ public class CacheContext implements CommandLineRunner {
         });
     }
 
+
+    public void initProBasicLogicalUnitList(){
+        unitls.clear();
+        unitMap.clear();
+        unitls = proBasicLogicalUnitService.list();
+        unitls.stream().forEach(tp -> {
+            unitMap.put(tp.getId(),tp );
+        });
+    }
+
 }

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

@@ -0,0 +1,37 @@
+package com.gyee.backconfig.controller;
+
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.EquipmentLogical;
+import com.gyee.backconfig.model.auto.ProBasicEnergyGroup;
+import com.gyee.backconfig.service.auto.EquipmentLogicalService;
+import com.gyee.common.model.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@RequestMapping("//logical")
+@Api(value = "关联表配置" ,tags =  "关联表配置")
+public class EquipmentLogicalController {
+    @Resource
+    private EquipmentLogicalService equipmentLogicalService;
+
+    @GetMapping(value = "/list")
+    @ApiOperation(value = "关联表配置-列表", notes = "关联表配置-列表")
+    public R wtls(String id,String name) {
+        List<EquipmentLogical> resultList = equipmentLogicalService.write();
+        if (StringUtils.isNotNull(resultList)) {
+            return R.ok((int) resultList.size()).data(resultList);
+        } else {
+            return R.error().message("访问失败");
+        }
+    }
+
+}

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

@@ -3,8 +3,10 @@ package com.gyee.backconfig.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.mapper.auto.ProEconLogicalUnitMapper;
 import com.gyee.backconfig.model.auto.ProEconEquipmentmodel;
 import com.gyee.backconfig.service.auto.IProEconEquipmentmodelService;
+import com.gyee.backconfig.service.auto.IProEconLogicalUnitService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
@@ -26,6 +28,8 @@ import java.util.Arrays;
 public class ProEconEquipmentmodelController {
     @Resource
     private IProEconEquipmentmodelService proEconEquipmentmodelService;
+    @Resource
+    private IProEconLogicalUnitService proEconLogicalUnitService;
 
     /**
      * 查询
@@ -62,6 +66,7 @@ public class ProEconEquipmentmodelController {
 
         boolean b = proEconEquipmentmodelService.saveOrUpdate(proEconEquipmentmodel);
         if (b) {
+            proEconLogicalUnitService.addgl(proEconEquipmentmodel);
             return R.ok().data(b);
         } else {
             return R.error().data("保存失败！");

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

@@ -0,0 +1,57 @@
+package com.gyee.backconfig.controller;
+
+
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.ProEconEquipmentmodel;
+import com.gyee.backconfig.model.auto.ProEconLogicalUnit;
+import com.gyee.backconfig.service.auto.IProEconLogicalUnitService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 逻辑部件 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-12-06
+ */
+@RestController
+@RequestMapping("//pro-econ-logical-unit")
+public class ProEconLogicalUnitController {
+    @Autowired
+    private IProEconLogicalUnitService proEconLogicalUnitService;
+
+    @PostMapping(value = "/add")
+    public R addGeneratePoint(@RequestParam(value = "jx", required = false) ProEconEquipmentmodel jx) {
+
+        boolean jxd = proEconLogicalUnitService.addgl(jx);
+        if (!jxd) {
+            return R.ok().data(jxd);
+        } else {
+            return R.error().data("查询失败！");
+        }
+
+    }
+
+    /**
+     * 查询
+     *
+     * @param
+     * @return
+     */
+    @GetMapping(value = "/typeid")
+    public R findList(
+            @RequestParam(value = "id", required = false) String id,
+            @RequestParam(value = "equipmentId", required = false) String equipmentId) {
+        List<ProEconLogicalUnit> code = proEconLogicalUnitService.list(id,equipmentId);
+        if (null != code) {
+            return R.ok().data(code);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+}

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

@@ -1,5 +1,8 @@
 package com.gyee.backconfig.mapper.auto;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.model.auto.EquipmentLogical;
+import com.gyee.backconfig.model.auto.ProBasicEnergyGroup;
 import com.gyee.backconfig.model.auto.ProEconEquipmentmodel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -26,5 +29,6 @@ public interface ProEconEquipmentmodelMapper extends BaseMapper<ProEconEquipment
 
     @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);
+    List<EquipmentLogical> selectByExamplegl();
+    IPage<EquipmentLogical> list(String id, String name, String aname, String pageNum, String pageSize);
 }

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

@@ -0,0 +1,21 @@
+package com.gyee.backconfig.mapper.auto;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.backconfig.model.auto.ProBasicEquipmentPoint;
+import com.gyee.backconfig.model.auto.ProBasicLogicalUnit;
+import com.gyee.backconfig.model.auto.ProEconLogicalUnit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 逻辑部件 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-12-06
+ */
+public interface ProEconLogicalUnitMapper extends BaseMapper<ProEconLogicalUnit> {
+
+}

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

@@ -0,0 +1,92 @@
+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-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconLogicalUnit 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 equipmentId;
+
+    /**
+     * 型号编号
+     */
+    private String modelId;
+
+    /**
+     * 扩展字段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

@@ -1,4 +1,21 @@
 package com.gyee.backconfig.service.auto;
 
+import com.gyee.backconfig.mapper.auto.ProEconEquipmentmodelMapper;
+import com.gyee.backconfig.model.auto.EquipmentLogical;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
 public class EquipmentLogicalService {
+    @Resource
+    private ProEconEquipmentmodelMapper proEconEquipmentmodelMapper;
+
+    public List<EquipmentLogical> write() {
+        EquipmentLogical logical = new EquipmentLogical();
+        List<EquipmentLogical> list = proEconEquipmentmodelMapper.selectByExamplegl();
+        return list;
+    }
+
 }

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

@@ -2,6 +2,9 @@ package com.gyee.backconfig.service.auto;
 
 import com.gyee.backconfig.model.auto.ProBasicLogicalUnit;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.backconfig.model.auto.ProEconEquipmentmodel;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-12-05
  */
 public interface IProBasicLogicalUnitService extends IService<ProBasicLogicalUnit> {
-
+    List<ProBasicLogicalUnit> Bylist(String nemCode);
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.ProEconEquipmentmodel;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 设备型号 服务类
@@ -14,4 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProEconEquipmentmodelService extends IService<ProEconEquipmentmodel> {
     IPage<ProEconEquipmentmodel> list (String id, String nemCode, String name,String pageNum, String pageSize);
+
+    List<ProEconEquipmentmodel> getmodelByid(String id);
+
 }

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

@@ -0,0 +1,24 @@
+package com.gyee.backconfig.service.auto;
+
+import com.gyee.backconfig.model.auto.ProEconEquipmentmodel;
+import com.gyee.backconfig.model.auto.ProEconLogicalUnit;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 逻辑部件 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-12-06
+ */
+public interface IProEconLogicalUnitService extends IService<ProEconLogicalUnit> {
+
+    public boolean addgl(ProEconEquipmentmodel jx);
+
+    List<ProEconLogicalUnit> list1(String[] modelId);
+
+    List<ProEconLogicalUnit> list(String id,String equipmentId);
+}

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

@@ -1,11 +1,16 @@
 package com.gyee.backconfig.service.auto.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.backconfig.model.auto.ProBasicLogicalUnit;
 import com.gyee.backconfig.mapper.auto.ProBasicLogicalUnitMapper;
+import com.gyee.backconfig.model.auto.ProEconEquipmentmodel;
 import com.gyee.backconfig.service.auto.IProBasicLogicalUnitService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 部件 服务实现类
@@ -17,4 +22,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProBasicLogicalUnitServiceImpl extends ServiceImpl<ProBasicLogicalUnitMapper, ProBasicLogicalUnit> implements IProBasicLogicalUnitService {
 
+    @Override
+    public List<ProBasicLogicalUnit> Bylist(String nemCode) {
+        QueryWrapper<ProBasicLogicalUnit> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(nemCode)) {
+            qw.lambda().eq(ProBasicLogicalUnit::getNemCode, nemCode);
+        }
+        List<ProBasicLogicalUnit> list = baseMapper.selectList(qw);
+        return list;
+    }
 }

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

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 设备型号 服务实现类
@@ -37,4 +39,15 @@ public class ProEconEquipmentmodelServiceImpl extends ServiceImpl<ProEconEquipme
         IPage<ProEconEquipmentmodel> companysPage = getBaseMapper().selectPage(page, qw);
         return companysPage;
     }
+
+    @Override
+    public List<ProEconEquipmentmodel> getmodelByid(String id) {
+        QueryWrapper<ProEconEquipmentmodel> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)) {
+            qw.lambda().eq(ProEconEquipmentmodel::getId, id);
+        }
+        List<ProEconEquipmentmodel> list = baseMapper.selectList(qw);
+
+        return list;
+    }
 }

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

@@ -0,0 +1,93 @@
+package com.gyee.backconfig.service.auto.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.backconfig.config.CacheContext;
+import com.gyee.backconfig.mapper.auto.ProBasicLogicalUnitMapper;
+import com.gyee.backconfig.model.auto.ProBasicLogicalUnit;
+import com.gyee.backconfig.model.auto.ProEconEquipmentmodel;
+import com.gyee.backconfig.model.auto.ProEconLogicalUnit;
+import com.gyee.backconfig.mapper.auto.ProEconLogicalUnitMapper;
+import com.gyee.backconfig.service.auto.IProBasicLogicalUnitService;
+import com.gyee.backconfig.service.auto.IProEconEquipmentmodelService;
+import com.gyee.backconfig.service.auto.IProEconLogicalUnitService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 逻辑部件 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-12-06
+ */
+@Service
+public class ProEconLogicalUnitServiceImpl extends ServiceImpl<ProEconLogicalUnitMapper, ProEconLogicalUnit> implements IProEconLogicalUnitService {
+    private static Logger logger = LoggerFactory.getLogger(ProEconLogicalUnitServiceImpl.class);
+    @Autowired
+    private IProEconEquipmentmodelService proEconEquipmentmodelService;
+
+    @Autowired
+    private IProBasicLogicalUnitService proBasicLogicalUnitService;//部件
+
+    @Autowired
+    private IProEconLogicalUnitService proEconLogicalUnitService;
+
+    @Override
+    public boolean addgl(ProEconEquipmentmodel jx) {
+
+        QueryWrapper<ProEconLogicalUnit> qw = new QueryWrapper<>(); //关联
+        List<ProEconLogicalUnit> list = baseMapper.selectList(qw);
+
+        List<ProBasicLogicalUnit> list1 = new ArrayList<>();
+
+        List<ProBasicLogicalUnit> units = CacheContext.unitls;//部件
+
+        if (!list.isEmpty()) {
+            for (ProEconLogicalUnit p1 : list) {
+                if (StringUtils.notEmp(p1.getId())) {
+                    ProEconLogicalUnit vo1 = new ProEconLogicalUnit();
+                    for (ProBasicLogicalUnit p2 : units) {
+                        vo1.setAname(p2.getAname());
+                        vo1.setName(p2.getName());
+                        vo1.setNemCode(p2.getNemCode());
+                        list.add(vo1);
+                    }
+                }
+            }
+        }
+
+        return this.saveOrUpdateBatch(list);
+    }
+
+    @Override
+    public List<ProEconLogicalUnit> list1(String[] modelId) {
+        QueryWrapper<ProEconLogicalUnit> qw = new QueryWrapper<>();
+
+        if (StringUtils.isNotEmpty(modelId)) {
+            qw.in("modelId", modelId);
+        }
+        List<ProEconLogicalUnit> list = baseMapper.selectList(qw);
+        return list;
+    }
+
+    @Override
+    public List<ProEconLogicalUnit> list(String id, String equipmentId) {
+        QueryWrapper<ProEconLogicalUnit> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)) {
+            qw.in("id", id);
+        }
+        if (StringUtils.isNotEmpty(equipmentId)) {
+            qw.in("equipment_id", equipmentId);
+        }
+        List<ProEconLogicalUnit> list = baseMapper.selectList(qw);
+        return list;
+    }
+}