Merge branch 'develop' of http://39.98.45.134:8090/tool/amos-tool into develop

src/main/java/com/yeejoin/amos/api/tool/controller/DataApiResource.java

@@ -36,7 +36,8 @@ import java.util.Map;
 @TycloudResource(module = "atl", value = "dataApi")
 @RequestMapping(value = "/v1/dataApi")
 @Api(tags = "atl-导出")
-public class DataApiResource {
+public class
+DataApiResource {
 
     private final Logger logger = LogManager.getLogger(DataApiResource.class);
 

src/main/java/com/yeejoin/amos/api/tool/controller/DataBaseLinkResource.java

 package com.yeejoin.amos.api.tool.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.api.tool.face.model.ApiInfoModel;
 import com.yeejoin.amos.api.tool.face.model.DataBaseLinkModel;
 import com.yeejoin.amos.api.tool.face.service.DataBaseLinkService;
 import io.swagger.annotations.Api;
@@ -12,6 +13,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -27,16 +29,28 @@ public class DataBaseLinkResource {
     private DataBaseLinkService dataBaseLinkService;
 
     /**
-     * 数据库初始化
-     * @param dataBaseLinkModel 数据库连接信息
-     * @return List<DataBaseLinkModel>
+     * 新增
+     * @param dataBaseLinkModel 数据库连接
+     * @return DataBaseLinkModel
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-    @PostMapping(value = "/refresh")
-    @ApiOperation(httpMethod = "POST", value = "数据库初始化", notes = "数据库初始化")
-    public ResponseModel<List<DataBaseLinkModel>> save(@RequestBody DataBaseLinkModel dataBaseLinkModel) throws Exception {
-            return ResponseHelper.buildResponse(
-                    dataBaseLinkService.refreshDataBase(dataBaseLinkService.encryptPwd(dataBaseLinkModel)));
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+    public ResponseModel<DataBaseLinkModel> save(@RequestBody DataBaseLinkModel dataBaseLinkModel) throws Exception {
+        dataBaseLinkModel = dataBaseLinkService.createWithModel(dataBaseLinkModel);
+        return ResponseHelper.buildResponse(dataBaseLinkModel);
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     * @param sequenceNbr 主键
+     * @return Boolean
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(dataBaseLinkService.removeById(sequenceNbr));
     }
 
     /**
@@ -67,4 +81,6 @@ public class DataBaseLinkResource {
     public ResponseModel<List<DataBaseLinkModel>> selectForList() {
         return ResponseHelper.buildResponse(dataBaseLinkService.queryForDataBaseList());
     }
+
+
 }

src/main/java/com/yeejoin/amos/api/tool/face/service/DataBaseLinkService.java

@@ -27,7 +27,8 @@ import java.util.List;
 public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBaseLink, DataBaseLinkMapper> {
     @Autowired
     private DataBaseLinkMapper dataBaseLinkMapper;
-
+    @Autowired
+    private DataBaseLinkService dataBaseLinkService;
     /**
      * 分页查询
      */
@@ -103,4 +104,6 @@ public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBase
             return model;
     }
 
+
+
 }