工控机端上下料站动态查询

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

@@ -2,12 +2,16 @@ package com.github.zuihou.business.controller.productionResourceCenter;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.zuihou.authority.dao.auth.StationUserLoginInfoMapper;
+import com.github.zuihou.authority.entity.auth.StationUserLoginInfo;
 import com.github.zuihou.authority.entity.common.DictionaryItem;
 import com.github.zuihou.base.R;
 import com.github.zuihou.base.controller.SuperController;
+import com.github.zuihou.business.productionResourceCenter.dao.ProductionresourceBizMapper;
 import com.github.zuihou.business.productionResourceCenter.dto.StationUserPageDTO;
 import com.github.zuihou.business.productionResourceCenter.dto.StationUserSaveDTO;
 import com.github.zuihou.business.productionResourceCenter.dto.StationUserUpdateDTO;
+import com.github.zuihou.business.productionResourceCenter.entity.Productionresource;
 import com.github.zuihou.business.productionResourceCenter.entity.StationUser;
 import com.github.zuihou.business.productionResourceCenter.service.StationUserService;
 import com.github.zuihou.common.util.StringUtil;
@@ -17,10 +21,13 @@ import com.github.zuihou.log.annotation.SysLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -43,6 +50,12 @@ import java.util.stream.Collectors;
 @SysLog(enabled = true)
 public class StationUserController extends SuperController<StationUserService, Long, StationUser, StationUserPageDTO, StationUserSaveDTO, StationUserUpdateDTO> {
 
+    @Autowired
+    private StationUserLoginInfoMapper stationUserLoginInfoMapper;
+    @Autowired
+    private ProductionresourceBizMapper productionresourceBizMapper;
+
+
     @ApiOperation(value = "查询上下料用户管理", notes = "查询上下料用户管理")
     @GetMapping("/all")
     public R<List<StationUser>> list() {
@@ -121,11 +134,19 @@ public class StationUserController extends SuperController<StationUserService, L
 
     @ApiOperation(value = "查询上下料用户", notes = "查询上下料用户")
     @GetMapping("/getStation")
-    public R<List<StationUser>> getStationByUser(@RequestParam(value="userId",required = false) String userId) {
-        LbqWrapper<StationUser> wrapper = Wraps.<StationUser>lbQ();
+    public R getStationByUser(@RequestParam(value="userId",required = false) String userId) {
+        LbqWrapper<StationUserLoginInfo> wrapper = Wraps.<StationUserLoginInfo>lbQ();
         if(userId!= null){
-            wrapper.eq(StationUser::getUserId, userId);
+            wrapper.eq(StationUserLoginInfo::getUserId, userId);
         }
-        return success(baseService.getStationByUser(wrapper));
+        StationUserLoginInfo stationUserLoginInfo = stationUserLoginInfoMapper.selectOne(wrapper);
+        // 查找上下料站信息
+        Productionresource productionresource = productionresourceBizMapper.selectById(stationUserLoginInfo.getStationId());
+//        Productionresource productionresource = new Productionresource();
+//        productionresource.setId( Long.valueOf("1496363582865014784"));
+//        productionresource.setName("保障中心_上下料站1");
+        List<Productionresource> stations = new ArrayList<Productionresource>();
+        stations.add(productionresource);
+        return success(stations);
     }
 }