Merge branch 'iec61850' of http://gitserver:8081/git/cac/backend into iec61850

src/main/java/com/xydl/cac/controller/NSensorController.java

@@ -188,10 +188,11 @@ public class NSensorController extends BasicController {
 
     @GetMapping("exportLatest")
     @ApiOperation("导出")
-    public void exportLatest(@ApiParam("主设备id") @RequestParam(value = "zsbid", required = false) Integer zsbid, HttpServletResponse response) throws Exception {
+    public void exportLatest(@ApiParam("主设备id") @RequestParam(value = "zsbid", required = false) Integer zsbid,
+                             @ApiParam("类型") @RequestParam(value = "typeId", required = false) Integer typeId, HttpServletResponse response) throws Exception {
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf-8");
-        List<NSensor> result = service.listAll(zsbid, null);
+        List<NSensor> result = service.listAll(zsbid, typeId);
 
         Map<Integer, List<NSensor>> map = new HashMap<>();
         for (NSensor nSensor : result) {