手动模式

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/dao/ProductionresourceBizMapper.java

@@ -18,19 +18,5 @@ import java.util.Map;
 @Repository
 public interface ProductionresourceBizMapper extends SuperMapper<Productionresource> {
 
-    List<Map> getList(Map map);
-
-
-    int getCount(Map map);
-
-
-    List<Map>getResourceStatus(Map map);
-
-    /**
-     * 获取设备和生产单元（产线）的关系
-     * @param map
-     * @return
-     */
-    List<Map>getResourceZone();
 
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/ProductionresourceBizService.java

@@ -0,0 +1,21 @@
+package com.github.zuihou.business.productionResourceCenter.service;
+
+import com.github.zuihou.base.service.SuperService;
+import com.github.zuihou.business.productionResourceCenter.entity.Productionresource;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 业务接口
+ * 生产资源配置
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-12-02
+ */
+public interface ProductionresourceBizService  {
+
+    Map<String, Object> pageList(Map<String, Object> map);
+
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/impl/ProductionresourceBizServiceImpl.java

@@ -0,0 +1,50 @@
+package com.github.zuihou.business.productionResourceCenter.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.github.zuihou.business.productionResourceCenter.entity.ResourceBusiness;
+import com.github.zuihou.business.productionResourceCenter.service.ProductionresourceBizService;
+import com.github.zuihou.business.productionResourceCenter.service.ResourceBusinessService;
+import com.github.zuihou.database.mybatis.conditions.Wraps;
+import com.github.zuihou.tenant.service.ProductionresourceService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 业务实现类
+ * 生产资源配置
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-12-02
+ */
+@Slf4j
+@Service
+public class ProductionresourceBizServiceImpl implements ProductionresourceBizService {
+
+    @Autowired
+    private ProductionresourceService productionresourceService;
+
+    @Autowired
+    private ResourceBusinessService resourceBusinessService;
+
+
+    @Override
+    public Map<String, Object> pageList(Map<String, Object> map) {
+        Map<String, Object> returnMap = productionresourceService.pageList(map);
+        List<Map> list = returnMap.get("data")==null?new ArrayList():(List)returnMap.get("data");
+        list.stream().map((item) -> {
+           String id = item.get("id").toString();
+           List businessList = resourceBusinessService.list(Wraps.<ResourceBusiness>lbQ().in(ResourceBusiness::getResourceId,id));
+            item.put("businessList", CollectionUtil.isEmpty(businessList)?new ArrayList<>():businessList);
+            return item;
+        }).collect(Collectors.toList());
+        return map;
+    }
+}

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionResourceCenter/ResourceBusinessController.java

@@ -10,6 +10,7 @@ import com.github.zuihou.business.productionResourceCenter.dto.ResourceBusinessS
 import com.github.zuihou.business.productionResourceCenter.dto.ResourceBusinessUpdateDTO;
 import com.github.zuihou.business.productionResourceCenter.entity.ResourceBusiness;
 import com.github.zuihou.business.productionResourceCenter.entity.ZZone;
+import com.github.zuihou.business.productionResourceCenter.service.ProductionresourceBizService;
 import com.github.zuihou.business.productionResourceCenter.service.ResourceBusinessService;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
@@ -18,6 +19,7 @@ import com.github.zuihou.utils.BeanPlusUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -41,6 +43,8 @@ import java.util.Map;
 @Api(value = "ResourceBusiness", tags = "设备业务管理")
 @SysLog(enabled = true)
 public class ResourceBusinessController extends SuperController<ResourceBusinessService, Long, ResourceBusiness, ResourceBusinessPageDTO, ResourceBusinessSaveDTO, ResourceBusinessUpdateDTO> {
+    @Autowired
+    private ProductionresourceBizService productionresourceBizService;
     @Override
     public void query(PageParams<ResourceBusinessPageDTO> params, IPage<ResourceBusiness> page, Long defSize) {
         ResourceBusinessPageDTO data = params.getModel();
@@ -79,4 +83,11 @@ public class ResourceBusinessController extends SuperController<ResourceBusiness
         return success(resourceBusiness);
     }
 
+
+    @ApiOperation(value = "租户端查询生产资源分页", notes = "租户端查询生产资源(通过视图)分页")
+    @PostMapping("/resourcePageList")
+    public R<Map<String, Object>> resourcePageList(@RequestBody(required = false) Map<String, Object> map) {
+        return success(productionresourceBizService.pageList(map));
+    }
+
 }