新增：项目相关参与人员基础查询类开发提交

outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProjectResourcePlanDMMapper.java

@@ -0,0 +1,8 @@
+package com.sdm.outbridge.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sdm.outbridge.entity.LyricVProjectResourcePlanDM;
+
+public interface LyricVProjectResourcePlanDMMapper extends BaseMapper<LyricVProjectResourcePlanDM> {
+
+}

outbridge/src/main/java/com/sdm/outbridge/entity/LyricVProjectResourcePlanDM.java

@@ -0,0 +1,44 @@
+package com.sdm.outbridge.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName(value = "v_project_resource_plan_DM", autoResultMap = true)
+@Schema(description = "项目参与人员信息视图")
+public class LyricVProjectResourcePlanDM {
+
+    @Schema(description = "id")
+    @TableField(value = "id")
+    private Long id;
+
+    @Schema(description = "项目id")
+    @TableField(value = "project_id")
+    private Long projectId;
+
+    @Schema(description = "工号")
+    @TableField(value = "user")
+    private String user;
+
+    @Schema(description = "姓名")
+    @TableField(value = "name")
+    private String name;
+
+    @Schema(description = "任务名称")
+    @TableField(value = "jobname")
+    private String jobname;
+
+    @Schema(description = "职位名称")
+    @TableField(value = "memo")
+    private String memo;
+
+    @Schema(description = "状态标识,0-存在, 1-删除 , 2-冻结")
+    @TableField(value = "del_flag")
+    private Long delFlag;
+
+}

outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectResourcePlanDMServiceImpl.java

@@ -0,0 +1,13 @@
+package com.sdm.outbridge.service.impl.lyric;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sdm.outbridge.dao.LyricVProjectResourcePlanDMMapper;
+import com.sdm.outbridge.entity.LyricVProjectResourcePlanDM;
+import com.sdm.outbridge.service.lyric.LyricVProjectResourcePlanDMService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class LyricVProjectResourcePlanDMServiceImpl extends ServiceImpl<LyricVProjectResourcePlanDMMapper, LyricVProjectResourcePlanDM>
+        implements LyricVProjectResourcePlanDMService {
+
+}

outbridge/src/main/java/com/sdm/outbridge/service/lyric/LyricVProjectResourcePlanDMService.java

@@ -0,0 +1,7 @@
+package com.sdm.outbridge.service.lyric;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sdm.outbridge.entity.LyricVProjectResourcePlanDM;
+
+public interface LyricVProjectResourcePlanDMService extends IService<LyricVProjectResourcePlanDM> {
+}

