diff --git a/pom.xml b/pom.xml index e4136bef4..95e7c6e2d 100644 --- a/pom.xml +++ b/pom.xml @@ -25,6 +25,7 @@ yudao-module-erp yudao-module-mes yudao-module-iot + yudao-module-common ${project.artifactId} 芋道项目基础脚手架 diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/DeviceEdgeData.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/DeviceEdgeData.java new file mode 100644 index 000000000..fb7f8e058 --- /dev/null +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/DeviceEdgeData.java @@ -0,0 +1,14 @@ +package cn.iocoder.yudao.framework.common.pojo; + +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class DeviceEdgeData { + private Long deviceId; + private LocalDateTime firstTs; + private String firstData; + private LocalDateTime lastTs; + private String lastData; +} diff --git a/yudao-module-common/pom.xml b/yudao-module-common/pom.xml new file mode 100644 index 000000000..3c45d90ff --- /dev/null +++ b/yudao-module-common/pom.xml @@ -0,0 +1,23 @@ + + + + cn.iocoder.boot + yudao + ${revision} + + 4.0.0 + + yudao-module-common-api + yudao-module-common-biz + + yudao-module-common + pom + + ${project.artifactId} + + common 模块下，存放通用的业务逻辑和工具类，供其他模块调用。 + + + \ No newline at end of file diff --git a/yudao-module-common/yudao-module-common-api/pom.xml b/yudao-module-common/yudao-module-common-api/pom.xml new file mode 100644 index 000000000..2e2e71459 --- /dev/null +++ b/yudao-module-common/yudao-module-common-api/pom.xml @@ -0,0 +1,33 @@ + + + + yudao-module-common + cn.iocoder.boot + ${revision} + + 4.0.0 + + yudao-module-common-api + jar + + ${project.artifactId} + common 模块 API，暴露给其它模块调用 + + + + + cn.iocoder.boot + yudao-common + + + + + org.springframework.boot + spring-boot-starter-validation + true + + + + \ No newline at end of file diff --git a/yudao-module-common/yudao-module-common-api/src/main/java/cn/iocoder/yudao/module/common/api/mold/MoldApi.java b/yudao-module-common/yudao-module-common-api/src/main/java/cn/iocoder/yudao/module/common/api/mold/MoldApi.java new file mode 100644 index 000000000..c97e7b4e2 --- /dev/null +++ b/yudao-module-common/yudao-module-common-api/src/main/java/cn/iocoder/yudao/module/common/api/mold/MoldApi.java @@ -0,0 +1,27 @@ +package cn.iocoder.yudao.module.common.api.mold; + +import cn.iocoder.yudao.module.common.api.mold.dto.MoldRespDTO; +import java.util.Collection; +import java.util.List; + +/** + * 模具 API 接口，定义暴露给其它模块的模具相关操作 + */ +public interface MoldApi { + + /** + * 根据模具ID获取模具信息 + * + * @param id 模具ID + * @return 模具信息 + */ + MoldRespDTO getMoldById(Long id); + + /** + * 根据模具ID集合获取模具信息列表 + * + * @param ids 模具ID集合 + * @return 模具信息列表 + */ + List getMoldListByIds(Collection ids); +} diff --git a/yudao-module-common/yudao-module-common-api/src/main/java/cn/iocoder/yudao/module/common/api/mold/MoldRepairApi.java b/yudao-module-common/yudao-module-common-api/src/main/java/cn/iocoder/yudao/module/common/api/mold/MoldRepairApi.java new file mode 100644 index 000000000..7460dfb1d --- /dev/null +++ b/yudao-module-common/yudao-module-common-api/src/main/java/cn/iocoder/yudao/module/common/api/mold/MoldRepairApi.java @@ -0,0 +1,18 @@ +package cn.iocoder.yudao.module.common.api.mold; + +import cn.iocoder.yudao.module.common.api.mold.dto.MoldRepairRespDTO; +import java.util.List; + +/** + * 模具维修单 API 接口，定义暴露给其它模块的模具维修单相关操作 + */ +public interface MoldRepairApi { + + /** + * 根据模具ID获取维修单列表 + * + * @param moldId 模具ID + * @return 维修单列表 + */ + List getRepairListByMoldId(Long moldId); +} \ No newline at end of file diff --git a/yudao-module-common/yudao-module-common-api/src/main/java/cn/iocoder/yudao/module/common/api/mold/dto/MoldRepairRespDTO.java b/yudao-module-common/yudao-module-common-api/src/main/java/cn/iocoder/yudao/module/common/api/mold/dto/MoldRepairRespDTO.java new file mode 100644 index 000000000..4ace6c9e2 --- /dev/null +++ b/yudao-module-common/yudao-module-common-api/src/main/java/cn/iocoder/yudao/module/common/api/mold/dto/MoldRepairRespDTO.java @@ -0,0 +1,62 @@ +package cn.iocoder.yudao.module.common.api.mold.dto; + +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 模具维修单响应数据 + */ +@Data +public class MoldRepairRespDTO { + + /** + * 维修单ID + */ + private Long id; + + /** + * 维修单编号 + */ + private String repairCode; + + /** + * 维修单名称 + */ + private String repairName; + + /** + * 模具ID + */ + private Long moldId; + + /** + * 模具编码 + */ + private String moldCode; + + /** + * 模具名称 + */ + private String moldName; + + /** + * 报修日期 + */ + private LocalDateTime requireDate; + + /** + * 完成日期 + */ + private LocalDateTime finishDate; + + /** + * 维修结果 + */ + private String repairResult; + + /** + * 状态 + */ + private Integer status; +} \ No newline at end of file diff --git a/yudao-module-common/yudao-module-common-api/src/main/java/cn/iocoder/yudao/module/common/api/mold/dto/MoldRespDTO.java b/yudao-module-common/yudao-module-common-api/src/main/java/cn/iocoder/yudao/module/common/api/mold/dto/MoldRespDTO.java new file mode 100644 index 000000000..b1f720704 --- /dev/null +++ b/yudao-module-common/yudao-module-common-api/src/main/java/cn/iocoder/yudao/module/common/api/mold/dto/MoldRespDTO.java @@ -0,0 +1,73 @@ +package cn.iocoder.yudao.module.common.api.mold.dto; + +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * 模具响应数据 + */ +@Data +public class MoldRespDTO { + + /** + * 模具ID + */ + private Long id; + + /** + * 模具编码 + */ + private String code; + + /** + * 模具名称 + */ + private String name; + + /** + * 单位名称 + */ + private String unitName; + + /** + * 设备ID + */ + private Long machineId; + + /** + * 设备名称 + */ + private String machineName; + + /** + * 使用时间(小时) + */ + private BigDecimal useTime; + + /** + * 入库时间 + */ + private LocalDateTime inTime; + + /** + * 状态 + */ + private Integer status; + + /** + * 型号ID + */ + private Long brandId; + + /** + * 型号名称 + */ + private String brandName; + + /** + * 是否启用 + */ + private Boolean isEnable; +} \ No newline at end of file diff --git a/yudao-module-common/yudao-module-common-biz/pom.xml b/yudao-module-common/yudao-module-common-biz/pom.xml new file mode 100644 index 000000000..418ad2281 --- /dev/null +++ b/yudao-module-common/yudao-module-common-biz/pom.xml @@ -0,0 +1,61 @@ + + + + yudao-module-common + cn.iocoder.boot + ${revision} + + 4.0.0 + + yudao-module-common-biz + jar + + ${project.artifactId} + common 模块业务实现 + + + + + cn.iocoder.boot + yudao-module-common-api + ${revision} + + + + + cn.iocoder.boot + yudao-spring-boot-starter-mybatis + + + cn.iocoder.boot + yudao-spring-boot-starter-redis + + + cn.iocoder.boot + yudao-spring-boot-starter-web + + + + + cn.iocoder.boot + yudao-spring-boot-starter-biz-data-permission + + + cn.iocoder.boot + yudao-spring-boot-starter-biz-tenant + + + cn.iocoder.boot + yudao-spring-boot-starter-biz-ip + + + + + cn.iocoder.boot + yudao-spring-boot-starter-excel + + + + \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/MoldBrandPageReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandPageReqVO.java similarity index 90% rename from yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/MoldBrandPageReqVO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandPageReqVO.java index 7e061a684..8bb277066 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/MoldBrandPageReqVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandPageReqVO.java @@ -1,13 +1,12 @@ -package cn.iocoder.yudao.module.mes.controller.admin.mold.vo; +package cn.iocoder.yudao.module.common.controller.admin.mold.vo; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import lombok.*; +import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import org.springframework.format.annotation.DateTimeFormat; - +import cn.iocoder.yudao.framework.common.pojo.PageParam; import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/MoldBrandRespVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandRespVO.java similarity index 92% rename from yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/MoldBrandRespVO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandRespVO.java index 97813445d..bd45681c0 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/MoldBrandRespVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandRespVO.java @@ -1,15 +1,16 @@ -package cn.iocoder.yudao.module.mes.controller.admin.mold.vo; +package cn.iocoder.yudao.module.common.controller.admin.mold.vo; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - +import lombok.*; +import java.util.*; +import java.util.*; import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; @Schema(description = "管理后台 - 模具型号 Response VO") diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/MoldBrandSaveReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandSaveReqVO.java similarity index 92% rename from yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/MoldBrandSaveReqVO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandSaveReqVO.java index 74a672b8f..b16e836e6 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/MoldBrandSaveReqVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldBrandSaveReqVO.java @@ -1,11 +1,12 @@ -package cn.iocoder.yudao.module.mes.controller.admin.mold.vo; +package cn.iocoder.yudao.module.common.controller.admin.mold.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; +import lombok.*; +import java.math.BigDecimal; +import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.math.BigDecimal; @Schema(description = "管理后台 - 模具型号新增/修改 Request VO") @Data diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/MoldPageReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldPageReqVO.java similarity index 92% rename from yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/MoldPageReqVO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldPageReqVO.java index 3a50cd2b0..60e005343 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/MoldPageReqVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldPageReqVO.java @@ -1,13 +1,12 @@ -package cn.iocoder.yudao.module.mes.controller.admin.mold.vo; +package cn.iocoder.yudao.module.common.controller.admin.mold.vo; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.*; +import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import org.springframework.format.annotation.DateTimeFormat; - +import cn.iocoder.yudao.framework.common.pojo.PageParam; import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/MoldProductRespVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldProductRespVO.java similarity index 75% rename from yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/MoldProductRespVO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldProductRespVO.java index f07f96338..3f867c062 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/MoldProductRespVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldProductRespVO.java @@ -1,12 +1,18 @@ -package cn.iocoder.yudao.module.mes.controller.admin.mold.vo; +package cn.iocoder.yudao.module.common.controller.admin.mold.vo; +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; +import java.math.BigDecimal; import java.time.LocalDateTime; +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; + @Schema(description = "管理后台 - 模具 Response VO") @Data @ExcelIgnoreUnannotated diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/MoldRespVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldRespVO.java similarity index 90% rename from yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/MoldRespVO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldRespVO.java index 208d5660d..361e66891 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/MoldRespVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldRespVO.java @@ -1,17 +1,18 @@ -package cn.iocoder.yudao.module.mes.controller.admin.mold.vo; +package cn.iocoder.yudao.module.common.controller.admin.mold.vo; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - +import lombok.*; +import java.util.*; +import java.util.*; import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 模具 Response VO") @Data @@ -32,6 +33,7 @@ public class MoldRespVO { @Schema(description = "单位ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19527") private Long unitId; + @Schema(description = "单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "个") // @ExcelProperty("单位") private String unitName; @@ -66,7 +68,7 @@ public class MoldRespVO { private String remark; @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED) -// @ExcelProperty("是否启用") + @ExcelProperty("是否启用") private Boolean isEnable; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/MoldSaveReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldSaveReqVO.java similarity index 95% rename from yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/MoldSaveReqVO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldSaveReqVO.java index e5a802900..cccc7028c 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/MoldSaveReqVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/mold/vo/MoldSaveReqVO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.mes.controller.admin.mold.vo; +package cn.iocoder.yudao.module.common.controller.admin.mold.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; +import lombok.*; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldrepair/enums/MoldRecordStatusEnum.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/enums/MoldRecordStatusEnum.java similarity index 91% rename from yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldrepair/enums/MoldRecordStatusEnum.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/enums/MoldRecordStatusEnum.java index 43f26d393..57652c768 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldrepair/enums/MoldRecordStatusEnum.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/enums/MoldRecordStatusEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.erp.controller.admin.moldrepair.enums; +package cn.iocoder.yudao.module.common.controller.admin.moldrepair.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/enums/RepairResultEnum.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/enums/RepairResultEnum.java similarity index 90% rename from yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/enums/RepairResultEnum.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/enums/RepairResultEnum.java index 3a1737b7b..0185d57f9 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/enums/RepairResultEnum.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/enums/RepairResultEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.moldrepair.enums; +package cn.iocoder.yudao.module.common.controller.admin.moldrepair.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/vo/MoldRepairLineRespVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairLineRespVO.java similarity index 95% rename from yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/vo/MoldRepairLineRespVO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairLineRespVO.java index adc5bdede..d4f5584db 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/vo/MoldRepairLineRespVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairLineRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo; +package cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/vo/MoldRepairLineSaveReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairLineSaveReqVO.java similarity index 95% rename from yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/vo/MoldRepairLineSaveReqVO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairLineSaveReqVO.java index 6513fac8d..5a8b9fb2a 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/vo/MoldRepairLineSaveReqVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairLineSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo; +package cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldrepair/vo/MoldRepairPageReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairPageReqVO.java similarity index 97% rename from yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldrepair/vo/MoldRepairPageReqVO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairPageReqVO.java index ac92bca44..ab4c92889 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldrepair/vo/MoldRepairPageReqVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.erp.controller.admin.moldrepair.vo; +package cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo; import cn.iocoder.yudao.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldrepair/vo/MoldRepairRespVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairRespVO.java similarity index 88% rename from yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldrepair/vo/MoldRepairRespVO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairRespVO.java index 8d158cf43..799893ec0 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldrepair/vo/MoldRepairRespVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.erp.controller.admin.moldrepair.vo; +package cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo; import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; @@ -79,8 +79,8 @@ public class MoldRepairRespVO { private String confirmBy; @Schema(description = "单据状态", example = "1") - @ExcelProperty(value = "单据状态 0-待完成 1-已完成") - @DictFormat("mes_mold_record_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 +// @ExcelProperty(value = "单据状态 0-待完成 1-已完成") +// @DictFormat("mes_mold_record_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 private Integer status; @Schema(description = "单据状态", example = "1") @@ -106,5 +106,12 @@ public class MoldRepairRespVO { @Schema(description = "关键件Id", example = "你猜") private Long componentId; + @Schema(description = "维修状态 0-待完成 1-通过 2-不通过") + private Integer repairStatus; + + @Schema(description = "维修状态") + @ExcelProperty("维修状态") + private String repairStatusName; + } \ No newline at end of file diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldrepair/vo/MoldRepairSaveReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairSaveReqVO.java similarity index 94% rename from yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldrepair/vo/MoldRepairSaveReqVO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairSaveReqVO.java index 0ab05362f..4c53dcf33 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldrepair/vo/MoldRepairSaveReqVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairSaveReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.erp.controller.admin.moldrepair.vo; +package cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo; -import cn.iocoder.yudao.module.erp.dal.dataobject.moldrepair.MoldRepairLineDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairLineDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/vo/MoldRepairUpdateReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairUpdateReqVO.java similarity index 88% rename from yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/vo/MoldRepairUpdateReqVO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairUpdateReqVO.java index 90b93bb4d..cb4012e40 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/vo/MoldRepairUpdateReqVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairUpdateReqVO.java @@ -1,6 +1,7 @@ -package cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo; +package cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo; +import cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo.MoldRepairLineSaveReqVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketmanagement/enums/MoldPlanTypeEnum.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/enums/MoldPlanTypeEnum.java similarity index 96% rename from yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketmanagement/enums/MoldPlanTypeEnum.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/enums/MoldPlanTypeEnum.java index 5713775fd..a55b819d3 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketmanagement/enums/MoldPlanTypeEnum.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/enums/MoldPlanTypeEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.erp.controller.admin.moldticketmanagement.enums; +package cn.iocoder.yudao.module.common.controller.admin.moldticketmanagement.enums; import lombok.Getter; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/vo/MoldTicketManagementBatchUpdateReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementBatchUpdateReqVO.java similarity index 87% rename from yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/vo/MoldTicketManagementBatchUpdateReqVO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementBatchUpdateReqVO.java index 897e835d4..d484e32ff 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/vo/MoldTicketManagementBatchUpdateReqVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementBatchUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.moldticketmanagement.vo; +package cn.iocoder.yudao.module.common.controller.admin.moldticketmanagement.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketmanagement/vo/MoldTicketManagementPageReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementPageReqVO.java similarity index 95% rename from yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketmanagement/vo/MoldTicketManagementPageReqVO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementPageReqVO.java index 6f87722a7..ecc2b2f88 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketmanagement/vo/MoldTicketManagementPageReqVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.erp.controller.admin.moldticketmanagement.vo; +package cn.iocoder.yudao.module.common.controller.admin.moldticketmanagement.vo; import cn.iocoder.yudao.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketmanagement/vo/MoldTicketManagementRespVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementRespVO.java similarity index 97% rename from yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketmanagement/vo/MoldTicketManagementRespVO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementRespVO.java index 9934bd504..d6c3d1eab 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketmanagement/vo/MoldTicketManagementRespVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.erp.controller.admin.moldticketmanagement.vo; +package cn.iocoder.yudao.module.common.controller.admin.moldticketmanagement.vo; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketmanagement/vo/MoldTicketManagementSaveReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementSaveReqVO.java similarity index 94% rename from yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketmanagement/vo/MoldTicketManagementSaveReqVO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementSaveReqVO.java index 772290330..05f6e96c1 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketmanagement/vo/MoldTicketManagementSaveReqVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.erp.controller.admin.moldticketmanagement.vo; +package cn.iocoder.yudao.module.common.controller.admin.moldticketmanagement.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketresults/enums/MoldJobResultEnum.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketresults/enums/MoldJobResultEnum.java similarity index 96% rename from yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketresults/enums/MoldJobResultEnum.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketresults/enums/MoldJobResultEnum.java index 55ae7df0f..2927907a8 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketresults/enums/MoldJobResultEnum.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketresults/enums/MoldJobResultEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.erp.controller.admin.moldticketresults.enums; +package cn.iocoder.yudao.module.common.controller.admin.moldticketresults.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketresults/vo/MoldTicketResultsPageReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketresults/vo/MoldTicketResultsPageReqVO.java similarity index 95% rename from yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketresults/vo/MoldTicketResultsPageReqVO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketresults/vo/MoldTicketResultsPageReqVO.java index 20358ac48..8c851585f 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketresults/vo/MoldTicketResultsPageReqVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketresults/vo/MoldTicketResultsPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.erp.controller.admin.moldticketresults.vo; +package cn.iocoder.yudao.module.common.controller.admin.moldticketresults.vo; import cn.iocoder.yudao.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketresults/vo/MoldTicketResultsRespVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketresults/vo/MoldTicketResultsRespVO.java similarity index 95% rename from yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketresults/vo/MoldTicketResultsRespVO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketresults/vo/MoldTicketResultsRespVO.java index b7e9a3f17..9d82e4c83 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketresults/vo/MoldTicketResultsRespVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketresults/vo/MoldTicketResultsRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.erp.controller.admin.moldticketresults.vo; +package cn.iocoder.yudao.module.common.controller.admin.moldticketresults.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketresults/vo/MoldTicketResultsSaveReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketresults/vo/MoldTicketResultsSaveReqVO.java similarity index 93% rename from yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketresults/vo/MoldTicketResultsSaveReqVO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketresults/vo/MoldTicketResultsSaveReqVO.java index 81428e1eb..675e1f6c1 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/moldticketresults/vo/MoldTicketResultsSaveReqVO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketresults/vo/MoldTicketResultsSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.erp.controller.admin.moldticketresults.vo; +package cn.iocoder.yudao.module.common.controller.admin.moldticketresults.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/package-info.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/package-info.java new file mode 100644 index 000000000..ce18717c5 --- /dev/null +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/package-info.java @@ -0,0 +1,6 @@ +/** + * 提供 RESTful API 给前端： + * 1. admin 包：提供给管理后台 yudao-ui-admin 前端项目 + * 2. app 包：提供给用户 APP yudao-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分 + */ +package cn.iocoder.yudao.module.common.controller; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/mold/MoldBrandDO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/mold/MoldBrandDO.java similarity index 96% rename from yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/mold/MoldBrandDO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/mold/MoldBrandDO.java index 8923e9008..811cda3e8 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/mold/MoldBrandDO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/mold/MoldBrandDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.erp.dal.dataobject.mold; +package cn.iocoder.yudao.module.common.dal.dataobject.mold; import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/mold/MoldBrandProductDO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/mold/MoldBrandProductDO.java similarity index 93% rename from yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/mold/MoldBrandProductDO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/mold/MoldBrandProductDO.java index dad271c24..4fb2385a0 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/mold/MoldBrandProductDO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/mold/MoldBrandProductDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.erp.dal.dataobject.mold; +package cn.iocoder.yudao.module.common.dal.dataobject.mold; import lombok.*; import java.util.*; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/mold/MoldDO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/mold/MoldDO.java similarity index 90% rename from yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/mold/MoldDO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/mold/MoldDO.java index fb8fd0523..622545641 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/mold/MoldDO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/mold/MoldDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.erp.dal.dataobject.mold; +package cn.iocoder.yudao.module.common.dal.dataobject.mold; import lombok.*; import java.util.*; @@ -9,8 +9,8 @@ import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.erp.dal.dataobject.moldrepair.MoldRepairLineDO; -import cn.iocoder.yudao.module.erp.dal.dataobject.moldticketresults.MoldTicketResultsDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairLineDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldticketresults.MoldTicketResultsDO; /** * 模具 DO diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/moldrepair/MoldRepairDO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldrepair/MoldRepairDO.java similarity index 92% rename from yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/moldrepair/MoldRepairDO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldrepair/MoldRepairDO.java index 8a35552a9..2e54dc63f 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/moldrepair/MoldRepairDO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldrepair/MoldRepairDO.java @@ -1,11 +1,10 @@ -package cn.iocoder.yudao.module.erp.dal.dataobject.moldrepair; +package cn.iocoder.yudao.module.common.dal.dataobject.moldrepair; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; -import org.apache.ibatis.type.Alias; import java.time.LocalDateTime; @@ -22,7 +21,6 @@ import java.time.LocalDateTime; @Builder @NoArgsConstructor @AllArgsConstructor -@Alias("ErpMoldRepairDO") public class MoldRepairDO extends BaseDO { /** @@ -114,4 +112,9 @@ public class MoldRepairDO extends BaseDO { */ private Long componentId; + /** + * 维修结果 0-待维修 1-通过 2-不通过 + */ + private Integer repairStatus; + } \ No newline at end of file diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/moldrepair/MoldRepairLineDO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldrepair/MoldRepairLineDO.java similarity index 89% rename from yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/moldrepair/MoldRepairLineDO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldrepair/MoldRepairLineDO.java index ca1cfa7e4..29b9fba49 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/moldrepair/MoldRepairLineDO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldrepair/MoldRepairLineDO.java @@ -1,11 +1,10 @@ -package cn.iocoder.yudao.module.erp.dal.dataobject.moldrepair; +package cn.iocoder.yudao.module.common.dal.dataobject.moldrepair; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; -import org.apache.ibatis.type.Alias; /** * 模具维修记录行 DO @@ -20,7 +19,6 @@ import org.apache.ibatis.type.Alias; @Builder @NoArgsConstructor @AllArgsConstructor -@Alias("ErpMoldRepairLineDO") public class MoldRepairLineDO extends BaseDO { /** @@ -73,4 +71,9 @@ public class MoldRepairLineDO extends BaseDO { */ private String remark; + /** + * 维修结果 0-待维修 1-通过 2-不通过 + */ + private Integer result; + } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/moldticketmanagement/MoldTicketManagementDO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldticketmanagement/MoldTicketManagementDO.java similarity index 89% rename from yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/moldticketmanagement/MoldTicketManagementDO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldticketmanagement/MoldTicketManagementDO.java index 98f8ba13e..c78b614b2 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/moldticketmanagement/MoldTicketManagementDO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldticketmanagement/MoldTicketManagementDO.java @@ -1,5 +1,9 @@ -package cn.iocoder.yudao.module.mes.dal.dataobject.moldticketmanagement; +package cn.iocoder.yudao.module.common.dal.dataobject.moldticketmanagement; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -7,13 +11,8 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.*; -import java.util.*; -import java.time.LocalDateTime; import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; - /** * 工单管理 DO * diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/moldticketresults/MoldTicketResultsDO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldticketresults/MoldTicketResultsDO.java similarity index 83% rename from yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/moldticketresults/MoldTicketResultsDO.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldticketresults/MoldTicketResultsDO.java index cec628d8c..95d78b7fe 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/moldticketresults/MoldTicketResultsDO.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldticketresults/MoldTicketResultsDO.java @@ -1,10 +1,13 @@ -package cn.iocoder.yudao.module.mes.dal.dataobject.moldticketresults; +package cn.iocoder.yudao.module.common.dal.dataobject.moldticketresults; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; -import java.util.*; + import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; /** * 工单检验结果 DO diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/mold/MoldBrandMapper.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/mold/MoldBrandMapper.java similarity index 92% rename from yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/mold/MoldBrandMapper.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/mold/MoldBrandMapper.java index bed90f081..ba5cfeb89 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/mold/MoldBrandMapper.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/mold/MoldBrandMapper.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.erp.dal.mysql.mold; +package cn.iocoder.yudao.module.common.dal.mysql.mold; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.erp.controller.admin.mold.vo.MoldBrandPageReqVO; -import cn.iocoder.yudao.module.erp.dal.dataobject.mold.MoldBrandDO; +import cn.iocoder.yudao.module.common.controller.admin.mold.vo.MoldBrandPageReqVO; +import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldBrandDO; import com.alibaba.excel.util.StringUtils; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.erp.controller.admin.mold.vo.*; +import cn.iocoder.yudao.module.common.controller.admin.mold.vo.*; import java.util.Arrays; import java.util.List; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/mold/MoldBrandProductMapper.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/mold/MoldBrandProductMapper.java similarity index 90% rename from yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/mold/MoldBrandProductMapper.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/mold/MoldBrandProductMapper.java index ec455f96e..9fd2d91df 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/mold/MoldBrandProductMapper.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/mold/MoldBrandProductMapper.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.erp.dal.mysql.mold; +package cn.iocoder.yudao.module.common.dal.mysql.mold; import java.util.*; @@ -6,7 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.erp.dal.dataobject.mold.MoldBrandProductDO; +import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldBrandProductDO; import org.apache.ibatis.annotations.Mapper; /** diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/mold/MoldMapper.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/mold/MoldMapper.java new file mode 100644 index 000000000..581ab0b20 --- /dev/null +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/mold/MoldMapper.java @@ -0,0 +1,78 @@ +package cn.iocoder.yudao.module.common.dal.mysql.mold; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.common.controller.admin.mold.vo.MoldPageReqVO; +import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO; +import com.alibaba.excel.util.StringUtils; +import org.apache.ibatis.annotations.Mapper; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 模具 Mapper + * + * @author 内蒙必硕 + */ +@Mapper +public interface MoldMapper extends BaseMapperX { + + default PageResult selectPage(MoldPageReqVO reqVO) { + LambdaQueryWrapperX wrapper = new LambdaQueryWrapperX<>(); + wrapper + .eqIfPresent(MoldDO::getCode, reqVO.getCode()) + .likeIfPresent(MoldDO::getName, reqVO.getName()) + .eqIfPresent(MoldDO::getUnitId, reqVO.getUnitId()) + .eqIfPresent(MoldDO::getMachineId, reqVO.getMachineId()) + .likeIfPresent(MoldDO::getMachineName, reqVO.getMachineName()) + .eqIfPresent(MoldDO::getUseTime, reqVO.getUseTime()) + .betweenIfPresent(MoldDO::getInTime, reqVO.getInTime()) + .eqIfPresent(MoldDO::getStatus, reqVO.getStatus()) + .likeIfPresent(MoldDO::getImages, reqVO.getImages()) + .likeIfPresent(MoldDO::getRemark, reqVO.getRemark()) + .eqIfPresent(MoldDO::getIsEnable, reqVO.getIsEnable()) + .betweenIfPresent(MoldDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(MoldDO::getBrandId, reqVO.getBrandId()) + .likeIfPresent(MoldDO::getFileUrl, reqVO.getFileUrl()) + .orderByDesc(MoldDO::getId); + + if (StringUtils.isNotBlank(reqVO.getIds())) { + List idList = Arrays.stream(reqVO.getIds().split(",")) + .map(String::trim) + .map(Long::valueOf) + .collect(Collectors.toList()); + wrapper.in(MoldDO::getId, idList); + } + + return selectPage(reqVO, wrapper); + } + + // 保持原有方法以兼容旧代码 + default PageResult selectPage(PageParam reqVO, Long brandId) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MoldDO::getBrandId, brandId) + .orderByDesc(MoldDO::getId)); + } + + default int deleteByBrandId(Long brandId) { + return delete(MoldDO::getBrandId, brandId); + } + + default List selectBy(MoldDO reqVO) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(MoldDO::getCode, reqVO.getCode()) + .likeIfPresent(MoldDO::getName, reqVO.getName()) + .eqIfPresent(MoldDO::getBrandId, reqVO.getBrandId()) + .orderByDesc(MoldDO::getId)); + } + + default List selectBy(Long brandId) { + return selectList(new LambdaQueryWrapperX() + .eq(MoldDO::getBrandId, brandId) + .orderByDesc(MoldDO::getId)); + } +} \ No newline at end of file diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/moldrepair/MoldRepairLineMapper.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldrepair/MoldRepairLineMapper.java similarity index 77% rename from yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/moldrepair/MoldRepairLineMapper.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldrepair/MoldRepairLineMapper.java index d3d110813..3f3fa238c 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/moldrepair/MoldRepairLineMapper.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldrepair/MoldRepairLineMapper.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.erp.dal.mysql.moldrepair; +package cn.iocoder.yudao.module.common.dal.mysql.moldrepair; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.erp.dal.dataobject.moldrepair.MoldRepairLineDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairLineDO; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; @@ -13,7 +13,7 @@ import java.util.List; * @author 内蒙必硕 */ @Mapper -@Repository("erpMoldRepairLineMapper") +@Repository public interface MoldRepairLineMapper extends BaseMapperX { default List selectListByRepairId(Long repairId) { diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/moldrepair/MoldRepairMapper.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldrepair/MoldRepairMapper.java similarity index 91% rename from yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/moldrepair/MoldRepairMapper.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldrepair/MoldRepairMapper.java index 0a8a00eee..6388e48fa 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/moldrepair/MoldRepairMapper.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldrepair/MoldRepairMapper.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.erp.dal.mysql.moldrepair; +package cn.iocoder.yudao.module.common.dal.mysql.moldrepair; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.erp.controller.admin.moldrepair.vo.MoldRepairPageReqVO; -import cn.iocoder.yudao.module.erp.dal.dataobject.moldrepair.MoldRepairDO; +import cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo.MoldRepairPageReqVO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairDO; import com.alibaba.excel.util.StringUtils; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; @@ -19,7 +19,7 @@ import java.util.stream.Collectors; * @author 内蒙必硕 */ @Mapper -@Repository("erpMoldRepairMapper") +@Repository public interface MoldRepairMapper extends BaseMapperX { default PageResult selectPage(MoldRepairPageReqVO reqVO) { diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/moldticketmanagement/MoldTicketManagementMapper.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldticketmanagement/MoldTicketManagementMapper.java similarity index 86% rename from yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/moldticketmanagement/MoldTicketManagementMapper.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldticketmanagement/MoldTicketManagementMapper.java index 9fc300194..8ea59bc21 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/moldticketmanagement/MoldTicketManagementMapper.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldticketmanagement/MoldTicketManagementMapper.java @@ -1,18 +1,18 @@ -package cn.iocoder.yudao.module.mes.dal.mysql.moldticketmanagement; - -import java.util.*; -import java.util.stream.Collectors; +package cn.iocoder.yudao.module.common.dal.mysql.moldticketmanagement; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldtaskmanagement.MoldTaskManagementDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketmanagement.MoldTicketManagementDO; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.common.controller.admin.moldticketmanagement.vo.MoldTicketManagementPageReqVO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldticketmanagement.MoldTicketManagementDO; import com.alibaba.excel.util.StringUtils; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.mes.controller.admin.moldticketmanagement.vo.*; import org.apache.ibatis.annotations.Param; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + /** * 项目方案关联 Mapper * diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/moldticketresults/MoldTicketResultsMapper.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldticketresults/MoldTicketResultsMapper.java similarity index 86% rename from yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/moldticketresults/MoldTicketResultsMapper.java rename to yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldticketresults/MoldTicketResultsMapper.java index c2725885d..b910f2a7f 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/moldticketresults/MoldTicketResultsMapper.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldticketresults/MoldTicketResultsMapper.java @@ -1,23 +1,22 @@ -package cn.iocoder.yudao.module.mes.dal.mysql.moldticketresults; - -import java.util.*; +package cn.iocoder.yudao.module.common.dal.mysql.moldticketresults; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketresults.MoldTicketResultsDO; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.common.controller.admin.moldticketresults.vo.MoldTicketResultsPageReqVO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldticketresults.MoldTicketResultsDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.mes.controller.admin.moldticketresults.vo.*; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + /** * 工单检验结果 Mapper * * @author 内蒙必硕 */ @Mapper -@Repository("mesMoldTicketResultsMapper") public interface MoldTicketResultsMapper extends BaseMapperX { default PageResult selectPage(MoldTicketResultsPageReqVO reqVO) { diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/service/package-info.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/service/package-info.java new file mode 100644 index 000000000..bd2f12fb8 --- /dev/null +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/service/package-info.java @@ -0,0 +1,10 @@ +/** + * erp 包下，企业资源管理（Enterprise Resource Planning）。 + * 例如说：采购、销售、库存、财务、产品等等 + * + * 1. Controller URL：以 /erp/ 开头，避免和其它 Module 冲突 + * 2. DataObject 表名：以 erp_ 开头，方便在数据库中区分 + * + * 注意，由于 Erp 模块下，容易和其它模块重名，所以类名都加载 Erp 的前缀~ + */ +package cn.iocoder.yudao.module.common.service; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/mold/MoldBrandMapper.xml b/yudao-module-common/yudao-module-common-biz/src/main/resources/mapper/mold/MoldBrandMapper.xml similarity index 85% rename from yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/mold/MoldBrandMapper.xml rename to yudao-module-common/yudao-module-common-biz/src/main/resources/mapper/mold/MoldBrandMapper.xml index ea132a040..422894c6a 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/mold/MoldBrandMapper.xml +++ b/yudao-module-common/yudao-module-common-biz/src/main/resources/mapper/mold/MoldBrandMapper.xml @@ -1,6 +1,6 @@ - + - SELECT - mtr.* - from - besure.mes_mold_ticket_results mtr - left join besure.mes_mold_ticket_management mtm on mtm.id = mtr.management_id - WHERE 1=1 - - - and mtr.mold_id = #{moldId} - - - and mtm.plan_type= #{planType} - - order by mtr.create_time desc - - - \ No newline at end of file diff --git a/yudao-module-erp/yudao-module-erp-biz/src/test/java/cn/iocoder/yudao/module/erp/service/mold/MoldBrandServiceImplTest.java b/yudao-module-erp/yudao-module-erp-biz/src/test/java/cn/iocoder/yudao/module/erp/service/mold/MoldBrandServiceImplTest.java index 9d233486b..33105742f 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/test/java/cn/iocoder/yudao/module/erp/service/mold/MoldBrandServiceImplTest.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/test/java/cn/iocoder/yudao/module/erp/service/mold/MoldBrandServiceImplTest.java @@ -7,9 +7,9 @@ import org.springframework.boot.test.mock.mockito.MockBean; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.erp.controller.admin.mold.vo.*; -import cn.iocoder.yudao.module.erp.dal.dataobject.mold.MoldBrandDO; -import cn.iocoder.yudao.module.erp.dal.mysql.mold.MoldBrandMapper; +import cn.iocoder.yudao.module.common.controller.admin.mold.vo.*; +import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldBrandDO; +import cn.iocoder.yudao.module.common.dal.mysql.mold.MoldBrandMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; import org.springframework.context.annotation.Import; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/test/java/cn/iocoder/yudao/module/erp/service/mold/MoldServiceImplTest.java b/yudao-module-erp/yudao-module-erp-biz/src/test/java/cn/iocoder/yudao/module/erp/service/mold/MoldServiceImplTest.java index 5ffdbab86..3691cfb41 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/test/java/cn/iocoder/yudao/module/erp/service/mold/MoldServiceImplTest.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/test/java/cn/iocoder/yudao/module/erp/service/mold/MoldServiceImplTest.java @@ -1,3 +1,4 @@ +/* package cn.iocoder.yudao.module.erp.service.mold; import org.junit.jupiter.api.Disabled; @@ -8,8 +9,8 @@ import org.springframework.boot.test.mock.mockito.MockBean; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; import cn.iocoder.yudao.module.erp.controller.admin.mold.vo.*; -import cn.iocoder.yudao.module.erp.dal.dataobject.mold.MoldDO; -import cn.iocoder.yudao.module.erp.dal.mysql.mold.MoldMapper; +import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO; +import cn.iocoder.yudao.module.common.dal.mysql.mold.MoldMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -30,11 +31,13 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; +*/ /** * {@link MoldServiceImpl} 的单元测试类 * * @author 内蒙必硕 - */ + *//* + @Import(MoldServiceImpl.class) public class MoldServiceImplTest extends BaseDbUnitTest { @@ -173,4 +176,4 @@ public class MoldServiceImplTest extends BaseDbUnitTest { assertPojoEquals(dbMold, pageResult.getList().get(0)); } -} \ No newline at end of file +}*/ diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java index 2bebb0a1d..dca260bc7 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java @@ -4,7 +4,6 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.module.infra.service.job.JobService; import cn.iocoder.yudao.module.iot.controller.admin.device.vo.*; @@ -37,7 +36,6 @@ import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.common.pojo.PageParam.PAGE_SIZE_NONE; @Tag(name = "管理后台 - 物联设备") @RestController diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/scheduled/coretask/DeviceTask.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/scheduled/coretask/DeviceTask.java index c0791e532..9caa15cab 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/scheduled/coretask/DeviceTask.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/scheduled/coretask/DeviceTask.java @@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.eclipse.milo.opcua.sdk.client.OpcUaClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -32,11 +31,6 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; @Component @Slf4j diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/LineDeviceRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/LineDeviceRespVO.java index 5df35f3df..d48f95632 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/LineDeviceRespVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/LineDeviceRespVO.java @@ -22,12 +22,12 @@ public class LineDeviceRespVO { @Schema(description = "设备Id") private Long deviceId; - @Schema(description = "产线编码") - @ExcelProperty("产线编码") + @Schema(description = "组织编码") + @ExcelProperty("组织编码") private String lineNode; - @Schema(description = "产线名称") - @ExcelProperty("产线名称") + @Schema(description = "组织名称") + @ExcelProperty("组织名称") private String lineName; @Schema(description = "设备编码") diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipe/RecipeController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipe/RecipeController.java index b24922f92..ebdb3a557 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipe/RecipeController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipe/RecipeController.java @@ -71,21 +71,22 @@ public class RecipeController { return success(BeanUtils.toBean(recipe, RecipeRespVO.class)); } -// @GetMapping("/page") + // @GetMapping("/page") // @Operation(summary = "获得配方管理主分页") // @PreAuthorize("@ss.hasPermission('iot:recipe:query')") // public CommonResult> getRecipePage(@Valid RecipePageReqVO pageReqVO) { // PageResult pageResult = recipeService.getRecipePage(pageReqVO); // return success(BeanUtils.toBean(pageResult, RecipeRespVO.class)); // } -@GetMapping("/page") -@Operation(summary = "获得配方管理主分页") -@PreAuthorize("@ss.hasPermission('iot:recipe:query')") -public CommonResult> getRecipePage(@Valid RecipePageReqVO pageReqVO) { - // 直接调用实现类的方法，无类型转换 - PageResult pageResult = recipeService.getRecipePageWithDeviceId(pageReqVO); - return success(pageResult); -} + @GetMapping("/page") + @Operation(summary = "获得配方管理主分页") + @PreAuthorize("@ss.hasPermission('iot:recipe:query')") + public CommonResult> getRecipePage(@Valid RecipePageReqVO pageReqVO) { + + // 直接调用实现类的方法，无类型转换 + PageResult pageResult = recipeService.getRecipePageWithDeviceId(pageReqVO); + return success(pageResult); + } @GetMapping("/export-excel") @Operation(summary = "导出配方管理主 Excel") diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipedeviceattribute/RecipeDeviceAttributeController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipedeviceattribute/RecipeDeviceAttributeController.java index 290ed9c11..4bc2b0b37 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipedeviceattribute/RecipeDeviceAttributeController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipedeviceattribute/RecipeDeviceAttributeController.java @@ -9,7 +9,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; import javax.validation.*; import javax.servlet.http.*; import java.util.*; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/TDengineService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/TDengineService.java index 31809123a..d1316e36b 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/TDengineService.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/TDengineService.java @@ -1,10 +1,10 @@ package cn.iocoder.yudao.module.iot.service.device; +import cn.iocoder.yudao.framework.common.pojo.DeviceEdgeData; +import com.alibaba.fastjson.JSON; import com.baomidou.dynamic.datasource.annotation.DS; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.taosdata.jdbc.utils.BlobUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.binary.Hex; @@ -15,11 +15,11 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.nio.charset.StandardCharsets; -import java.sql.Blob; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; import java.text.SimpleDateFormat; +import java.time.LocalDateTime; import java.util.*; @Service @@ -387,4 +387,145 @@ public class TDengineService { return Collections.singletonList(createEmptyResult(id)); } } + + /** + * 从 TDengine 中查询设备边缘数据 + * + * 说明： + * 1. TDengine 中每个设备对应一张子表，表名规则：d_{deviceId} + * 2. 根据时间范围查询 + * 3. 根据 latest 参数决定取最新一条还是最早一条 + * + * @param deviceId 设备ID，同时也是子表后缀 + * @param startTime 起始时间（可以为 null） + * @param endTime 结束时间（可以为 null） + * @param latest true 表示取最新一条，false 表示取最早一条 + * @return 查询结果，包含 timestamp / deviceId / queryData + */ + @DS("tdengine") + public Map getDeviceEdgeData( + Long deviceId, + String startTime, + String endTime, + boolean latest) { + + // TDengine 子表名：d_设备ID + String tableName = "d_" + deviceId; + + // 构建 SQL + StringBuilder sql = new StringBuilder(); + sql.append("SELECT ts, query_data ") + .append("FROM besure.").append(tableName) + .append(" WHERE 1=1 "); + + // 起始时间条件 + if (startTime != null) { + sql.append(" AND ts >= '").append(startTime).append("' "); + } + + // 结束时间条件 + if (endTime != null) { + sql.append(" AND ts <= '").append(endTime).append("' "); + } + + // 根据 latest 决定排序方式 + // latest = true -> 按时间倒序，取最新一条 + // latest = false -> 按时间正序，取最早一条 + sql.append(" ORDER BY ts ") + .append(latest ? "DESC" : "ASC") + .append(" LIMIT 1"); + + try { + return jdbcTemplate.query(sql.toString(), rs -> { + + // 没有数据直接返回 null + if (!rs.next()) { + return null; + } + + Map result = new HashMap<>(); + result.put("timestamp", rs.getTimestamp("ts")); + result.put("deviceId", deviceId); + + // 读取 query_data（二进制字段） + byte[] blob = rs.getBytes("query_data"); + if (blob != null) { + // 转为字符串 + String json = new String(blob, StandardCharsets.UTF_8).trim(); + + // 去除 TDengine 中可能存在的外层双引号 + if (json.startsWith("\"") && json.endsWith("\"")) { + json = json.substring(1, json.length() - 1); + } + + // 如果是十六进制字符串，先解码 + if (isHexString(json)) { + json = hexToString(json); + } + + // 统一约定：queryData 始终返回 String，由上层决定是否解析 JSON + result.put("queryData", json); + } else { + // 没有数据时返回空数组字符串 + result.put("queryData", "[]"); + } + + return result; + }); + } catch (Exception e) { + log.error("TDengine 查询失败，deviceId={} ，td表不存在", deviceId); + return null; + } + } + + + /** + * 批量获取设备在时间区间的首末数据 + * @param deviceIds 设备ID列表 + * @param startTime 开始时间, 格式 yyyy-MM-dd HH:mm:ss + * @param endTime 结束时间, 格式 yyyy-MM-dd HH:mm:ss + * @return Map + */ + @DS("tdengine") + public Map queryDeviceFirstAndLast(Set deviceIds, String startTime, String endTime) { + if (deviceIds == null || deviceIds.isEmpty()) { + return Collections.emptyMap(); + } + + Map result = new HashMap<>(); + + for (Long deviceId : deviceIds) { + try { + // 查询首条数据 + List> firstList = getstDeviceDataOrderByTimeDesc(deviceId, startTime, endTime, 1); + Map firstData = firstList.isEmpty() ? null : firstList.get(0); + + // 查询末条数据 + List> lastList = getstDeviceDataOrderByTimeDesc(deviceId, startTime, endTime, 1); + Map lastData = lastList.isEmpty() ? null : lastList.get(0); + + DeviceEdgeData edgeData = new DeviceEdgeData(); + edgeData.setDeviceId(deviceId); + + if (firstData != null) { + edgeData.setFirstTs(((Timestamp) firstData.get("timestamp")).toLocalDateTime()); + edgeData.setFirstData(JSON.toJSONString(firstData.get("queryData"))); + } + + if (lastData != null) { + edgeData.setLastTs(((Timestamp) lastData.get("timestamp")).toLocalDateTime()); + edgeData.setLastData(JSON.toJSONString(lastData.get("queryData"))); + } + + result.put(deviceId, edgeData); + } catch (Exception e) { + log.error("查询设备首末数据失败, deviceId={}", deviceId, e); + } + } + + return result; + } + + + } \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/devicemodelattribute/DeviceModelAttributeServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/devicemodelattribute/DeviceModelAttributeServiceImpl.java index 2b0216e64..ec751d1b4 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/devicemodelattribute/DeviceModelAttributeServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/devicemodelattribute/DeviceModelAttributeServiceImpl.java @@ -1,8 +1,6 @@ package cn.iocoder.yudao.module.iot.service.devicemodelattribute; -import cn.iocoder.yudao.framework.common.exception.ErrorCode; import cn.iocoder.yudao.module.iot.dal.dataobject.deviceattributetype.DeviceAttributeTypeDO; -import cn.iocoder.yudao.module.iot.dal.dataobject.devicemodel.DeviceModelDO; import cn.iocoder.yudao.module.iot.dal.mysql.deviceattributetype.DeviceAttributeTypeMapper; import cn.iocoder.yudao.module.iot.service.device.TDengineService; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -16,7 +14,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; import java.sql.Timestamp; -import java.sql.Wrapper; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -24,7 +21,6 @@ import java.util.stream.Collectors; import cn.iocoder.yudao.module.iot.controller.admin.devicemodelattribute.vo.*; import cn.iocoder.yudao.module.iot.dal.dataobject.devicemodelattribute.DeviceModelAttributeDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.iot.dal.mysql.devicemodelattribute.DeviceModelAttributeMapper; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/recipedeviceattribute/RecipeDeviceAttributeServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/recipedeviceattribute/RecipeDeviceAttributeServiceImpl.java index 44fb64b17..227719a12 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/recipedeviceattribute/RecipeDeviceAttributeServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/recipedeviceattribute/RecipeDeviceAttributeServiceImpl.java @@ -1,6 +1,5 @@ package cn.iocoder.yudao.module.iot.service.recipedeviceattribute; -import cn.iocoder.yudao.module.iot.dal.dataobject.deviceattributetype.DeviceAttributeTypeDO; import cn.iocoder.yudao.module.iot.service.device.TDengineService; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; @@ -13,14 +12,11 @@ import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; -import java.sql.Timestamp; -import java.text.SimpleDateFormat; import java.util.*; import cn.iocoder.yudao.module.iot.controller.admin.recipedeviceattribute.vo.*; import cn.iocoder.yudao.module.iot.dal.dataobject.recipedeviceattribute.RecipeDeviceAttributeDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.iot.dal.mysql.recipedeviceattribute.RecipeDeviceAttributeMapper; diff --git a/yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/moldrepair/MoldRepairApi.java b/yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/moldrepair/MoldRepairApi.java new file mode 100644 index 000000000..d0c14c490 --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/moldrepair/MoldRepairApi.java @@ -0,0 +1,20 @@ +package cn.iocoder.yudao.module.mes.api.moldrepair; + +import cn.iocoder.yudao.module.mes.api.moldrepair.dto.MoldRepairRespDTO; +import java.util.List; + +/** + * 模具维修记录 API 接口 + * + * @author 内蒙必硕 + */ +public interface MoldRepairApi { + + /** + * 根据模具ID获取维修记录列表 + * + * @param moldId 模具ID + * @return 维修记录列表 + */ + List getRepairListByMoldId(Long moldId); +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/moldrepair/dto/MoldRepairRespDTO.java b/yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/moldrepair/dto/MoldRepairRespDTO.java new file mode 100644 index 000000000..50279973f --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/moldrepair/dto/MoldRepairRespDTO.java @@ -0,0 +1,64 @@ +package cn.iocoder.yudao.module.mes.api.moldrepair.dto; + +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 模具维修记录 Response DTO + * + * @author 内蒙必硕 + */ +@Data +public class MoldRepairRespDTO { + + /** + * ID + */ + private Long id; + + /** + * 维修单编号 + */ + private String repairCode; + + /** + * 维修单名称 + */ + private String repairName; + + /** + * 模具ID + */ + private Long moldId; + + /** + * 模具编码 + */ + private String moldCode; + + /** + * 模具名称 + */ + private String moldName; + + /** + * 报修日期 + */ + private LocalDateTime requireDate; + + /** + * 完成日期 + */ + private LocalDateTime finishDate; + + /** + * 维修结果 + */ + private String repairResult; + + /** + * 单据状态0-待完成 1-已完成 + */ + private Integer status; +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-api/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants_手动操作.java b/yudao-module-mes/yudao-module-mes-api/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants_手动操作.java deleted file mode 100644 index a210e184c..000000000 --- a/yudao-module-mes/yudao-module-mes-api/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants_手动操作.java +++ /dev/null @@ -1,3 +0,0 @@ -// TODO 待办：请将下面的错误码复制到 yudao-module-mes-api 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！ -// ========== 质量管理-检验类型 TODO 补充编号 ========== -ErrorCode ZJ_TYPE_NOT_EXISTS = new ErrorCode(TODO 补充编号, "质量管理-检验类型不存在"); \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/DashboardController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/DashboardController.java index 83f5e9a93..d25977123 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/DashboardController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/DashboardController.java @@ -4,9 +4,9 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.util.collection.MapUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO; +import cn.iocoder.yudao.module.common.dal.mysql.mold.MoldMapper; import cn.iocoder.yudao.module.erp.controller.admin.product.vo.product.ErpProductRespVO; -import cn.iocoder.yudao.module.erp.dal.dataobject.mold.MoldDO; -import cn.iocoder.yudao.module.erp.dal.mysql.mold.MoldMapper; import cn.iocoder.yudao.module.erp.service.mold.MoldBrandService; import cn.iocoder.yudao.module.erp.service.product.ErpProductService; import cn.iocoder.yudao.module.iot.dal.mysql.device.DeviceMapper; @@ -14,8 +14,8 @@ import cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo.*; import cn.iocoder.yudao.module.mes.controller.admin.plan.vo.PlanRespVO; import cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger.DeviceLedgerDO; import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketmanagement.MoldTicketManagementDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldticketmanagement.MoldTicketManagementDO; import cn.iocoder.yudao.module.mes.dal.dataobject.organization.OrganizationDO; import cn.iocoder.yudao.module.mes.dal.dataobject.plan.PlanDO; import cn.iocoder.yudao.module.mes.dal.dataobject.task.TaskDO; @@ -27,7 +27,7 @@ import cn.iocoder.yudao.module.mes.dal.mysql.task.TaskMapper; import cn.iocoder.yudao.module.mes.service.deviceledger.DeviceLedgerService; import cn.iocoder.yudao.module.mes.service.devicetype.DeviceTypeService; import cn.iocoder.yudao.module.mes.service.dvrepair.DvRepairService; -import cn.iocoder.yudao.module.mes.service.mold.MoldService; +import cn.iocoder.yudao.module.erp.service.mold.MoldService; import cn.iocoder.yudao.module.mes.service.moldrepair.MoldRepairService; import cn.iocoder.yudao.module.mes.service.moldticketmanagement.MoldTicketManagementService; import cn.iocoder.yudao.module.mes.service.organization.OrganizationService; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/vo/dashboard/EventStatisticsVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/vo/dashboard/EventStatisticsVO.java new file mode 100644 index 000000000..042a8d6cd --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/vo/dashboard/EventStatisticsVO.java @@ -0,0 +1,49 @@ +package cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo.dashboard; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.ToString; + +@Schema(description = "管理后台 - 大屏各任务数统计 VO") +@Data +@ToString(callSuper = true) +public class EventStatisticsVO { + + @Schema(description = "设备点检") + private int deviceInspection; + + @Schema(description = "设备点检占比") + private String deviceInspectionProportion; + + @Schema(description = "模具点检") + private int moldInspection; + + @Schema(description = "模具点检占比") + private String moldInspectionProportion; + + @Schema(description = "设备保养") + private int deviceMaintenance; + + @Schema(description = "设备保养占比") + private String deviceMaintenanceProportion; + + @Schema(description = "模具保养") + private int moldMaintenance; + + @Schema(description = "模具保养占比") + private String moldMaintenanceProportion; + + @Schema(description = "设备维修") + private int deviceRepair; + + @Schema(description = "设备维修占比") + private String deviceRepairProportion; + + @Schema(description = "模具维修") + private int moldRepair; + + @Schema(description = "模具维修占比") + private String moldRepairProportion; + + +} diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/vo/dashboard/TaskVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/vo/dashboard/TaskVO.java new file mode 100644 index 000000000..76e0ae9dc --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/vo/dashboard/TaskVO.java @@ -0,0 +1,26 @@ +package cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo.dashboard; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.ToString; + +@Schema(description = "管理后台 - 大屏任务返回 VO") +@Data +@ToString(callSuper = true) +public class TaskVO { + + @Schema(description = "编码") + private String code; + + @Schema(description = "名称") + private String name; + + @Schema(description = "类型") + private String type; + + @Schema(description = "完成状态 0-待完成 1-已完成 2-已取消") + private String finishStatus; + + @Schema(description = "完成结果 1-通过 2-不通过") + private int resultStatus; +} diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java index e4f3d6b52..e9f475fc1 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.mes.controller.admin.deviceledger; -import cn.iocoder.yudao.module.erp.dal.dataobject.mold.MoldDO; +import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO; import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO; import cn.iocoder.yudao.module.mes.controller.admin.deviceledger.utils.ResumeNameUtils; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerRespVO.java index 14e30b828..c41f507e5 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerRespVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerRespVO.java @@ -7,7 +7,7 @@ import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO; import cn.iocoder.yudao.module.mes.dal.dataobject.criticalcomponent.CriticalComponentDO; import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairLineDO; import cn.iocoder.yudao.module.mes.dal.dataobject.ticketresults.TicketResultsDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO; +import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.v3.oas.annotations.media.Schema; @@ -131,7 +131,7 @@ public class DeviceLedgerRespVO extends BaseDO { private List beijianList; @Schema(description = "模具列表") - private List moldList; + private List moldList; @Schema(description = "附件地址") // @ExcelProperty("附件地址") diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/DvRepairController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/DvRepairController.java index ab2a58489..dc18c11d7 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/DvRepairController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/DvRepairController.java @@ -7,13 +7,10 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.module.mes.controller.admin.dvrepair.enums.RepairEnum; -import cn.iocoder.yudao.module.mes.controller.admin.dvrepair.enums.StatusEnum; +import cn.iocoder.yudao.module.mes.controller.admin.dvrepair.enums.RepairStatusEnum; import cn.iocoder.yudao.module.mes.controller.admin.dvrepair.vo.*; -import cn.iocoder.yudao.module.mes.controller.admin.ticketresults.vo.TicketInspectionExportVO; -import cn.iocoder.yudao.module.mes.controller.admin.ticketresults.vo.TicketResultsSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairDO; import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairLineDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.ticketresults.TicketResultsDO; import cn.iocoder.yudao.module.mes.service.dvrepair.DvRepairService; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; @@ -117,7 +114,7 @@ public class DvRepairController { dvSubjectRespVO.setConfirmBy("(" + user.getUsername() + ")" + user.getNickname()); } if (dvSubjectRespVO.getStatus() !=null) { - String statusName = StatusEnum.getDescriptionByCode(dvSubjectRespVO.getStatus()); + String statusName = RepairStatusEnum.getDescriptionByCode(dvSubjectRespVO.getStatus()); dvSubjectRespVO.setStatusName(statusName); } if (dvSubjectRespVO.getRepairStatus() !=null) { diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/enums/StatusEnum.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/enums/RepairStatusEnum.java similarity index 80% rename from yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/enums/StatusEnum.java rename to yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/enums/RepairStatusEnum.java index 6e2e644fb..4ecebdead 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/enums/StatusEnum.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/enums/RepairStatusEnum.java @@ -13,7 +13,7 @@ import java.util.stream.Collectors; * 0-待完成 1-已完成 */ @Getter -public enum StatusEnum { +public enum RepairStatusEnum { PENDING(0, "待完成"), COMPLETED(1, "已完成"); @@ -21,7 +21,7 @@ public enum StatusEnum { private final Integer code; private final String description; - StatusEnum(Integer code, String description) { + RepairStatusEnum(Integer code, String description) { this.code = code; this.description = description; } @@ -29,11 +29,11 @@ public enum StatusEnum { /** * 根据code获取枚举 */ - public static StatusEnum getByCode(Integer code) { + public static RepairStatusEnum getByCode(Integer code) { if (code == null) { return null; } - for (StatusEnum status : values()) { + for (RepairStatusEnum status : values()) { if (status.getCode().equals(code)) { return status; } @@ -45,7 +45,7 @@ public enum StatusEnum { * 根据code获取描述 */ public static String getDescriptionByCode(Integer code) { - StatusEnum status = getByCode(code); + RepairStatusEnum status = getByCode(code); return status != null ? status.getDescription() : "未知"; } @@ -61,7 +61,7 @@ public enum StatusEnum { */ public static List getAllCodes() { return Arrays.stream(values()) - .map(StatusEnum::getCode) + .map(RepairStatusEnum::getCode) .collect(Collectors.toList()); } @@ -70,7 +70,7 @@ public enum StatusEnum { */ public static List getAllDescriptions() { return Arrays.stream(values()) - .map(StatusEnum::getDescription) + .map(RepairStatusEnum::getDescription) .collect(Collectors.toList()); } @@ -79,7 +79,7 @@ public enum StatusEnum { */ public static Map getCodeDescriptionMap() { Map map = new LinkedHashMap<>(); - for (StatusEnum status : values()) { + for (RepairStatusEnum status : values()) { map.put(status.getCode(), status.getDescription()); } return map; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/vo/TimePointCache.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/vo/TimePointCache.java new file mode 100644 index 000000000..827a19a10 --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/vo/TimePointCache.java @@ -0,0 +1,14 @@ +package cn.iocoder.yudao.module.mes.controller.admin.energydevice.vo; + +import com.alibaba.fastjson.JSONObject; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.Map; + +@Data +public class TimePointCache { + private LocalDateTime timestamp; + private String queryData; + private Map pointIndex; +} diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/MoldBrandController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/MoldBrandController.java deleted file mode 100644 index 9c1bd7166..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/MoldBrandController.java +++ /dev/null @@ -1,206 +0,0 @@ -package cn.iocoder.yudao.module.mes.controller.admin.mold; - -import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldBrandDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldBrandProductDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO; -import cn.iocoder.yudao.module.mes.service.mold.MoldBrandService; -import cn.iocoder.yudao.module.mes.controller.admin.mold.vo.*; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; - -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - -@Tag(name = "管理后台 - 模具型号") -@RestController("mesMoldBrandController") -@RequestMapping("/mes/mold-brand") -@Validated -public class MoldBrandController { - - @Resource - private MoldBrandService moldBrandService; - - @PostMapping("/create") - @Operation(summary = "创建模具型号") - @PreAuthorize("@ss.hasPermission('erp:mold-brand:create')") - public CommonResult createMoldBrand(@Valid @RequestBody MoldBrandSaveReqVO createReqVO) { - return success(moldBrandService.createMoldBrand(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新模具型号") - @PreAuthorize("@ss.hasPermission('erp:mold-brand:update')") - public CommonResult updateMoldBrand(@Valid @RequestBody MoldBrandSaveReqVO updateReqVO) { - moldBrandService.updateMoldBrand(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除模具型号") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('erp:mold-brand:delete')") - public CommonResult deleteMoldBrand(@RequestParam("id") Long id) { - moldBrandService.deleteMoldBrand(id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得模具型号") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") - public CommonResult getMoldBrand(@RequestParam("id") Long id) { - MesMoldBrandDO moldBrand = moldBrandService.getMoldBrand(id); - return success(BeanUtils.toBean(moldBrand, MoldBrandRespVO.class)); - } - @GetMapping("/getBrandList") - @Operation(summary = "获得模具型号列表") - public CommonResult> getBrandList(MoldBrandPageReqVO pageReqVO) { - List brandDOList = moldBrandService.selectBy(pageReqVO); - return success(brandDOList); - } - @GetMapping("/page") - @Operation(summary = "获得模具型号分页") - @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") - public CommonResult> getMoldBrandPage(@Valid MoldBrandPageReqVO pageReqVO) { - PageResult pageResult = moldBrandService.getMoldBrandPage(pageReqVO); - return success(pageResult); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出模具型号 Excel") - @PreAuthorize("@ss.hasPermission('erp:mold-brand:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportMoldBrandExcel(@Valid MoldBrandPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = moldBrandService.getMoldBrandPage(pageReqVO).getList(); - List moldBrandRespVOS = BeanUtils.toBean(list, MoldBrandRespVO.class); - // 导出 Excel - ExcelUtils.write(response, "模具型号.xls", "数据", MoldBrandRespVO.class, moldBrandRespVOS); - } - - // ==================== 子表（模具） ==================== - @GetMapping("/getMoldList") - @Operation(summary = "获得模具型号") - public CommonResult> getMoldList(MesMoldDO moldDO) { - List doList = moldBrandService.selectBy(moldDO); - return success(doList); - } - - @GetMapping("/getMoldAllList") - @Operation(summary = "获得模具型号") - public CommonResult> getMoldAllList() { - List doList = moldBrandService.getAllList(); - return success(doList); - } - - @GetMapping("/mold/page") - @Operation(summary = "获得模具分页") - @Parameter(name = "brandId", description = "型号id") - @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") - public CommonResult> getMoldPage(PageParam pageReqVO, @RequestParam(value = "brandId", required = false) Long brandId) { - return success(moldBrandService.getMoldPage(pageReqVO, brandId)); - } - - @GetMapping("/mold/list") - @Operation(summary = "获得模具列表") - @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") - public CommonResult> getMoldList() { - List moldDOList = moldBrandService.getMoldList(); - return success(moldDOList); - } - - @PostMapping("/mold/create") - @Operation(summary = "创建模具") - @PreAuthorize("@ss.hasPermission('erp:mold-brand:create')") - public CommonResult createMold(@Valid @RequestBody MesMoldDO mold) { - return success(moldBrandService.createMold(mold)); - } - - @PutMapping("/mold/update") - @Operation(summary = "更新模具") - @PreAuthorize("@ss.hasPermission('erp:mold-brand:update')") - public CommonResult updateMold(@Valid @RequestBody MesMoldDO mold) { - moldBrandService.updateMold(mold); - return success(true); - } - - @DeleteMapping("/mold/delete") - @Parameter(name = "id", description = "编号", required = true) - @Operation(summary = "删除模具") - @PreAuthorize("@ss.hasPermission('erp:mold-brand:delete')") - public CommonResult deleteMold(@RequestParam("id") Long id) { - moldBrandService.deleteMold(id); - return success(true); - } - - @GetMapping("/mold/get") - @Operation(summary = "获得模具") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") - public CommonResult getMold(@RequestParam("id") Long id) { - return success(moldBrandService.getMold(id)); - } - - // ==================== 子表（模具产品） ==================== - - @GetMapping("/mold-brand-product/page") - @Operation(summary = "获得模具产品分页") - @Parameter(name = "brandId", description = "型号ID") - @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") - public CommonResult> getMoldBrandProductPage(PageParam pageReqVO, - @RequestParam("brandId") Long brandId) { - PageResult pageResult = moldBrandService.getMoldBrandProductPage(pageReqVO, brandId); - PageResult result = new PageResult<>(moldBrandService.buildProduct(pageResult.getList()),pageResult.getTotal()); - return success(result); - } - - @PostMapping("/mold-brand-product/create") - @Operation(summary = "创建模具产品") - @PreAuthorize("@ss.hasPermission('erp:mold-brand:create')") - public CommonResult createMoldBrandProduct(@Valid @RequestBody MesMoldBrandProductDO moldBrandProduct) { - return success(moldBrandService.createMoldBrandProduct(moldBrandProduct)); - } - - @PutMapping("/mold-brand-product/update") - @Operation(summary = "更新模具产品") - @PreAuthorize("@ss.hasPermission('erp:mold-brand:update')") - public CommonResult updateMoldBrandProduct(@Valid @RequestBody MesMoldBrandProductDO moldBrandProduct) { - moldBrandService.updateMoldBrandProduct(moldBrandProduct); - return success(true); - } - - @DeleteMapping("/mold-brand-product/delete") - @Parameter(name = "id", description = "编号", required = true) - @Operation(summary = "删除模具产品") - @PreAuthorize("@ss.hasPermission('erp:mold-brand:delete')") - public CommonResult deleteMoldBrandProduct(@RequestParam("id") Long id) { - moldBrandService.deleteMoldBrandProduct(id); - return success(true); - } - - @GetMapping("/mold-brand-product/get") - @Operation(summary = "获得模具产品") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") - public CommonResult getMoldBrandProduct(@RequestParam("id") Long id) { - return success(moldBrandService.getMoldBrandProduct(id)); - } - -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/MoldController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/MoldController.java deleted file mode 100644 index 9cd46dadd..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/MoldController.java +++ /dev/null @@ -1,94 +0,0 @@ -package cn.iocoder.yudao.module.mes.controller.admin.mold; - -import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO; -import cn.iocoder.yudao.module.mes.service.mold.MoldService; -import cn.iocoder.yudao.module.mes.controller.admin.mold.vo.MoldPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.mold.vo.MoldRespVO; -import cn.iocoder.yudao.module.mes.controller.admin.mold.vo.MoldSaveReqVO; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.List; - -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - -@Tag(name = "管理后台 - 模具") -@RestController("mesMoldController") -@RequestMapping("/mes/mold") -@Validated -public class MoldController { - - @Resource - private MoldService moldService; - - - @PostMapping("/create") - @Operation(summary = "创建模具") - @PreAuthorize("@ss.hasPermission('erp:mold:create')") - public CommonResult createMold(@Valid @RequestBody MoldSaveReqVO createReqVO) { - return success(moldService.createMold(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新模具") - @PreAuthorize("@ss.hasPermission('erp:mold:update')") - public CommonResult updateMold(@Valid @RequestBody MoldSaveReqVO updateReqVO) { - moldService.updateMold(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除模具") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('erp:mold:delete')") - public CommonResult deleteMold(@RequestParam("id") Long id) { - moldService.deleteMold(id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得模具") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:mold:query')") - public CommonResult getMold(@RequestParam("id") Long id) { - MesMoldDO mold = moldService.getMold(id); - return success(BeanUtils.toBean(mold, MoldRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得模具分页") - @PreAuthorize("@ss.hasPermission('erp:mold:query')") - public CommonResult> getMoldPage(@Valid MoldPageReqVO pageReqVO) { - PageResult pageResult = moldService.getMoldPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, MoldRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出模具 Excel") - @PreAuthorize("@ss.hasPermission('erp:mold:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportMoldExcel(@Valid MoldPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = moldService.getMoldPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "模具.xls", "数据", MoldRespVO.class, - BeanUtils.toBean(list, MoldRespVO.class)); - } - -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/enums/OrgTypeStatusEnum.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/enums/OrgTypeStatusEnum.java deleted file mode 100644 index 4168438bf..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/enums/OrgTypeStatusEnum.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.iocoder.yudao.module.mes.controller.admin.mold.enums; - - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor -public enum OrgTypeStatusEnum { - zhijiang("zhijiang", "制浆"), - duidie("duidie", "堆叠"), - chengxing("chengxing", "成型"), - honggan("honggan", "烘干"), - zhuanyi("zhuanyi", "转移"), - jiashi("jiashi", "加湿"), - reya("reya", "热压"), - qiebian("qiebian", "切边"), - pinjian("pinjian", "品检"), - dabao("dabao", "打包"), - tiebiao("tiebiao", "贴标"), - sufeng("sufeng", "塑封"), - pinyin("pinyin", "品印"); - - private final String orgtype; - private final String description; - - public static OrgTypeStatusEnum getByCode(String code) { - for (OrgTypeStatusEnum status : values()) { - if (status.getOrgtype().equals(code)) { - return status; - } - } - return null; - } -} diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/OrgTypeConverter.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/OrgTypeConverter.java deleted file mode 100644 index 60269dd5d..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mold/vo/OrgTypeConverter.java +++ /dev/null @@ -1,86 +0,0 @@ -package cn.iocoder.yudao.module.mes.controller.admin.mold.vo; - -import cn.iocoder.yudao.module.mes.controller.admin.mold.enums.OrgTypeStatusEnum; -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.enums.CellDataTypeEnum; -import com.alibaba.excel.metadata.GlobalConfiguration; -import com.alibaba.excel.metadata.data.ReadCellData; -import com.alibaba.excel.metadata.data.WriteCellData; -import com.alibaba.excel.metadata.property.ExcelContentProperty; -import org.springframework.stereotype.Component; - -/** - * 模具类型状态转换器（英文字符串 ↔ 中文） - */ -@Component("mesOrgTypeConverter") -public class OrgTypeConverter implements Converter { // 泛型改为 String，对应英文字符串 - - /** - * 读取Excel时调用（Excel中的英文/中文 → Java对象的英文字符串） - */ - @Override - public String convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, - GlobalConfiguration globalConfiguration) { - String cellValue = cellData.getStringValue(); - if (cellValue == null || cellValue.trim().isEmpty()) { - return null; - } - - // 优先匹配中文 → 转换为对应的英文常量名 - for (OrgTypeStatusEnum status : OrgTypeStatusEnum.values()) { - if (status.getDescription().equals(cellValue)) { // 注意枚举的描述方法是 getDesc - return status.name(); // 返回枚举的英文常量名（如 IN_USE） - } - } - - // 匹配英文 → 直接返回（兼容Excel中填英文的场景） - for (OrgTypeStatusEnum status : OrgTypeStatusEnum.values()) { - if (status.name().equals(cellValue)) { - return cellValue; - } - } - - // 无匹配则抛出异常 - throw new IllegalArgumentException("设备状态格式错误: " + cellValue + "，仅支持中文（在机/在库/维修中/保养中/报废）或英文（IN_USE/IN_STOCK/UNDER_REPAIR/UNDER_MAINTENANCE/SCRAPPED）"); - } - - /** - * 写入Excel时调用（Java对象的英文字符串 → Excel中的中文） - */ - @Override - public WriteCellData convertToExcelData(String value, ExcelContentProperty contentProperty, - GlobalConfiguration globalConfiguration) { - if (value == null || value.trim().isEmpty()) { - return new WriteCellData<>(""); - } - - // 根据英文常量名匹配枚举，转换为中文 - OrgTypeStatusEnum status = null; - try { - status = OrgTypeStatusEnum.valueOf(value); // 通过英文名称获取枚举 - } catch (IllegalArgumentException e) { - // 若英文匹配失败，尝试兜底匹配中文（兼容异常场景） - for (OrgTypeStatusEnum s : OrgTypeStatusEnum.values()) { - if (s.getDescription().equals(value)) { - status = s; - break; - } - } - } - - String text = status != null ? status.getDescription() : "未知"; - return new WriteCellData<>(text); - } - - // 必须实现的接口方法：指定转换的Java类型 - @Override - public Class supportJavaTypeKey() { - return String.class; - } - - // 必须实现的接口方法：指定Excel单元格类型 - @Override - public CellDataTypeEnum supportExcelTypeKey() { - return CellDataTypeEnum.STRING; - } -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldoperate/MoldOperateController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldoperate/MoldOperateController.java index c67fc1fb6..b0710afe7 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldoperate/MoldOperateController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldoperate/MoldOperateController.java @@ -1,11 +1,11 @@ package cn.iocoder.yudao.module.mes.controller.admin.moldoperate; import cn.iocoder.yudao.framework.common.util.collection.MapUtils; -import cn.iocoder.yudao.module.mes.controller.admin.mold.vo.MoldRespVO; -import cn.iocoder.yudao.module.mes.controller.admin.mold.vo.MoldSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO; +import cn.iocoder.yudao.module.common.controller.admin.mold.vo.MoldRespVO; +import cn.iocoder.yudao.module.common.controller.admin.mold.vo.MoldSaveReqVO; +import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO; import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockInItemDO; -import cn.iocoder.yudao.module.mes.service.mold.MoldService; +import cn.iocoder.yudao.module.erp.service.mold.MoldService; import cn.iocoder.yudao.module.mes.controller.admin.deviceledger.vo.DeviceLedgerRespVO; import cn.iocoder.yudao.module.mes.controller.admin.deviceledger.vo.DeviceLedgerSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger.DeviceLedgerDO; @@ -66,7 +66,7 @@ public class MoldOperateController { public CommonResult createMoldOperate(@Valid @RequestBody MoldOperateSaveReqVO createReqVO) { if (Objects.equals(createReqVO.getOperateType(), "1")) { DeviceLedgerDO deviceLedger = deviceLedgerService.getDeviceLedger(createReqVO.getDeviceId()); - MesMoldDO moldDO = moldService.getMold(createReqVO.getMoldId()); + MoldDO moldDO = moldService.getMold(createReqVO.getMoldId()); moldDO.setMachineId(createReqVO.getDeviceId()); moldDO.setMachineName(deviceLedger.getDeviceName()); moldDO.setStatus(0); // 在机 0 在库 1 @@ -76,7 +76,7 @@ public class MoldOperateController { } else { DeviceLedgerDO deviceLedger = deviceLedgerService.getDeviceLedger(createReqVO.getDeviceId()); createReqVO.setMoldId(Long.parseLong(deviceLedger.getMoldId())); - MesMoldDO moldDO = moldService.getMold(Long.parseLong(deviceLedger.getMoldId())); + MoldDO moldDO = moldService.getMold(Long.parseLong(deviceLedger.getMoldId())); moldDO.setMachineId(0L); moldDO.setMachineName(""); moldDO.setStatus(3); // 在机 0 在库 1 diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/MoldRepairController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/MoldRepairController.java index 479175938..ebcf9b59c 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/MoldRepairController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/MoldRepairController.java @@ -6,12 +6,12 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.MoldRepairLineRespVO; -import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.MoldRepairLineSaveReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.MoldRepairUpdateReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.*; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairLineDO; +import cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo.MoldRepairLineRespVO; +import cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo.MoldRepairLineSaveReqVO; +import cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo.MoldRepairUpdateReqVO; +import cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo.*; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairLineDO; import cn.iocoder.yudao.module.mes.service.moldrepair.MoldRepairService; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/enums/MoldRecordStatusEnum.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/enums/MoldRecordStatusEnum.java deleted file mode 100644 index c517dea0c..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/enums/MoldRecordStatusEnum.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.iocoder.yudao.module.mes.controller.admin.moldrepair.enums; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 单据状态枚举 - */ -@Getter -@AllArgsConstructor -public enum MoldRecordStatusEnum { - - PENDING(0, "待完成"), - COMPLETED(1, "已完成"), - // 可以根据需要添加其他状态 - CANCELED(2, "已取消"); - - @JsonValue - private final Integer code; - private final String name; - - @JsonCreator - public static MoldRecordStatusEnum getByCode(Integer code) { - if (code == null) { - return null; - } - for (MoldRecordStatusEnum status : MoldRecordStatusEnum.values()) { - if (status.getCode().equals(code)) { - return status; - } - } - return null; - } -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/vo/MoldRepairPageReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/vo/MoldRepairPageReqVO.java deleted file mode 100644 index ac8d76db0..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/vo/MoldRepairPageReqVO.java +++ /dev/null @@ -1,76 +0,0 @@ -package cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo; - -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 模具维修记录分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MoldRepairPageReqVO extends PageParam { - - @Schema(description = "维修单编号") - private String repairCode; - - @Schema(description = "维修单名称", example = "王五") - private String repairName; - - @Schema(description = "模具ID", example = "6979") - private Long moldId; - - @Schema(description = "模具编码") - private String moldCode; - - @Schema(description = "模具名称", example = "张三") - private String moldName; - - @Schema(description = "品牌") - private String moldBrand; - - @Schema(description = "规格型号") - private String moldSpec; - - @Schema(description = "模具类型", example = "1622") - private Long moldTypeId; - - @Schema(description = "报修日期") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] requireDate; - - @Schema(description = "完成日期") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] finishDate; - - @Schema(description = "验收日期") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] confirmDate; - - @Schema(description = "维修结果") - private String repairResult; - - @Schema(description = "维修人员") - private String acceptedBy; - - @Schema(description = "验收人员") - private String confirmBy; - - @Schema(description = "单据状态0-待完成 1-已完成", example = "1") - private Integer status; - - @Schema(description = "备注") - private String remark; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - - - @Schema(description = "ids集合导出用") - private String ids; -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/vo/MoldRepairRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/vo/MoldRepairRespVO.java deleted file mode 100644 index 08eb499d9..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/vo/MoldRepairRespVO.java +++ /dev/null @@ -1,120 +0,0 @@ -package cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo; - -import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.enums.MoldRecordStatusEnum; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; - -@Schema(description = "管理后台 - 模具维修记录 Response VO") -@Data -@ExcelIgnoreUnannotated -public class MoldRepairRespVO { - - @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27809") -// @ExcelProperty("ID") - private Long id; - - @Schema(description = "维修单编号", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("维修单编号") - private String repairCode; - - @Schema(description = "维修单名称", example = "王五") - @ExcelProperty("维修单名称") - private String repairName; - - @Schema(description = "模具ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6979") -// @ExcelProperty("模具ID") - private Long moldId; - - @Schema(description = "模具编码", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("模具编码") - private String moldCode; - - @Schema(description = "模具名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") - @ExcelProperty("模具名称") - private String moldName; - - @Schema(description = "品牌") -// @ExcelProperty("品牌") - private String moldBrand; - - @Schema(description = "规格型号") -// @ExcelProperty("规格型号") - private String moldSpec; - - @Schema(description = "模具类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1622") -// @ExcelProperty(value = "模具类型", converter = DictConvert.class) -// @DictFormat("mes_machine_type") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 - private Long moldTypeId; - - @Schema(description = "报修日期") - @ExcelProperty("报修日期") - @ColumnWidth(20) - private LocalDateTime requireDate; - - @Schema(description = "完成日期") - @ExcelProperty("完成日期") - @ColumnWidth(20) - private LocalDateTime finishDate; - - @Schema(description = "验收日期") - @ExcelProperty("验收日期") - @ColumnWidth(20) - private LocalDateTime confirmDate; - - @Schema(description = "维修结果") - @ExcelProperty("维修结果") - private String repairResult; - - @Schema(description = "维修人员") - @ExcelProperty("维修人员") - private String acceptedBy; - - @Schema(description = "验收人员") - @ExcelProperty("验收人员") - private String confirmBy; - - @Schema(description = "单据状态", example = "1") - @ExcelProperty(value = "单据状态 0-待完成 1-已完成") - @DictFormat("mes_mold_record_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 - private Integer status; - - @Schema(description = "单据状态", example = "1") - @ExcelProperty(value = "单据状态 0-待完成 1-已完成") - @DictFormat("mes_mold_record_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 - private String statusName; - - @Schema(description = "备注", example = "你猜") - @ExcelProperty("备注") - private String remark; - - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("创建时间") - @ColumnWidth(20) - private LocalDateTime createTime; - - @Schema(description = "模具类型 1-模具 2-关键件", example = "你猜") - private Integer deviceType; - - @Schema(description = "模具Id", example = "你猜") - private Long deviceId; - - @Schema(description = "关键件Id", example = "你猜") - private Long componentId; - - @Schema(description = "维修状态 0-待完成 1-通过 2-不通过") - private Integer repairStatus; - - @Schema(description = "维修状态") - @ExcelProperty("维修状态") - private String repairStatusName; - - -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/vo/MoldRepairSaveReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/vo/MoldRepairSaveReqVO.java deleted file mode 100644 index e1afd0e83..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/vo/MoldRepairSaveReqVO.java +++ /dev/null @@ -1,84 +0,0 @@ -package cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo; - -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairLineDO; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.time.LocalDateTime; -import java.util.List; - -@Schema(description = "管理后台 - 模具维修记录新增/修改 Request VO") -@Data -public class MoldRepairSaveReqVO { - - @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27809") - private Long id; - - @Schema(description = "维修单编号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "维修单编号不能为空") - private String repairCode; - - @Schema(description = "维修单名称", example = "王五") - private String repairName; - - @Schema(description = "模具ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6979") -// @NotNull(message = "模具ID不能为空") - private Long moldId; - - @Schema(description = "模具编码", requiredMode = Schema.RequiredMode.REQUIRED) -// @NotEmpty(message = "模具编码不能为空") - private String moldCode; - - @Schema(description = "模具名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") -// @NotEmpty(message = "模具名称不能为空") - private String moldName; - - @Schema(description = "品牌") - private String moldBrand; - - @Schema(description = "规格型号") - private String moldSpec; - - @Schema(description = "模具类型-待用", requiredMode = Schema.RequiredMode.REQUIRED, example = "1622") -// @NotNull(message = "模具类型不能为空") - private Long moldTypeId; - - @Schema(description = "报修日期") - private LocalDateTime requireDate; - - @Schema(description = "完成日期") - private LocalDateTime finishDate; - - @Schema(description = "验收日期") - private LocalDateTime confirmDate; - - @Schema(description = "维修结果") - private String repairResult; - - @Schema(description = "维修人员") - private String acceptedBy; - - @Schema(description = "验收人员") - private String confirmBy; - - @Schema(description = "单据状态", example = "1") - private String status; - - @Schema(description = "备注", example = "你猜") - private String remark; - - @Schema(description = "模具维修记录行列表") - private List moldRepairLines; - - @Schema(description = "模具类型 1-模具 2-关键件") - private Integer deviceType; - - @Schema(description = "模具Id") - private Long deviceId; - - @Schema(description = "关键件Id") - private Long componentId; - -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepairtems/MoldRepairTemsController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepairtems/MoldRepairTemsController.java index e02e017ef..4eac5a69a 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepairtems/MoldRepairTemsController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepairtems/MoldRepairTemsController.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.mes.controller.admin.moldrepairtems; import cn.iocoder.yudao.module.mes.dal.dataobject.criticalcomponent.CriticalComponentDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldtaskmanagement/MoldTaskManagementController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldtaskmanagement/MoldTaskManagementController.java index 5d4dd8dd6..0156ff99a 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldtaskmanagement/MoldTaskManagementController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldtaskmanagement/MoldTaskManagementController.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.mes.controller.admin.moldtaskmanagement; import cn.iocoder.yudao.module.mes.controller.admin.planmaintenance.vo.PlanMaintenanceRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.zjtask.vo.ZjTaskRespVO; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import org.springframework.web.bind.annotation.*; @@ -98,18 +99,33 @@ public class MoldTaskManagementController { @Operation(summary = "导出任务管理 Excel") @PreAuthorize("@ss.hasPermission('mes:mold-task-management:export')") @ApiAccessLog(operateType = EXPORT) - public void exportMoldTaskManagementExcel(@Valid MoldTaskManagementPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { + public void exportMoldTaskManagementExcel(@Valid MoldTaskManagementPageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = moldtaskManagementService.getMoldTaskManagementPage(pageReqVO).getList(); List moldtaskManagementRespVOList = BeanUtils.toBean(list, MoldTaskManagementRespVO.class); - for (MoldTaskManagementRespVO planMaintenanceRespVO : moldtaskManagementRespVOList) { - AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(planMaintenanceRespVO.getCreator())); - planMaintenanceRespVO.setCreatorName( "(" + user.getUsername()+ ")" + user.getNickname()); + for (MoldTaskManagementRespVO moldTaskManagementRespVO : moldtaskManagementRespVOList) { + AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(moldTaskManagementRespVO.getCreator())); + moldTaskManagementRespVO.setCreatorName("(" + user.getUsername() + ")" + user.getNickname()); + + // 修复：使用实例方法而不是静态方法 + if (moldTaskManagementRespVO.getTaskType() != null) { + switch (moldTaskManagementRespVO.getTaskType()) { + case 1: + moldTaskManagementRespVO.setTaskTypeName("点检"); + break; + case 2: + moldTaskManagementRespVO.setTaskTypeName("保养"); + break; + default: + moldTaskManagementRespVO.setTaskTypeName(null); + break; + } + } } - // 导出 Excel - ExcelUtils.write(response, "模具类型.xls", "数据", MoldTaskManagementRespVO.class,moldtaskManagementRespVOList); + + // 修复：使用正确的Excel文件名 + ExcelUtils.write(response, "任务管理.xls", "数据", MoldTaskManagementRespVO.class, moldtaskManagementRespVOList); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldtaskmanagement/vo/MoldTaskManagementRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldtaskmanagement/vo/MoldTaskManagementRespVO.java index 7e9e94478..2f5635bf8 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldtaskmanagement/vo/MoldTaskManagementRespVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldtaskmanagement/vo/MoldTaskManagementRespVO.java @@ -29,11 +29,15 @@ public class MoldTaskManagementRespVO extends BaseDO { private String name; @Schema(description = "类型(1-点检 2-保养)", example = "2") - @ExcelProperty("类型(1-点检 2-保养)") +// @ExcelProperty("类型(1-点检 2-保养)") private Integer taskType; + @Schema(description = "类型(1-点检 2-保养)", example = "2") + @ExcelProperty("类型") + private String taskTypeName; + @Schema(description = "模具列表") - @ExcelProperty("模具列表") +// @ExcelProperty("模具列表") private String moldList; @Schema(description = "项目表单") @@ -55,7 +59,7 @@ public class MoldTaskManagementRespVO extends BaseDO { private String cronExpression; @Schema(description = "可操作人") - @ExcelProperty("可操作人") +// @ExcelProperty("可操作人") private String operableUsers; @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/MoldTicketManagementController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/MoldTicketManagementController.java index 1e7c4db94..55ac6dca0 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/MoldTicketManagementController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/MoldTicketManagementController.java @@ -1,11 +1,9 @@ package cn.iocoder.yudao.module.mes.controller.admin.moldticketmanagement; -import cn.iocoder.yudao.module.mes.controller.admin.mold.vo.MoldRespVO; import cn.iocoder.yudao.module.mes.controller.admin.moldticketresults.vo.MoldTicketInspectionExportVO; import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.enums.InspectionResultEnum; import cn.iocoder.yudao.module.mes.controller.admin.ticketresults.vo.TicketInspectionExportVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketresults.MoldTicketResultsDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.ticketresults.TicketResultsDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldticketresults.MoldTicketResultsDO; import cn.iocoder.yudao.module.system.api.dict.DictDataApi; import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; @@ -19,7 +17,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; import javax.validation.*; import javax.servlet.http.*; import java.net.URLEncoder; @@ -40,8 +37,8 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; -import cn.iocoder.yudao.module.mes.controller.admin.moldticketmanagement.vo.*; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketmanagement.MoldTicketManagementDO; +import cn.iocoder.yudao.module.common.controller.admin.moldticketmanagement.vo.*; +import cn.iocoder.yudao.module.common.dal.dataobject.moldticketmanagement.MoldTicketManagementDO; import cn.iocoder.yudao.module.mes.service.moldticketmanagement.MoldTicketManagementService; @Tag(name = "管理后台 - 工单管理") diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/vo/MoldTicketManagementPageReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/vo/MoldTicketManagementPageReqVO.java deleted file mode 100644 index 8389b8c0c..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/vo/MoldTicketManagementPageReqVO.java +++ /dev/null @@ -1,63 +0,0 @@ -package cn.iocoder.yudao.module.mes.controller.admin.moldticketmanagement.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 项目方案关联分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MoldTicketManagementPageReqVO extends PageParam { - - @Schema(description = "项目ID", example = "21368") - private Long taskId; - - @Schema(description = "方案ID", example = "20459") - private Long planId; - - @Schema(description = "单号") - private String planNo; - - @Schema(description = "设备名称", example = "张三") - private String moldName; - - @Schema(description = "类型(1-点检 2-保养)", example = "2") - private String planType; - - @Schema(description = "计划配置名称", example = "赵六") - private String configName; - - @Schema(description = "作业状态", example = "1") - private Integer jobStatus; - - @Schema(description = "作业结果") - private String jobResult; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - - - @Schema(description = "id集合导出用") - private String ids; - - - @Schema(description = "作业开始时间") - private String taskTime; - - @Schema(description = "作业结束时间") - private String taskEndTime; - - -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/vo/MoldTicketManagementRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/vo/MoldTicketManagementRespVO.java deleted file mode 100644 index e0c6fe1c9..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/vo/MoldTicketManagementRespVO.java +++ /dev/null @@ -1,92 +0,0 @@ -package cn.iocoder.yudao.module.mes.controller.admin.moldticketmanagement.vo; - -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; -import com.github.xiaoymin.knife4j.annotations.Ignore; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; - -@Schema(description = "管理后台 - 项目方案关联 Response VO") -@Data -@ExcelIgnoreUnannotated -public class MoldTicketManagementRespVO extends BaseDO { - - @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "6566") - @ExcelProperty("id") - private Long id; - - @Schema(description = "任务Id", example = "21368") -// @ExcelProperty("项目ID") - private Long taskId; - - @Schema(description = "方案ID", example = "20459") -// @ExcelProperty("方案ID") - private Long planId; - - @Schema(description = "单号") - @ExcelProperty("单号") - private String planNo; - - @Schema(description = "设备名称", example = "张三") - @ExcelProperty("设备名称") - private String moldName; - - @Schema(description = "类型", example = "2") - @ExcelProperty("类型") - private String planType; - - @Schema(description = "计划配置名称", example = "赵六") - @ExcelProperty("计划配置名称") - private String configName; - - @Schema(description = "作业状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @ExcelProperty("作业状态") - private Integer jobStatus; - - @Schema(description = "作业结果") - @ExcelProperty("作业结果") - private Integer jobResult; - - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("创建时间") - private LocalDateTime createTime; - - - - /** - * 作业开始时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonSerialize(using = LocalDateTimeSerializer.class) - @JsonDeserialize(using = LocalDateTimeDeserializer.class) - private LocalDateTime taskTime; - - /** - * 作业结束时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonSerialize(using = LocalDateTimeSerializer.class) - @JsonDeserialize(using = LocalDateTimeDeserializer.class) - private LocalDateTime taskEndTime; - - - @Schema(description = "创建人名字") - @ExcelProperty("创建人名字") - private String creatorName; - - @Schema(description = "作业人") - private String operator; - @Schema(description = "作业人名称") - @ExcelProperty("作业人名称") - private String operatorName; - - -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/vo/MoldTicketManagementSaveReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/vo/MoldTicketManagementSaveReqVO.java deleted file mode 100644 index e4c38de3b..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/vo/MoldTicketManagementSaveReqVO.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.iocoder.yudao.module.mes.controller.admin.moldticketmanagement.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import javax.validation.constraints.*; - -@Schema(description = "管理后台 - 项目方案关联新增/修改 Request VO") -@Data -public class MoldTicketManagementSaveReqVO { - - @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "6566") - private Long id; - - @Schema(description = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21368") - @NotNull(message = "项目ID不能为空") - private Long subjectId; - - @Schema(description = "方案ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20459") - @NotNull(message = "方案ID不能为空") - private Long planId; - - @Schema(description = "单号") - private String planNo; - - @Schema(description = "设备名称", example = "张三") - private String moldName; - - @Schema(description = "类型", example = "2") - private String planType; - - @Schema(description = "计划配置名称", example = "赵六") - private String configName; - - @Schema(description = "作业状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "作业状态不能为空") - private Integer jobStatus; - - @Schema(description = "作业结果") - private Integer jobResult; - -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketresults/MoldTicketResultsController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketresults/MoldTicketResultsController.java index 84e160f28..ea3f2dac5 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketresults/MoldTicketResultsController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketresults/MoldTicketResultsController.java @@ -25,8 +25,8 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; -import cn.iocoder.yudao.module.mes.controller.admin.moldticketresults.vo.*; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketresults.MoldTicketResultsDO; +import cn.iocoder.yudao.module.common.controller.admin.moldticketresults.vo.*; +import cn.iocoder.yudao.module.common.dal.dataobject.moldticketresults.MoldTicketResultsDO; import cn.iocoder.yudao.module.mes.service.moldticketresults.MoldTicketResultsService; @Tag(name = "管理后台 - 工单检验结果") diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/taskmanagement/scheduled/coretask/GenerateWorkOrderTask.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/taskmanagement/scheduled/coretask/GenerateWorkOrderTask.java index 0db8c6c2d..e7d8d66ee 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/taskmanagement/scheduled/coretask/GenerateWorkOrderTask.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/taskmanagement/scheduled/coretask/GenerateWorkOrderTask.java @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.mes.controller.admin.taskmanagement.scheduled.co import cn.iocoder.yudao.module.iot.controller.admin.device.enums.TaskTypeEnum; import cn.iocoder.yudao.module.iot.controller.admin.device.scheduled.core.Task; -import cn.iocoder.yudao.module.iot.service.device.TDengineService; import cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger.DeviceLedgerDO; import cn.iocoder.yudao.module.mes.dal.dataobject.dvsubject.DvSubjectDO; import cn.iocoder.yudao.module.mes.dal.dataobject.subjectplan.SubjectPlanDO; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/enums/MoldPlanTypeEnum.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/enums/JobStatusEnum.java similarity index 54% rename from yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/enums/MoldPlanTypeEnum.java rename to yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/enums/JobStatusEnum.java index 964e28803..96e074dd9 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/enums/MoldPlanTypeEnum.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/enums/JobStatusEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.mes.controller.admin.moldticketmanagement.enums; +package cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.enums; import lombok.Getter; @@ -9,59 +9,60 @@ import java.util.Map; import java.util.stream.Collectors; /** - * 计划类型枚举 - * 1-点检 2-保养 + * 作业状态枚举 + * 0-待完成 1-已完成 2-已取消 */ @Getter -public enum MoldPlanTypeEnum { +public enum JobStatusEnum { - INSPECTION(1, "点检"), - MAINTENANCE(2, "保养"); + PENDING(0, "待完成"), + COMPLETED(1, "已完成"), + CANCELED(2, "已取消"); private final Integer code; private final String description; - MoldPlanTypeEnum(Integer code, String description) { + JobStatusEnum(Integer code, String description) { this.code = code; this.description = description; } /** - * 根据code获取枚举 + * 根据 code 获取枚举 */ - public static MoldPlanTypeEnum getByCode(Integer code) { + public static JobStatusEnum getByCode(Integer code) { if (code == null) { return null; } - for (MoldPlanTypeEnum type : values()) { - if (type.getCode().equals(code)) { - return type; + for (JobStatusEnum status : values()) { + if (status.getCode().equals(code)) { + return status; } } return null; } /** - * 根据code获取描述 + * 根据 code 获取描述 */ public static String getDescriptionByCode(Integer code) { - MoldPlanTypeEnum type = getByCode(code); - return type != null ? type.getDescription() : "未知"; + JobStatusEnum status = getByCode(code); + return status != null ? status.getDescription() : "未知"; } /** - * 检查code是否有效 + * 校验 code 是否有效 */ public static boolean isValidCode(Integer code) { return getByCode(code) != null; } /** - * 获取所有code列表 + * 获取所有 code 列表 */ public static List getAllCodes() { return Arrays.stream(values()) - .map(MoldPlanTypeEnum::getCode) + .map(JobStatusEnum::getCode) .collect(Collectors.toList()); } @@ -70,18 +71,18 @@ public enum MoldPlanTypeEnum { */ public static List getAllDescriptions() { return Arrays.stream(values()) - .map(MoldPlanTypeEnum::getDescription) + .map(JobStatusEnum::getDescription) .collect(Collectors.toList()); } /** - * 获取code和描述的映射 + * 获取 code -> 描述 映射 */ public static Map getCodeDescriptionMap() { Map map = new LinkedHashMap<>(); - for (MoldPlanTypeEnum type : values()) { - map.put(type.getCode(), type.getDescription()); + for (JobStatusEnum status : values()) { + map.put(status.getCode(), status.getDescription()); } return map; } -} \ No newline at end of file +} diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjitem/vo/ZjItemPageReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjitem/vo/ZjItemPageReqVO.java index a43318b5f..1b6a93560 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjitem/vo/ZjItemPageReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjitem/vo/ZjItemPageReqVO.java @@ -43,4 +43,7 @@ public class ZjItemPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + @Schema(description = "ids集合导出用") + private String ids; + } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjschema/vo/ZjSchemaPageReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjschema/vo/ZjSchemaPageReqVO.java index 9c6f96c3b..386629901 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjschema/vo/ZjSchemaPageReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjschema/vo/ZjSchemaPageReqVO.java @@ -37,4 +37,7 @@ public class ZjSchemaPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + @Schema(description = "ids集合导出用") + private String ids; + } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/ZjTaskController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/ZjTaskController.java index e8cd2bfd7..046baf42d 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/ZjTaskController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/ZjTaskController.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.mes.controller.admin.zjtask; +import cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo.MoldRepairRespVO; +import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -83,13 +85,30 @@ public class ZjTaskController { @Operation(summary = "导出质量管理-检验任务 Excel") @PreAuthorize("@ss.hasPermission('mes:zj-task:export')") @ApiAccessLog(operateType = EXPORT) - public void exportZjTaskExcel(@Valid ZjTaskPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { + public void exportZjTaskExcel(@Valid ZjTaskPageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = zjTaskService.getZjTaskPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "质量管理-检验任务.xls", "数据", ZjTaskRespVO.class, - BeanUtils.toBean(list, ZjTaskRespVO.class)); + List zjTaskRespVOList = BeanUtils.toBean(list, ZjTaskRespVO.class); + for (ZjTaskRespVO zjTaskRespVO : zjTaskRespVOList) { + if (zjTaskRespVO.getResult() != null) { + switch (zjTaskRespVO.getResult()) { + case "0": + zjTaskRespVO.setResultName(null); + break; + case "1": + zjTaskRespVO.setResultName("通过"); + break; + case "2": + zjTaskRespVO.setResultName("不通过"); + break; + default: + zjTaskRespVO.setResultName(null); + break; + } + } + } + // 使用处理后的zjTaskRespVOList进行导出 + ExcelUtils.write(response, "质量管理-检验任务.xls", "数据", ZjTaskRespVO.class, zjTaskRespVOList); } } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskPageReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskPageReqVO.java index 34dc3432f..4f72be5d7 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskPageReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskPageReqVO.java @@ -65,4 +65,7 @@ public class ZjTaskPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] executeTime; + @Schema(description = "ids集合导出用") + private String ids; + } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskRespVO.java index 4f285be1b..83bb8eda5 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskRespVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskRespVO.java @@ -78,9 +78,13 @@ public class ZjTaskRespVO { private Integer status; @Schema(description = "结果") - @ExcelProperty("结果（0=待完成，1=通过，2=不通过）") +// @ExcelProperty("结果（0=待完成，1=通过，2=不通过）") private String result; + @Schema(description = "结果") + @ExcelProperty("结果") + private String resultName; + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") @ColumnWidth(20) diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtype/vo/ZjTypePageReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtype/vo/ZjTypePageReqVO.java index 963b048de..1b70bd6b8 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtype/vo/ZjTypePageReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtype/vo/ZjTypePageReqVO.java @@ -28,4 +28,7 @@ public class ZjTypePageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + @Schema(description = "ids集合导出用") + private String ids; + } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/deviceledger/DeviceLedgerDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/deviceledger/DeviceLedgerDO.java index 81561f1ac..3946cd427 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/deviceledger/DeviceLedgerDO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/deviceledger/DeviceLedgerDO.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger; -import cn.iocoder.yudao.module.erp.dal.dataobject.mold.MoldDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO; +import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO; import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductCategoryDO; import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO; import cn.iocoder.yudao.module.mes.dal.dataobject.criticalcomponent.CriticalComponentDO; @@ -45,7 +44,7 @@ public class DeviceLedgerDO extends BaseDO { /** * 设备状态 (0-正常, 1-停用, 2-维修, 3-报废) */ - private String deviceStatus; + private Integer deviceStatus; /** * 设备品牌 */ diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/mold/MesMoldBrandDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/mold/MesMoldBrandDO.java deleted file mode 100644 index a714cf2b4..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/mold/MesMoldBrandDO.java +++ /dev/null @@ -1,76 +0,0 @@ -package cn.iocoder.yudao.module.mes.dal.dataobject.mold; - -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; - -import java.math.BigDecimal; - -/** - * 模具型号 DO - * - * @author 内蒙必硕 - */ -@TableName("erp_mold_brand") -@KeySequence("erp_mold_brand_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MesMoldBrandDO extends BaseDO { - - /** - * ID - */ - @TableId - private Long id; - /** - * 型号编码 - */ - private String code; - /** - * 型号名称 - */ - private String name; - /** - * 规格 - */ - private String moldType; - /** - * 产品ID - */ - private Long productId; - /** - * 预期寿命(小时) - */ - private BigDecimal useTime; - /** - * 维保模式 - * - * 枚举 {@link TODO maintain_type 对应的类} - */ - private Integer maintainType; - /** - * 维保周期 - */ - private BigDecimal maintainTime; - /** - * 模具系数 - */ - private Long moldSize; - /** - * 备注 - */ - private String remark; - /** - * 是否启用 - */ - private Boolean isEnable; - -// @Schema(description = "工序", example = "你说的对") - private String orgType; -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/mold/MesMoldBrandProductDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/mold/MesMoldBrandProductDO.java deleted file mode 100644 index 601051e1b..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/mold/MesMoldBrandProductDO.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.iocoder.yudao.module.mes.dal.dataobject.mold; - -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; - -/** - * 模具产品 DO - * - * @author 内蒙必硕 - */ -@TableName("erp_mold_brand_product") -@KeySequence("erp_mold_brand_product_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MesMoldBrandProductDO extends BaseDO { - - /** - * ID - */ - @TableId - private Long id; - /** - * 型号ID - */ - private Long brandId; - /** - * 产品ID - */ - private Long productId; - /** - * 备注 - */ - private String remark; - -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/mold/MesMoldDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/mold/MesMoldDO.java deleted file mode 100644 index 6ef80b777..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/mold/MesMoldDO.java +++ /dev/null @@ -1,118 +0,0 @@ -package cn.iocoder.yudao.module.mes.dal.dataobject.mold; - -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairLineDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketresults.MoldTicketResultsDO; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Map; - -/** - * 模具 DO - * - * @author 内蒙必硕 - */ -@TableName("erp_mold") -@KeySequence("erp_mold_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MesMoldDO extends BaseDO { - - /** - * ID - */ - @TableId - private Long id; - /** - * 模具编码 - */ - private String code; - /** - * 模具名称 - */ - private String name; - /** - * 单位ID - */ - private Long unitId; - /** - * 设备ID - */ - private Long machineId; - /** - * 设备名称 - */ - private String machineName; - /** - * 使用时间(小时) - */ - private BigDecimal useTime; - /** - * 入库时间 - */ - private LocalDateTime inTime; - /** - * 状态 - * - * 枚举 {@link TODO erp_mold_status 对应的类} - */ - private Integer status; - /** - * 模具图片 - */ - private String images; - /** - * 备注 - */ - private String remark; - /** - * 是否启用 - */ - private Boolean isEnable; - /** - * 型号id - */ - private Long brandId; - - - private String fileUrl; - - /** - * 点检列表 - */ - @TableField(exist = false) - private List inspectionList; - - /** - * 保养列表 - */ - @TableField(exist = false) - private List maintainList; - - /** - * 维修列表 - */ - @TableField(exist = false) - private Map> repairList; - - @TableField(exist = false) - private String orgType; - @TableField(exist = false) - private Long moldSize; - @TableField(exist = false) - private String brandName; - @TableField(exist = false) - private String moldType; - -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/moldrepair/MoldRepairDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/moldrepair/MoldRepairDO.java deleted file mode 100644 index 29c7a78af..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/moldrepair/MoldRepairDO.java +++ /dev/null @@ -1,122 +0,0 @@ -package cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair; - -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; - -/** - * 模具维修记录 DO - * - * @author 内蒙必硕 - */ -@TableName("mes_mold_repair") -@KeySequence("mes_mold_repair_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MoldRepairDO extends BaseDO { - - /** - * ID - */ - @TableId - private Long id; - /** - * 维修单编号 - */ - private String repairCode; - /** - * 维修单名称 - */ - private String repairName; - /** - * 模具ID - */ - private Long moldId; - /** - * 模具编码 - */ - private String moldCode; - /** - * 模具名称 - */ - private String moldName; - /** - * 品牌 - */ - private String moldBrand; - /** - * 规格型号 - */ - private String moldSpec; - /** - * 模具类型 - * - * 枚举 {@link TODO mes_machine_type 对应的类} - */ - private Long moldTypeId; - /** - * 报修日期 - */ - private LocalDateTime requireDate; - /** - * 完成日期 - */ - private LocalDateTime finishDate; - /** - * 验收日期 - */ - private LocalDateTime confirmDate; - /** - * 维修结果 - */ - private String repairResult; - /** - * 维修人员 - */ - private String acceptedBy; - /** - * 验收人员 - */ - private String confirmBy; - /** - * 单据状态0-待完成 1-已完成 - * - * 枚举 {@link TODO mes_mold_record_status 对应的类} - */ - private Integer status; - /** - * 备注 - */ - private String remark; - - /** - * 模具类型 1-模具 2-关键件 - */ - private Integer moldType; - - /** - * 设备Id - */ - private Long deviceId; - - /** - * 关键件Id - */ - private Long componentId; - - /** - * 维修结果 0-待维修 1-通过 2-不通过 - */ - private Integer repairStatus; - -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/moldrepair/MoldRepairLineDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/moldrepair/MoldRepairLineDO.java deleted file mode 100644 index 18379dd3b..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/moldrepair/MoldRepairLineDO.java +++ /dev/null @@ -1,80 +0,0 @@ -package cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair; - -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; - -/** - * 模具维修记录行 DO - * - * @author 内蒙必硕 - */ -@TableName("mes_mold_repair_line") -@KeySequence("mes_mold_repair_line_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MoldRepairLineDO extends BaseDO { - - /** - * ID - */ - @TableId - private Long id; - /** - * 维修单ID - */ - private Long repairId; - /** - * 项目ID - */ - private Long subjectId; - /** - * 项目编码 - */ - private String subjectCode; - /** - * 项目名称 - */ - private String subjectName; - /** - * 项目类型 - */ - private String subjectType; - /** - * 项目内容 - */ - private String subjectContent; - /** - * 标准 - */ - private String subjectStandard; - /** - * 故障描述 - */ - private String malfunction; - /** - * 故障描述资源 - */ - private String malfunctionUrl; - /** - * 维修情况 - */ - private String repairDes; - /** - * 备注 - */ - private String remark; - - /** - * 维修结果 0-待维修 1-通过 2-不通过 - */ - private Integer result; - -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dvrepair/DvRepairMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dvrepair/DvRepairMapper.java index 84b672138..01fe01ed5 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dvrepair/DvRepairMapper.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dvrepair/DvRepairMapper.java @@ -6,6 +6,7 @@ import java.util.stream.Collectors; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo.dashboard.EventStatisticsVO; import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairDO; import cn.iocoder.yudao.module.mes.dal.dataobject.dvsubject.DvSubjectDO; import com.alibaba.excel.util.StringUtils; @@ -56,4 +57,5 @@ public interface DvRepairMapper extends BaseMapperX { return selectPage(reqVO,dvRepairDOLambdaQueryWrapperX ); } + void selectDeviceRepair(EventStatisticsVO eventStatisticsVO); } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/mold/MesMoldBrandMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/mold/MesMoldBrandMapper.java deleted file mode 100644 index 9628c4abc..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/mold/MesMoldBrandMapper.java +++ /dev/null @@ -1,72 +0,0 @@ -package cn.iocoder.yudao.module.mes.dal.mysql.mold; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.mes.controller.admin.mold.vo.MoldBrandPageReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldBrandDO; -import com.alibaba.excel.util.StringUtils; -import org.apache.ibatis.annotations.Mapper; - -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -/** - * 模具型号 Mapper - * - * @author 内蒙必硕 - */ -@Mapper -public interface MesMoldBrandMapper extends BaseMapperX { - - default PageResult selectPage(MoldBrandPageReqVO reqVO) { - - LambdaQueryWrapperX moldBrandDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>(); - moldBrandDOLambdaQueryWrapperX - .eqIfPresent(MesMoldBrandDO::getCode, reqVO.getCode()) - .likeIfPresent(MesMoldBrandDO::getName, reqVO.getName()) - .eqIfPresent(MesMoldBrandDO::getMoldType, reqVO.getMoldType()) - .eqIfPresent(MesMoldBrandDO::getProductId, reqVO.getProductId()) - .eqIfPresent(MesMoldBrandDO::getUseTime, reqVO.getUseTime()) - .eqIfPresent(MesMoldBrandDO::getMaintainType, reqVO.getMaintainType()) - .eqIfPresent(MesMoldBrandDO::getMaintainTime, reqVO.getMaintainTime()) - .eqIfPresent(MesMoldBrandDO::getMoldSize, reqVO.getMoldSize()) - .eqIfPresent(MesMoldBrandDO::getRemark, reqVO.getRemark()) - .eqIfPresent(MesMoldBrandDO::getIsEnable, reqVO.getIsEnable()) - .eqIfPresent(MesMoldBrandDO::getOrgType, reqVO.getOrgType()) - .betweenIfPresent(MesMoldBrandDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(MesMoldBrandDO::getId); - - // 单独处理 ids 条件 - if (StringUtils.isNotBlank(reqVO.getIds())) { - List idList = Arrays.stream(reqVO.getIds().split(",")) - .map(String::trim) - .map(Long::valueOf) - .collect(Collectors.toList()); - moldBrandDOLambdaQueryWrapperX.in(MesMoldBrandDO::getId, idList); - } - - return selectPage(reqVO, moldBrandDOLambdaQueryWrapperX); - - - - - } - default List selectBy(MoldBrandPageReqVO reqVO) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(MesMoldBrandDO::getCode, reqVO.getCode()) - .likeIfPresent(MesMoldBrandDO::getName, reqVO.getName()) - .eqIfPresent(MesMoldBrandDO::getMoldType, reqVO.getMoldType()) - .eqIfPresent(MesMoldBrandDO::getProductId, reqVO.getProductId()) - .eqIfPresent(MesMoldBrandDO::getUseTime, reqVO.getUseTime()) - .eqIfPresent(MesMoldBrandDO::getMaintainType, reqVO.getMaintainType()) - .eqIfPresent(MesMoldBrandDO::getMaintainTime, reqVO.getMaintainTime()) - .eqIfPresent(MesMoldBrandDO::getMoldSize, reqVO.getMoldSize()) - .eqIfPresent(MesMoldBrandDO::getRemark, reqVO.getRemark()) - .eqIfPresent(MesMoldBrandDO::getIsEnable, reqVO.getIsEnable()) - .eqIfPresent(MesMoldBrandDO::getOrgType, reqVO.getOrgType()) - .betweenIfPresent(MesMoldBrandDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(MesMoldBrandDO::getId)); - } -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/mold/MesMoldBrandProductMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/mold/MesMoldBrandProductMapper.java deleted file mode 100644 index 31900c68d..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/mold/MesMoldBrandProductMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.iocoder.yudao.module.mes.dal.mysql.mold; - -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldBrandProductDO; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 模具产品 Mapper - * - * @author 内蒙必硕 - */ -@Mapper -public interface MesMoldBrandProductMapper extends BaseMapperX { - - default PageResult selectPage(PageParam reqVO, Long brandId) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eq(MesMoldBrandProductDO::getBrandId, brandId) - .orderByDesc(MesMoldBrandProductDO::getId)); - } - - default int deleteByBrandId(Long brandId) { - return delete(MesMoldBrandProductDO::getBrandId, brandId); - } - default List selectList(MesMoldBrandProductDO reqVO) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(MesMoldBrandProductDO::getProductId, reqVO.getProductId()) - .eqIfPresent(MesMoldBrandProductDO::getBrandId, reqVO.getBrandId()) - .orderByDesc(MesMoldBrandProductDO::getId)); - } -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/mold/MesMoldMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/mold/MesMoldMapper.java deleted file mode 100644 index 659c99e0d..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/mold/MesMoldMapper.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.iocoder.yudao.module.mes.dal.mysql.mold; - -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 模具 Mapper - * - * @author 内蒙必硕 - */ -@Mapper -public interface MesMoldMapper extends BaseMapperX { - - default PageResult selectPage(PageParam reqVO, Long brandId) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MesMoldDO::getBrandId, brandId) - .orderByDesc(MesMoldDO::getId)); - } - - default int deleteByBrandId(Long brandId) { - return delete(MesMoldDO::getBrandId, brandId); - } - - default List selectBy(MesMoldDO reqVO) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(MesMoldDO::getCode, reqVO.getCode()) - .likeIfPresent(MesMoldDO::getName, reqVO.getName()) - .eqIfPresent(MesMoldDO::getBrandId, reqVO.getBrandId()) - .orderByDesc(MesMoldDO::getId)); - } - - default List selectBy(Long brandId) { - return selectList(new LambdaQueryWrapperX() - .eq(MesMoldDO::getBrandId, brandId) - .orderByDesc(MesMoldDO::getId)); - } - - -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/moldrepair/MoldRepairLineMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/moldrepair/MoldRepairLineMapper.java deleted file mode 100644 index 4376da826..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/moldrepair/MoldRepairLineMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.iocoder.yudao.module.mes.dal.mysql.moldrepair; - -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairLineDO; -import org.apache.ibatis.annotations.Mapper; -import org.springframework.stereotype.Repository; - -/** - * 设备维修记录行 Mapper - * - * @author 内蒙必硕 - */ -@Mapper -@Repository("mesMoldRepairLineMapper") -public interface MoldRepairLineMapper extends BaseMapperX { - - default List selectListByRepairId(Long repairId) { - return selectList(MoldRepairLineDO::getRepairId, repairId); - } - - default int deleteByRepairId(Long repairId) { - return delete(MoldRepairLineDO::getRepairId, repairId); - } - -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/moldrepair/MoldRepairMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/moldrepair/MoldRepairMapper.java deleted file mode 100644 index f7e8a93fa..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/moldrepair/MoldRepairMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package cn.iocoder.yudao.module.mes.dal.mysql.moldrepair; - -import java.util.*; -import java.util.stream.Collectors; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldsubject.MoldSubjectDO; -import com.alibaba.excel.util.StringUtils; -import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.*; -import org.springframework.stereotype.Repository; - -/** - * 设备维修记录 Mapper - * - * @author 内蒙必硕 - */ -@Mapper -@Repository("mesMoldRepairMapper") -public interface MoldRepairMapper extends BaseMapperX { - - default PageResult selectPage(MoldRepairPageReqVO reqVO) { - - - LambdaQueryWrapperX dvRepairDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>(); - dvRepairDOLambdaQueryWrapperX - .eqIfPresent(MoldRepairDO::getRepairCode, reqVO.getRepairCode()) - .likeIfPresent(MoldRepairDO::getRepairName, reqVO.getRepairName()) - .eqIfPresent(MoldRepairDO::getMoldId, reqVO.getMoldId()) - .eqIfPresent(MoldRepairDO::getMoldCode, reqVO.getMoldCode()) - .likeIfPresent(MoldRepairDO::getMoldName, reqVO.getMoldName()) - .eqIfPresent(MoldRepairDO::getMoldBrand, reqVO.getMoldBrand()) - .eqIfPresent(MoldRepairDO::getMoldSpec, reqVO.getMoldSpec()) - .eqIfPresent(MoldRepairDO::getMoldTypeId, reqVO.getMoldTypeId()) - .betweenIfPresent(MoldRepairDO::getRequireDate, reqVO.getRequireDate()) - .betweenIfPresent(MoldRepairDO::getFinishDate, reqVO.getFinishDate()) - .betweenIfPresent(MoldRepairDO::getConfirmDate, reqVO.getConfirmDate()) - .eqIfPresent(MoldRepairDO::getRepairResult, reqVO.getRepairResult()) - .eqIfPresent(MoldRepairDO::getAcceptedBy, reqVO.getAcceptedBy()) - .eqIfPresent(MoldRepairDO::getConfirmBy, reqVO.getConfirmBy()) - .eqIfPresent(MoldRepairDO::getStatus, reqVO.getStatus()) - .eqIfPresent(MoldRepairDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(MoldRepairDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(MoldRepairDO::getCreateTime); - - // 单独处理 ids 条件 - if (StringUtils.isNotBlank(reqVO.getIds())) { - List idList = Arrays.stream(reqVO.getIds().split(",")) - .map(String::trim) - .map(Long::valueOf) - .collect(Collectors.toList()); - dvRepairDOLambdaQueryWrapperX.in(MoldRepairDO::getId, idList); - } - - return selectPage(reqVO,dvRepairDOLambdaQueryWrapperX ); - } - -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjitem/ZjItemMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjitem/ZjItemMapper.java index caee6cc99..3691ac4df 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjitem/ZjItemMapper.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjitem/ZjItemMapper.java @@ -1,11 +1,14 @@ package cn.iocoder.yudao.module.mes.dal.mysql.zjitem; import java.util.*; +import java.util.stream.Collectors; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairDO; import cn.iocoder.yudao.module.mes.dal.dataobject.zjitem.ZjItemDO; +import com.alibaba.excel.util.StringUtils; import org.apache.ibatis.annotations.Mapper; import cn.iocoder.yudao.module.mes.controller.admin.zjitem.vo.*; @@ -18,7 +21,8 @@ import cn.iocoder.yudao.module.mes.controller.admin.zjitem.vo.*; public interface ZjItemMapper extends BaseMapperX { default PageResult selectPage(ZjItemPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() + LambdaQueryWrapperX zjItemDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>(); + zjItemDOLambdaQueryWrapperX .eqIfPresent(ZjItemDO::getZjType, reqVO.getZjType()) .likeIfPresent(ZjItemDO::getName, reqVO.getName()) .likeIfPresent(ZjItemDO::getRemark, reqVO.getRemark()) @@ -28,7 +32,18 @@ public interface ZjItemMapper extends BaseMapperX { .eqIfPresent(ZjItemDO::getUpperVal, reqVO.getUpperVal()) .eqIfPresent(ZjItemDO::getLowerVal, reqVO.getLowerVal()) .betweenIfPresent(ZjItemDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(ZjItemDO::getId)); + .orderByDesc(ZjItemDO::getId); + + // 单独处理 ids 条件 + if (StringUtils.isNotBlank(reqVO.getIds())) { + List idList = Arrays.stream(reqVO.getIds().split(",")) + .map(String::trim) + .map(Long::valueOf) + .collect(Collectors.toList()); + zjItemDOLambdaQueryWrapperX.in(ZjItemDO::getId, idList); + } + + return selectPage(reqVO,zjItemDOLambdaQueryWrapperX ); } } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjschema/ZjSchemaMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjschema/ZjSchemaMapper.java index 60695e887..e895ebe01 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjschema/ZjSchemaMapper.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjschema/ZjSchemaMapper.java @@ -1,11 +1,14 @@ package cn.iocoder.yudao.module.mes.dal.mysql.zjschema; import java.util.*; +import java.util.stream.Collectors; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairDO; import cn.iocoder.yudao.module.mes.dal.dataobject.zjschema.ZjSchemaDO; +import com.alibaba.excel.util.StringUtils; import org.apache.ibatis.annotations.Mapper; import cn.iocoder.yudao.module.mes.controller.admin.zjschema.vo.*; @@ -18,7 +21,8 @@ import cn.iocoder.yudao.module.mes.controller.admin.zjschema.vo.*; public interface ZjSchemaMapper extends BaseMapperX { default PageResult selectPage(ZjSchemaPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() + LambdaQueryWrapperX zjSchemaDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>(); + zjSchemaDOLambdaQueryWrapperX .eqIfPresent(ZjSchemaDO::getType, reqVO.getType()) .likeIfPresent(ZjSchemaDO::getName, reqVO.getName()) .eqIfPresent(ZjSchemaDO::getRemark, reqVO.getRemark()) @@ -26,9 +30,21 @@ public interface ZjSchemaMapper extends BaseMapperX { .eqIfPresent(ZjSchemaDO::getVal, reqVO.getVal()) .eqIfPresent(ZjSchemaDO::getItem, reqVO.getItem()) .betweenIfPresent(ZjSchemaDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(ZjSchemaDO::getId)); + .orderByDesc(ZjSchemaDO::getId); + + if (StringUtils.isNotBlank(reqVO.getIds())) { + List idList = Arrays.stream(reqVO.getIds().split(",")) + .map(String::trim) + .map(Long::valueOf) + .collect(Collectors.toList()); + zjSchemaDOLambdaQueryWrapperX.in(ZjSchemaDO::getId, idList); + } + + return selectPage(reqVO, zjSchemaDOLambdaQueryWrapperX); } + + default ZjSchemaDO selectByName(String name) { return selectOne(new LambdaQueryWrapperX() .eq(ZjSchemaDO::getName, name)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjtask/ZjTaskMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjtask/ZjTaskMapper.java index b5221f840..b2eef6835 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjtask/ZjTaskMapper.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjtask/ZjTaskMapper.java @@ -1,11 +1,14 @@ package cn.iocoder.yudao.module.mes.dal.mysql.zjtask; import java.util.*; +import java.util.stream.Collectors; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairDO; import cn.iocoder.yudao.module.mes.dal.dataobject.zjtask.ZjTaskDO; +import com.alibaba.excel.util.StringUtils; import org.apache.ibatis.annotations.Mapper; import cn.iocoder.yudao.module.mes.controller.admin.zjtask.vo.*; @@ -18,7 +21,8 @@ import cn.iocoder.yudao.module.mes.controller.admin.zjtask.vo.*; public interface ZjTaskMapper extends BaseMapperX { default PageResult selectPage(ZjTaskPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() + LambdaQueryWrapperX zjTaskDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>(); + zjTaskDOLambdaQueryWrapperX .eqIfPresent(ZjTaskDO::getCode, reqVO.getCode()) .likeIfPresent(ZjTaskDO::getName, reqVO.getName()) .eqIfPresent(ZjTaskDO::getType, reqVO.getType()) @@ -34,7 +38,17 @@ public interface ZjTaskMapper extends BaseMapperX { .eqIfPresent(ZjTaskDO::getStatus, reqVO.getStatus()) .eqIfPresent(ZjTaskDO::getResult, reqVO.getResult()) .betweenIfPresent(ZjTaskDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(ZjTaskDO::getId)); + .orderByDesc(ZjTaskDO::getId); + + if (StringUtils.isNotBlank(reqVO.getIds())) { + List idList = Arrays.stream(reqVO.getIds().split(",")) + .map(String::trim) + .map(Long::valueOf) + .collect(Collectors.toList()); + zjTaskDOLambdaQueryWrapperX.in(ZjTaskDO::getId, idList); + } + + return selectPage(reqVO,zjTaskDOLambdaQueryWrapperX ); } } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjtype/ZjTypeMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjtype/ZjTypeMapper.java index 074d65f53..4eb309c4a 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjtype/ZjTypeMapper.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjtype/ZjTypeMapper.java @@ -1,11 +1,14 @@ package cn.iocoder.yudao.module.mes.dal.mysql.zjtype; import java.util.*; +import java.util.stream.Collectors; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairDO; import cn.iocoder.yudao.module.mes.dal.dataobject.zjtype.ZjTypeDO; +import com.alibaba.excel.util.StringUtils; import org.apache.ibatis.annotations.Mapper; import cn.iocoder.yudao.module.mes.controller.admin.zjtype.vo.*; @@ -18,12 +21,23 @@ import cn.iocoder.yudao.module.mes.controller.admin.zjtype.vo.*; public interface ZjTypeMapper extends BaseMapperX { default PageResult selectPage(ZjTypePageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() + LambdaQueryWrapperX zjTypeDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>(); + zjTypeDOLambdaQueryWrapperX .eqIfPresent(ZjTypeDO::getCode, reqVO.getCode()) .likeIfPresent(ZjTypeDO::getName, reqVO.getName()) .likeIfPresent(ZjTypeDO::getRemark, reqVO.getRemark()) .betweenIfPresent(ZjTypeDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(ZjTypeDO::getId)); + .orderByDesc(ZjTypeDO::getId); + + if (StringUtils.isNotBlank(reqVO.getIds())) { + List idList = Arrays.stream(reqVO.getIds().split(",")) + .map(String::trim) + .map(Long::valueOf) + .collect(Collectors.toList()); + zjTypeDOLambdaQueryWrapperX.in(ZjTypeDO::getId, idList); + } + + return selectPage(reqVO,zjTypeDOLambdaQueryWrapperX ); } } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/redis/no/MesNoRedisDAO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/redis/no/MesNoRedisDAO.java index 9b0ec2799..d97cd669d 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/redis/no/MesNoRedisDAO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/redis/no/MesNoRedisDAO.java @@ -23,7 +23,7 @@ public class MesNoRedisDAO { /** - * 模具 {@link cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO} + * 模具 {@link cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO} */ public static final String MOLD_NO_PREFIX = "MUJU-"; public static final String MOLD_RECORD_NO_PREFIX = "MR-"; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerService.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerService.java index ab0e188ab..e11f9509c 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerService.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerService.java @@ -4,7 +4,7 @@ import java.util.*; import javax.validation.*; import cn.iocoder.yudao.module.erp.controller.admin.mold.vo.MoldRespVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO; +import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO; import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO; import cn.iocoder.yudao.module.mes.controller.admin.deviceledger.vo.*; import cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger.DeviceLedgerDO; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java index 9c2063896..7d131bc6a 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java @@ -4,15 +4,15 @@ import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.framework.common.util.collection.MapUtils; import cn.iocoder.yudao.module.erp.controller.admin.mold.vo.MoldRespVO; import cn.iocoder.yudao.module.erp.controller.admin.product.vo.product.ErpProductRespVO; -import cn.iocoder.yudao.module.erp.dal.dataobject.mold.MoldDO; -import cn.iocoder.yudao.module.erp.dal.mysql.mold.MoldMapper; +import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldBrandDO; +import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO; +import cn.iocoder.yudao.module.common.dal.mysql.mold.MoldMapper; import cn.iocoder.yudao.module.mes.dal.dataobject.devicetype.DeviceTypeDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldBrandDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO; import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO; import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductUnitDO; +import cn.iocoder.yudao.module.common.dal.mysql.mold.MoldMapper; import cn.iocoder.yudao.module.mes.dal.mysql.devicetype.DeviceTypeMapper; -import cn.iocoder.yudao.module.mes.dal.mysql.mold.MesMoldMapper; +import cn.iocoder.yudao.module.common.dal.mysql.mold.MoldMapper; import cn.iocoder.yudao.module.erp.dal.mysql.product.ErpProductMapper; import cn.iocoder.yudao.module.erp.service.product.ErpProductUnitService; import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.enums.PlanTypeEnum; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairService.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairService.java index a3c8a0166..7e58b8a09 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairService.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairService.java @@ -1,10 +1,11 @@ package cn.iocoder.yudao.module.mes.service.dvrepair; import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo.dashboard.EventStatisticsVO; import cn.iocoder.yudao.module.mes.controller.admin.dvrepair.vo.*; import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairDO; import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairLineDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairDO; import javax.validation.Valid; import java.util.List; @@ -75,4 +76,8 @@ public interface DvRepairService { Long getRepairListCountByRepairStatus(); List getDvRepairDOListByStatus(); + + void selectCountDeviceRepair(EventStatisticsVO eventStatisticsVO); + + List getList(); } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairServiceImpl.java index 3726d4951..5214bafc4 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairServiceImpl.java @@ -5,14 +5,16 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.module.iot.dal.dataobject.devicemodel.DeviceModelDO; +import cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo.dashboard.EventStatisticsVO; import cn.iocoder.yudao.module.mes.controller.admin.dvrepair.enums.RepairResultEnum; +import cn.iocoder.yudao.module.mes.controller.admin.dvrepair.enums.RepairStatusEnum; import cn.iocoder.yudao.module.mes.controller.admin.dvrepair.vo.*; import cn.iocoder.yudao.module.mes.controller.admin.ticketresults.enums.JobResultEnum; import cn.iocoder.yudao.module.mes.controller.admin.ticketresults.vo.TicketResultsSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.devicetype.DeviceTypeDO; import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairDO; import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairLineDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairDO; import cn.iocoder.yudao.module.mes.dal.dataobject.ticketmanagement.TicketManagementDO; import cn.iocoder.yudao.module.mes.dal.dataobject.ticketresults.TicketResultsDO; import cn.iocoder.yudao.module.mes.dal.mysql.dvrepair.DvRepairLineMapper; @@ -283,6 +285,21 @@ public class DvRepairServiceImpl implements DvRepairService { } + @Override + public void selectCountDeviceRepair(EventStatisticsVO eventStatisticsVO) { + + //设备待维修数量 + int count = dvRepairMapper.selectCount(Wrappers.lambdaQuery() + .eq(DvRepairDO::getStatus, RepairStatusEnum.PENDING.getCode())).intValue(); + + eventStatisticsVO.setDeviceRepair(count); + } + + @Override + public List getList() { + return dvRepairMapper.selectList(); + } + private LocalDateTime parseToLocalDateTime(String timeStr) { if (StringUtils.isBlank(timeStr)) { diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/energydevice/EnergyDeviceServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/energydevice/EnergyDeviceServiceImpl.java index b05095392..ecc92e70d 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/energydevice/EnergyDeviceServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/energydevice/EnergyDeviceServiceImpl.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.mes.service.energydevice; +import cn.iocoder.yudao.framework.common.pojo.DeviceEdgeData; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; @@ -25,9 +26,7 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import java.math.BigDecimal; -import java.nio.charset.StandardCharsets; import java.text.DecimalFormat; -import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.util.*; @@ -249,972 +248,253 @@ public class EnergyDeviceServiceImpl implements EnergyDeviceService { } @Override - public List queryDataRecords(EnergyDeviceConsumptionReqVO deviceConsumptionReqVO) { + public List queryDataRecords(EnergyDeviceConsumptionReqVO req) { List result = new ArrayList<>(); - List energyDeviceDO = energyDeviceMapper.selectList( - Wrappers.lambdaQuery() - .in(StringUtils.isNotBlank(deviceConsumptionReqVO.getIds()), - EnergyDeviceDO::getId, - StringUtils.isNotBlank(deviceConsumptionReqVO.getIds()) - ? Arrays.asList(deviceConsumptionReqVO.getIds().split(",")) - : null) - .like(StringUtils.isNotBlank(deviceConsumptionReqVO.getName()), EnergyDeviceDO::getName, deviceConsumptionReqVO.getName()) - .eq(deviceConsumptionReqVO.getOrgId() != null, EnergyDeviceDO::getOrgId, deviceConsumptionReqVO.getOrgId()) - .orderByDesc(EnergyDeviceDO::getCreateTime)); - if (energyDeviceDO == null || energyDeviceDO.isEmpty()) { - throw exception(ENERGY_LIST_NOT_EXISTS); - } - - for (EnergyDeviceDO deviceDO : energyDeviceDO) { - if (StringUtils.isBlank(deviceDO.getRules())) { - continue; - } + // 查询设备列表 + List devices = queryDevices(req); + if (devices.isEmpty()) return result; - // 解析规则 - List operationRulesVOList = JSON.parseArray(deviceDO.getRules(), OperationRulesVO.class); - if (operationRulesVOList == null || operationRulesVOList.isEmpty()) { - continue; - } - - try { - // 计算设备结果 - EnergyDeviceRespVO deviceRespVO = buildEnergyDeviceRespVO(deviceDO, operationRulesVOList, deviceConsumptionReqVO.getStartTime(), deviceConsumptionReqVO.getEndTime()); - if (deviceRespVO != null) { - result.add(deviceRespVO); - } - } catch (Exception e) { - log.error("计算设备结果失败, deviceId: {}", deviceDO.getId(), e); + // 解析规则 & 收集所有 ruleDeviceIds 和点位ID + Map> deviceRulesMap = new HashMap<>(); + Set ruleDeviceIds = new HashSet<>(); + Set pointIds = new HashSet<>(); + for (EnergyDeviceDO device : devices) { + List rules = parseRules(device); + if (!rules.isEmpty()) { + deviceRulesMap.put(device.getId(), rules); + rules.forEach(r -> { + if (r.getDeviceId() != null) ruleDeviceIds.add(r.getDeviceId()); + if (r.getPointId() != null) pointIds.add(r.getPointId()); + }); } } - return result; - } + if (ruleDeviceIds.isEmpty()) return result; - /** - * 构建EnergyDeviceRespVO对象 - */ - private EnergyDeviceRespVO buildEnergyDeviceRespVO(EnergyDeviceDO deviceDO, - List rules, - String startTime, String endTime) { - if (deviceDO == null || rules == null || rules.isEmpty()) { - return null; - } - - EnergyDeviceRespVO respVO = new EnergyDeviceRespVO(); - - // 设置设备基本信息 - respVO.setId(deviceDO.getId()); - respVO.setName(deviceDO.getName()); - respVO.setCode(deviceDO.getCode()); - respVO.setInfo(deviceDO.getInfo()); - respVO.setCheckCron(deviceDO.getCheckCron()); - respVO.setLastCheckTime(deviceDO.getLastCheckTime()); - respVO.setLastCheckValue(deviceDO.getLastCheckValue()); - respVO.setUnitName(deviceDO.getUnitName()); - respVO.setIsEnable(deviceDO.getIsEnable()); - respVO.setCreateTime(deviceDO.getCreateTime()); - respVO.setUpdateTime(deviceDO.getUpdateTime()); - respVO.setDeviceTypeId(deviceDO.getDeviceTypeId()); - respVO.setDeviceTypeName(deviceDO.getDeviceTypeName()); - respVO.setOrgId(deviceDO.getOrgId()); - respVO.setOrgName(deviceDO.getOrgName()); - respVO.setRules(deviceDO.getRules()); - respVO.setOperationRulesVOList(rules); - - // 计算数据结果 - Map calculationResult = calculateDeviceData(deviceDO, rules, startTime, endTime); - if (calculationResult == null) { - return respVO; - } + // TDengine 查询所有设备首末数据 + Map edgeDataMap = + tDengineService.queryDeviceFirstAndLast(ruleDeviceIds, req.getStartTime(), req.getEndTime()); - // 设置能耗总用量差值 - Double totalDifference = (Double) calculationResult.get("totalDifference"); - if (totalDifference != null) { - respVO.setEnergyConsumption(formatDouble(totalDifference)); - } else { - respVO.setEnergyConsumption("0.0"); - } + // 构建缓存 + Map firstCache = buildCache(edgeDataMap, true); + Map lastCache = buildCache(edgeDataMap, false); - // 设置最新和最晚数据时间 - if (StringUtils.isNotBlank(startTime)) { - respVO.setEarliestDataTime(formatDateTime(startTime, "yyyy-MM-dd HH:mm")); - } - if (StringUtils.isNotBlank(endTime)) { - respVO.setLatestDataTime(formatDateTime(endTime, "yyyy-MM-dd HH:mm")); - } + // 批量获取点位信息（名称/单位）避免 N+1 查询 + Map pointInfoMap = batchGetPointInfoFromLocalDB(new ArrayList<>(pointIds)); - // 构建点位详情列表 - List pointDetails = buildPointDetails(calculationResult, deviceDO, rules); - respVO.setPointDetails(pointDetails); + // 逐设备计算 EnergyDeviceRespVO + for (EnergyDeviceDO device : devices) { + List rules = deviceRulesMap.get(device.getId()); + if (rules == null || rules.isEmpty()) continue; - return respVO; - } - - /** - * 格式化时间为指定格式 - */ - private String formatDateTime(String time, String pattern) { - if (StringUtils.isBlank(time)) { - return ""; - } - - try { - // 常见时间格式列表 - String[] possiblePatterns = { - "yyyy-MM-dd HH:mm:ss", - "yyyy-MM-dd HH:mm:ss.SSS", - "yyyy-MM-dd'T'HH:mm:ss", - "yyyy-MM-dd'T'HH:mm:ss.SSS", - "yyyy/MM/dd HH:mm:ss", - "yyyy-MM-dd HH:mm" - }; - - for (String possiblePattern : possiblePatterns) { - try { - SimpleDateFormat sdf = new SimpleDateFormat(possiblePattern); - Date date = sdf.parse(time); - SimpleDateFormat targetFormat = new SimpleDateFormat(pattern); - return targetFormat.format(date); - } catch (Exception e) { - continue; - } - } - - // 如果解析失败，尝试简单截取 - if (time.length() >= 16) { - return time.substring(0, 16); - } - - } catch (Exception e) { - log.warn("时间格式化失败: {}", time, e); - } - - return time; - } - /** - * 从数据中获取时间 - */ - /** - * 从数据中获取时间，格式化为 yyyy-MM-dd HH:mm:ss - */ - private String getTimeFromData(Map calculationResult, String dataKey) { - if (calculationResult == null || dataKey == null) { - return ""; + EnergyDeviceRespVO vo = calculateDevice(device, rules, firstCache, lastCache, pointInfoMap, req); + result.add(vo); } - Map timeData = (Map) calculationResult.get(dataKey); - if (timeData == null) { - return ""; - } - - Object timestamp = timeData.get("timestamp"); - if (timestamp == null) { - return ""; - } - - String timeStr = timestamp.toString(); - - // 如果已经是目标格式的长度，直接返回 - if (timeStr.length() == 19) { // yyyy-MM-dd HH:mm:ss - return timeStr; - } - - // 如果有毫秒部分，截取前19位 - if (timeStr.length() > 19 && timeStr.charAt(19) == '.') { - return timeStr.substring(0, 19); - } - - // 如果是其他格式，尝试解析 - try { - // 移除毫秒部分 - if (timeStr.contains(".")) { - timeStr = timeStr.substring(0, timeStr.indexOf(".")); - } - - // 确保格式正确 - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - SimpleDateFormat originalSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); - - try { - // 尝试用带毫秒的格式解析 - Date date = originalSdf.parse(timeStr); - return sdf.format(date); - } catch (Exception e) { - // 尝试不带毫秒解析 - try { - Date date = sdf.parse(timeStr); - return sdf.format(date); - } catch (Exception e2) { - // 如果不是标准格式，只做简单截取 - if (timeStr.length() > 19) { - return timeStr.substring(0, Math.min(19, timeStr.length())); - } - return timeStr; - } - } - } catch (Exception e) { - return timeStr; - } - } - - /** - * 从查询结果中提取特定点位的数据 - */ - private Map getPointData(Map dataMap, Long pointId) { - if (dataMap == null || pointId == null) { - return null; - } - - try { - Object queryDataObj = dataMap.get("queryData"); - if (queryDataObj == null) { - return null; - } - - String queryData = queryDataObj.toString(); - if (StringUtils.isBlank(queryData)) { - return null; - } - -// // 处理编码问题 -// queryData = fixEncoding(queryData); - - // 解析JSON数组 - JSONArray jsonArray = JSON.parseArray(queryData); - - for (int i = 0; i < jsonArray.size(); i++) { - JSONObject jsonObj = jsonArray.getJSONObject(i); - - // 安全获取id - Long dataPointId = null; - try { - dataPointId = jsonObj.getLong("id"); - } catch (Exception e) { - continue; - } - - if (dataPointId == null) { - continue; - } - - // 匹配点位ID - if (pointId.equals(dataPointId)) { - Map pointData = new HashMap<>(); - - // 提取所有需要的字段 - pointData.put("id", dataPointId); - - // 安全获取字段 - pointData.put("address", getJsonString(jsonObj, "address")); - - // 处理值 - Object value = jsonObj.get("addressValue"); - Double doubleValue = null; - if (value != null) { - try { - if (value instanceof Number) { - doubleValue = ((Number) value).doubleValue(); - } else { - doubleValue = Double.parseDouble(value.toString()); - } - } catch (NumberFormatException e) { - log.warn("点位值无法转换为数字: pointId={}, value={}", pointId, value); - doubleValue = null; - } - } - pointData.put("value", doubleValue); - pointData.put("addressValue", value); - - pointData.put("attributeCode", getJsonString(jsonObj, "attributeCode")); - pointData.put("attributeName", getJsonString(jsonObj, "attributeName")); - pointData.put("attributeType", getJsonString(jsonObj, "attributeType")); - pointData.put("dataType", getJsonString(jsonObj, "dataType")); - pointData.put("dataUnit", getJsonString(jsonObj, "dataUnit")); - - // 安全获取ratio - try { - Float ratio = jsonObj.getFloat("ratio"); - pointData.put("ratio", ratio); - } catch (Exception e) { - pointData.put("ratio", null); - } - - return pointData; - } - } - - } catch (Exception e) { - log.error("解析点位数据失败, pointId: {}", pointId, e); - } - - return null; - } - - /** - * 从JSON对象安全获取字符串 - */ - private String getJsonString(JSONObject jsonObj, String key) { - try { - return jsonObj.getString(key); - } catch (Exception e) { - return ""; - } + return result; } - /** - * 格式化double值为字符串 - */ - private String formatDouble(Double value) { - if (value == null) { - return "0.0"; - } +// =================== 核心方法 =================== - DecimalFormat df = new DecimalFormat("#.##"); - return df.format(value); + /** 查询设备列表 */ + private List queryDevices(EnergyDeviceConsumptionReqVO req) { + return energyDeviceMapper.selectList( + Wrappers.lambdaQuery() + .in(StringUtils.isNotBlank(req.getIds()), + EnergyDeviceDO::getId, + StringUtils.isNotBlank(req.getIds()) + ? Arrays.asList(req.getIds().split(",")) + : null) + .like(StringUtils.isNotBlank(req.getName()), EnergyDeviceDO::getName, req.getName()) + .eq(req.getOrgId() != null, EnergyDeviceDO::getOrgId, req.getOrgId()) + .orderByDesc(EnergyDeviceDO::getCreateTime) + ); } - /** - * 计算设备数据 - */ - private Map calculateDeviceData(EnergyDeviceDO deviceDO, - List rules, - String startTime, String endTime) { - if (deviceDO == null || rules == null || rules.isEmpty()) { - return null; - } - - Map result = new HashMap<>(); - + /** 解析设备规则 */ + private List parseRules(EnergyDeviceDO device) { + if (device == null || StringUtils.isBlank(device.getRules())) return Collections.emptyList(); try { - // 分别计算最新和最晚时间的数据 - Map latestData = getTimePointData(rules, startTime, endTime, true); - Map earliestData = getTimePointData(rules, startTime, endTime, false); - - if (latestData == null || earliestData == null) { - return result; - } - - // 提取实际采集时间 - String latestTime = extractTimestamp(latestData); - String earliestTime = extractTimestamp(earliestData); - - // 使用相同的规则计算两个时间点的总值 - Double latestTotal = calculateTotalByRules(latestData, rules); - Double earliestTotal = calculateTotalByRules(earliestData, rules); - - // 计算每个点位的差值 - List> pointDifferences = calculatePointDifferences(latestData, earliestData, rules); - - result.put("latestData", latestData); - result.put("earliestData", earliestData); - result.put("latestTime", latestTime); - result.put("earliestTime", earliestTime); - result.put("latestTotal", latestTotal != null ? latestTotal : 0.0); - result.put("earliestTotal", earliestTotal != null ? earliestTotal : 0.0); - result.put("totalDifference", (latestTotal != null && earliestTotal != null) ? - latestTotal - earliestTotal : 0.0); - result.put("pointDifferences", pointDifferences != null ? pointDifferences : Collections.emptyList()); - + return JSON.parseArray(device.getRules(), OperationRulesVO.class); } catch (Exception e) { - log.error("计算设备数据失败, deviceId: {}", deviceDO.getId(), e); - } - - return result; - } - - /** - * 从数据中提取时间戳 - */ - private String extractTimestamp(Map timePointData) { - if (timePointData == null) { - return ""; - } - - Object timestamp = timePointData.get("timestamp"); - if (timestamp != null) { - return timestamp.toString(); - } - - return ""; - } - - /** - * 从设备数据中获取点位值 - */ - private Double getPointValueFromDataByDevice(Map timePointData, Long deviceId, Long pointId) { - if (timePointData == null || deviceId == null || pointId == null) { - return null; + log.error("解析规则失败, deviceId={}", device.getId(), e); + return Collections.emptyList(); } - - String deviceKey = "device_" + deviceId; - Map deviceData = (Map) timePointData.get(deviceKey); - if (deviceData == null) { - return null; - } - - return getPointValueFromData(deviceData, pointId); } - /** - * 获取点位值 - */ - private Double getPointValueFromData(Map dataMap, Long pointId) { - if (dataMap == null || pointId == null) { - return null; - } - - Map pointData = getPointData(dataMap, pointId); - if (pointData != null) { - Object value = pointData.get("value"); - if (value instanceof Double) { - return (Double) value; - } else if (value instanceof Number) { - return ((Number) value).doubleValue(); - } + /** 构建缓存 */ + private Map buildCache(Map dataMap, boolean first) { + Map cache = new HashMap<>(); + for (DeviceEdgeData d : dataMap.values()) { + TimePointCache c = new TimePointCache(); + c.setTimestamp(first ? d.getFirstTs() : d.getLastTs()); + c.setQueryData(first ? d.getFirstData() : d.getLastData()); + cache.put(d.getDeviceId(), c); } - return null; + return cache; } - /** - * 获取指定时间点的数据 - */ - private Map getTimePointData(List rules, - String startTime, String endTime, - boolean isLatest) { - if (rules == null || rules.isEmpty()) { - return null; - } - - Map timePointData = new HashMap<>(); - String timestamp = null; + /** 单设备计算 */ + private EnergyDeviceRespVO calculateDevice(EnergyDeviceDO device, + List rules, + Map firstCache, + Map lastCache, + Map pointInfoMap, + EnergyDeviceConsumptionReqVO req) { - for (OperationRulesVO rule : rules) { - if (rule == null || rule.getDeviceId() == null) { - continue; - } - - List> maps = null; - try { - maps = tDengineService.getstDeviceDataOrderByTimeDesc( - rule.getDeviceId(), startTime, endTime,null); - } catch (Exception e) { - log.error("查询设备数据失败, deviceId: {}", rule.getDeviceId(), e); - continue; - } - - if (maps == null || maps.isEmpty()) { - continue; - } - - Map dataMap = null; - try { - if (isLatest) { - dataMap = maps.get(0); - } else { - dataMap = maps.get(maps.size() - 1); - } - } catch (Exception e) { - log.error("获取时间点数据失败, deviceId: {}, isLatest: {}", rule.getDeviceId(), isLatest, e); - continue; - } - - if (dataMap == null) { - continue; - } + Double firstTotal = calculateByRules(rules, firstCache); + Double lastTotal = calculateByRules(rules, lastCache); - if (timestamp == null && dataMap.containsKey("timestamp")) { - Object tsObj = dataMap.get("timestamp"); - if (tsObj != null) { - timestamp = tsObj.toString(); - } - } + EnergyDeviceRespVO vo = new EnergyDeviceRespVO(); + vo.setId(device.getId()); + vo.setName(device.getName()); + vo.setCode(device.getCode()); + vo.setOrgId(device.getOrgId()); + vo.setOrgName(device.getOrgName()); + vo.setCreateTime(device.getCreateTime()); + vo.setUpdateTime(device.getUpdateTime()); + vo.setRules(device.getRules()); - String deviceKey = "device_" + rule.getDeviceId(); - if (!timePointData.containsKey(deviceKey)) { - timePointData.put(deviceKey, dataMap); - } - } + vo.setEnergyConsumption(formatDouble(lastTotal - firstTotal)); + vo.setEarliestDataTime(req.getStartTime()); + vo.setLatestDataTime(req.getEndTime()); - if (timestamp != null) { - timePointData.put("timestamp", timestamp); - } else { - timePointData.put("timestamp", ""); - } + // 构建点位详情 + vo.setPointDetails(buildPointDetails(rules, firstCache, lastCache, pointInfoMap)); - return timePointData.isEmpty() ? null : timePointData; + return vo; } - /** - * 根据规则计算总值 - */ - private Double calculateTotalByRules(Map timePointData, List rules) { - if (timePointData == null || timePointData.isEmpty() || rules == null || rules.isEmpty()) { - return 0.0; - } - + /** 根据规则计算总值 */ + private Double calculateByRules(List rules, Map cache) { Double total = null; - String lastOperator = null; + String lastOp = "+"; - for (int i = 0; i < rules.size(); i++) { - OperationRulesVO rule = rules.get(i); - if (rule == null || rule.getDeviceId() == null || rule.getPointId() == null) { - continue; - } + for (OperationRulesVO r : rules) { + TimePointCache c = cache.get(r.getDeviceId()); + if (c == null) continue; - String deviceKey = "device_" + rule.getDeviceId(); - Map deviceData = (Map) timePointData.get(deviceKey); - if (deviceData == null) { - continue; - } - - Double pointValue = getPointValueFromData(deviceData, rule.getPointId()); - if (pointValue == null) { - continue; - } + Double value = getPointValue(c, r.getPointId()); + if (value == null) continue; if (total == null) { - total = pointValue; + total = value; } else { - String operator = null; - if (rule.getOperator() != null) { - operator = rule.getOperator().trim(); - } - - if (StringUtils.isEmpty(operator)) { - operator = lastOperator; - } - - if (StringUtils.isNotEmpty(operator)) { - try { - total = applyOperator(total, pointValue, operator); - } catch (Exception e) { - log.error("应用运算符失败: current={}, value={}, operator={}", total, pointValue, operator, e); - total += pointValue; - } - } else { - total += pointValue; - } + total = applyOperator(total, value, StringUtils.defaultIfBlank(r.getOperator(), lastOp)); } - lastOperator = rule.getOperator(); + lastOp = r.getOperator(); } return total != null ? total : 0.0; } - /** - * 计算每个点位的差值 - */ - private List> calculatePointDifferences(Map latestData, - Map earliestData, - List rules) { - List> differences = new ArrayList<>(); - - if (rules == null || rules.isEmpty()) { - return differences; - } - - for (OperationRulesVO rule : rules) { - if (rule == null || rule.getDeviceId() == null || rule.getPointId() == null) { - continue; - } - - Map pointDiff = new HashMap<>(); - pointDiff.put("pointId", rule.getPointId()); - pointDiff.put("operator", rule.getOperator() != null ? rule.getOperator() : ""); - pointDiff.put("deviceId", rule.getDeviceId()); - - Double latestValue = getPointValueFromDataByDevice(latestData, rule.getDeviceId(), rule.getPointId()); - Double earliestValue = getPointValueFromDataByDevice(earliestData, rule.getDeviceId(), rule.getPointId()); - - pointDiff.put("latestValue", latestValue != null ? latestValue : 0.0); - pointDiff.put("earliestValue", earliestValue != null ? earliestValue : 0.0); - - if (latestValue != null && earliestValue != null) { - Double difference = latestValue - earliestValue; - pointDiff.put("difference", difference); - } else if (latestValue != null) { - pointDiff.put("difference", latestValue); - } else if (earliestValue != null) { - pointDiff.put("difference", -earliestValue); - } else { - pointDiff.put("difference", 0.0); - } - - differences.add(pointDiff); - } - - return differences; - } - - /** - * 应用运算符计算 - */ - private Double applyOperator(Double current, Double value, String operator) { - if (current == null || value == null || operator == null) { - return current; - } - - String op = operator.trim(); - switch (op) { - case "+": - return current + value; - case "-": - return current - value; - case "*": - return current * value; - case "/": - if (Math.abs(value) > 0.000001) { // 避免除零 - return current / value; - } else { - log.warn("除数不能为0: current={}, value={}", current, value); - return current; - } - default: - log.warn("不支持的操作符: {}, 使用加法", operator); - return current + value; - } - } - - /** - * 修复编码问题 - */ - private String fixEncoding(String str) { - if (StringUtils.isBlank(str)) { - return str; + /** 延迟解析 JSON 获取点位值 */ + private Double getPointValue(TimePointCache cache, Long pointId) { + if (cache == null || pointId == null) return null; + if (cache.getPointIndex() == null) { + cache.setPointIndex(buildPointIndex(cache.getQueryData())); } + JSONObject obj = cache.getPointIndex().get(pointId); + if (obj == null) return null; + Object v = obj.get("addressValue"); + if (v instanceof Number) return ((Number) v).doubleValue(); try { - // 尝试UTF-8解码 - byte[] bytes = str.getBytes(StandardCharsets.ISO_8859_1); - return new String(bytes, StandardCharsets.UTF_8); + return Double.parseDouble(String.valueOf(v)); } catch (Exception e) { - return str; + return null; } } + /** 构建 JSON 点位索引 */ + private Map buildPointIndex(String jsonData) { + Map index = new HashMap<>(); + if (StringUtils.isBlank(jsonData)) return index; - /** - * 构建点位详情列表 - * 包含：点位名称、最早值、最晚值、相差值、时间、单位等信息 - */ - private List buildPointDetails(Map calculationResult, - EnergyDeviceDO deviceDO, - List originalRules) { - List result = new ArrayList<>(); - - if (calculationResult == null || originalRules == null || originalRules.isEmpty()) { - return result; - } - - List> pointDifferences = (List>) calculationResult.get("pointDifferences"); - if (pointDifferences == null || pointDifferences.isEmpty()) { - return result; - } - - Map latestData = (Map) calculationResult.get("latestData"); - Map earliestData = (Map) calculationResult.get("earliestData"); - - // 收集所有点位ID - List allPointIds = new ArrayList<>(); - for (Map pointDiff : pointDifferences) { - Long pointId = (Long) pointDiff.get("pointId"); - if (pointId != null) { - allPointIds.add(pointId); - } - } - - // 批量从本地数据库获取点位信息 - Map pointInfoMap = batchGetPointInfoFromLocalDB(allPointIds); - - for (Map pointDiff : pointDifferences) { - Long pointId = (Long) pointDiff.get("pointId"); - Long deviceId = (Long) pointDiff.get("deviceId"); - - if (pointId == null) { - continue; - } - - // 获取点位详细信息 - PointDetailVO pointDetail = new PointDetailVO(); - pointDetail.setPointId(pointId); - pointDetail.setDeviceId(deviceId); - - // 设置运算符 - String operator = (String) pointDiff.get("operator"); - pointDetail.setOperator(operator != null ? operator : ""); - - // 从TD数据获取点位信息和实际采集时间 - setPointDataFromTD(pointDetail, latestData, earliestData, pointId, deviceId, pointDiff); - - // 如果没有从TD数据获取到点位名称，从本地数据库获取 - if (StringUtils.isBlank(pointDetail.getPointName())) { - setPointInfoFromLocalDB(pointDetail, pointInfoMap.get(pointId)); - } - - // 如果没有单位，尝试从本地数据库获取 - if (StringUtils.isBlank(pointDetail.getUnit())) { - setPointUnitFromLocalDB(pointDetail, pointInfoMap.get(pointId)); - } - - // 设置数值 - Double earliestValue = (Double) pointDiff.get("earliestValue"); - Double latestValue = (Double) pointDiff.get("latestValue"); - Double difference = (Double) pointDiff.get("difference"); - - pointDetail.setEarliestValue(formatDouble(earliestValue != null ? earliestValue : 0.0)); - pointDetail.setLatestValue(formatDouble(latestValue != null ? latestValue : 0.0)); - pointDetail.setDifference(formatDouble(difference != null ? difference : 0.0)); - - result.add(pointDetail); - } - - return result; - } - - /** - * 从TD数据库数据中获取点位详细信息 - */ - private void setPointDataFromTD(PointDetailVO pointDetail, - Map latestData, - Map earliestData, - Long pointId, - Long deviceId, - Map pointDiff) { - - // 获取最新数据的时间 - if (latestData != null) { - String deviceKey = "device_" + deviceId; - Map deviceData = (Map) latestData.get(deviceKey); - if (deviceData != null) { - Object timestamp = deviceData.get("timestamp"); - if (timestamp != null) { - pointDetail.setLatestTime(formatToFullTime(timestamp.toString())); - } - } + Object obj = JSON.parse(jsonData); + JSONArray array; + if (obj instanceof JSONArray) { + array = (JSONArray) obj; + } else if (obj instanceof String) { + // 外层字符串 -> 再解析一次 + array = JSON.parseArray((String) obj); + } else { + array = new JSONArray(); } - // 获取最早数据的时间 - if (earliestData != null) { - String deviceKey = "device_" + deviceId; - Map deviceData = (Map) earliestData.get(deviceKey); - if (deviceData != null) { - Object timestamp = deviceData.get("timestamp"); - if (timestamp != null) { - pointDetail.setEarliestTime(formatToFullTime(timestamp.toString())); - } - } - } - // 从最新数据获取点位名称和单位 - if (latestData != null) { - String deviceKey = "device_" + deviceId; - Map deviceData = (Map) latestData.get(deviceKey); - if (deviceData != null) { - Map pointData = getPointData(deviceData, pointId); - if (pointData != null) { - // 获取点位名称 - String pointName = (String) pointData.get("attributeName"); - if (StringUtils.isNotBlank(pointName)) { - pointDetail.setPointName(pointName); - } else { - pointName = (String) pointData.get("attributeCode"); - if (StringUtils.isNotBlank(pointName)) { - pointDetail.setPointName(pointName); - } - } - - // 获取单位 - String unit = (String) pointData.get("dataUnit"); - if (StringUtils.isNotBlank(unit)) { - pointDetail.setUnit(unit); - } - } - } + for (int i = 0; i < array.size(); i++) { + JSONObject jsonObject = array.getJSONObject(i); + Long id = jsonObject.getLong("id"); + if (id != null) index.put(id, jsonObject); } + return index; } - /** - * 格式化为完整时间 yyyy-MM-dd HH:mm:ss - */ - private String formatToFullTime(String time) { - if (StringUtils.isBlank(time)) { - return ""; - } - - try { - String timeStr = time.trim(); - - // 1. 如果已经是 yyyy-MM-dd HH:mm:ss 格式 - if (timeStr.length() >= 19 && timeStr.charAt(4) == '-' && timeStr.charAt(10) == ' ') { - if (timeStr.length() == 19) { - return timeStr; // 直接返回 - } else { - return timeStr.substring(0, 19); // 截取前19位 - } - } - - // 2. ISO格式: 2024-01-15T14:30:00.000+08:00 - if (timeStr.contains("T")) { - timeStr = timeStr.replace("T", " "); - int dotIndex = timeStr.indexOf("."); - if (dotIndex > 0) { - timeStr = timeStr.substring(0, dotIndex); - } else { - int plusIndex = Math.min(timeStr.indexOf("+"), timeStr.indexOf("-", 11)); - if (plusIndex > 0) { - timeStr = timeStr.substring(0, plusIndex); - } else if (timeStr.contains("Z")) { - timeStr = timeStr.substring(0, timeStr.indexOf("Z")); - } - } - return timeStr.length() >= 19 ? timeStr.substring(0, 19) : timeStr; - } - - // 3. 尝试解析 - String[] patterns = { - "yyyy-MM-dd HH:mm:ss", - "yyyy-MM-dd HH:mm:ss.SSS", - "yyyy-MM-dd'T'HH:mm:ss", - "yyyy-MM-dd'T'HH:mm:ss.SSS", - "yyyy/MM/dd HH:mm:ss", - "yyyy/MM/dd HH:mm:ss.SSS" - }; - - for (String pattern : patterns) { - try { - SimpleDateFormat sdf = new SimpleDateFormat(pattern); - Date date = sdf.parse(timeStr); - SimpleDateFormat targetFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - return targetFormat.format(date); - } catch (Exception e) { - continue; - } - } - - } catch (Exception e) { - log.warn("时间格式化失败: {}", time, e); + /** 应用运算符 */ + private Double applyOperator(Double current, Double value, String operator) { + if (current == null || value == null || StringUtils.isBlank(operator)) return current; + switch (operator.trim()) { + case "+": return current + value; + case "-": return current - value; + case "*": return current * value; + case "/": return Math.abs(value) > 1e-6 ? current / value : current; + default: return current + value; } - - return time; } - /** - * 从时间戳中提取时分秒 - */ - private String extractHMSFromTimestamp(String timestamp) { - if (StringUtils.isBlank(timestamp)) { - return ""; - } - - try { - String timeStr = timestamp.trim(); - // 处理多种格式 - // 1. 标准格式: yyyy-MM-dd HH:mm:ss - if (timeStr.length() >= 19) { - return timeStr.substring(11, 19); // 提取 HH:mm:ss - } - - // 2. ISO格式: 2024-01-15T14:30:00.000+08:00 - if (timeStr.contains("T")) { - int tIndex = timeStr.indexOf("T"); - int dotIndex = timeStr.indexOf("."); - if (dotIndex > tIndex) { - return timeStr.substring(tIndex + 1, dotIndex); - } else { - int plusIndex = timeStr.indexOf("+"); - if (plusIndex > tIndex) { - return timeStr.substring(tIndex + 1, plusIndex); - } else if (timeStr.contains("Z") && timeStr.indexOf("Z") > tIndex) { - int zIndex = timeStr.indexOf("Z"); - return timeStr.substring(tIndex + 1, zIndex); - } - } - } + /** 构建点位详情列表并使用本地数据库批量获取点位信息 */ + private List buildPointDetails(List rules, + Map firstCache, + Map lastCache, + Map pointInfoMap) { + List result = new ArrayList<>(); + if (rules == null || rules.isEmpty()) return result; - // 3. 如果是 HH:mm:ss 格式 - if (timeStr.matches("\\d{1,2}:\\d{1,2}:\\d{1,2}")) { - return timeStr; - } + for (OperationRulesVO r : rules) { + PointDetailVO p = new PointDetailVO(); + p.setDeviceId(r.getDeviceId()); + p.setPointId(r.getPointId()); + p.setOperator(r.getOperator()); - // 4. 尝试解析 - try { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); - Date date = sdf.parse(timeStr); - SimpleDateFormat hmsFormat = new SimpleDateFormat("HH:mm:ss"); - return hmsFormat.format(date); - } catch (Exception e) { - // 继续尝试其他格式 - } + Double firstVal = getPointValue(firstCache.get(r.getDeviceId()), r.getPointId()); + Double lastVal = getPointValue(lastCache.get(r.getDeviceId()), r.getPointId()); + p.setEarliestValue(formatDouble(firstVal)); + p.setLatestValue(formatDouble(lastVal)); + p.setDifference(formatDouble((lastVal != null ? lastVal : 0.0) - (firstVal != null ? firstVal : 0.0))); - try { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Date date = sdf.parse(timeStr); - SimpleDateFormat hmsFormat = new SimpleDateFormat("HH:mm:ss"); - return hmsFormat.format(date); - } catch (Exception e) { - // 解析失败 + // 从本地数据库获取点位名称和单位 + DeviceContactModelDO pointInfo = pointInfoMap.get(r.getPointId()); + if (pointInfo != null) { + p.setPointName(StringUtils.isNotBlank(pointInfo.getAttributeName()) + ? pointInfo.getAttributeName() + : pointInfo.getAttributeCode()); + p.setUnit(pointInfo.getDataUnit()); } - } catch (Exception e) { - log.warn("时间格式解析失败: {}", timestamp, e); - } - - return timestamp; - } - - /** - * 从本地数据库获取点位信息 - */ - private void setPointInfoFromLocalDB(PointDetailVO pointDetail, DeviceContactModelDO pointInfo) { - if (pointDetail == null || pointInfo == null) { - return; - } - - if (StringUtils.isBlank(pointDetail.getPointName())) { - if (StringUtils.isNotBlank(pointInfo.getAttributeName())) { - pointDetail.setPointName(pointInfo.getAttributeName()); - } else if (StringUtils.isNotBlank(pointInfo.getAttributeCode())) { - pointDetail.setPointName(pointInfo.getAttributeCode()); - } else { - pointDetail.setPointName("点位" + pointDetail.getPointId()); - } + result.add(p); } + return result; } - /** - * 从本地数据库获取点位单位 - */ - private void setPointUnitFromLocalDB(PointDetailVO pointDetail, DeviceContactModelDO pointInfo) { - if (pointDetail == null || pointInfo == null) { - return; - } - - if (StringUtils.isBlank(pointDetail.getUnit())) { - if (StringUtils.isNotBlank(pointInfo.getDataUnit())) { - pointDetail.setUnit(pointInfo.getDataUnit()); - } - } + /** 格式化 double */ + private String formatDouble(Double value) { + if (value == null) return "0.0"; + return new DecimalFormat("#.##").format(value); } - /** - * 批量获取点位信息（优化性能） - */ + /** 批量获取点位信息（本地数据库） */ private Map batchGetPointInfoFromLocalDB(List pointIds) { Map result = new HashMap<>(); - - if (pointIds == null || pointIds.isEmpty()) { - return result; - } + if (pointIds == null || pointIds.isEmpty()) return result; try { - List deviceContacts = deviceContactModelMapper.selectBatchIds(pointIds); - if (deviceContacts != null && !deviceContacts.isEmpty()) { - for (DeviceContactModelDO deviceContact : deviceContacts) { - if (deviceContact != null && deviceContact.getId() != null) { - result.put(deviceContact.getId(), deviceContact); - } + List contacts = deviceContactModelMapper.selectBatchIds(pointIds); + if (contacts != null) { + for (DeviceContactModelDO c : contacts) { + if (c != null && c.getId() != null) result.put(c.getId(), c); } } } catch (Exception e) { @@ -1224,78 +504,8 @@ public class EnergyDeviceServiceImpl implements EnergyDeviceService { return result; } - /** - * 从TD数据库数据中获取点位名称 - */ - private String getPointNameFromTDData(Map timePointData, Long pointId, Map pointDiff) { - if (timePointData == null || pointId == null || pointDiff == null) { - return null; - } - - Long deviceId = (Long) pointDiff.get("deviceId"); - if (deviceId == null) { - return null; - } - - String deviceKey = "device_" + deviceId; - Map deviceData = (Map) timePointData.get(deviceKey); - if (deviceData == null) { - return null; - } - - Map pointData = getPointData(deviceData, pointId); - if (pointData == null) { - return null; - } - - String attributeName = (String) pointData.get("attributeName"); - if (StringUtils.isNotBlank(attributeName)) { - return attributeName; - } - - String attributeCode = (String) pointData.get("attributeCode"); - if (StringUtils.isNotBlank(attributeCode)) { - return attributeCode; - } - return null; - } - - /** - * 批量获取点位名称（优化性能） - */ - private Map batchGetPointNamesFromLocalDB(List pointIds) { - Map result = new HashMap<>(); - if (pointIds == null || pointIds.isEmpty()) { - return result; - } - try { - // 批量查询点位信息 - List deviceContacts = deviceContactModelMapper.selectBatchIds(pointIds); - if (deviceContacts != null && !deviceContacts.isEmpty()) { - for (DeviceContactModelDO deviceContact : deviceContacts) { - if (deviceContact == null || deviceContact.getId() == null) { - continue; - } - - String pointName = null; - if (StringUtils.isNotBlank(deviceContact.getAttributeName())) { - pointName = deviceContact.getAttributeName(); - } else if (StringUtils.isNotBlank(deviceContact.getAttributeCode())) { - pointName = deviceContact.getAttributeCode(); - } - - if (StringUtils.isNotBlank(pointName)) { - result.put(deviceContact.getId(), pointName); - } - } - } - } catch (Exception e) { - log.error("批量查询点位信息失败, pointIds: {}", pointIds, e); - } - return result; - } } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/mold/MoldBrandService.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/mold/MoldBrandService.java deleted file mode 100644 index f87d6c2d0..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/mold/MoldBrandService.java +++ /dev/null @@ -1,176 +0,0 @@ -package cn.iocoder.yudao.module.mes.service.mold; - -import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.module.mes.controller.admin.mold.vo.*; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldBrandDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldBrandProductDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO; - -import javax.validation.Valid; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; - -/** - * 模具型号 Service 接口 - * - * @author 内蒙必硕 - */ -public interface MoldBrandService { - - /** - * 创建模具型号 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createMoldBrand(@Valid MoldBrandSaveReqVO createReqVO); - - /** - * 更新模具型号 - * - * @param updateReqVO 更新信息 - */ - void updateMoldBrand(@Valid MoldBrandSaveReqVO updateReqVO); - - /** - * 删除模具型号 - * - * @param id 编号 - */ - void deleteMoldBrand(Long id); - - /** - * 获得模具型号 - * - * @param id 编号 - * @return 模具型号 - */ - MesMoldBrandDO getMoldBrand(Long id); - List selectBy(MoldBrandPageReqVO reqVO); - /** - * 获得模具型号分页 - * - * @param pageReqVO 分页查询 - * @return 模具型号分页 - */ - PageResult getMoldBrandPage(MoldBrandPageReqVO pageReqVO); - default Map getMap(Collection ids) { - if (CollUtil.isEmpty(ids)) { - return new HashMap<>(); - } - return CollectionUtils.convertMap(getList(ids), MesMoldBrandDO::getId); - } - List getList(Collection ids); - // ==================== 子表（模具） ==================== - - /** - * 获得模具分页 - * - * @param pageReqVO 分页查询 - * @param brandId 型号id - * @return 模具分页 - */ - PageResult getMoldPage(PageParam pageReqVO, Long brandId); - - List getMoldList(); - - /** - * 创建模具 - * - * @param mold 创建信息 - * @return 编号 - */ - Long createMold(@Valid MesMoldDO mold); - - /** - * 更新模具 - * - * @param mold 更新信息 - */ - void updateMold(@Valid MesMoldDO mold); - - /** - * 删除模具 - * - * @param id 编号 - */ - void deleteMold(Long id); - - /** - * 获得模具 - * - * @param id 编号 - * @return 模具 - */ - MesMoldDO getMold(Long id); - List selectBy(MesMoldDO reqVO); - // ==================== 子表（模具产品） ==================== - - /** - * 获得模具产品分页 - * - * @param pageReqVO 分页查询 - * @param brandId 型号ID - * @return 模具产品分页 - */ - PageResult getMoldBrandProductPage(PageParam pageReqVO, Long brandId); - List buildProduct(List list); - /** - * 创建模具产品 - * - * @param moldBrandProduct 创建信息 - * @return 编号 - */ - Long createMoldBrandProduct(@Valid MesMoldBrandProductDO moldBrandProduct); - - /** - * 更新模具产品 - * - * @param moldBrandProduct 更新信息 - */ - void updateMoldBrandProduct(@Valid MesMoldBrandProductDO moldBrandProduct); - - /** - * 删除模具产品 - * - * @param id 编号 - */ - void deleteMoldBrandProduct(Long id); - - /** - * 获得模具产品 - * - * @param id 编号 - * @return 模具产品 - */ - MesMoldBrandProductDO getMoldBrandProduct(Long id); - - List getAllList(); - - - /** - * 获得产品分类列表 - * - * @param ids 编号数组 - * @return 产品分类列表 - */ - List getMoldBrandList(Collection ids); - - /** - * 获得产品分类 Map - * - * @param ids 编号数组 - * @return 产品分类 Map - */ - default Map getMoldBrandMap(Collection ids) { - if(ids.isEmpty())return new HashMap<>(); - return convertMap(getMoldBrandList(ids), MesMoldBrandDO::getId); - } -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/mold/MoldBrandServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/mold/MoldBrandServiceImpl.java deleted file mode 100644 index 2d0122509..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/mold/MoldBrandServiceImpl.java +++ /dev/null @@ -1,312 +0,0 @@ -package cn.iocoder.yudao.module.mes.service.mold; - -import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.MapUtils; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.mes.controller.admin.mold.vo.*; -import cn.iocoder.yudao.module.mes.controller.admin.moldticketmanagement.enums.MoldPlanTypeEnum; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldBrandDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldBrandProductDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairLineDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketresults.MoldTicketResultsDO; -import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO; -import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductUnitDO; -import cn.iocoder.yudao.module.mes.dal.mysql.mold.MesMoldBrandMapper; -import cn.iocoder.yudao.module.mes.dal.mysql.mold.MesMoldBrandProductMapper; -import cn.iocoder.yudao.module.mes.dal.mysql.mold.MesMoldMapper; -import cn.iocoder.yudao.module.mes.dal.mysql.moldrepair.MoldRepairLineMapper; -import cn.iocoder.yudao.module.mes.dal.mysql.moldrepair.MoldRepairMapper; -import cn.iocoder.yudao.module.mes.dal.mysql.moldticketresults.MoldTicketResultsMapper; -import cn.iocoder.yudao.module.erp.service.product.ErpProductService; -import cn.iocoder.yudao.module.erp.service.product.ErpProductUnitService; -import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.*; - -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; -import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*; - -/** - * 模具型号 Service 实现类 - * - * @author 内蒙必硕 - */ -@Service("mesMoldBrandService") -@Validated -public class MoldBrandServiceImpl implements MoldBrandService { - - @Resource - private MesMoldBrandMapper mesMoldBrandMapper; - @Resource - private MesMoldMapper mesMoldMapper; - @Resource - private MoldRepairMapper moldRepairMapperRepair; - @Resource - private MoldRepairLineMapper moldRepairLineMapper; - @Resource - private MoldTicketResultsMapper moldticketResultsMapper; - @Resource - private ErpProductUnitService productUnitService; - @Resource - private ErpProductService productService; - @Override - public Long createMoldBrand(MoldBrandSaveReqVO createReqVO) { - // 插入 - MesMoldBrandDO moldBrand = BeanUtils.toBean(createReqVO, MesMoldBrandDO.class); - mesMoldBrandMapper.insert(moldBrand); - // 返回 - return moldBrand.getId(); - } - - @Override - public void updateMoldBrand(MoldBrandSaveReqVO updateReqVO) { - // 校验存在 - validateMoldBrandExists(updateReqVO.getId()); - // 更新 - MesMoldBrandDO updateObj = BeanUtils.toBean(updateReqVO, MesMoldBrandDO.class); - mesMoldBrandMapper.updateById(updateObj); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteMoldBrand(Long id) { - // 校验存在 - validateMoldBrandExists(id); - // 删除 - mesMoldBrandMapper.deleteById(id); - - // 删除子表 - deleteMoldByBrandId(id); - } - - private void validateMoldBrandExists(Long id) { - if (mesMoldBrandMapper.selectById(id) == null) { - throw exception(MOLD_BRAND_NOT_EXISTS); - } - } - - @Override - public MesMoldBrandDO getMoldBrand(Long id) { - return mesMoldBrandMapper.selectById(id); - } - @Override - public List selectBy(MoldBrandPageReqVO reqVO){ - return mesMoldBrandMapper.selectBy(reqVO); - } - - @Override - public PageResult getMoldBrandPage(MoldBrandPageReqVO pageReqVO) { - PageResult pageResult = mesMoldBrandMapper.selectPage(pageReqVO); - return new PageResult<>(buildMoldBrandVOList(pageResult.getList()), pageResult.getTotal()); - } - - private List buildMoldBrandVOList(List list) { - if (CollUtil.isEmpty(list)) { - return Collections.emptyList(); - } - Map map = productService.getProductMap( - convertSet(list, MesMoldBrandDO::getProductId)); - return BeanUtils.toBean(list, MoldBrandRespVO.class, item -> { - MapUtils.findAndThen(map, item.getProductId(), - product -> item.setProductName(product.getName())); - }); - } - @Override - public List getList(Collection ids) { - return mesMoldBrandMapper.selectBatchIds(ids); - } - // ==================== 子表（模具） ==================== - - @Override - public PageResult getMoldPage(PageParam pageReqVO, Long brandId) { - PageResult pageResult = mesMoldMapper.selectPage(pageReqVO, brandId); - return new PageResult<>(buildMoldVOList(pageResult.getList()), pageResult.getTotal()); - } - - @Override - public List getMoldList() { - return mesMoldMapper.selectList(); - } - - private List buildMoldVOList(List list) { - if (CollUtil.isEmpty(list)) { - return Collections.emptyList(); - } - Map unitMap = productUnitService.getProductUnitMap( - convertSet(list, MesMoldDO::getUnitId)); - return BeanUtils.toBean(list, MoldRespVO.class, product -> { - MapUtils.findAndThen(unitMap, product.getUnitId(), - unit -> product.setUnitName(unit.getName())); - }); - } - @Override - public Long createMold(MesMoldDO mold) { - mesMoldMapper.insert(mold); - return mold.getId(); - } - - @Override - public void updateMold(MesMoldDO mold) { - // 校验存在 - validateMoldExists(mold.getId()); - // 更新 - mesMoldMapper.updateById(mold); - } - - @Override - public void deleteMold(Long id) { - // 校验存在 - validateMoldExists(id); - // 删除 - mesMoldMapper.deleteById(id); - } - - @Override - public MesMoldDO getMold(Long id) { - MesMoldDO moldDO = mesMoldMapper.selectById(id); - Map> moldRepairDOMap=new HashMap<>(); - - // 关联查询品牌表并补充字段 - if (moldDO != null && moldDO.getBrandId() != null) { - MesMoldBrandDO moldBrandDO = mesMoldBrandMapper.selectById(moldDO.getBrandId()); - if (moldBrandDO != null) { - moldDO.setBrandName(moldBrandDO.getName()); // 品牌名称 - moldDO.setMoldType(moldBrandDO.getMoldType()); // 模具类型 - moldDO.setMoldSize(moldBrandDO.getMoldSize()); // 模具尺寸 - moldDO.setOrgType(moldBrandDO.getOrgType()); // 组织类型 - } - } - - //点检列表 - List inspectionList = moldticketResultsMapper.findByMoldIdAndPlanType(id, MoldPlanTypeEnum.INSPECTION.getCode(),null,null,null); - if(CollectionUtils.isNotEmpty(inspectionList)){ - moldDO.setInspectionList(inspectionList); - } - - //保养列表 - List maintainList = moldticketResultsMapper.findByMoldIdAndPlanType(id, MoldPlanTypeEnum.MAINTENANCE.getCode(),null,null,null); - if(CollectionUtils.isNotEmpty(maintainList)){ - moldDO.setMaintainList(maintainList); - } - - //维修列表 - List moldRepairDOS = moldRepairMapperRepair.selectList( - Wrappers.lambdaQuery() - .eq(MoldRepairDO::getMoldId, id)); - - for (MoldRepairDO moldRepairDO : moldRepairDOS) { - List moldRepairLineDOS = moldRepairLineMapper.selectList(Wrappers.lambdaQuery() - .eq(MoldRepairLineDO::getRepairId, moldRepairDO.getId()) - .orderByDesc(MoldRepairLineDO::getCreateTime)); - if (!moldRepairLineDOS.isEmpty()) { - // 修复JSON序列化null Key问题（保持原有风格的极简处理） - String repairName = moldRepairDO.getRepairName(); - if (repairName == null || repairName.trim().isEmpty()) { - repairName = "维修单-" + moldRepairDO.getId(); - } - moldRepairDOMap.put(repairName, moldRepairLineDOS); - } - } - - if(CollectionUtils.isNotEmpty(moldRepairDOMap)){ - moldDO.setRepairList(moldRepairDOMap); - } - - return moldDO; - } - @Override - public List selectBy(MesMoldDO reqVO){ - return mesMoldMapper.selectBy(reqVO); - } - private void validateMoldExists(Long id) { - if (mesMoldMapper.selectById(id) == null) { - throw exception(MOLD_NOT_EXISTS); - } - } - - private void deleteMoldByBrandId(Long brandId) { - mesMoldMapper.deleteByBrandId(brandId); - } - - // ==================== 子表（模具产品） ==================== - @Resource - private MesMoldBrandProductMapper mesMoldBrandProductMapper; - @Override - public PageResult getMoldBrandProductPage(PageParam pageReqVO, Long brandId) { - return mesMoldBrandProductMapper.selectPage(pageReqVO, brandId); - } - @Override - public List buildProduct(List list) { - if (CollUtil.isEmpty(list)) { - return Collections.emptyList(); - } - Map map = productService.getProductMap( - convertSet(list, MesMoldBrandProductDO::getProductId)); - return BeanUtils.toBean(list, MoldProductRespVO.class, item -> { - MapUtils.findAndThen(map, item.getProductId(), - product -> item.setProductName(product.getName())); - }); - } - @Override - public Long createMoldBrandProduct(MesMoldBrandProductDO moldBrandProduct) { - MesMoldBrandProductDO resVo = new MesMoldBrandProductDO().setBrandId(moldBrandProduct.getBrandId()) - .setProductId(moldBrandProduct.getProductId()); - List list = mesMoldBrandProductMapper.selectList(resVo); - if(list!=null && list.size()>0){ - throw exception(MOLD_BRAND_PRODUCT_EXISTS); - } - mesMoldBrandProductMapper.insert(moldBrandProduct); - return moldBrandProduct.getId(); - } - - @Override - public void updateMoldBrandProduct(MesMoldBrandProductDO moldBrandProduct) { - // 校验存在 - validateMoldBrandProductExists(moldBrandProduct.getId()); - // 更新 - mesMoldBrandProductMapper.updateById(moldBrandProduct); - } - - @Override - public void deleteMoldBrandProduct(Long id) { - // 校验存在 - validateMoldBrandProductExists(id); - // 删除 - mesMoldBrandProductMapper.deleteById(id); - } - - @Override - public MesMoldBrandProductDO getMoldBrandProduct(Long id) { - return mesMoldBrandProductMapper.selectById(id); - } - - @Override - public List getAllList() { - return mesMoldMapper.selectList(); - } - - @Override - public List getMoldBrandList(Collection ids) { - return mesMoldBrandMapper.selectBatchIds(ids); - } - - private void validateMoldBrandProductExists(Long id) { - if (mesMoldBrandProductMapper.selectById(id) == null) { - throw exception(MOLD_BRAND_PRODUCT_NOT_EXISTS); - } - } - - private void deleteMoldBrandProductByBrandId(Long brandId) { - mesMoldBrandProductMapper.deleteByBrandId(brandId); - } -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/mold/MoldService.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/mold/MoldService.java deleted file mode 100644 index 1c07bb51b..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/mold/MoldService.java +++ /dev/null @@ -1,99 +0,0 @@ -package cn.iocoder.yudao.module.mes.service.mold; - -import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.module.mes.controller.admin.mold.vo.MoldPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.mold.vo.MoldRespVO; -import cn.iocoder.yudao.module.mes.controller.admin.mold.vo.MoldSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO; - -import javax.validation.Valid; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; - -/** - * 模具 Service 接口 - * - * @author 内蒙必硕 - */ -public interface MoldService { - - /** - * 创建模具 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createMold(@Valid MoldSaveReqVO createReqVO); - - /** - * 更新模具 - * - * @param updateReqVO 更新信息 - */ - void updateMold(@Valid MoldSaveReqVO updateReqVO); - - /** - * 删除模具 - * - * @param id 编号 - */ - void deleteMold(Long id); - - /** - * 获得模具 - * - * @param id 编号 - * @return 模具 - */ - MesMoldDO getMold(Long id); - - /** - * 获得模具分页 - * - * @param pageReqVO 分页查询 - * @return 模具分页 - */ - PageResult getMoldPage(MoldPageReqVO pageReqVO); - List getList(Collection ids); - default Map getMap(Collection ids) { - if (CollUtil.isEmpty(ids)) { - return new HashMap<>(); - } - return CollectionUtils.convertMap(getList(ids), MesMoldDO::getId); - } - - /** - * 校验模具们的有效性 - * - * @param ids 编号数组 - * @return 模具列表 - */ - List validMoldList(Collection ids); - - /** - * 获得产品 VO 列表 - * - * @param ids 编号数组 - * @return 产品 VO 列表 - */ - List getMoldVOList(Collection ids); - - /** - * 获得模具 VO Map - * - * @param ids 编号数组 - * @return 模具 VO Map - */ - default Map getMoldVOMap(Collection ids) { - if(ids.isEmpty())return new HashMap<>(); - return convertMap(getMoldVOList(ids), MoldRespVO::getId); - } - - List buildMoldVOList(List list); -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/mold/MoldServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/mold/MoldServiceImpl.java deleted file mode 100644 index 040415cc8..000000000 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/mold/MoldServiceImpl.java +++ /dev/null @@ -1,104 +0,0 @@ -package cn.iocoder.yudao.module.mes.service.mold; - -import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.mes.controller.admin.mold.vo.MoldPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.mold.vo.MoldRespVO; -import cn.iocoder.yudao.module.mes.controller.admin.mold.vo.MoldSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO; -import cn.iocoder.yudao.module.mes.dal.mysql.mold.MesMoldMapper; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.Collection; -import java.util.Collections; -import java.util.List; - -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.MOLD_NOT_EXISTS; - -/** - * 模具 Service 实现类 - * - * @author 内蒙必硕 - */ -@Service("mesMoldService") -@Validated -public class MoldServiceImpl implements MoldService { - - @Resource - private MesMoldMapper mesMoldMapper; - - @Override - public Long createMold(MoldSaveReqVO createReqVO) { - // 插入 - MesMoldDO mold = BeanUtils.toBean(createReqVO, MesMoldDO.class); - mesMoldMapper.insert(mold); - // 返回 - return mold.getId(); - } - - @Override - public void updateMold(MoldSaveReqVO updateReqVO) { - // 校验存在 - validateMoldExists(updateReqVO.getId()); - // 更新 - MesMoldDO updateObj = BeanUtils.toBean(updateReqVO, MesMoldDO.class); - mesMoldMapper.updateById(updateObj); - } - - @Override - public void deleteMold(Long id) { - // 校验存在 - validateMoldExists(id); - // 删除 - mesMoldMapper.deleteById(id); - } - - private void validateMoldExists(Long id) { - if (mesMoldMapper.selectById(id) == null) { - throw exception(MOLD_NOT_EXISTS); - } - } - - @Override - public MesMoldDO getMold(Long id) { - return mesMoldMapper.selectById(id); - } - - @Override - public PageResult getMoldPage(MoldPageReqVO pageReqVO) { - return mesMoldMapper.selectPage(pageReqVO, pageReqVO.getBrandId()); - } - @Override - public List getList(Collection ids) { - return mesMoldMapper.selectBatchIds(ids); - } - - @Override - public List validMoldList(Collection ids) { - if (CollUtil.isEmpty(ids)) { - return Collections.emptyList(); - } - return mesMoldMapper.selectBatchIds(ids); - } - - @Override - public List getMoldVOList(Collection ids) { - if (CollUtil.isEmpty(ids)) { - return Collections.emptyList(); - } - List list = mesMoldMapper.selectBatchIds(ids); - return buildMoldVOList(list); - } - - @Override - public List buildMoldVOList(List list) { - if (CollUtil.isEmpty(list)) { - return Collections.emptyList(); - } - return BeanUtils.toBean(list, MoldRespVO.class); - } -} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrecord/MoldRecordServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrecord/MoldRecordServiceImpl.java index e2e4d980c..7fa819206 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrecord/MoldRecordServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrecord/MoldRecordServiceImpl.java @@ -4,10 +4,10 @@ import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.collection.MapUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldBrandDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO; -import cn.iocoder.yudao.module.mes.service.mold.MoldBrandService; -import cn.iocoder.yudao.module.mes.service.mold.MoldService; +import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldBrandDO; +import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO; +import cn.iocoder.yudao.module.erp.service.mold.MoldBrandService; +import cn.iocoder.yudao.module.erp.service.mold.MoldService; import cn.iocoder.yudao.module.mes.controller.admin.moldrecord.vo.MoldRecordPageReqVO; import cn.iocoder.yudao.module.mes.controller.admin.moldrecord.vo.MoldRecordRespVO; import cn.iocoder.yudao.module.mes.controller.admin.moldrecord.vo.MoldRecordSaveReqVO; @@ -129,9 +129,9 @@ public class MoldRecordServiceImpl implements MoldRecordService { Map userMap = userService.getUserMap( convertSet(list, MoldRecordDO::getUserId)); - Map brandMap = moldBrandService.getMap( + Map brandMap = moldBrandService.getMap( convertSet(list, MoldRecordDO::getBrandId)); - Map moldMap = moldService.getMap( + Map moldMap = moldService.getMap( convertSet(list, MoldRecordDO::getMoldId)); Map machineMap = machineComponentService.getMap( diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepair/MoldRepairService.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepair/MoldRepairService.java index aa06e4edb..b0f90f4e8 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepair/MoldRepairService.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepair/MoldRepairService.java @@ -1,13 +1,14 @@ package cn.iocoder.yudao.module.mes.service.moldrepair; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.MoldRepairLineRespVO; -import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.MoldRepairLineSaveReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.MoldRepairUpdateReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.*; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairLineDO; -import cn.iocoder.yudao.module.mes.dal.mysql.moldrepair.MoldRepairLineMapper; +import cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo.dashboard.EventStatisticsVO; +import cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo.MoldRepairLineRespVO; +import cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo.MoldRepairLineSaveReqVO; +import cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo.MoldRepairUpdateReqVO; +import cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo.*; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairLineDO; +import cn.iocoder.yudao.module.common.dal.mysql.moldrepair.MoldRepairLineMapper; import javax.validation.Valid; import java.util.List; @@ -78,5 +79,9 @@ public interface MoldRepairService { Long getRepairListCountByRepairStatus(); List getMoldRepairDOListByStatus(); + + void selectCountMoldRepair(EventStatisticsVO eventStatisticsVO); + + List getList(); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepair/MoldRepairServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepair/MoldRepairServiceImpl.java index 8044c0871..9aa371395 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepair/MoldRepairServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepair/MoldRepairServiceImpl.java @@ -2,20 +2,19 @@ package cn.iocoder.yudao.module.mes.service.moldrepair; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.enums.RepairResultEnum; -import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.MoldRepairLineRespVO; -import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.MoldRepairLineSaveReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.MoldRepairUpdateReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.MoldRepairPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.MoldRepairSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo.dashboard.EventStatisticsVO; +import cn.iocoder.yudao.module.common.controller.admin.moldrepair.enums.RepairResultEnum; +import cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo.MoldRepairLineRespVO; +import cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo.MoldRepairLineSaveReqVO; +import cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo.MoldRepairUpdateReqVO; +import cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo.MoldRepairPageReqVO; +import cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo.MoldRepairSaveReqVO; import cn.iocoder.yudao.module.mes.controller.admin.ticketresults.enums.JobResultEnum; import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairLineDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairLineDO; -import cn.iocoder.yudao.module.mes.dal.mysql.moldrepair.MoldRepairLineMapper; -import cn.iocoder.yudao.module.mes.dal.mysql.moldrepair.MoldRepairMapper; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairLineDO; +import cn.iocoder.yudao.module.common.dal.mysql.moldrepair.MoldRepairLineMapper; +import cn.iocoder.yudao.module.common.dal.mysql.moldrepair.MoldRepairMapper; import cn.iocoder.yudao.module.mes.service.moldrepair.MoldRepairService; import com.alibaba.excel.util.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -51,9 +50,9 @@ import cn.iocoder.yudao.framework.common.exception.ServiceException; @Validated public class MoldRepairServiceImpl implements MoldRepairService { - @Resource(name = "mesMoldRepairMapper") + @Resource private MoldRepairMapper moldRepairMapper; - @Resource(name = "mesMoldRepairLineMapper") + @Resource private MoldRepairLineMapper moldRepairLineMapper; @Override @@ -430,4 +429,17 @@ public class MoldRepairServiceImpl implements MoldRepairService { .eq(MoldRepairDO::getRepairStatus, 0)); } + + @Override + public void selectCountMoldRepair(EventStatisticsVO eventStatisticsVO) { + //未完成维修单 + int intValue = moldRepairMapper.selectCount(Wrappers.lambdaQuery() + .eq(MoldRepairDO::getStatus, 0)).intValue(); + eventStatisticsVO.setMoldRepair(intValue); + } + + @Override + public List getList() { + return moldRepairMapper.selectList(); + } } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepairtems/MoldRepairTemsService.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepairtems/MoldRepairTemsService.java index 82ee1d370..d2ce95db7 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepairtems/MoldRepairTemsService.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepairtems/MoldRepairTemsService.java @@ -4,7 +4,6 @@ import java.util.*; import javax.validation.*; import cn.iocoder.yudao.module.mes.controller.admin.moldrepairtems.vo.*; import cn.iocoder.yudao.module.mes.dal.dataobject.criticalcomponent.CriticalComponentDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO; import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepairtems.MoldRepairTemsDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepairtems/MoldRepairTemsServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepairtems/MoldRepairTemsServiceImpl.java index 9936a4609..399a84c51 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepairtems/MoldRepairTemsServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepairtems/MoldRepairTemsServiceImpl.java @@ -3,10 +3,10 @@ package cn.iocoder.yudao.module.mes.service.moldrepairtems; //import cn.iocoder.yudao.module.iot.controller.admin.mold.vo.LineMoldRespVO; //import cn.iocoder.yudao.module.iot.dal.dataobject.moldmodel.MoldModelDO; import cn.iocoder.yudao.module.mes.dal.dataobject.criticalcomponent.CriticalComponentDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldBrandDO; +import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO; +import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldBrandDO; import cn.iocoder.yudao.module.mes.dal.mysql.criticalcomponent.CriticalComponentMapper; -import cn.iocoder.yudao.module.mes.dal.mysql.mold.MesMoldMapper; +import cn.iocoder.yudao.module.common.dal.mysql.mold.MoldMapper; import cn.iocoder.yudao.module.mes.service.moldrepairtems.MoldRepairTemsService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -46,7 +46,7 @@ public class MoldRepairTemsServiceImpl implements MoldRepairTemsService { @Resource - private MesMoldMapper mesMoldMapper; + private MoldMapper moldMapper; @Resource private CriticalComponentMapper criticalComponentMapper; @@ -132,7 +132,7 @@ public class MoldRepairTemsServiceImpl implements MoldRepairTemsService { // @Override // public List getComponentList(Long moldId) { // -// MesMoldDO moldDO = mesMoldMapper.selectById(moldId); +// MoldDO moldDO = moldMapper.selectById(moldId); // if(moldDO == null ){ // throw exception(DEVICE_LEDGER_NOT_EXISTS); // } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldtaskmanagement/MoldTaskManagementServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldtaskmanagement/MoldTaskManagementServiceImpl.java index 022a66488..bae116c8f 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldtaskmanagement/MoldTaskManagementServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldtaskmanagement/MoldTaskManagementServiceImpl.java @@ -1,17 +1,18 @@ package cn.iocoder.yudao.module.mes.service.moldtaskmanagement; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO; +import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO; +import cn.iocoder.yudao.module.common.dal.mysql.mold.MoldMapper; import cn.iocoder.yudao.module.mes.dal.dataobject.moldsubject.MoldSubjectDO; import cn.iocoder.yudao.module.mes.dal.dataobject.moldplanmaintenance.MoldPlanMaintenanceDO; import cn.iocoder.yudao.module.mes.dal.dataobject.subjectmoldplan.SubjectMoldPlanDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketmanagement.MoldTicketManagementDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketresults.MoldTicketResultsDO; -import cn.iocoder.yudao.module.mes.dal.mysql.mold.MesMoldMapper; +import cn.iocoder.yudao.module.common.dal.dataobject.moldticketmanagement.MoldTicketManagementDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldticketresults.MoldTicketResultsDO; +import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO; import cn.iocoder.yudao.module.mes.dal.mysql.moldsubject.MoldSubjectMapper; import cn.iocoder.yudao.module.mes.dal.mysql.moldplanmaintenance.MoldPlanMaintenanceMapper; import cn.iocoder.yudao.module.mes.dal.mysql.subjectmoldplan.SubjectMoldPlanMapper; -import cn.iocoder.yudao.module.mes.dal.mysql.moldticketmanagement.MoldTicketManagementMapper; -import cn.iocoder.yudao.module.mes.dal.mysql.moldticketresults.MoldTicketResultsMapper; +import cn.iocoder.yudao.module.common.dal.mysql.moldticketmanagement.MoldTicketManagementMapper; +import cn.iocoder.yudao.module.common.dal.mysql.moldticketresults.MoldTicketResultsMapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -56,7 +57,7 @@ public class MoldTaskManagementServiceImpl implements MoldTaskManagementService private MoldTicketResultsMapper moldticketResultsMapper; @Resource - private MesMoldMapper mesMoldMapper; + private MoldMapper moldMapper; @Resource private MoldPlanMaintenanceMapper moldplanMaintenanceMapper; @@ -178,7 +179,7 @@ public PageResult getMoldTaskManagementPage(MoldTaskManage for (Long moldId : idList) { MoldTicketManagementDO moldticketManagementDO = new MoldTicketManagementDO(); - MesMoldDO moldDO = mesMoldMapper.selectById(moldId); + MoldDO moldDO = moldMapper.selectById(moldId); moldticketManagementDO.setTaskId(moldtaskManagementDO.getId()); moldticketManagementDO.setPlanNo(generatePrefixedOrderNo()); moldticketManagementDO.setPlanId(moldtaskManagementDO.getProjectForm()); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketmanagement/MoldTicketManagementService.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketmanagement/MoldTicketManagementService.java index 04a5a023b..80a5e754b 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketmanagement/MoldTicketManagementService.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketmanagement/MoldTicketManagementService.java @@ -2,12 +2,13 @@ package cn.iocoder.yudao.module.mes.service.moldticketmanagement; import java.util.*; import javax.validation.*; -import cn.iocoder.yudao.module.mes.controller.admin.moldticketmanagement.vo.*; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketmanagement.MoldTicketManagementDO; +import cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo.dashboard.EventStatisticsVO; +import cn.iocoder.yudao.module.common.controller.admin.moldticketmanagement.vo.*; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldticketmanagement.MoldTicketManagementDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketresults.MoldTicketResultsDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldticketresults.MoldTicketResultsDO; /** @@ -67,4 +68,9 @@ public interface MoldTicketManagementService { List getListByJobStatus(); + void selectCountMoldInspection(EventStatisticsVO eventStatisticsVO); + + void selectCountMoldMaintenance(EventStatisticsVO eventStatisticsVO); + + List getList(); } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketmanagement/MoldTicketManagementServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketmanagement/MoldTicketManagementServiceImpl.java index 0a776b61a..56d61c8e6 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketmanagement/MoldTicketManagementServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketmanagement/MoldTicketManagementServiceImpl.java @@ -1,17 +1,13 @@ package cn.iocoder.yudao.module.mes.service.moldticketmanagement; -import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.enums.PlanTypeEnum; -import cn.iocoder.yudao.module.mes.dal.dataobject.mold.MesMoldDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.ticketmanagement.TicketManagementDO; -import cn.iocoder.yudao.module.mes.dal.mysql.mold.MesMoldMapper; -import cn.iocoder.yudao.module.mes.controller.admin.moldticketmanagement.enums.MoldPlanTypeEnum; +import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO; +import cn.iocoder.yudao.module.common.dal.mysql.mold.MoldMapper; +import cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo.dashboard.EventStatisticsVO; import cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger.DeviceLedgerDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketresults.MoldTicketResultsDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.ticketresults.TicketResultsDO; +import cn.iocoder.yudao.module.common.controller.admin.moldticketmanagement.enums.MoldPlanTypeEnum; +import cn.iocoder.yudao.module.common.dal.dataobject.moldticketresults.MoldTicketResultsDO; +import cn.iocoder.yudao.module.common.dal.mysql.moldticketresults.MoldTicketResultsMapper; import cn.iocoder.yudao.module.mes.dal.mysql.deviceledger.DeviceLedgerMapper; -import cn.iocoder.yudao.module.mes.dal.mysql.moldticketresults.MoldTicketResultsMapper; -import cn.iocoder.yudao.module.mes.dal.mysql.ticketresults.TicketResultsMapper; -import cn.iocoder.yudao.module.mes.service.moldticketmanagement.MoldTicketManagementService; import com.alibaba.excel.util.StringUtils; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -24,13 +20,13 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.stream.Collectors; -import cn.iocoder.yudao.module.mes.controller.admin.moldticketmanagement.vo.*; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketmanagement.MoldTicketManagementDO; +import cn.iocoder.yudao.module.common.controller.admin.moldticketmanagement.vo.*; +import cn.iocoder.yudao.module.common.dal.dataobject.moldticketmanagement.MoldTicketManagementDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.mes.dal.mysql.moldticketmanagement.MoldTicketManagementMapper; +import cn.iocoder.yudao.module.common.dal.mysql.moldticketmanagement.MoldTicketManagementMapper; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; @@ -45,10 +41,10 @@ import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; public class MoldTicketManagementServiceImpl implements MoldTicketManagementService { @Resource - private MoldTicketManagementMapper moldticketManagementMapper; + private MoldTicketManagementMapper moldTicketManagementMapper; @Resource @Lazy - private MesMoldMapper mesMoldMapper; + private MoldMapper moldMapper; @Resource @Lazy private MoldTicketResultsMapper moldTicketResultsMapper; @@ -57,7 +53,7 @@ public class MoldTicketManagementServiceImpl implements MoldTicketManagementServ public Long createMoldTicketManagement(MoldTicketManagementSaveReqVO createReqVO) { // 插入 MoldTicketManagementDO moldticketManagement = BeanUtils.toBean(createReqVO, MoldTicketManagementDO.class); - moldticketManagementMapper.insert(moldticketManagement); + moldTicketManagementMapper.insert(moldticketManagement); // 返回 return moldticketManagement.getId(); } @@ -68,7 +64,7 @@ public class MoldTicketManagementServiceImpl implements MoldTicketManagementServ validateMoldTicketManagementExists(updateReqVO.getId()); // 更新 MoldTicketManagementDO updateObj = BeanUtils.toBean(updateReqVO, MoldTicketManagementDO.class); - moldticketManagementMapper.updateById(updateObj); + moldTicketManagementMapper.updateById(updateObj); } @Override @@ -76,23 +72,23 @@ public class MoldTicketManagementServiceImpl implements MoldTicketManagementServ // 校验存在 validateMoldTicketManagementExists(id); // 删除 - moldticketManagementMapper.deleteById(id); + moldTicketManagementMapper.deleteById(id); } private void validateMoldTicketManagementExists(Long id) { - if (moldticketManagementMapper.selectById(id) == null) { + if (moldTicketManagementMapper.selectById(id) == null) { throw exception(TICKET_MANAGEMENT_NOT_EXISTS); } } @Override public MoldTicketManagementDO getMoldTicketManagement(Long id) { - return moldticketManagementMapper.selectById(id); + return moldTicketManagementMapper.selectById(id); } @Override public PageResult getMoldTicketManagementPage(MoldTicketManagementPageReqVO pageReqVO) { - return moldticketManagementMapper.selectPage(pageReqVO); + return moldTicketManagementMapper.selectPage(pageReqVO); } @Override @@ -105,13 +101,13 @@ public class MoldTicketManagementServiceImpl implements MoldTicketManagementServ } // 2. 批量更新 - moldticketManagementMapper.batchUpdateJobStatus(idList, reqVO.getJobStatus()); + moldTicketManagementMapper.batchUpdateJobStatus(idList, reqVO.getJobStatus()); } @Override public List getInspectionByMoldId(Long id, String startTime, String endTime, String ids) { - MesMoldDO moldDO = mesMoldMapper.selectById(id); + MoldDO moldDO = moldMapper.selectById(id); //点检列表 List inspectionList = moldTicketResultsMapper.findByMoldIdAndPlanType(id, MoldPlanTypeEnum.INSPECTION.getCode(),startTime,endTime,ids); if(CollectionUtils.isNotEmpty(inspectionList)){ @@ -123,7 +119,7 @@ public class MoldTicketManagementServiceImpl implements MoldTicketManagementServ @Override public List getMaintenanceByMoldId(Long id,String startTime,String endTime,String ids) { - MesMoldDO moldDO = mesMoldMapper.selectById(id); + MoldDO moldDO = moldMapper.selectById(id); //保养列表 List inspectionList = moldTicketResultsMapper.findByMoldIdAndPlanType(id, MoldPlanTypeEnum.MAINTENANCE.getCode(),startTime,endTime,ids); @@ -152,22 +148,46 @@ public class MoldTicketManagementServiceImpl implements MoldTicketManagementServ @Override public Long getBaoyangListCountByJobStatus() { - return moldticketManagementMapper.selectCount(Wrappers.lambdaQuery() + return moldTicketManagementMapper.selectCount(Wrappers.lambdaQuery() .eq(MoldTicketManagementDO::getJobStatus, 0) .eq(MoldTicketManagementDO::getPlanType,2)); } @Override public Long getDianjianListCountByJobStatus() { - return moldticketManagementMapper.selectCount(Wrappers.lambdaQuery() + return moldTicketManagementMapper.selectCount(Wrappers.lambdaQuery() .eq(MoldTicketManagementDO::getJobStatus, 0) .eq(MoldTicketManagementDO::getPlanType,1)); } @Override public List getListByJobStatus() { - return moldticketManagementMapper.selectList(Wrappers.lambdaQuery() + return moldTicketManagementMapper.selectList(Wrappers.lambdaQuery() .eq(MoldTicketManagementDO::getJobStatus, 0)); } + @Override + public void selectCountMoldInspection(EventStatisticsVO eventStatisticsVO) { + //模具点检 + int intValue = moldTicketManagementMapper.selectCount(Wrappers.lambdaQuery() + .eq(MoldTicketManagementDO::getPlanType, MoldPlanTypeEnum.INSPECTION.getCode()) + .eq(MoldTicketManagementDO::getJobStatus,0)).intValue(); + + eventStatisticsVO.setMoldInspection(intValue); + } + + @Override + public void selectCountMoldMaintenance(EventStatisticsVO eventStatisticsVO) { + //模具保养 + int intValue = moldTicketManagementMapper.selectCount(Wrappers.lambdaQuery() + .eq(MoldTicketManagementDO::getPlanType, MoldPlanTypeEnum.MAINTENANCE.getCode()) + .eq(MoldTicketManagementDO::getJobStatus,0)).intValue(); + eventStatisticsVO.setMoldMaintenance(intValue); + } + + @Override + public List getList() { + return moldTicketManagementMapper.selectList(); + } + } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketresults/MoldTicketResultsService.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketresults/MoldTicketResultsService.java index a3553c0dd..ed1ddd7b0 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketresults/MoldTicketResultsService.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketresults/MoldTicketResultsService.java @@ -2,8 +2,8 @@ package cn.iocoder.yudao.module.mes.service.moldticketresults; import java.util.*; import javax.validation.*; -import cn.iocoder.yudao.module.mes.controller.admin.moldticketresults.vo.*; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketresults.MoldTicketResultsDO; +import cn.iocoder.yudao.module.common.controller.admin.moldticketresults.vo.*; +import cn.iocoder.yudao.module.common.dal.dataobject.moldticketresults.MoldTicketResultsDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketresults/MoldTicketResultsServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketresults/MoldTicketResultsServiceImpl.java index 6305646b4..92d074003 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketresults/MoldTicketResultsServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketresults/MoldTicketResultsServiceImpl.java @@ -2,9 +2,9 @@ package cn.iocoder.yudao.module.mes.service.moldticketresults; import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; -import cn.iocoder.yudao.module.mes.controller.admin.moldticketresults.enums.MoldJobResultEnum; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketmanagement.MoldTicketManagementDO; -import cn.iocoder.yudao.module.mes.dal.mysql.moldticketmanagement.MoldTicketManagementMapper; +import cn.iocoder.yudao.module.common.controller.admin.moldticketresults.enums.MoldJobResultEnum; +import cn.iocoder.yudao.module.common.dal.dataobject.moldticketmanagement.MoldTicketManagementDO; +import cn.iocoder.yudao.module.common.dal.mysql.moldticketmanagement.MoldTicketManagementMapper; import cn.iocoder.yudao.module.mes.service.moldticketresults.MoldTicketResultsService; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import org.springframework.context.annotation.Lazy; @@ -15,13 +15,13 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.*; -import cn.iocoder.yudao.module.mes.controller.admin.moldticketresults.vo.*; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketresults.MoldTicketResultsDO; +import cn.iocoder.yudao.module.common.controller.admin.moldticketresults.vo.*; +import cn.iocoder.yudao.module.common.dal.dataobject.moldticketresults.MoldTicketResultsDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.mes.dal.mysql.moldticketresults.MoldTicketResultsMapper; +import cn.iocoder.yudao.module.common.dal.mysql.moldticketresults.MoldTicketResultsMapper; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; @@ -35,7 +35,6 @@ import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; @Validated public class MoldTicketResultsServiceImpl implements MoldTicketResultsService { - @Resource(name = "mesMoldTicketResultsMapper") private MoldTicketResultsMapper moldticketResultsMapper; @Resource diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementService.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementService.java index dccd9e86e..73beb11a1 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementService.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementService.java @@ -2,8 +2,10 @@ package cn.iocoder.yudao.module.mes.service.ticketmanagement; import java.util.*; import javax.validation.*; + +import cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo.dashboard.EventStatisticsVO; import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.vo.*; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketmanagement.MoldTicketManagementDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldticketmanagement.MoldTicketManagementDO; import cn.iocoder.yudao.module.mes.dal.dataobject.ticketmanagement.TicketManagementDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -66,4 +68,10 @@ public interface TicketManagementService { Long getDianjianListCountByJobStatus(); List getListByJobStatus(); + + void selectCountDeviceInspection(EventStatisticsVO eventStatisticsVO); + + void selectCountDeviceMaintenance(EventStatisticsVO eventStatisticsVO); + + List getList(); } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementServiceImpl.java index b2c997dcb..5912997e2 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementServiceImpl.java @@ -1,10 +1,12 @@ package cn.iocoder.yudao.module.mes.service.ticketmanagement; +import cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo.dashboard.EventStatisticsVO; +import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.enums.JobStatusEnum; import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.enums.PlanTypeEnum; import cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger.DeviceLedgerDO; import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairDO; import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairLineDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairDO; import cn.iocoder.yudao.module.mes.dal.dataobject.ticketresults.TicketResultsDO; import cn.iocoder.yudao.module.mes.dal.mysql.deviceledger.DeviceLedgerMapper; import cn.iocoder.yudao.module.mes.dal.mysql.ticketresults.TicketResultsMapper; @@ -149,6 +151,31 @@ public class TicketManagementServiceImpl implements TicketManagementService { .eq(TicketManagementDO::getJobStatus, 0)); } + @Override + public void selectCountDeviceInspection(EventStatisticsVO eventStatisticsVO) { + //点检 + int count = ticketManagementMapper.selectCount(Wrappers.lambdaQuery() + .eq(TicketManagementDO::getPlanType, PlanTypeEnum.INSPECTION.getCode()) + .eq(TicketManagementDO::getJobStatus, JobStatusEnum.PENDING.getCode())).intValue();; + + eventStatisticsVO.setDeviceInspection(count); + } + + @Override + public void selectCountDeviceMaintenance(EventStatisticsVO eventStatisticsVO) { + + //保养 + int count = ticketManagementMapper.selectCount(Wrappers.lambdaQuery() + .eq(TicketManagementDO::getPlanType, PlanTypeEnum.MAINTENANCE.getCode()) + .eq(TicketManagementDO::getJobStatus, JobStatusEnum.PENDING.getCode())).intValue();; + + eventStatisticsVO.setDeviceMaintenance(count); + } + + @Override + public List getList() { + return ticketManagementMapper.selectList(); + } /** diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/moldrepair/MoldRepairMapper.xml b/yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/moldrepair/MoldRepairMapper.xml index fc057b247..2fad15c4e 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/moldrepair/MoldRepairMapper.xml +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/moldrepair/MoldRepairMapper.xml @@ -1,6 +1,6 @@ - +