feat:添加批量放置货架功能，添加导出弹窗，可导出筛选的数据

wj

1 天以前 365b409cdb629396cd2cbb2635ee10309cd3cd96

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java

@@ -2,10 +2,10 @@

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.acs.common.constant.CommonConstant;
import com.zy.acs.common.utils.GsonUtils;
import com.zy.acs.common.utils.Utils;
import com.zy.acs.common.utils.QrCodeCodecSupport;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
import com.zy.acs.framework.exception.CoolException;
@@ -23,7 +23,6 @@
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.FuncStaService;
import com.zy.acs.manager.manager.service.RouteService;
import com.zy.acs.manager.manager.service.impl.CodeServiceImpl;
import com.zy.acs.manager.system.controller.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -125,7 +124,7 @@
    @OperationLog("Create Code")
    @PostMapping("/code/save")
    public R save(@RequestBody Code code) {
        code.setData(Utils.zeroFill(code.getData(), CommonConstant.QR_CODE_LEN));
        code.setData(QrCodeCodecSupport.normalize(code.getData()));
        code.setUuid("code".concat(code.getData()));
        code.setCreateBy(getLoginUserId());
        code.setCreateTime(new Date());
@@ -133,10 +132,8 @@
        code.setUpdateTime(new Date());
        if (!codeService.save(code)) {
            return R.error("Save Fail");
        } else {
            CodeServiceImpl.CODE_ID_CACHE.put(code.getId(), code);
            CodeServiceImpl.CODE_DATA_CACHE.put(code.getData(), code);
        }
        codeService.refreshCacheById(code.getId());
        return R.ok("Save Success").add(code);
    }

@@ -144,19 +141,25 @@
    @OperationLog("Update Code")
    @PostMapping("/code/update")
    public R update(@RequestBody Code code) {
        code.setData(Utils.zeroFill(code.getData(), CommonConstant.QR_CODE_LEN));
        Code origin = codeService.getById(code.getId());
        boolean cornerChanged = origin != null
                && code.getCorner() != null
                && !Objects.equals(origin.getCorner(), code.getCorner());
        code.setData(QrCodeCodecSupport.normalize(code.getData()));
        code.setUpdateBy(getLoginUserId());
        code.setUpdateTime(new Date());
        if (!codeService.updateById(code)) {
            return R.error("Update Fail");
        } else {
            CodeServiceImpl.CODE_ID_CACHE.put(code.getId(), code);
            CodeServiceImpl.CODE_DATA_CACHE.put(code.getData(), code);
        }
        List<Long> affectedCodeIds = Utils.singletonList(code.getId());
        affectedCodeIds.add(code.getId());
        affectedCodeIds.addAll(routeService.getAdjacencyNode(code.getId()));
        codeService.refreshCornerByCodeIds(affectedCodeIds);
        List<Long> affectedCodeIds = new ArrayList<>(routeService.getAdjacencyNode(code.getId()));
        if (!cornerChanged) {
            affectedCodeIds.add(code.getId());
        }
        codeService.evictCacheById(code.getId(), origin == null ? null : origin.getData());
        codeService.refreshCacheById(code.getId());
        if (!affectedCodeIds.isEmpty()) {
            codeService.refreshCornerByCodeIds(affectedCodeIds);
        }
        return R.ok("Update Success").add(code);
    }

@@ -176,10 +179,8 @@
            routeService.remove(new LambdaQueryWrapper<Route>().eq(Route::getStartCode, code.getId()).or().eq(Route::getEndCode, code.getId()));
            if (!codeService.removeById(id)) {
                throw new CoolException("failed to remove code");
            } else {
                CodeServiceImpl.CODE_ID_CACHE.remove(code.getId());
                CodeServiceImpl.CODE_DATA_CACHE.remove(code.getData());
            }
            codeService.evictCacheById(code.getId(), code.getData());
        }
        codeService.refreshCornerByCodeIds(affectedCodeIds);
        return R.ok("Delete Success").add(ids);
@@ -202,7 +203,52 @@
    @PreAuthorize("hasAuthority('manager:code:list')")
    @PostMapping("/code/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(codeService.list(), Code.class), response);
        // 1. 提取筛选条件（兼容前端 { filter: {...} } 格式）
        Map<String, Object> filter = map;
        if (map != null && map.containsKey("filter")) {
            Object filterObj = map.get("filter");
            if (filterObj instanceof Map) {
                filter = (Map<String, Object>) filterObj;
            }
        }

        // 2. 构建查询条件（MyBatis-Plus）
        QueryWrapper<Code> wrapper = new QueryWrapper<>();
        if (filter != null && !filter.isEmpty()) {
            // 根据前端可能传递的字段添加条件（字段名需与数据库列或实体属性对应）
            if (filter.containsKey("corner")) {
                wrapper.eq("corner", filter.get("corner"));
            }
            if (filter.containsKey("condition")) {
                String condition = (String) filter.get("condition");
                wrapper.and(w -> w.like("data", condition).or().like("uuid", condition));
            }
            if (filter.containsKey("timeStart")) {
                wrapper.ge("create_time", filter.get("timeStart"));
            }
            if (filter.containsKey("timeEnd")) {
                wrapper.le("create_time", filter.get("timeEnd"));
            }
            if (filter.containsKey("x")) {
                wrapper.eq("x", filter.get("x"));
            }
            if (filter.containsKey("y")) {
                wrapper.eq("y", filter.get("y"));
            }
            if (filter.containsKey("memo")) {
                wrapper.like("memo", filter.get("memo"));
            }
            if (filter.containsKey("status")) {
                wrapper.eq("status", filter.get("status"));
            }
            // 还可以添加其他字段如 data, uuid 等
        }

        // 3. 查询符合条件的数据
        List<Code> list = codeService.list(wrapper);

        // 4. 导出 Excel
        ExcelUtil.build(ExcelUtil.create(list, Code.class), response);
    }

    @PreAuthorize("hasAuthority('manager:code:save')")
@@ -211,10 +257,10 @@
        Date now = new Date();  Long userId = getLoginUserId();
        for (Map<String, Object> map : list) {
            Code code = Cools.convert(map, Code.class);
            code.setData(QrCodeCodecSupport.normalize(code.getData()));
            if (null != codeService.getCacheByData(code.getData())) {
                continue;
            }
            code.setData(Utils.zeroFill(code.getData(), CommonConstant.QR_CODE_LEN));
            code.setUuid("code".concat(code.getData()));
//            code.setCorner(0);
            code.setScale(GsonUtils.toJson(Cools.add("x", 1).add("y", 1)));
@@ -225,10 +271,8 @@
            code.setUpdateTime(now);
            if (!codeService.save(code)) {
                log.error("failed to save code {}", JSON.toJSONString(map));
            } else {
                CodeServiceImpl.CODE_ID_CACHE.put(code.getId(), code);
                CodeServiceImpl.CODE_DATA_CACHE.put(code.getData(), code);
            }
            codeService.refreshCacheById(code.getId());
        }
        return R.ok();
    }