lsh#

1

19 小时以前 e711c834aec2293c53b07efe53e81e3573c289b6

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java

@@ -21,6 +21,7 @@
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.mapper.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.BasStationServiceImpl;
import com.vincent.rsf.server.system.constant.CodeRes;
import com.vincent.rsf.server.system.constant.GlobalConfigCode;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -38,8 +39,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -129,6 +130,9 @@
    private WarehouseRoleMenuService warehouseRoleMenuService;
    @Autowired
    private BasContainerService basContainerService;
    @Resource
    private UserRoleService userRoleService;
    private BasStationServiceImpl basStationService;

    /**
     * @return
@@ -157,6 +161,14 @@
        if (!userService.comparePassword(user.getPassword(), param.getPassword())) {
            return R.parse(CodeRes.USER_10003);
        }

        List<Role> roles = userRoleService.listByUserId(user.getId());
        user.setRoles(roles);
        Long[] roleIds = new Long[roles.size()];
        for(int i = 0; i < roles.size(); i++) {
            roleIds[i] = roles.get(i).getId();
        }
        user.setRoleIds(roleIds);

        String accessToken = JwtUtil.buildToken(new JwtSubject(param.getUsername(), user.getTenantId()),
                configProperties.getTokenExpireTime(), configProperties.getTokenKey());
@@ -1026,7 +1038,47 @@
                        .map(WarehouseRoleMenu::getMenuId)
                        .collect(Collectors.toSet());
                // 获取 areaList 并转换为 Long 类型的 Set
                List<Integer> areaList = container.getAreas();
                List<Integer> areaList = container.getAreasIds();
                Set<Long> areaSet = new HashSet<>();
                if (areaList != null) {
                    areaList.forEach(area -> areaSet.add(area.longValue()));
                }
                // 求两个集合的交集
                menuIdSet.retainAll(areaSet);

                List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
                        .in(WarehouseAreas::getId, menuIdSet));
                return R.ok(areas);

            }
        }
        return R.ok(new ArrayList<>());
    }

    /**
     * @param
     * @param user
     * @return
     * @author Ryan
     * @description 通过容器获取组拖物料
     * @time 2025/4/9 16:57
     */
    @Override
    public R getItemByContainerArea(Map<String, Object> params, User user) {
        List<BasContainer> containers = basContainerService.list();
        for (BasContainer container : containers) {
            String codeType = container.getCodeType(); // 获取正则表达式
            if (params.get("barcode").toString().matches(codeType)) { // 判断条码是否符合这个正则
                List<WarehouseRoleMenu> warehouseRoleMenus = warehouseRoleMenuService
                        .list(new LambdaQueryWrapper<WarehouseRoleMenu>()
                                .in(WarehouseRoleMenu::getRoleId, Arrays.asList(user.getUserRoleIds())));
                Set<WarehouseRoleMenu> warehouseRoleMenusSet = new HashSet<>(warehouseRoleMenus);
                // 获取 menuId 集合
                Set<Long> menuIdSet = warehouseRoleMenusSet.stream()
                        .map(WarehouseRoleMenu::getMenuId)
                        .collect(Collectors.toSet());
                // 获取 areaList 并转换为 Long 类型的 Set
                List<Integer> areaList = container.getAreasIds();
                Set<Long> areaSet = new HashSet<>();
                if (areaList != null) {
                    areaList.forEach(area -> areaSet.add(area.longValue()));
@@ -1130,11 +1182,12 @@
     */
    @Override
    public R getDeviceSites() {
        List<DeviceSite> sites = deviceSiteMapper.selectList(new LambdaQueryWrapper<DeviceSite>()
                .select(DeviceSite::getId, DeviceSite::getSite, DeviceSite::getName)
                .eq(DeviceSite::getStatus, 1)
                .groupBy(DeviceSite::getSite, DeviceSite::getId, DeviceSite::getName));
        return R.ok(sites);
//        List<DeviceSite> sites = deviceSiteMapper.selectList(new LambdaQueryWrapper<DeviceSite>()
//                .select(DeviceSite::getId, DeviceSite::getSite, DeviceSite::getName)
//                .eq(DeviceSite::getStatus, 1)
//                .groupBy(DeviceSite::getSite, DeviceSite::getId, DeviceSite::getName));
        List<BasStation> basStationList = basStationService.list(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStatus, 1));
        return R.ok(basStationList);
    }

    /**
@@ -1164,7 +1217,7 @@
        }
        GenerateTaskParams taskParams = new GenerateTaskParams();
        taskParams.setWaitPakins(waitPakins)
                .setSiteId(Long.parseLong(map.get("site").toString()))
                .setSiteNo(map.get("siteNo").toString())
                .setLocCode(map.get("locCode").toString());
        return R.ok(taskService.generateTasks(taskParams, loginUserId));

@@ -1239,3 +1292,4 @@
    }

}