add admin getDataset by datasetId

Author: caryliao(廖飞强)

wedpr-components/admin/src/main/java/com/webank/wedpr/components/admin/controller/WedprDatasetController.java

@@ -3,6 +3,7 @@
 import com.webank.wedpr.components.admin.common.Utils;
 import com.webank.wedpr.components.admin.request.GetWedprDatasetListRequest;
 import com.webank.wedpr.components.admin.service.WedprDatasetService;
+import com.webank.wedpr.components.dataset.dao.Dataset;
 import com.webank.wedpr.components.dataset.message.ListDatasetResponse;
 import com.webank.wedpr.components.token.auth.model.UserToken;
 import com.webank.wedpr.core.utils.Constant;
@@ -12,6 +13,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -43,4 +45,18 @@ public WeDPRResponse listDataset(
             return new WeDPRResponse(Constant.WEDPR_FAILED, e.getMessage());
         }
     }
+
+    @GetMapping("/queryDataset")
+    public WeDPRResponse queryDataset(
+            @RequestParam("datasetId") String datasetId, HttpServletRequest request) {
+        try {
+            // check user permission
+            UserToken userToken = Utils.checkPermission(request);
+            Dataset dataset = wedprDatasetService.getById(datasetId);
+            return new WeDPRResponse(Constant.WEDPR_SUCCESS, Constant.WEDPR_SUCCESS_MSG, dataset);
+        } catch (Exception e) {
+            log.error("queryDataset error", e);
+            return new WeDPRResponse(Constant.WEDPR_FAILED, e.getMessage());
+        }
+    }
 }

wedpr-components/dataset/src/main/java/com/webank/wedpr/components/dataset/dao/Dataset.java

@@ -1,6 +1,7 @@
 package com.webank.wedpr.components.dataset.dao;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -14,6 +15,7 @@
 @Data
 public class Dataset {
 
+    @TableId("dataset_id")
     private String datasetId;
 
     private String datasetLabel;

wedpr-components/mybatis/src/main/java/com/webank/wedpr/components/mybatis/tool/GenerateCodeMain.java

@@ -23,10 +23,10 @@ public static void main(String[] args) {
         // 数据源配置
         com.baomidou.mybatisplus.generator.config.DataSourceConfig dsc = new DataSourceConfig();
         dsc.setUrl(
-                "jdbc:mysql://139.159.202.235:3306/cary?characterEncoding=utf8&useSSL=false&serverTimezone=UTC");
+                "jdbc:mysql://127.0.0.1:3306/wedpr?characterEncoding=utf8&useSSL=false&serverTimezone=UTC");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
-        dsc.setUsername("root");
-        dsc.setPassword("Wedpr2023");
+        dsc.setUsername("");
+        dsc.setPassword("");
         mpg.setDataSource(dsc);
 
         // 全局配置

wedpr-components/report/src/main/java/com/webank/wedpr/components/report/ReportQuartzJob.java

@@ -1,23 +1,17 @@
 /** Copyright (C) @2014-2022 Webank */
 package com.webank.wedpr.components.report;
 
-import com.webank.wedpr.components.dataset.dao.Dataset;
-import com.webank.wedpr.components.report.service.WedprDatasetService;
 import java.time.LocalDateTime;
-import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
 @DisallowConcurrentExecution
 @Slf4j
 public class ReportQuartzJob implements Job {
 
-    @Autowired private WedprDatasetService wedprDatasetService;
-
     @Override
     public void execute(JobExecutionContext context) {
         log.info("ReportQuartzJob run at:{}", LocalDateTime.now());
@@ -30,7 +24,6 @@ public void execute(JobExecutionContext context) {
 
     @Transactional(rollbackFor = Exception.class)
     private void doReport() {
-        List<Dataset> wedprDatasetList = wedprDatasetService.list();
         log.info("do report...");
     }
 }