#

vincentlu

昨天 c23cad893b1fe995f6dc0788ba4454218fbbb6c3

#

 zy-acs-flow/public/imports/code_import_template.xlsx

Binary files differ

 zy-acs-flow/public/imports/loc_import_template.xlsx

Binary files differ

 zy-acs-flow/public/imports/route_import_template.xlsx

Binary files differ

 zy-acs-framework/src/main/java/com/zy/acs/framework/common/Cools.java

@@ -108,7 +108,7 @@
    /**
     * map 转 对象
     */
    public static <T> T conver(Map<? extends String, ?> map, Class<T> cls){
    public static <T> T convert(Map<? extends String, ?> map, Class<T> cls){
        T instance = null;
        try {
            Constructor<T> constructor = cls.getDeclaredConstructor();

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

@@ -159,7 +159,7 @@
    public R importBatch(@RequestBody List<Map<String, Object>> list) {
        Date now = new Date();  Long userId = getLoginUserId();
        for (Map<String, Object> map : list) {
            Code code = Cools.conver(map, Code.class);
            Code code = Cools.convert(map, Code.class);
            if (null != codeService.getCacheByData(code.getData())) {
                continue;
            }

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

@@ -206,7 +206,7 @@
                key = Utils.toCamelCase(key);
                one.put(key, entry.getValue());
            }
            RouteExcel excelDto = Cools.conver(one, RouteExcel.class);
            RouteExcel excelDto = Cools.convert(one, RouteExcel.class);

            Code code0 = codeService.getCacheByData(Utils.zeroFill(excelDto.getStartCode(), CommonConstant.QR_CODE_LEN));
            Code code1 = codeService.getCacheByData(Utils.zeroFill(excelDto.getEndCode(), CommonConstant.QR_CODE_LEN));