新增型号表对部件表一对多新增

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

@@ -4,7 +4,6 @@ package com.gyee.backconfig.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.ProBasicLogicalUnit;
-import com.gyee.backconfig.model.auto.ProEconEquipmentmodel;
 import com.gyee.backconfig.service.auto.IProBasicLogicalUnitService;
 import com.gyee.backconfig.service.auto.impl.ProEconLogicalUnitServiceImpl;
 import io.swagger.annotations.ApiOperation;

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.ProEconEquipmentmodel;
 import com.gyee.backconfig.service.auto.IProEconEquipmentmodelService;
+import com.gyee.backconfig.service.auto.impl.ProBasicLogicalUnitServiceImpl;
+import com.gyee.backconfig.service.auto.impl.ProEconLogicalUnitServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
@@ -26,7 +28,8 @@ import java.util.Arrays;
 public class ProEconEquipmentmodelController {
     @Resource
     private IProEconEquipmentmodelService proEconEquipmentmodelService;
-
+    @Resource
+    private ProBasicLogicalUnitServiceImpl proBasicLogicalUnitService;
     /**
      * 查询
      * @param id
@@ -62,6 +65,7 @@ public class ProEconEquipmentmodelController {
 
         boolean b = proEconEquipmentmodelService.saveOrUpdate(proEconEquipmentmodel);
         if (b) {
+            proBasicLogicalUnitService.addxh(proEconEquipmentmodel);
             return R.ok().data(b);
         } else {
             return R.error().data("保存失败！");

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

@@ -25,17 +25,6 @@ public class ProEconLogicalUnitController {
     @Autowired
     private IProEconLogicalUnitService proEconLogicalUnitService;
 
-    @PostMapping(value = "/add")
-    public R addGeneratePoint(@RequestParam(value = "jx", required = false) ProBasicLogicalUnit jx) {
-
-        boolean jxd = proEconLogicalUnitService.addgl(jx);
-        if (!jxd) {
-            return R.ok().data(jxd);
-        } else {
-            return R.error().data("查询失败！");
-        }
-
-    }
 
     /**
      * 查询

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

@@ -17,4 +17,6 @@ import java.util.List;
  */
 public interface IProBasicLogicalUnitService extends IService<ProBasicLogicalUnit> {
     IPage<ProBasicLogicalUnit> Bylist(String nemCode, String pageNum, String pageSize);
+
+    public boolean addxh(ProEconEquipmentmodel jx);
 }

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

@@ -17,7 +17,7 @@ import java.util.List;
  */
 public interface IProEconLogicalUnitService extends IService<ProEconLogicalUnit> {
 
-    public boolean addgl(ProBasicLogicalUnit jx);
+    public boolean addgl(ProBasicLogicalUnit bj);
 
     List<ProEconLogicalUnit> list1(String[] modelId);
 

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

@@ -3,15 +3,20 @@ 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.config.CacheContext;
 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.model.auto.ProEconLogicalUnit;
 import com.gyee.backconfig.service.auto.IProBasicLogicalUnitService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.common.model.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -24,6 +29,9 @@ import java.util.List;
 @Service
 public class ProBasicLogicalUnitServiceImpl extends ServiceImpl<ProBasicLogicalUnitMapper, ProBasicLogicalUnit> implements IProBasicLogicalUnitService {
 
+    @Autowired
+    private IProBasicLogicalUnitService proBasicLogicalUnitService;//部件
+
     @Override
     public IPage<ProBasicLogicalUnit> Bylist(String nemCode, String pageNum, String pageSize) {
         QueryWrapper<ProBasicLogicalUnit> qw = new QueryWrapper<>();
@@ -35,4 +43,35 @@ public class ProBasicLogicalUnitServiceImpl extends ServiceImpl<ProBasicLogicalU
         IPage<ProBasicLogicalUnit> companysPage = getBaseMapper().selectPage(page, qw);
         return companysPage;
     }
+
+    @Override
+    public boolean addxh(ProEconEquipmentmodel jx) {
+
+        List<ProBasicLogicalUnit> list = new ArrayList<>();
+        List<ProBasicLogicalUnit> units = CacheContext.unitls;//部件
+
+        List<ProEconEquipmentmodel> list1 = new ArrayList<>();
+        List<ProEconEquipmentmodel> modells = CacheContext.Equipments;//型号
+
+        if (!units.isEmpty()) {
+
+            for (ProBasicLogicalUnit p1 : units) {
+                ProBasicLogicalUnit vo1 = new ProBasicLogicalUnit();
+                if (StringUtils.notEmp(p1.getName())) {
+
+                    for (ProEconEquipmentmodel p2 : modells) {
+                        vo1.setAname(p1.getAname());
+                        vo1.setNemCode(p1.getNemCode());
+                        vo1.setName(p1.getName());
+                    }
+
+                }
+                list.add(vo1);
+            }
+
+        }
+
+
+        return proBasicLogicalUnitService.saveOrUpdateBatch(list);
+    }
 }

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

@@ -38,33 +38,35 @@ public class ProEconLogicalUnitServiceImpl extends ServiceImpl<ProEconLogicalUni
     private IProBasicLogicalUnitService proBasicLogicalUnitService;//部件
 
     @Autowired
-    private IProEconLogicalUnitService proEconLogicalUnitService;
+    private IProEconLogicalUnitService proEconLogicalUnitService; //关联
 
     @Override
-    public boolean addgl(ProBasicLogicalUnit jx) {
+    public boolean addgl(ProBasicLogicalUnit bj) {
 
         QueryWrapper<ProEconLogicalUnit> qw = new QueryWrapper<>(); //关联
         List<ProEconLogicalUnit> list = baseMapper.selectList(qw);
 
-        List<ProBasicLogicalUnit> list1 = new ArrayList<>();
-
+        List<ProEconLogicalUnit> list1 = new ArrayList<>();
         List<ProBasicLogicalUnit> units = CacheContext.unitls;//部件
 
         if (!list.isEmpty()) {
+            ProEconLogicalUnit vo1 = new ProEconLogicalUnit();
             for (ProEconLogicalUnit p1 : list) {
-                if (StringUtils.notEmp(p1.getId())) {
-                    ProEconLogicalUnit vo1 = new ProEconLogicalUnit();
+
+                if (StringUtils.notEmp(p1.getName())) {
+
                     for (ProBasicLogicalUnit p2 : units) {
+                        if (StringUtils.notEmp(p2.getName()))
                         vo1.setAname(p2.getAname());
                         vo1.setName(p2.getName());
                         vo1.setNemCode(p2.getNemCode());
-                        list.add(vo1);
                     }
                 }
             }
+            list1.add(vo1);
         }
 
-        return this.saveOrUpdateBatch(list);
+        return proEconLogicalUnitService.saveOrUpdateBatch(list1);
     }
 
     @Override