增加更新型号同步更新关联表modelid形成闭环

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

@@ -60,7 +60,8 @@ public class ProBasicLogicalUnitController {
 
         boolean b = proBasicLogicalUnitService.saveOrUpdate(proBasicLogicalUnit);
         if (b) {
-            proEconLogicalUnitService.addgl(proBasicLogicalUnit);
+            proEconLogicalUnitService.addgl(proBasicLogicalUnit); //部件-关联
+            proBasicLogicalUnitService.addgxxh(proBasicLogicalUnit);//部件-型号
             return R.ok().data(b);
         } else {
             return R.error().data("保存失败！");

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

@@ -30,6 +30,8 @@ public class ProEconEquipmentmodelController {
     private IProEconEquipmentmodelService proEconEquipmentmodelService;
     @Resource
     private ProBasicLogicalUnitServiceImpl proBasicLogicalUnitService;
+    @Resource
+    private ProEconLogicalUnitServiceImpl proEconLogicalUnitService;
     /**
      * 查询
      * @param id
@@ -65,7 +67,8 @@ public class ProEconEquipmentmodelController {
 
         boolean b = proEconEquipmentmodelService.saveOrUpdate(proEconEquipmentmodel);
         if (b) {
-            proBasicLogicalUnitService.addxh(proEconEquipmentmodel);
+            proBasicLogicalUnitService.addgxbj(proEconEquipmentmodel);//型号-部件
+            proEconLogicalUnitService.addjx(proEconEquipmentmodel);//型号-关联
             return R.ok().data(b);
         } else {
             return R.error().data("保存失败！");

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

@@ -18,5 +18,7 @@ import java.util.List;
 public interface IProBasicLogicalUnitService extends IService<ProBasicLogicalUnit> {
     IPage<ProBasicLogicalUnit> Bylist(String nemCode, String pageNum, String pageSize);
 
-    public boolean addxh(ProEconEquipmentmodel jx);
+    public boolean addgxbj(ProEconEquipmentmodel jx);
+
+    public boolean addgxxh(ProBasicLogicalUnit jx);
 }

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

@@ -19,6 +19,8 @@ public interface IProEconLogicalUnitService extends IService<ProEconLogicalUnit>
 
     public boolean addgl(ProBasicLogicalUnit bj);
 
+    public boolean addjx(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

@@ -10,6 +10,7 @@ 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.backconfig.service.auto.IProEconEquipmentmodelService;
 import com.gyee.common.model.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,6 +32,7 @@ public class ProBasicLogicalUnitServiceImpl extends ServiceImpl<ProBasicLogicalU
 
     @Autowired
     private IProBasicLogicalUnitService proBasicLogicalUnitService;//部件
+    private IProEconEquipmentmodelService proEconEquipmentmodelService;//型号
 
     @Override
     public IPage<ProBasicLogicalUnit> Bylist(String nemCode, String pageNum, String pageSize) {
@@ -45,7 +47,8 @@ public class ProBasicLogicalUnitServiceImpl extends ServiceImpl<ProBasicLogicalU
     }
 
     @Override
-    public boolean addxh(ProEconEquipmentmodel jx) {
+//    新增型号更新多个部件
+    public boolean addgxbj(ProEconEquipmentmodel jx) {
 
         List<ProBasicLogicalUnit> list = new ArrayList<>();
         List<ProBasicLogicalUnit> units = CacheContext.unitls;//部件
@@ -74,4 +77,36 @@ public class ProBasicLogicalUnitServiceImpl extends ServiceImpl<ProBasicLogicalU
 
         return proBasicLogicalUnitService.saveOrUpdateBatch(list);
     }
+
+    @Override
+    //更新部件新增型号
+    public boolean addgxxh(ProBasicLogicalUnit 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) {
+                ProEconEquipmentmodel vo1 = new ProEconEquipmentmodel();
+                if (StringUtils.notEmp(p1.getName())) {
+
+                    for (ProEconEquipmentmodel p2 : modells) {
+                        vo1.setId(p2.getId());
+                        vo1.setNemCode(p2.getNemCode());
+                        vo1.setName(p2.getName());
+                        vo1.setAname(p2.getAname());
+                    }
+
+                }
+                list1.add(vo1);
+            }
+
+        }
+
+
+        return proEconEquipmentmodelService.saveOrUpdateBatch(list1);
+    }
 }

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

@@ -41,6 +41,7 @@ public class ProEconLogicalUnitServiceImpl extends ServiceImpl<ProEconLogicalUni
     private IProEconLogicalUnitService proEconLogicalUnitService; //关联
 
     @Override
+    //部件表新增同步更新关联表
     public boolean addgl(ProBasicLogicalUnit bj) {
 
         QueryWrapper<ProEconLogicalUnit> qw = new QueryWrapper<>(); //关联
@@ -70,6 +71,35 @@ public class ProEconLogicalUnitServiceImpl extends ServiceImpl<ProEconLogicalUni
     }
 
     @Override
+    //新增一个型号更新关联表型号
+    public boolean addjx(ProEconEquipmentmodel jx) {
+
+        QueryWrapper<ProEconLogicalUnit> qw = new QueryWrapper<>(); //关联
+        List<ProEconLogicalUnit> list = baseMapper.selectList(qw);
+
+
+        List<ProEconLogicalUnit> list1 = new ArrayList<>();
+        List<ProEconEquipmentmodel> units = CacheContext.Equipments;//型号
+
+        if (!list.isEmpty()) {
+            ProEconLogicalUnit vo1 = new ProEconLogicalUnit();
+            for (ProEconLogicalUnit p1 : list) {
+
+                if (StringUtils.notEmp(p1.getName())) {
+
+                    for (ProEconEquipmentmodel p2 : units) {
+                        if (StringUtils.notEmp(p2.getName()))
+                            vo1.setModelId(jx.getId());
+                    }
+                }
+            }
+            list1.add(vo1);
+        }
+
+        return proEconLogicalUnitService.saveOrUpdateBatch(list1);
+    }
+
+    @Override
     public List<ProEconLogicalUnit> list1(String[] modelId) {
         QueryWrapper<ProEconLogicalUnit> qw = new QueryWrapper<>();