Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/data-acquisition

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentAccountController.java

@@ -3,6 +3,7 @@ package cn.wise.sc.acquisition.business.controller;
 
 import cn.wise.im.common.http.R;
 import cn.wise.sc.acquisition.business.model.PageQuery;
+import cn.wise.sc.acquisition.business.model.query.TEquipmentAccountQuery;
 import cn.wise.sc.acquisition.business.service.ITEquipmentAccountService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -10,6 +11,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -31,7 +33,7 @@ public class TEquipmentAccountController {
 	private ITEquipmentAccountService equipmentAccountService;
 
 
-	@ApiOperation(value = "人员分页列表")
+	@ApiOperation(value = "设备分页列表")
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "EquipmentName", value = "设备名称", paramType = "query", dataType = "EquipmentName")
 	})
@@ -40,8 +42,11 @@ public class TEquipmentAccountController {
 		return equipmentAccountService.getPage(pageQuery, EquipmentName);
 	}
 
-
-
+	@ApiOperation(value = "新增设备")
+	@PostMapping("/create")
+	public R create(TEquipmentAccountQuery query) {
+		return equipmentAccountService.create(query);
+	}