部件表及逻辑部件列表修改

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
 
 /**
  * <p>
@@ -39,9 +40,12 @@ public class ProBasicLogicalUnitController {
     @GetMapping(value = "/list")
     @ApiOperation(value = "部件-列表", notes = "部件-列表")
     public R findList(@RequestParam(value = "nemCode", required = false) String nemCode,
+                      @RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "name", required = false) String name,
+                      @RequestParam(value = "aname", required = false) String aname,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<ProBasicLogicalUnit> list = proBasicLogicalUnitService.Bylist(nemCode,pageNum, pageSize);
+        IPage<ProBasicLogicalUnit> list = proBasicLogicalUnitService.Bylist(id,name,aname,nemCode,pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {
@@ -67,4 +71,16 @@ public class ProBasicLogicalUnitController {
             return R.error().data("保存失败！");
         }
     }
+
+    @DeleteMapping(value = "/{ids}")
+    @ApiOperation(value = "部件-删除", notes = "部件-删除")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = proBasicLogicalUnitService.removeByIds(Arrays.asList(strings));
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
 }

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

@@ -1,14 +1,15 @@
 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.model.auto.ProEconLogicalUnit;
 import com.gyee.backconfig.service.auto.IProEconLogicalUnitService;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -32,11 +33,17 @@ public class ProEconLogicalUnitController {
      * @param
      * @return
      */
