Merge remote-tracking branch 'origin/master'

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/api/ass/ActiveController.java

@@ -13,20 +13,20 @@ import cn.com.taiji.common.web.ApiResponse;
 import cn.com.taiji.iaw.api.MyValidController;
 import cn.com.taiji.iaw.dto.ass.AssSaveRecordRequestDTO;
 import cn.com.taiji.iaw.dto.ass.AssSaveRecordResponseDTO;
-import cn.com.taiji.iaw.manager.ass.ActiveRecordManager;
+import cn.com.taiji.iaw.manager.ass.ActiveManager;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
-@Api(tags = {"激活记录"})
+@Api(tags = {"设备激活"})
 @RestController
 @RequestMapping("/active")
 public class ActiveController extends MyValidController {
     @Autowired
-    private ActiveRecordManager manager;
+    private ActiveManager manager;
 
     @ApiOperation(value = "新增激活记录")
     @PostMapping(value = "/saveRecord")
-    public ApiResponse<AssSaveRecordResponseDTO> saveRecord(@Valid @RequestBody AssSaveRecordRequestDTO reqDto) throws ManagerException {
+    public ApiResponse<AssSaveRecordResponseDTO> queryVehicle(@Valid @RequestBody AssSaveRecordRequestDTO reqDto) throws ManagerException {
         AssSaveRecordResponseDTO resDto = manager.saveRecord(reqDto);
         return ApiResponse.of(resDto).setMessage("添加成功");
     }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/ass/ActiveManager.java

@@ -0,0 +1,12 @@
+package cn.com.taiji.iaw.manager.ass;
+
+import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.iaw.dto.ass.AssSaveRecordRequestDTO;
+import cn.com.taiji.iaw.dto.ass.AssSaveRecordResponseDTO;
+
+/**
+ * 自助工单相关功能
+ */
+public interface ActiveManager {
+    AssSaveRecordResponseDTO saveRecord(AssSaveRecordRequestDTO requestDTO) throws ManagerException;
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/ass/ActiveRecordManagerImpl.java → zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/ass/ActiveManagerImpl.java

@@ -20,7 +20,7 @@ import java.time.LocalDateTime;
  * 激活记录相关功能
  */
 @Service
-public class ActiveRecordManagerImpl extends AbstractCommManager implements ActiveRecordManager {
+public class ActiveManagerImpl extends AbstractCommManager implements ActiveManager {
 
     @Autowired
     private ActiveRecordRepo recordRepo;