还原

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/EquipFeignService.java

-package com.yeejoin.amos.boot.module.tzs.api.service;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-
-/**
- * 装备服务feign
- *
- * @author Dell
- */
-@FeignClient(name = "AMOS-EQUIPMANAGE", path = "equip")
-//@FeignClient(name = "AMOS-AUTOSYS", url = "http://172.16.10.66:8085", path = "fireAutoSys")
-public interface EquipFeignService {
-
-    /**
-     * 获取消防建筑树
-     *
-     * @return
-     */
-    @RequestMapping(value = "/building/BuildingtreeAndEquip", method = RequestMethod.GET)
-    ResponseModel<Object> getBuildingTreeAndEquip();
-}
+//package com.yeejoin.amos.boot.module.tzs.api.service;
+//
+//import org.springframework.cloud.openfeign.FeignClient;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RequestMethod;
+//import org.typroject.tyboot.core.restful.utils.ResponseModel;
+//
+//
+///**
+// * 装备服务feign
+// *
+// * @author Dell
+// */
+//@FeignClient(name = "AMOS-EQUIPMANAGE", path = "equip")
+////@FeignClient(name = "AMOS-AUTOSYS", url = "http://172.16.10.66:8085", path = "fireAutoSys")
+//public interface EquipFeignService {
+//
+//	/**
+//	 * 获取消防建筑树
+//	 *
+//	 * @return
+//	 */
+//	@RequestMapping(value = "/building/BuildingtreeAndEquip", method = RequestMethod.GET)
+//	ResponseModel<Object> getBuildingTreeAndEquip();
+//}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/ExcelController.java

@@ -97,6 +97,21 @@ public class ExcelController extends BaseController {
         }
     }
 
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "上传文件数据-2")
+    @PostMapping("/upload2")
+    public void upload2(@RequestPart("file") MultipartFile multipartFile,
+                        @RequestParam(required = false) String fileName,
+                        @RequestParam(required = false) String sheetName,
+                        @RequestParam String type) {
+        try {
+            excelService.commonUpload(multipartFile, new ExcelDto(fileName, sheetName, type));
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("系统异常！");
+        }
+    }
+
     /**
      * 导出值班模板
      *