修改数据源配置问题

industry-admin/src/views/source/dataSource/index.vue

@@ -408,6 +408,8 @@ export default {
         this.dataSourceForm.label = data.label
         this.dataSourceForm.type = data.labelKey
         this.dataSourceForm.typeId = data.id
+
+        this.$refs.dataSourceForm.validateField('label')
       }
       this.initDataSourceForm()
     },
@@ -572,18 +574,23 @@ export default {
       this.datasourceDialogVisible = false
     },
     winSave(){
-      this.dataSourceForm.dataSourceDescribe = this.dataSourceForm.desc
-      let data = {
-        dataSourceName : this.dataSourceForm.dataSourceName,
-        dataSourceDescribe : this.dataSourceForm.desc,
-        id: this.dataSourceForm.id
-      }
-      //只修改名称和备注
-      updateDataSourceNameAndDescribe(data).then(res => {
-        if (res.data) {
-          this.showMsg('保存成功！', true)
-          this.handleClose()
-          this.getAllDataSource()
+      this.$refs['dataSourceForm'].validate(valid => {
+        if (valid) {
+          this.dataSourceForm.dataSourceDescribe = this.dataSourceForm.desc
+          let data = {
+            dataSourceName: this.dataSourceForm.dataSourceName,
+            dataSourceDescribe: this.dataSourceForm.desc,
+            id: this.dataSourceForm.id,
+            typeId: this.dataSourceForm.typeId
+          }
+          //只修改名称和备注
+          updateDataSourceNameAndDescribe(data).then(res => {
+            if (res.data) {
+              this.showMsg('保存成功！', true)
+              this.handleClose()
+              this.getAllDataSource()
+            }
+          })
         }
       })
     },

industry-system/industry-da/src/main/java/com/example/opc_da/controller/DataSourceController.java

@@ -61,7 +61,7 @@ public class DataSourceController {
     @PostMapping("/updateDataSourceNameAndDescribe")
     @WebLog(ServerEnum = ServerEnum.CLIENT, ModelEnum = ModelEnum.DATASOURCE, OperationEnum = OperationEnum.UPDATE)
     public Result updateDataSourceNameAndDescribe(@RequestBody DataSource dataSource) {
-        if (Blank.isEmpty(dataSource, dataSource.getId(),dataSource.getDataSourceName())) {
+        if (Blank.isEmpty(dataSource,dataSource.getTypeId(), dataSource.getDataSourceName())) {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "数据源名称不能为空");
         }
         return dataSourceService.updateDataSourceNameAndDescribe(dataSource);

industry-system/industry-da/src/main/java/com/example/opc_da/service/impl/DataSourceServiceImpl.java

@@ -73,6 +73,14 @@ public class DataSourceServiceImpl implements DataSourceService {
 
     @Override
     public Result updateDataSourceNameAndDescribe(DataSource dataSource) {
+        String currentUserId = userUtil.getCurrentUserId();
+        dataSource.setUserId(currentUserId);
+        if(Blank.isEmpty(dataSource.getId())){
+            if (dataSourceDao.addDataSource(dataSource) <= 0) {
+                return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "添加数据源配置失败");
+            }
+            return Result.ok("添加数据源配置成功");
+        }
         if (dataSourceDao.updateDataSourceNameAndDescribe(dataSource) <= 0) {
             return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "修改数据源配置失败");
         }