-    @GetMapping(value = "/typeid")
+    @GetMapping(value = "/list")
+    @ApiOperation(value = "逻辑部件-列表", notes = "逻辑部件-列表")
     public R findList(
             @RequestParam(value = "id", required = false) String id,
-            @RequestParam(value = "equipmentId", required = false) String equipmentId) {
-        List<ProEconLogicalUnit> code = proEconLogicalUnitService.list(id,equipmentId);
+            @RequestParam(value = "name", required = false) String name,
+            @RequestParam(value = "nemCode", required = false) String nemCode,
+            @RequestParam(value = "aname", required = false) String aname,
+            @RequestParam(value = "equipmentId", required = false) String equipmentId,
+            @RequestParam(value = "pageNum", required = true) String pageNum,
+            @RequestParam(value = "pageSize", required = true) String pageSize){
+         IPage<ProEconLogicalUnit> code = proEconLogicalUnitService.list(id,name,aname,nemCode,equipmentId,pageNum,pageSize);
         if (null != code) {
             return R.ok().data(code);
         } else {
@@ -44,4 +51,37 @@ public class ProEconLogicalUnitController {
         }
     }
 
+    /**
+     *
+     * @param proEconLogicalUnit
+     * @return
+     */
+    @PostMapping(value = "/add")
+    @ApiOperation(value = "逻辑部件-新增or修改", notes = "逻辑部件-新增or修改")
+    public R addAll(@RequestBody ProEconLogicalUnit proEconLogicalUnit) {
+
+        boolean b = proEconLogicalUnitService.saveOrUpdate(proEconLogicalUnit);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+    }
+
+    /**
+     * 逻辑部件-删除
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/{ids}")
+    @ApiOperation(value = "逻辑部件-删除", notes = "逻辑部件-删除")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = proEconLogicalUnitService.removeByIds(Arrays.asList(strings));
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
 }

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

@@ -16,7 +16,7 @@ import java.util.List;
  * @since 2022-12-05
  */
 public interface IProBasicLogicalUnitService extends IService<ProBasicLogicalUnit> {
-    IPage<ProBasicLogicalUnit> Bylist(String nemCode, String pageNum, String pageSize);
+    IPage<ProBasicLogicalUnit> Bylist(String nemCode,String id,String name,String aname, String pageNum, String pageSize);
 
     public boolean addgxbj(ProEconEquipmentmodel jx);
 

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

@@ -1,5 +1,6 @@
 package com.gyee.backconfig.service.auto;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.ProBasicLogicalUnit;
 import com.gyee.backconfig.model.auto.ProEconEquipmentmodel;
 import com.gyee.backconfig.model.auto.ProEconLogicalUnit;
@@ -17,11 +18,11 @@ import java.util.List;
  */
 public interface IProEconLogicalUnitService extends IService<ProEconLogicalUnit> {
 
-    public boolean addgl(ProBasicLogicalUnit bj);
+     boolean addgl(ProBasicLogicalUnit bj);
 
-    public boolean addjx(ProEconEquipmentmodel jx);
+     boolean addjx(ProEconEquipmentmodel jx);
 
     List<ProEconLogicalUnit> list1(String[] modelId);
 
-    List<ProEconLogicalUnit> list(String id,String equipmentId);
+     IPage<ProEconLogicalUnit> list(String id, String name, String nemCode, String aname, String equipmentId,String pageNum,String pageSize);
 }

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

@@ -7,15 +7,12 @@ 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.backconfig.service.auto.IProEconEquipmentmodelService;
 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.*;
 
@@ -35,11 +32,20 @@ public class ProBasicLogicalUnitServiceImpl extends ServiceImpl<ProBasicLogicalU
     private IProEconEquipmentmodelService proEconEquipmentmodelService;//型号
 
     @Override
-    public IPage<ProBasicLogicalUnit> Bylist(String nemCode, String pageNum, String pageSize) {
+    public IPage<ProBasicLogicalUnit> Bylist(String nemCode,String id,String name,String aname, String pageNum, String pageSize) {
         QueryWrapper<ProBasicLogicalUnit> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(nemCode)) {
             qw.lambda().eq(ProBasicLogicalUnit::getNemCode, nemCode);
         }
+        if (StringUtils.isNotEmpty(id)) {
+            qw.lambda().eq(ProBasicLogicalUnit::getId, id);
+        }
+        if (StringUtils.isNotEmpty(name)) {
+            qw.lambda().eq(ProBasicLogicalUnit::getName, name);
+        }
+        if (StringUtils.isNotEmpty(aname)) {
+            qw.lambda().eq(ProBasicLogicalUnit::getAname, aname);
+        }
         List<ProBasicLogicalUnit> list = baseMapper.selectList(qw);
         Page<ProBasicLogicalUnit> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         IPage<ProBasicLogicalUnit> companysPage = getBaseMapper().selectPage(page, qw);

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

@@ -1,8 +1,9 @@
 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.mapper.auto.ProBasicLogicalUnitMapper;
 import com.gyee.backconfig.model.auto.ProBasicLogicalUnit;
 import com.gyee.backconfig.model.auto.ProEconEquipmentmodel;
 import com.gyee.backconfig.model.auto.ProEconLogicalUnit;
@@ -44,7 +45,7 @@ public class ProEconLogicalUnitServiceImpl extends ServiceImpl<ProEconLogicalUni
     //部件表新增同步更新关联表
     public boolean addgl(ProBasicLogicalUnit bj) {
 
-        QueryWrapper<ProEconLogicalUnit> qw = new QueryWrapper<>(); //关联
+        QueryWrapper<ProEconLogicalUnit> qw = new QueryWrapper<>(); // 关联
         List<ProEconLogicalUnit> list = baseMapper.selectList(qw);
 
         List<ProEconLogicalUnit> list1 = new ArrayList<>();
@@ -110,16 +111,28 @@ public class ProEconLogicalUnitServiceImpl extends ServiceImpl<ProEconLogicalUni
         return list;
     }
 
+
     @Override
-    public List<ProEconLogicalUnit> list(String id, String equipmentId) {
+    public IPage<ProEconLogicalUnit> list(String id, String name, String nemCode, String aname, String equipmentId,String pageNum,String pageSize) {
         QueryWrapper<ProEconLogicalUnit> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)) {
             qw.in("id", id);
         }
+        if (StringUtils.isNotEmpty(name)) {
+            qw.in("name", name);
+        }
+        if (StringUtils.isNotEmpty(nemCode)) {
+            qw.in("nem_code", nemCode);
+        }
+        if (StringUtils.isNotEmpty(aname)) {
+            qw.in("aname", aname);
+        }
         if (StringUtils.isNotEmpty(equipmentId)) {
             qw.in("equipment_id", equipmentId);
         }
-        List<ProEconLogicalUnit> list = baseMapper.selectList(qw);
-        return list;
+        Page<ProEconLogicalUnit> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<ProEconLogicalUnit> companysPage = getBaseMapper().selectPage(page, qw);
+//        List<ProEconLogicalUnit> list = baseMapper.selectList(qw);
+        return companysPage;
     }
 }