pbs/src/main/java/com/sdm/pbs/controller/TestSecondDbController.java

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
@@ -39,6 +40,12 @@ public class TestSecondDbController  {
     private LyricVProjectToDmService lyricVProjectToDmService;
     @Autowired
     private LyricVTodoInfoService lyricVTodoInfoService;
+    @Autowired
+    private LyricVProjectStationToDmService lyricVProjectStationToDmService;
+    @Autowired
+    private LyricVProjectStationPlanToDmService lyricVProjectStationPlanToDmService;
+    @Autowired
+    private LyricVProjectResourcePlanDMService lyricVProjectResourcePlanDMService;
 
     @Autowired
     private DynamicSqlExecutor dynamicSqlExecutor;
@@ -108,56 +115,120 @@ public class TestSecondDbController  {
     /*现场查询视图的方法mock */
     @GetMapping("/getTodoInfoDm")
     @Operation(summary = "查询代办")
-    public SdmResponse<List<LyricVTodoEmulationInfoDM>> getTodoInfoDm() {
+    public SdmResponse<Map<String, Object>> getTodoInfoDm() {
+        Map<String, Object> map = new HashMap<>();
         // 查询从数据源
-        List<LyricVTodoEmulationInfoDM> todoInfoList = lyricVTodoInfoService.lambdaQuery().last( "limit 2").list();
-        return SdmResponse.success(todoInfoList);
+        List<LyricVTodoEmulationInfoDM> todoInfoList = lyricVTodoInfoService.lambdaQuery().last("limit 2").list();
+        Long count = lyricVTodoInfoService.lambdaQuery().count();
+        map.put("视图数据", todoInfoList);
+        map.put("数据总数", count);
+        return SdmResponse.success(map);
     }
 
     @GetMapping("/getPdtDm")
     @Operation(summary = "查询项目Pdt")
-    public SdmResponse<List<LyricVPdtToDM>> getPdtDm() {
+    public SdmResponse<Map<String, Object>> getPdtDm() {
+        Map<String, Object> map = new HashMap<>();
         // 查询从数据源
-        List<LyricVPdtToDM> lyricVPdtToDMList =lyricVPdtDmService.lambdaQuery().last( "limit 2").list();
-        return SdmResponse.success(lyricVPdtToDMList);
+        List<LyricVPdtToDM> lyricVPdtToDMList = lyricVPdtDmService.lambdaQuery().last("limit 2").list();
+        Long count = lyricVPdtDmService.lambdaQuery().count();
+        map.put("视图数据", lyricVPdtToDMList);
+        map.put("数据总数", count);
+        return SdmResponse.success(map);
     }
 
     @GetMapping("/getMain")
     @Operation(summary = "查询主计划")
-    public SdmResponse<List<LyricVMainPlanDM>> getMain() {
+    public SdmResponse<Map<String, Object>> getMain() {
+        Map<String, Object> map = new HashMap<>();
         // 查询从数据源
         List<LyricVMainPlanDM> mainPlanDMSList = lyricVMainPlanDMService.lambdaQuery().last("limit 2").list();
-        return SdmResponse.success(mainPlanDMSList);
+        Long count = lyricVMainPlanDMService.lambdaQuery().count();
+        map.put("视图数据", mainPlanDMSList);
+        map.put("数据总数", count);
+        return SdmResponse.success(map);
     }
 
     @GetMapping("/getProductLine")
     @Operation(summary = "查询产线信息")
-    public SdmResponse<List<LyricVProductionLineToDM>> getProductLine() {
+    public SdmResponse<Map<String, Object>> getProductLine() {
+        Map<String, Object> map = new HashMap<>();
         // 查询从数据源
         List<LyricVProductionLineToDM> productionLineToDMList = lyricVProductionLineToDmService
-                .lambdaQuery().last( "limit 2").list();
-        return SdmResponse.success(productionLineToDMList);
+                .lambdaQuery().last("limit 2").list();
+        Long count = lyricVProductionLineToDmService.lambdaQuery().count();
+        map.put("视图数据", productionLineToDMList);
+        map.put("数据总数", count);
+        return SdmResponse.success(map);
     }
 
     @GetMapping("/getProjectBatch")
     @Operation(summary = "查询批次信息")
-    public SdmResponse<List<LyricVProjectBatchToDM>> getProjectBatch() {
+    public SdmResponse<Map<String, Object>> getProjectBatch() {
+        Map<String, Object> map = new HashMap<>();
         // 查询从数据源
         List<LyricVProjectBatchToDM> list = lyricVProjectBatchToDmService
                 .lambdaQuery().last("limit 2").list();
-        return SdmResponse.success(list);
+        Long count = lyricVProjectBatchToDmService.lambdaQuery().count();
+        map.put("视图数据", list);
+        map.put("数据总数", count);
+        return SdmResponse.success(map);
     }
 
     @GetMapping("/getProjectInfo")
     @Operation(summary = "查询项目信息")
-    public SdmResponse<List<LyricVProjectToDM>> getProjectInfo() {
+    public SdmResponse<Map<String, Object>> getProjectInfo() {
+        Map<String, Object> map = new HashMap<>();
         // 查询从数据源
         List<LyricVProjectToDM> projectToDmList =
                 lyricVProjectToDmService.lambdaQuery().last("limit 3").list();
-        return SdmResponse.success(projectToDmList);
+        Long count = lyricVProjectToDmService.lambdaQuery().count();
+        map.put("视图数据", projectToDmList);
+        map.put("数据总数", count);
+        return SdmResponse.success(map);
+    }
+
+    @GetMapping("/getProjectStation")
+    @Operation(summary = "查询项目-工位-机台")
+    public SdmResponse<Map<String,Object>> getProjectStation() {
+        Map<String, Object> map = new HashMap<>();
+        // 查询从数据源
+        List<LyricVProjectStationToDM> projectToDmList =
+                lyricVProjectStationToDmService.lambdaQuery().last("limit 3").list();
+        Long count = lyricVProjectStationToDmService.lambdaQuery().count();
+        map.put("视图数据",projectToDmList);
+        map.put("数据总数",count);
+        return SdmResponse.success(map);
     }
 
 
+    @GetMapping("/getProjectPlan")
+    @Operation(summary = "查询项目-工位-批次")
+    public SdmResponse<Map<String,Object>> getProjectPlan() {
+        Map<String, Object> map = new HashMap<>();
+        // 查询从数据源
+        List<LyricVProjectStationPlanToDM> projectToDmList =
+                lyricVProjectStationPlanToDmService.lambdaQuery().last("limit 3").list();
+        Long count = lyricVProjectStationPlanToDmService.lambdaQuery().count();
+        map.put("视图数据",projectToDmList);
+        map.put("数据总数",count);
+        return SdmResponse.success(map);
+    }
+
+
+
+    @GetMapping("/getProjectResourcePlan")
+    @Operation(summary = "查询项目-参与人员")
+    public SdmResponse<Map<String,Object>> getProjectResourcePlan() {
+        Map<String, Object> map = new HashMap<>();
+        // 查询从数据源
+        List<LyricVProjectResourcePlanDM> list =
+                lyricVProjectResourcePlanDMService.lambdaQuery().last("limit 3").list();
+        Long count = lyricVProjectResourcePlanDMService.lambdaQuery().count();
+        map.put("视图数据",list);
+        map.put("数据总数",count);
+        return SdmResponse.success(map);
+    }
 
     /**
      * 执行查询SQL接口