diff --git a/outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProjectResourcePlanDMMapper.java b/outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProjectResourcePlanDMMapper.java new file mode 100644 index 00000000..e53b23e4 --- /dev/null +++ b/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 { + +} \ No newline at end of file diff --git a/outbridge/src/main/java/com/sdm/outbridge/entity/LyricVProjectResourcePlanDM.java b/outbridge/src/main/java/com/sdm/outbridge/entity/LyricVProjectResourcePlanDM.java new file mode 100644 index 00000000..8cfc57e5 --- /dev/null +++ b/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; + +} \ No newline at end of file diff --git a/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectResourcePlanDMServiceImpl.java b/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectResourcePlanDMServiceImpl.java new file mode 100644 index 00000000..c4356abe --- /dev/null +++ b/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 + implements LyricVProjectResourcePlanDMService { + +} \ No newline at end of file diff --git a/outbridge/src/main/java/com/sdm/outbridge/service/lyric/LyricVProjectResourcePlanDMService.java b/outbridge/src/main/java/com/sdm/outbridge/service/lyric/LyricVProjectResourcePlanDMService.java new file mode 100644 index 00000000..b784bde0 --- /dev/null +++ b/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 { +} \ No newline at end of file diff --git a/pbs/src/main/java/com/sdm/pbs/controller/TestSecondDbController.java b/pbs/src/main/java/com/sdm/pbs/controller/TestSecondDbController.java index 8d256477..9ffa1700 100644 --- a/pbs/src/main/java/com/sdm/pbs/controller/TestSecondDbController.java +++ b/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> getTodoInfoDm() { + public SdmResponse> getTodoInfoDm() { + Map map = new HashMap<>(); // 查询从数据源 - List todoInfoList = lyricVTodoInfoService.lambdaQuery().last( "limit 2").list(); - return SdmResponse.success(todoInfoList); + List 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> getPdtDm() { + public SdmResponse> getPdtDm() { + Map map = new HashMap<>(); // 查询从数据源 - List lyricVPdtToDMList =lyricVPdtDmService.lambdaQuery().last( "limit 2").list(); - return SdmResponse.success(lyricVPdtToDMList); + List 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> getMain() { + public SdmResponse> getMain() { + Map map = new HashMap<>(); // 查询从数据源 List 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> getProductLine() { + public SdmResponse> getProductLine() { + Map map = new HashMap<>(); // 查询从数据源 List 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> getProjectBatch() { + public SdmResponse> getProjectBatch() { + Map map = new HashMap<>(); // 查询从数据源 List 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> getProjectInfo() { + public SdmResponse> getProjectInfo() { + Map map = new HashMap<>(); // 查询从数据源 List 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> getProjectStation() { + Map map = new HashMap<>(); + // 查询从数据源 + List 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> getProjectPlan() { + Map map = new HashMap<>(); + // 查询从数据源 + List 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> getProjectResourcePlan() { + Map map = new HashMap<>(); + // 查询从数据源 + List list = + lyricVProjectResourcePlanDMService.lambdaQuery().last("limit 3").list(); + Long count = lyricVProjectResourcePlanDMService.lambdaQuery().count(); + map.put("视图数据",list); + map.put("数据总数",count); + return SdmResponse.success(map); + } /** * 执行查询SQL接口