1

src/main/java/com/cdf/config/WebAppConfig.java

@@ -29,15 +29,15 @@ public class WebAppConfig implements WebMvcConfigurer {
 
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
-//		registry.addInterceptor(tokenInterceptor).addPathPatterns("/**").excludePathPatterns("/**/login/**");
-//		registry.addInterceptor(backUserInterceptor).addPathPatterns("/back/**").excludePathPatterns("/**/login/**");
-//		registry.addInterceptor(sceneInterceptor).addPathPatterns("/service/**")
-//				.excludePathPatterns("/service/scene/edit/tag/save","/service/scene/edit/tag/delete",
-//						"/service/scene/edit/tag/list","/service/scene/edit/tag/getHotJson",
-//						"/service/scene/edit/publicScene","/service/scene/edit/upload/files",
-//						"/service/scene/getInfo","/service/scene/edit/getAuth",
-//						"/service/scene/edit/down/qrCode");
-//		WebMvcConfigurer.super.addInterceptors(registry);
+		registry.addInterceptor(tokenInterceptor).addPathPatterns("/**").excludePathPatterns("/**/login/**");
+		registry.addInterceptor(backUserInterceptor).addPathPatterns("/back/**").excludePathPatterns("/**/login/**");
+		registry.addInterceptor(sceneInterceptor).addPathPatterns("/service/**")
+				.excludePathPatterns("/service/scene/edit/tag/save","/service/scene/edit/tag/delete",
+						"/service/scene/edit/tag/list","/service/scene/edit/tag/getHotJson",
+						"/service/scene/edit/publicScene","/service/scene/edit/upload/files",
+						"/service/scene/getInfo","/service/scene/edit/getAuth",
+						"/service/scene/edit/down/qrCode");
+		WebMvcConfigurer.super.addInterceptors(registry);
 	}
 
 	@Override

src/main/java/com/cdf/schedule/ScheduleTask.java

@@ -141,7 +141,7 @@ public class ScheduleTask {
 
     @Scheduled(fixedDelay = 24*60*60*1000, initialDelay = 10*1000)
     public void updateBrand() throws Exception {
-       // brandService.updateBrandInfo();
+        brandService.updateBrandInfo();
     }
 
 }

src/main/java/com/cdf/service/impl/ExcelService.java

@@ -172,7 +172,7 @@ public class ExcelService {
 
     private void checkUploadOutline(File file, List<String> errorList) {
         List<HashMap<Integer, String>> excelRowList = ExcelUtil.getExcelRowList(file);
-        Integer colum = 0;
+        Integer colum = 1;
         List<String> outlineIds = new ArrayList<>();
         List<String> outlineIdsDb = new ArrayList<>();
         List<String> brandIds = new ArrayList<>();
@@ -221,7 +221,7 @@ public class ExcelService {
 
     private void checkUploadProduct(File file, List<String> errorList){
         List<HashMap<Integer, String>> excelRowList = ExcelUtil.getExcelRowList(file);
-        Integer colum = 0;
+        Integer colum = 1;
         HashMap<String,ProductSource> productSourceHashMap = new HashMap<>();
         HashMap<String, List<String>> productSourceProductMap = new HashMap<>();
         HashMap<String, List<String>> resultPMap = new HashMap<>();
@@ -289,7 +289,7 @@ public class ExcelService {
     }
     private void checkHot(File file, List<String> errorList) {
         List<HashMap<Integer, String>> excelRowList = ExcelUtil.getExcelRowList(file);
-        Integer colum = 0;
+        Integer colum = 1;
         List<HotUploadTemplate> list = null;
 
         for (HashMap<Integer, String> map : excelRowList) {

src/main/java/com/cdf/util/ExcelUtil.java

@@ -44,7 +44,7 @@ public class ExcelUtil {
                 for (int cellNum=0;cellNum<= row.getLastCellNum();cellNum++){
                     Cell cell = row.getCell(cellNum);
                     if(cell != null){
-                        map.put(cellNum,cell.toString());
+                        map.put(cellNum,fommartNum(cell.toString().trim()));
                     }
                 }
                 rowList.add(map);
@@ -109,4 +109,13 @@ public class ExcelUtil {
         }
         return null;
     }
+
+    private static  String fommartNum(String value){
+        try {
+            return Double.valueOf(value).intValue() +"";
+        }catch (Exception e){
+            return value;
+        }
+    }
+
 }