Merge remote-tracking branch 'origin/master'

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

@@ -1,9 +1,16 @@
 package com.gyee.backconfig.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+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;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
 
 /**
  * <p>
@@ -17,4 +24,47 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("//pro-basic-logical-unit")
 public class ProBasicLogicalUnitController {
 
+    @Resource
+    private IProBasicLogicalUnitService proBasicLogicalUnitService;
+    @Resource
+    private ProEconLogicalUnitServiceImpl proEconLogicalUnitService;
+    /**
+     * 查询
+     * @param
+     * @param nemCode
+     * @param
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/list")
+    @ApiOperation(value = "部件-列表", notes = "部件-列表")
+    public R findList(@RequestParam(value = "nemCode", required = false) String nemCode,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<ProBasicLogicalUnit> list = proBasicLogicalUnitService.Bylist(nemCode,pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 添加
+     * @param proBasicLogicalUnit
+     * @return
+     */
+    @PostMapping(value = "/add")
+    @ApiOperation(value = "部件-新增or修改", notes = "部件-新增or修改")
+    public R addAll(@RequestBody ProBasicLogicalUnit proBasicLogicalUnit) {
+
+        boolean b = proBasicLogicalUnitService.saveOrUpdate(proBasicLogicalUnit);
+        if (b) {
+            proEconLogicalUnitService.addgl(proBasicLogicalUnit);
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+    }
 }

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

@@ -3,10 +3,8 @@ 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.*;
@@ -28,8 +26,6 @@ import java.util.Arrays;
 public class ProEconEquipmentmodelController {
     @Resource
     private IProEconEquipmentmodelService proEconEquipmentmodelService;
-    @Resource
-    private IProEconLogicalUnitService proEconLogicalUnitService;
 
     /**
      * 查询
@@ -66,7 +62,6 @@ 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

@@ -2,6 +2,7 @@ package com.gyee.backconfig.controller;
 
 
 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;
@@ -25,7 +26,7 @@ public class ProEconLogicalUnitController {
     private IProEconLogicalUnitService proEconLogicalUnitService;
 
     @PostMapping(value = "/add")
-    public R addGeneratePoint(@RequestParam(value = "jx", required = false) ProEconEquipmentmodel jx) {
+    public R addGeneratePoint(@RequestParam(value = "jx", required = false) ProBasicLogicalUnit jx) {
 
         boolean jxd = proEconLogicalUnitService.addgl(jx);
         if (!jxd) {

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicLogicalUnitService.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.baomidou.mybatisplus.extension.service.IService;
 import com.gyee.backconfig.model.auto.ProEconEquipmentmodel;
@@ -15,5 +16,5 @@ import java.util.List;
  * @since 2022-12-05
  */
 public interface IProBasicLogicalUnitService extends IService<ProBasicLogicalUnit> {
-    List<ProBasicLogicalUnit> Bylist(String nemCode);
+    IPage<ProBasicLogicalUnit> Bylist(String nemCode, String pageNum, String pageSize);
 }

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.gyee.backconfig.model.auto.ProBasicLogicalUnit;
 import com.gyee.backconfig.model.auto.ProEconEquipmentmodel;
 import com.gyee.backconfig.model.auto.ProEconLogicalUnit;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -16,7 +17,7 @@ import java.util.List;
  */
 public interface IProEconLogicalUnitService extends IService<ProEconLogicalUnit> {
 
-    public boolean addgl(ProEconEquipmentmodel jx);
+    public boolean addgl(ProBasicLogicalUnit jx);
 
     List<ProEconLogicalUnit> list1(String[] modelId);
 

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

@@ -1,6 +1,8 @@
 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.model.auto.ProBasicLogicalUnit;
 import com.gyee.backconfig.mapper.auto.ProBasicLogicalUnitMapper;
 import com.gyee.backconfig.model.auto.ProEconEquipmentmodel;
@@ -23,12 +25,14 @@ import java.util.List;
 public class ProBasicLogicalUnitServiceImpl extends ServiceImpl<ProBasicLogicalUnitMapper, ProBasicLogicalUnit> implements IProBasicLogicalUnitService {
 
     @Override
-    public List<ProBasicLogicalUnit> Bylist(String nemCode) {
+    public IPage<ProBasicLogicalUnit> Bylist(String nemCode, String pageNum, String pageSize) {
         QueryWrapper<ProBasicLogicalUnit> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(nemCode)) {
             qw.lambda().eq(ProBasicLogicalUnit::getNemCode, nemCode);
         }
         List<ProBasicLogicalUnit> list = baseMapper.selectList(qw);
-        return list;
+        Page<ProBasicLogicalUnit> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<ProBasicLogicalUnit> companysPage = getBaseMapper().selectPage(page, qw);
+        return companysPage;
     }
 }

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

@@ -41,7 +41,7 @@ public class ProEconLogicalUnitServiceImpl extends ServiceImpl<ProEconLogicalUni
     private IProEconLogicalUnitService proEconLogicalUnitService;
 
     @Override
-    public boolean addgl(ProEconEquipmentmodel jx) {
+    public boolean addgl(ProBasicLogicalUnit jx) {
 
         QueryWrapper<ProEconLogicalUnit> qw = new QueryWrapper<>(); //关联
         List<ProEconLogicalUnit> list = baseMapper.selectList(qw);