#
luxiaotao1123
2024-09-19 d2adaf492a992dfbcbe117ecc1fa2b7e4d8aaf73
#
5个文件已修改
2个文件已添加
44 ■■■■ 已修改文件
zy-acs-flow/src/page/code/useCodeImport.jsx 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/page/components/ImportModal.jsx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/page/route/RouteList.jsx 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/page/route/importTemp.csv 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/page/route/useRouteImport.jsx 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/page/code/useCodeImport.jsx
@@ -1,5 +1,4 @@
import { useCallback, useMemo } from 'react';
import { useDataProvider, useGetIdentity } from 'react-admin';
import request from '@/utils/request';
export function useCodeImport() {
zy-acs-flow/src/page/components/ImportModal.jsx
@@ -149,7 +149,7 @@
                                            label="common.action.import.download"
                                            color="info"
                                            to={importTemp}
                                            download={'crm_contacts_sample.csv'}
                                            download={'import_template.csv'}
                                        />
                                    }
                                >
zy-acs-flow/src/page/route/RouteList.jsx
@@ -42,6 +42,11 @@
import MyField from "../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE } from '@/config/setting';
import * as Common from '@/utils/common';
import ImportButton from '../components/ImportButton'
import { useRouteImport } from './useRouteImport';
import * as importTemp from './importTemp.csv?raw';
const IMPORT_TEMP_URL = `data:text/csv;name=crm_contacts_sample.csv;charset=utf-8,${encodeURIComponent(importTemp.default)}`;
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
    '& .css-1vooibu-MuiSvgIcon-root': {
@@ -117,6 +122,7 @@
                        <FilterButton />
                        <MyCreateButton onClick={() => { setCreateDialog(true) }} />
                        <SelectColumnsButton preferenceKey='route' />
                        <ImportButton importTemp={IMPORT_TEMP_URL} useCodeImport={useRouteImport} onceBatch={10} />
                        <MyExportButton />
                    </TopToolbar>
                )}
zy-acs-flow/src/page/route/importTemp.csv
New file
@@ -0,0 +1 @@
start_code,end_code,distance,"direction(0:无序,1:正向,2:反向)"
zy-acs-flow/src/page/route/useRouteImport.jsx
New file
@@ -0,0 +1,20 @@
import { useCallback, useMemo } from 'react';
import request from '@/utils/request';
export function useRouteImport() {
    const processBatch = useCallback(async (batch) => {
        const res = await request.post('/route/import', batch);
        const { code, msg, data } = res.data;
        if (code === 200) {
        } else {
            console.error(msg);
            throw new Error(`Batch import failed: ${msg}`);
        }
    }, []);
    return {
        processBatch,
    };
}
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java
@@ -129,8 +129,7 @@
    @PreAuthorize("hasAuthority('manager:code:save')")
    @PostMapping("/code/import")
    public R importBatch(@RequestBody List<Map<String, Object>> list) {
        Date now = new Date();
        Long userId = getLoginUserId();
        Date now = new Date();  Long userId = getLoginUserId();
        for (Map<String, Object> map : list) {
            Code code = Cools.conver(map, Code.class);
            if (null != codeService.selectByData(code.getData())) {
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java
@@ -4,11 +4,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.common.annotation.OperationLog;
import com.zy.acs.manager.common.domain.BaseParam;
import com.zy.acs.manager.common.domain.KeyValVo;
import com.zy.acs.manager.common.domain.PageParam;
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.manager.entity.Route;
import com.zy.acs.manager.manager.service.RouteService;
import com.zy.acs.manager.system.controller.BaseController;
@@ -108,4 +108,13 @@
        ExcelUtil.build(ExcelUtil.create(routeService.list(), Route.class), response);
    }
    @PreAuthorize("hasAuthority('manager:route:save')")
    @PostMapping("/route/import")
    public R importBatch(@RequestBody List<Map<String, Object>> list) {
        Date now = new Date();  Long userId = getLoginUserId();
        for (Map<String, Object> map : list) {
        }
        return R.ok();
    }
}