diff --git a/klp-admin/src/main/resources/application-dev.yml b/klp-admin/src/main/resources/application-dev.yml index 67cf4b7e..3845d408 100644 --- a/klp-admin/src/main/resources/application-dev.yml +++ b/klp-admin/src/main/resources/application-dev.yml @@ -72,9 +72,9 @@ spring: lazy: true type: ${spring.datasource.type} driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/ry-flowable-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true - username: - password: + url: jdbc:mysql://140.143.206.120:13306/klp_pocketfactory?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true + username: klp + password: KeLunPu@123 # oracle: # type: ${spring.datasource.type} # driverClassName: oracle.jdbc.OracleDriver diff --git a/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProPlantStateDefineController.java b/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProPlantStateDefineController.java index a7049d25..7d7bd38b 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProPlantStateDefineController.java +++ b/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProPlantStateDefineController.java @@ -23,6 +23,15 @@ public class Klptcm1ProPlantStateDefineController extends BaseController { @Resource private IKlptcm1ProPlantStateDefineService defineService; + /** + * 获取所有定义及其当前值（用于前端初始化缓存） + * @return 所有定义列表，每个定义包含对应的当前值 + */ + @GetMapping("/allWithValues") + public R> getAllWithValues() { + return R.ok(defineService.selectAllWithValues()); + } + @GetMapping("/plant/state") public List getTopByValue(@RequestParam String name) { return defineService.selectByValue(name); diff --git a/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProductionStatisticsController.java b/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProductionStatisticsController.java new file mode 100644 index 00000000..59d6f6a8 --- /dev/null +++ b/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProductionStatisticsController.java @@ -0,0 +1,93 @@ +package com.klp.pocket.controller; + +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.R; +import com.klp.pocket.domain.vo.ProductionStatisticsVo; +import com.klp.pocket.domain.vo.CrewProductionVo; +import com.klp.pocket.domain.vo.SpecDistributionVo; +import com.klp.pocket.domain.vo.TeamPerformanceVo; +import com.klp.pocket.service.IKlptcm1PdoExcoilService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 生产统计Controller + * + * @author klp + * @date 2025-10-31 + */ +@RequiredArgsConstructor +@RestController +@RequestMapping("/pocket/productionStatistics") +public class Klptcm1ProductionStatisticsController extends BaseController { + + private final IKlptcm1PdoExcoilService excoilService; + + /** + * 获取生产统计汇总数据 + * @param startDate 开始日期（格式：yyyy-MM-dd） + * @param endDate 结束日期（格式：yyyy-MM-dd） + * @return 统计数据（钢卷数、平均宽度、平均厚度、原料总量、成品总量、成材率） + */ + @GetMapping("/summary") + public R getSummary( + @RequestParam String startDate, + @RequestParam String endDate) { + return R.ok(excoilService.getProductionStatistics(startDate, endDate)); + } + + /** + * 获取班组产量统计 + * @param startDate 开始日期 + * @param endDate 结束日期 + * @return 班组产量列表（按产量倒序） + */ + @GetMapping("/crewProduction") + public R> getCrewProduction( + @RequestParam String startDate, + @RequestParam String endDate) { + return R.ok(excoilService.getCrewProduction(startDate, endDate)); + } + + /** + * 获取厚度分布统计 + * @param startDate 开始日期 + * @param endDate 结束日期 + * @return 厚度分布列表 + */ + @GetMapping("/thicknessDistribution") + public R> getThicknessDistribution( + @RequestParam String startDate, + @RequestParam String endDate) { + return R.ok(excoilService.getThicknessDistribution(startDate, endDate)); + } + + /** + * 获取宽度分布统计 + * @param startDate 开始日期 + * @param endDate 结束日期 + * @return 宽度分布列表 + */ + @GetMapping("/widthDistribution") + public R> getWidthDistribution( + @RequestParam String startDate, + @RequestParam String endDate) { + return R.ok(excoilService.getWidthDistribution(startDate, endDate)); + } + + /** + * 获取班组绩效统计 + * @param startDate 开始日期 + * @param endDate 结束日期 + * @return 班组绩效列表（按综合评分倒序排列） + */ + @GetMapping("/teamPerformance") + public R> getTeamPerformance( + @RequestParam String startDate, + @RequestParam String endDate) { + return R.ok(excoilService.getTeamPerformance(startDate, endDate)); + } +} + diff --git a/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ShiftCurrentController.java b/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ShiftCurrentController.java new file mode 100644 index 00000000..4c1c4cab --- /dev/null +++ b/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ShiftCurrentController.java @@ -0,0 +1,32 @@ +package com.klp.pocket.controller; + +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.R; +import com.klp.pocket.domain.vo.Klptcm1ShiftCurrentVo; +import com.klp.pocket.service.IKlptcm1ShiftCurrentService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +/** + * 当前班组Controller + * + * @author klp + * @date 2025-10-31 + */ +@RequiredArgsConstructor +@RestController +@RequestMapping("/pocket/shiftCurrent") +public class Klptcm1ShiftCurrentController extends BaseController { + + private final IKlptcm1ShiftCurrentService shiftCurrentService; + + /** + * 获取当前班组信息 + * @return 当前班组信息（班次+班组） + */ + @GetMapping("/current") + public R getCurrentShift() { + return R.ok(shiftCurrentService.getCurrentShift()); + } +} + diff --git a/klp-pocket/src/main/java/com/klp/pocket/domain/Klptcm1PdoExcoil.java b/klp-pocket/src/main/java/com/klp/pocket/domain/Klptcm1PdoExcoil.java new file mode 100644 index 00000000..72adc8d9 --- /dev/null +++ b/klp-pocket/src/main/java/com/klp/pocket/domain/Klptcm1PdoExcoil.java @@ -0,0 +1,64 @@ +package com.klp.pocket.domain; + +import lombok.Data; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 成品卷对象 klptcm1_pdo_excoil + */ +@Data +public class Klptcm1PdoExcoil { + + /** 成品卷号 */ + private String encoilid; + + /** 钢种 */ + private String grade; + + /** 厚度质量 */ + private BigDecimal thickQuality; + + /** 板形质量 */ + private BigDecimal shapeQuality; + + /** 入口厚度 */ + private BigDecimal entryThick; + + /** 出口厚度 */ + private BigDecimal exitThick; + + /** 入口宽度 */ + private BigDecimal entryWidth; + + /** 出口宽度 */ + private BigDecimal exitWidth; + + /** 入口重量 */ + private BigDecimal entryWeight; + + /** 出口重量 */ + private BigDecimal exitWeight; + + /** 上线时间 */ + private Date onlineDate; + + /** 开始时间 */ + private Date startDate; + + /** 结束时间 */ + private Date endDate; + + /** 插入时间 */ + private Date insdate; + + /** 班次 */ + private String shift; + + /** 班组 */ + private String crew; + + /** 出口卷号 */ + private String excoilid; +} + diff --git a/klp-pocket/src/main/java/com/klp/pocket/domain/Klptcm1ShiftCurrent.java b/klp-pocket/src/main/java/com/klp/pocket/domain/Klptcm1ShiftCurrent.java new file mode 100644 index 00000000..17a2539e --- /dev/null +++ b/klp-pocket/src/main/java/com/klp/pocket/domain/Klptcm1ShiftCurrent.java @@ -0,0 +1,33 @@ +package com.klp.pocket.domain; + +import lombok.Data; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 当前班组对象 klptcm1_shift_current + */ +@Data +public class Klptcm1ShiftCurrent { + + /** + * 班次（如：A/B/C 或 早/中/晚） + */ + private String shift; + + /** + * 班组编号 + */ + private BigDecimal crew; + + /** + * 序列号 + */ + private BigDecimal seqNum; + + /** + * 系统时间 + */ + private Date sysTime; +} + diff --git a/klp-pocket/src/main/java/com/klp/pocket/domain/bo/Klptcm1ProStoppageBo.java b/klp-pocket/src/main/java/com/klp/pocket/domain/bo/Klptcm1ProStoppageBo.java index 921ed93e..29c43213 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/domain/bo/Klptcm1ProStoppageBo.java +++ b/klp-pocket/src/main/java/com/klp/pocket/domain/bo/Klptcm1ProStoppageBo.java @@ -3,6 +3,7 @@ package com.klp.pocket.domain.bo; import com.klp.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -58,13 +59,15 @@ public class Klptcm1ProStoppageBo extends BaseEntity { private String REMARK; /** - * + * 开始日期（支持多种日期格式） */ + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date startDate; /** - * + * 结束日期（支持多种日期格式） */ + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date endDate; /** @@ -73,8 +76,9 @@ public class Klptcm1ProStoppageBo extends BaseEntity { private Long DURATION; /** - * + * 插入日期 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date insDate; /** diff --git a/klp-pocket/src/main/java/com/klp/pocket/domain/vo/CrewProductionVo.java b/klp-pocket/src/main/java/com/klp/pocket/domain/vo/CrewProductionVo.java new file mode 100644 index 00000000..bba61df5 --- /dev/null +++ b/klp-pocket/src/main/java/com/klp/pocket/domain/vo/CrewProductionVo.java @@ -0,0 +1,30 @@ +package com.klp.pocket.domain.vo; + +import lombok.Data; +import java.math.BigDecimal; + +/** + * 班组产量统计视图对象 + */ +@Data +public class CrewProductionVo { + + /** 班组 */ + private String crew; + + /** 班次 */ + private String shift; + + /** 钢卷数 */ + private Long coilCount; + + /** 总产量 */ + private BigDecimal totalWeight; + + /** 平均厚度 */ + private BigDecimal avgThick; + + /** 平均宽度 */ + private BigDecimal avgWidth; +} + diff --git a/klp-pocket/src/main/java/com/klp/pocket/domain/vo/Klptcm1ShiftCurrentVo.java b/klp-pocket/src/main/java/com/klp/pocket/domain/vo/Klptcm1ShiftCurrentVo.java new file mode 100644 index 00000000..35eb3f3a --- /dev/null +++ b/klp-pocket/src/main/java/com/klp/pocket/domain/vo/Klptcm1ShiftCurrentVo.java @@ -0,0 +1,18 @@ +package com.klp.pocket.domain.vo; + +import lombok.Data; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 当前班组视图对象 klptcm1_shift_current + */ +@Data +public class Klptcm1ShiftCurrentVo { + + private String shift; + private BigDecimal crew; + private BigDecimal seqNum; + private Date sysTime; +} + diff --git a/klp-pocket/src/main/java/com/klp/pocket/domain/vo/ProductionStatisticsVo.java b/klp-pocket/src/main/java/com/klp/pocket/domain/vo/ProductionStatisticsVo.java new file mode 100644 index 00000000..cf8be18e --- /dev/null +++ b/klp-pocket/src/main/java/com/klp/pocket/domain/vo/ProductionStatisticsVo.java @@ -0,0 +1,30 @@ +package com.klp.pocket.domain.vo; + +import lombok.Data; +import java.math.BigDecimal; + +/** + * 生产统计视图对象 + */ +@Data +public class ProductionStatisticsVo { + + /** 生产钢卷数 */ + private Long coilCount; + + /** 平均宽度 */ + private BigDecimal avgWidth; + + /** 平均厚度 */ + private BigDecimal avgThick; + + /** 原料总量 */ + private BigDecimal totalEntryWeight; + + /** 成品总量 */ + private BigDecimal totalExitWeight; + + /** 成材率 */ + private BigDecimal yieldRate; +} + diff --git a/klp-pocket/src/main/java/com/klp/pocket/domain/vo/SpecDistributionVo.java b/klp-pocket/src/main/java/com/klp/pocket/domain/vo/SpecDistributionVo.java new file mode 100644 index 00000000..cc3363a4 --- /dev/null +++ b/klp-pocket/src/main/java/com/klp/pocket/domain/vo/SpecDistributionVo.java @@ -0,0 +1,17 @@ +package com.klp.pocket.domain.vo; + +import lombok.Data; + +/** + * 规格分布视图对象 + */ +@Data +public class SpecDistributionVo { + + /** 分类名称 */ + private String category; + + /** 数量 */ + private Long count; +} + diff --git a/klp-pocket/src/main/java/com/klp/pocket/domain/vo/TeamPerformanceVo.java b/klp-pocket/src/main/java/com/klp/pocket/domain/vo/TeamPerformanceVo.java new file mode 100644 index 00000000..5c82a1b8 --- /dev/null +++ b/klp-pocket/src/main/java/com/klp/pocket/domain/vo/TeamPerformanceVo.java @@ -0,0 +1,42 @@ +package com.klp.pocket.domain.vo; + +import lombok.Data; +import java.math.BigDecimal; + +/** + * 班组绩效视图对象 + */ +@Data +public class TeamPerformanceVo { + + /** 班组 */ + private String crew; + + /** 班次 */ + private String shift; + + /** 班组-班次组合（用于显示） */ + private String teamName; + + /** 产量(t) */ + private BigDecimal output; + + /** 成材率(%) */ + private BigDecimal yieldRate; + + /** 合格率(%) - 基于厚度质量 */ + private BigDecimal passRate; + + /** 平均厚度质量 */ + private BigDecimal avgThickQuality; + + /** 平均板形质量 */ + private BigDecimal avgShapeQuality; + + /** 效率指标（钢卷数/时间，这里简化为钢卷数） */ + private Long efficiency; + + /** 综合评分 */ + private BigDecimal score; +} + diff --git a/klp-pocket/src/main/java/com/klp/pocket/mapper/Klptcm1PdoExcoilMapper.java b/klp-pocket/src/main/java/com/klp/pocket/mapper/Klptcm1PdoExcoilMapper.java new file mode 100644 index 00000000..18e6a6db --- /dev/null +++ b/klp-pocket/src/main/java/com/klp/pocket/mapper/Klptcm1PdoExcoilMapper.java @@ -0,0 +1,63 @@ +package com.klp.pocket.mapper; + +import com.klp.pocket.domain.vo.ProductionStatisticsVo; +import com.klp.pocket.domain.vo.CrewProductionVo; +import com.klp.pocket.domain.vo.SpecDistributionVo; +import com.klp.pocket.domain.vo.TeamPerformanceVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 成品卷Mapper接口 + */ +@Mapper +public interface Klptcm1PdoExcoilMapper { + + /** + * 查询生产统计汇总数据 + * @param startDate 开始日期 + * @param endDate 结束日期 + * @return 统计数据 + */ + ProductionStatisticsVo selectProductionStatistics(@Param("startDate") String startDate, + @Param("endDate") String endDate); + + /** + * 查询班组产量统计 + * @param startDate 开始日期 + * @param endDate 结束日期 + * @return 班组产量列表 + */ + List selectCrewProduction(@Param("startDate") String startDate, + @Param("endDate") String endDate); + + /** + * 查询厚度分布 + * @param startDate 开始日期 + * @param endDate 结束日期 + * @return 厚度分布列表 + */ + List selectThicknessDistribution(@Param("startDate") String startDate, + @Param("endDate") String endDate); + + /** + * 查询宽度分布 + * @param startDate 开始日期 + * @param endDate 结束日期 + * @return 宽度分布列表 + */ + List selectWidthDistribution(@Param("startDate") String startDate, + @Param("endDate") String endDate); + + /** + * 查询班组绩效统计 + * @param startDate 开始日期 + * @param endDate 结束日期 + * @return 班组绩效列表 + */ + List selectTeamPerformance(@Param("startDate") String startDate, + @Param("endDate") String endDate); +} + diff --git a/klp-pocket/src/main/java/com/klp/pocket/mapper/Klptcm1ProPlantStateDefineMapper.java b/klp-pocket/src/main/java/com/klp/pocket/mapper/Klptcm1ProPlantStateDefineMapper.java index d48a0652..162d0a2f 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/mapper/Klptcm1ProPlantStateDefineMapper.java +++ b/klp-pocket/src/main/java/com/klp/pocket/mapper/Klptcm1ProPlantStateDefineMapper.java @@ -25,6 +25,12 @@ public interface Klptcm1ProPlantStateDefineMapper { List selectByValue(String name); + /** + * 获取所有定义及其当前值 + * @return 所有定义列表，每个定义包含对应的当前值 + */ + List selectAllWithValues(); + /** * 按ID查询 */ diff --git a/klp-pocket/src/main/java/com/klp/pocket/mapper/Klptcm1ShiftCurrentMapper.java b/klp-pocket/src/main/java/com/klp/pocket/mapper/Klptcm1ShiftCurrentMapper.java new file mode 100644 index 00000000..b62d0c29 --- /dev/null +++ b/klp-pocket/src/main/java/com/klp/pocket/mapper/Klptcm1ShiftCurrentMapper.java @@ -0,0 +1,19 @@ +package com.klp.pocket.mapper; + +import com.klp.pocket.domain.Klptcm1ShiftCurrent; +import com.klp.pocket.domain.vo.Klptcm1ShiftCurrentVo; +import org.apache.ibatis.annotations.Mapper; + +/** + * 当前班组Mapper接口 + */ +@Mapper +public interface Klptcm1ShiftCurrentMapper { + + /** + * 查询当前班组信息（最新一条） + * @return 当前班组信息 + */ + Klptcm1ShiftCurrentVo selectCurrent(); +} + diff --git a/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1PdoExcoilService.java b/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1PdoExcoilService.java new file mode 100644 index 00000000..cc196154 --- /dev/null +++ b/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1PdoExcoilService.java @@ -0,0 +1,55 @@ +package com.klp.pocket.service; + +import com.klp.pocket.domain.vo.ProductionStatisticsVo; +import com.klp.pocket.domain.vo.CrewProductionVo; +import com.klp.pocket.domain.vo.SpecDistributionVo; +import com.klp.pocket.domain.vo.TeamPerformanceVo; + +import java.util.List; + +/** + * 生产统计Service接口 + */ +public interface IKlptcm1PdoExcoilService { + + /** + * 查询生产统计汇总数据 + * @param startDate 开始日期 + * @param endDate 结束日期 + * @return 统计数据 + */ + ProductionStatisticsVo getProductionStatistics(String startDate, String endDate); + + /** + * 查询班组产量统计 + * @param startDate 开始日期 + * @param endDate 结束日期 + * @return 班组产量列表 + */ + List getCrewProduction(String startDate, String endDate); + + /** + * 查询厚度分布 + * @param startDate 开始日期 + * @param endDate 结束日期 + * @return 厚度分布列表 + */ + List getThicknessDistribution(String startDate, String endDate); + + /** + * 查询宽度分布 + * @param startDate 开始日期 + * @param endDate 结束日期 + * @return 宽度分布列表 + */ + List getWidthDistribution(String startDate, String endDate); + + /** + * 查询班组绩效统计 + * @param startDate 开始日期 + * @param endDate 结束日期 + * @return 班组绩效列表（按综合评分倒序） + */ + List getTeamPerformance(String startDate, String endDate); +} + diff --git a/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ProPlantStateDefineService.java b/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ProPlantStateDefineService.java index 6d54aa98..fd373b50 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ProPlantStateDefineService.java +++ b/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ProPlantStateDefineService.java @@ -25,6 +25,12 @@ public interface IKlptcm1ProPlantStateDefineService { List selectByValue(String name); + /** + * 获取所有定义及其当前值 + * @return 所有定义列表，每个定义包含对应的当前值 + */ + List selectAllWithValues(); + Klptcm1ProPlantStateDefine selectById(BigDecimal id); int insert(Klptcm1ProPlantStateDefine entity); diff --git a/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ShiftCurrentService.java b/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ShiftCurrentService.java new file mode 100644 index 00000000..e43a1074 --- /dev/null +++ b/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ShiftCurrentService.java @@ -0,0 +1,16 @@ +package com.klp.pocket.service; + +import com.klp.pocket.domain.vo.Klptcm1ShiftCurrentVo; + +/** + * 当前班组Service接口 + */ +public interface IKlptcm1ShiftCurrentService { + + /** + * 查询当前班组信息 + * @return 当前班组信息 + */ + Klptcm1ShiftCurrentVo getCurrentShift(); +} + diff --git a/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1PdoExcoilServiceImpl.java b/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1PdoExcoilServiceImpl.java new file mode 100644 index 00000000..11b64573 --- /dev/null +++ b/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1PdoExcoilServiceImpl.java @@ -0,0 +1,50 @@ +package com.klp.pocket.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.klp.pocket.domain.vo.ProductionStatisticsVo; +import com.klp.pocket.domain.vo.CrewProductionVo; +import com.klp.pocket.domain.vo.SpecDistributionVo; +import com.klp.pocket.domain.vo.TeamPerformanceVo; +import com.klp.pocket.mapper.Klptcm1PdoExcoilMapper; +import com.klp.pocket.service.IKlptcm1PdoExcoilService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 生产统计Service实现类 + */ +@RequiredArgsConstructor +@DS("slave") +@Service +public class Klptcm1PdoExcoilServiceImpl implements IKlptcm1PdoExcoilService { + + private final Klptcm1PdoExcoilMapper excoilMapper; + + @Override + public ProductionStatisticsVo getProductionStatistics(String startDate, String endDate) { + return excoilMapper.selectProductionStatistics(startDate, endDate); + } + + @Override + public List getCrewProduction(String startDate, String endDate) { + return excoilMapper.selectCrewProduction(startDate, endDate); + } + + @Override + public List getThicknessDistribution(String startDate, String endDate) { + return excoilMapper.selectThicknessDistribution(startDate, endDate); + } + + @Override + public List getWidthDistribution(String startDate, String endDate) { + return excoilMapper.selectWidthDistribution(startDate, endDate); + } + + @Override + public List getTeamPerformance(String startDate, String endDate) { + return excoilMapper.selectTeamPerformance(startDate, endDate); + } +} + diff --git a/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProPlantStateDefineServiceImpl.java b/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProPlantStateDefineServiceImpl.java index 8b35c3f4..e2da1847 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProPlantStateDefineServiceImpl.java +++ b/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProPlantStateDefineServiceImpl.java @@ -42,6 +42,11 @@ public class Klptcm1ProPlantStateDefineServiceImpl implements IKlptcm1ProPlantSt return defineMapper.selectByValue(name); } + @Override + public List selectAllWithValues() { + return defineMapper.selectAllWithValues(); + } + @Override public Klptcm1ProPlantStateDefine selectById(BigDecimal id) { return defineMapper.selectById(id); diff --git a/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProStoppageServiceImpl.java b/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProStoppageServiceImpl.java index d40e3c03..a8d18f46 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProStoppageServiceImpl.java +++ b/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProStoppageServiceImpl.java @@ -71,12 +71,15 @@ public class Klptcm1ProStoppageServiceImpl implements IKlptcm1ProStoppageService lqw.eq(StringUtils.isNotBlank(bo.getUNIT()), Klptcm1ProStoppage::getUnit, bo.getUNIT()); lqw.eq(StringUtils.isNotBlank(bo.getSETON()), Klptcm1ProStoppage::getSeton, bo.getSETON()); lqw.eq(StringUtils.isNotBlank(bo.getREMARK()), Klptcm1ProStoppage::getRemark, bo.getREMARK()); - lqw.eq(bo.getStartDate() != null, Klptcm1ProStoppage::getStartDate, bo.getStartDate()); - lqw.eq(bo.getEndDate() != null, Klptcm1ProStoppage::getEndDate, bo.getEndDate()); + // 日期范围查询：查询停机开始时间在指定范围内的记录 + // bo.startDate 是查询开始时间，stoppage.startDate 是停机开始时间 + lqw.ge(bo.getStartDate() != null, Klptcm1ProStoppage::getStartDate, bo.getStartDate()); + // bo.endDate 是查询结束时间，stoppage.startDate 是停机开始时间 + lqw.le(bo.getEndDate() != null, Klptcm1ProStoppage::getStartDate, bo.getEndDate()); lqw.eq(bo.getDURATION() != null, Klptcm1ProStoppage::getDuration, bo.getDURATION()); lqw.eq(bo.getInsDate() != null, Klptcm1ProStoppage::getInsDate, bo.getInsDate()); lqw.eq(StringUtils.isNotBlank(bo.getStopType()), Klptcm1ProStoppage::getStopType, bo.getStopType()); - //倒叙 + //倒序 lqw.orderByDesc(Klptcm1ProStoppage::getInsDate); return lqw; } diff --git a/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ShiftCurrentServiceImpl.java b/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ShiftCurrentServiceImpl.java new file mode 100644 index 00000000..258868a2 --- /dev/null +++ b/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ShiftCurrentServiceImpl.java @@ -0,0 +1,25 @@ +package com.klp.pocket.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.klp.pocket.domain.vo.Klptcm1ShiftCurrentVo; +import com.klp.pocket.mapper.Klptcm1ShiftCurrentMapper; +import com.klp.pocket.service.IKlptcm1ShiftCurrentService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * 当前班组Service实现类 + */ +@RequiredArgsConstructor +@DS("slave") +@Service +public class Klptcm1ShiftCurrentServiceImpl implements IKlptcm1ShiftCurrentService { + + private final Klptcm1ShiftCurrentMapper shiftCurrentMapper; + + @Override + public Klptcm1ShiftCurrentVo getCurrentShift() { + return shiftCurrentMapper.selectCurrent(); + } +} + diff --git a/klp-pocket/src/main/resources/mapper/pocket/Klptcm1PdoExcoilMapper.xml b/klp-pocket/src/main/resources/mapper/pocket/Klptcm1PdoExcoilMapper.xml new file mode 100644 index 00000000..3dc65119 --- /dev/null +++ b/klp-pocket/src/main/resources/mapper/pocket/Klptcm1PdoExcoilMapper.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-pocket/src/main/resources/mapper/pocket/Klptcm1ProPlantStateDefineMapper.xml b/klp-pocket/src/main/resources/mapper/pocket/Klptcm1ProPlantStateDefineMapper.xml index 3ccdd732..41316684 100644 --- a/klp-pocket/src/main/resources/mapper/pocket/Klptcm1ProPlantStateDefineMapper.xml +++ b/klp-pocket/src/main/resources/mapper/pocket/Klptcm1ProPlantStateDefineMapper.xml @@ -68,7 +68,7 @@ + + + diff --git a/klp-pocket/src/main/resources/mapper/pocket/Klptcm1ShiftCurrentMapper.xml b/klp-pocket/src/main/resources/mapper/pocket/Klptcm1ShiftCurrentMapper.xml new file mode 100644 index 00000000..ac247306 --- /dev/null +++ b/klp-pocket/src/main/resources/mapper/pocket/Klptcm1ShiftCurrentMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + +