|
|
@@ -1,6 +1,7 @@
|
|
|
package com.github.zuihou.business.productionResourceCenter.service.impl;
|
|
|
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
@@ -18,6 +19,7 @@ import com.github.zuihou.business.productionResourceCenter.service.Productionres
|
|
|
import com.github.zuihou.business.productionResourceCenter.service.ResourceBusinessService;
|
|
|
import com.github.zuihou.business.productionResourceCenter.service.ZZoneService;
|
|
|
import com.github.zuihou.common.constant.ParameterKey;
|
|
|
+import com.github.zuihou.common.util.StringUtil;
|
|
|
import com.github.zuihou.context.BaseContextHandler;
|
|
|
import com.github.zuihou.database.mybatis.auth.DataScope;
|
|
|
import com.github.zuihou.database.mybatis.conditions.Wraps;
|
|
|
@@ -35,6 +37,7 @@ import org.springframework.web.client.RestTemplate;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+import java.util.Objects;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
@@ -70,9 +73,15 @@ public class ProductionresourceBizServiceImpl extends SuperServiceImpl<Productio
|
|
|
|
|
|
@Override
|
|
|
public Map<String, Object> pageList(Map<String, Object> map) {
|
|
|
+
|
|
|
//默认显示FMS产线所有设备
|
|
|
- String org_id = zZoneService.getOne(new LbqWrapper<ZZone>().eq(ZZone::getNo, "capsule")).getOrgId().toString();
|
|
|
- map.put("orgIds", org_id);
|
|
|
+ if(map.get("model") !=null && StringUtil.isNotEmpty(map.get("model").toString())){
|
|
|
+ Map jsonMap = (Map)map.get("model");
|
|
|
+ if(!Objects.isNull(jsonMap.get("zoneId"))){
|
|
|
+ String org_id = zZoneService.getOne(new LbqWrapper<ZZone>().eq(ZZone::getId, jsonMap.get("zoneId").toString())).getOrgId().toString();
|
|
|
+ map.put("orgIds", org_id);
|
|
|
+ }
|
|
|
+ }
|
|
|
Map<String, Object> returnMap = productionresourceService.pageList(map);
|
|
|
List<Map> list = returnMap.get("data")==null?new ArrayList():(List)returnMap.get("data");
|
|
|
list.stream().map((item) -> {
|
lxb