From 5b1ad59492452af8f342243605be36f847c07556 Mon Sep 17 00:00:00 2001 From: yangbin <yangbin@qq.com> Date: 星期一, 29 七月 2024 15:25:04 +0800 Subject: [PATCH] 集成 --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/MdcClassMonthlyscheduleMapper.java | 17 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/IClassMonthlyscheduleService.java | 37 + lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml | 5 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/xml/MdcQualityMonthMapper.xml | 7 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/ProductDayschedule.java | 47 ++ lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcProductMonthlyschedule.java | 53 ++ lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/ProductMonthlyschedule.java | 37 + lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/IMdcProductMonthScheduleService.java | 18 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/IMesInfoInMdcService.java | 23 + lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcClassMonthServiceImpl.java | 48 ++ lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcUnderLineQueue.java | 55 ++ lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/OnLineQueue.java | 36 + lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/ClassMonthlyschedule.java | 40 + lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcOnLineQueue.java | 53 ++ lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcProductDayschedule.java | 69 +++ lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/IMdcClassMonthService.java | 17 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/vo/QualityMonthyVo.java | 10 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/ClassMonthlyscheduleMapper.java | 38 + lxzn-module-system/lxzn-system-start/src/main/resources/application.yml | 4 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/ClassMonthlyscheduleServiceImpl.java | 39 + lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/vo/MesProductMonthlyschedule.java | 17 lxzn-module-system/lxzn-system-start/src/test/java/org/jeecg/modules/mdcJc/MesTest.java | 45 ++ lxzn-boot-base-core/pom.xml | 7 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/QualityMonth.java | 33 + lxzn-module-mdc/src/main/java/org/jeecg/modules/utils/BeanMapper.java | 59 ++ lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/xml/MdcClassMonthlyscheduleMapper.xml | 8 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/vo/MesClassMonthlyschedule.java | 17 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/MdcQualityMonthMapper.java | 20 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcQualityMonth.java | 51 ++ lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/xml/ClassMonthlyscheduleMapper.xml | 17 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/MdcProductMonthScheduleMapper.java | 16 lxzn-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java | 2 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcClassMonthlyschedule.java | 54 ++ lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/xml/MdcProductMonthScheduleMapper.xml | 7 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/IMdcQualityMonthService.java | 13 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcProductMonthScheduleServiceImp.java | 47 ++ lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/controller/ClassMonthlyscheduleController.java | 35 + lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/UnderLineQueue.java | 36 + lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MesInfoInMdcServiceImpl.java | 35 + lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcQualityMonthServiceImpl.java | 49 ++ lxzn-module-system/lxzn-system-start/src/test/java/org/jeecg/TestMain.java | 7 41 files changed, 1,222 insertions(+), 6 deletions(-) diff --git a/lxzn-boot-base-core/pom.xml b/lxzn-boot-base-core/pom.xml index d956bcc..47d636f 100644 --- a/lxzn-boot-base-core/pom.xml +++ b/lxzn-boot-base-core/pom.xml @@ -193,6 +193,13 @@ <artifactId>minio</artifactId> </dependency> + <!--澶嶅埗--> + <dependency> + <groupId>ma.glasnost.orika</groupId> + <artifactId>orika-core</artifactId> + <version>1.4.6</version> + </dependency> + <!-- 闃块噷浜戠煭淇� --> <dependency> <groupId>com.aliyun</groupId> diff --git a/lxzn-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java b/lxzn-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java index de9f331..75df920 100644 --- a/lxzn-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java +++ b/lxzn-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java @@ -87,7 +87,7 @@ } /** - * 鐢ㄤ簬鍚庣瀛楀吀缈昏瘧 SysDictServiceImpl#queryManyDictByKeys(java.util.List, java.util.List) + * 鐢ㄤ簬鍚庣瀛楀吀缈昏瘧 SysDictServiceImpl#queryManyDictByKeys(java.utils.List, java.utils.List) * @param dictCodeList * @param keys * @return diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/controller/ClassMonthlyscheduleController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/controller/ClassMonthlyscheduleController.java new file mode 100644 index 0000000..c6c7102 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/controller/ClassMonthlyscheduleController.java @@ -0,0 +1,35 @@ +package org.jeecg.modules.mdcJc.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.modules.mdcJc.entity.ClassMonthlyschedule; +import org.jeecg.modules.mdcJc.mapper.ClassMonthlyscheduleMapper; +import org.jeecg.modules.mdcJc.service.IClassMonthlyscheduleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author clown + * * @date 2024/7/16 + */ +@Slf4j +@Api(tags = "闆嗘垚") +@RestController +@RequestMapping("/mdcJc/mdcAlarmInfo") +public class ClassMonthlyscheduleController extends JeecgController<ClassMonthlyschedule,IClassMonthlyscheduleService> { + + @Autowired + private IClassMonthlyscheduleService classMonthlyscheduleService; + + @ApiOperation(value = "mes", notes = "mes") + @GetMapping("/findListClass") + public Result<?> findListClass() { + classMonthlyscheduleService.findListClass("2024-06"); + return null; + } +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/ClassMonthlyschedule.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/ClassMonthlyschedule.java new file mode 100644 index 0000000..200c065 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/ClassMonthlyschedule.java @@ -0,0 +1,40 @@ +package org.jeecg.modules.mdcJc.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * @author clown + * * @date 2024/7/15 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("T_ClassMonthlyschedule") +@ApiModel(value = "褰撴湀鐝粍") +public class ClassMonthlyschedule implements Serializable { + private static final long serialVersionUID = -4733120585358211415L; + + @TableId(type = IdType.ASSIGN_ID) + private String mdc_id; + @TableField(value = "ID") + private Integer id; + @TableField(value = "NY") + private String ny; + @TableField(value = "Clazz") + private String clazz; + @TableField(value = "PlanCont") + private Integer planCont; + @TableField(value = "CompletionCount") + private Integer completionCount; + @TableField(value = "QualifiedCount") + private Integer qualifiedCount; +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcClassMonthlyschedule.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcClassMonthlyschedule.java new file mode 100644 index 0000000..2a523a9 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcClassMonthlyschedule.java @@ -0,0 +1,54 @@ +package org.jeecg.modules.mdcJc.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @author clown + * * @date 2024/7/16 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("mdcJc_ClassMonthlyschedule") +@ApiModel(value = "褰撴湀鐝粍") +public class MdcClassMonthlyschedule implements Serializable { + + private static final long serialVersionUID = -4733120585358211415L; + + @TableId(type = IdType.ASSIGN_ID) + private String mdc_id; + @TableField(value = "id") + private Integer id; + @TableField(value = "ny") + private String ny; + @TableField(value = "clazz") + private String clazz; + @TableField(value = "planCount") + private Integer planCount; + @TableField(value = "completionCount") + private Integer completionCount; + @TableField(value = "qualifiedCount") + private Integer qualifiedCount; + + /** + * 鍒涘缓鏃ユ湡 + */ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "鍒涘缓鏃ユ湡") + private Date createTime; + +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcOnLineQueue.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcOnLineQueue.java new file mode 100644 index 0000000..8c10da6 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcOnLineQueue.java @@ -0,0 +1,53 @@ +package org.jeecg.modules.mdcJc.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @author clown + * * @date 2024/7/19 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("mdcJc_OnLine_Queue") +@ApiModel(value = "鑷姩绾夸笂绾�") +public class MdcOnLineQueue implements Serializable { + private static final long serialVersionUID = -4733120585358211415L; + + @TableId(type = IdType.ASSIGN_ID) + private String mdc_id; + + @TableField(value = "id") + private Integer id; + @TableField(value = "partBarCode") + private String partBarCode; + @TableField(value = "productNo") + private String productNo; + @TableField(value = "productName") + private String productName; + @TableField(value = "scanTime") + private Date scanTime; + @TableField(value = "remark") + private Integer remark; + + /** + * 鍒涘缓鏃ユ湡 + */ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "鍒涘缓鏃ユ湡") + private Date createTime; +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcProductDayschedule.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcProductDayschedule.java new file mode 100644 index 0000000..6d53f47 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcProductDayschedule.java @@ -0,0 +1,69 @@ +package org.jeecg.modules.mdcJc.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @author clown + * * @date 2024/7/19 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("mdcJc_ProductDayschedule") +@ApiModel(value = "褰撴湀闆堕儴浠惰鍒掕繘搴�") +public class MdcProductDayschedule implements Serializable { + + private static final long serialVersionUID = -4733120585358211415L; + + @TableId(type = IdType.ASSIGN_ID) + private String mdc_id; + + @TableField(value = "ID") + private Integer id; + @TableField(value = "PlanDate") + private String planDate; + @TableField(value = "ProductNo") + private String productNo; + @TableField(value = "ProductName") + private String productName; + @TableField(value = "OrderID") + private String orderId; + @TableField(value = "ProcedureName") + private String procedureName; + @TableField(value = "Clazz") + private String clazz; + @TableField(value = "PlanCount") + private Integer planCount; + @TableField(value = "CompletionCount") + private Integer completionCount; + @TableField(value = "QualifiedCount") + private Integer qualifiedCount; + @TableField(value = "ProcessRoute") + private String processRoute; + @TableField(value = "EquipmentID") + private String equipmentId; + @TableField(value = "IsAutomaticLine") + private String isAutomaticLine; + + /** + * 鍒涘缓鏃ユ湡 + */ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "鍒涘缓鏃ユ湡") + private Date createTime; + +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcProductMonthlyschedule.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcProductMonthlyschedule.java new file mode 100644 index 0000000..af5c4db --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcProductMonthlyschedule.java @@ -0,0 +1,53 @@ +package org.jeecg.modules.mdcJc.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @author clown + * * @date 2024/7/17 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("mdcJc_ProductMonthlyschedule") +@ApiModel(value = "褰撴湀闆堕儴浠�") +public class MdcProductMonthlyschedule implements Serializable { + private static final long serialVersionUID = -4733120585358211415L; + + @TableId(type = IdType.ASSIGN_ID) + private String mdc_id; + + private Integer id; + @TableField(value = "ny") + private String ny; + @TableField(value = "productNo") + private String productNo; + @TableField(value = "productName") + private String productName; + @TableField(value = "planCount") + private Integer planCount; + @TableField(value = "completionCount") + private Integer completionCount; + @TableField(value = "qualifiedCount") + private Integer qualifiedCount; + /** + * 鍒涘缓鏃ユ湡 + */ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "鍒涘缓鏃ユ湡") + private Date createTime; +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcQualityMonth.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcQualityMonth.java new file mode 100644 index 0000000..86ebaa2 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcQualityMonth.java @@ -0,0 +1,51 @@ +package org.jeecg.modules.mdcJc.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @author clown + * * @date 2024/7/17 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("mdcJc_qualityMonthy") +@ApiModel(value = "褰撴湀闆堕儴浠�") +public class MdcQualityMonth implements Serializable { + + private static final long serialVersionUID = -4733120585358211415L; + + @TableId(type = IdType.ASSIGN_ID) + private String mdc_id; + + @TableField(value = "id") + private Integer id; + @TableField(value = "ny") + private String ny; + @TableField(value = "productNo") + private String productNo; + @TableField(value = "productName") + private String productName; + @TableField(value = "completionCount") + private Integer completionCount; + /** + * 鍒涘缓鏃ユ湡 + */ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "鍒涘缓鏃ユ湡") + private Date createTime; +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcUnderLineQueue.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcUnderLineQueue.java new file mode 100644 index 0000000..6c0f74a --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/MdcUnderLineQueue.java @@ -0,0 +1,55 @@ +package org.jeecg.modules.mdcJc.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @author clown + * * @date 2024/7/19 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("mdcJc_UnderLine_Queue") +@ApiModel(value = "鑷姩绾夸笅绾块槦鍒桵ES") +public class MdcUnderLineQueue implements Serializable { + + private static final long serialVersionUID = -4733120585358211415L; + + @TableId(type = IdType.ASSIGN_ID) + private String mdc_id; + @TableField(value = "id") + private Integer id; + @TableField(value = "partBarCode") + private String partBarCode; + @TableField(value = "productNo") + private String productNo; + @TableField(value = "productName") + private String productName; + @TableField(value = "devCode") + private String devCode; + @TableField(value = "underTime") + private Date underTime; + @TableField(value = "remark") + private Integer remark; + + /** + * 鍒涘缓鏃ユ湡 + */ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "鍒涘缓鏃ユ湡") + private Date createTime; +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/OnLineQueue.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/OnLineQueue.java new file mode 100644 index 0000000..1360c17 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/OnLineQueue.java @@ -0,0 +1,36 @@ +package org.jeecg.modules.mdcJc.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + * @author clown + * * @date 2024/7/19 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("T_OnLine_Queue") +@ApiModel(value = "鑷姩绾夸笂绾�") +public class OnLineQueue { + @TableField(value = "ID") + private Integer id; + @TableField(value = "PartBarCode") + private String partBarCode; + @TableField(value = "ProductNo") + private String productNo; + @TableField(value = "ProductName") + private String productName; + @TableField(value = "Scan_time") + private Date scanTime; + @TableField(value = "Remark") + private Integer remark; + + +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/ProductDayschedule.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/ProductDayschedule.java new file mode 100644 index 0000000..1513fa0 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/ProductDayschedule.java @@ -0,0 +1,47 @@ +package org.jeecg.modules.mdcJc.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @author clown + * * @date 2024/7/19 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("T_ProductDayschedule") +@ApiModel(value = "褰撴湀闆堕儴浠惰鍒掕繘搴�") +public class ProductDayschedule { + @TableField(value = "ID") + private Integer id; + @TableField(value = "PlanDate") + private String planDate; + @TableField(value = "ProductNo") + private String productNo; + @TableField(value = "ProductName") + private String productName; + @TableField(value = "OrderID") + private String orderId; + @TableField(value = "ProcedureName") + private String procedureName; + @TableField(value = "Clazz") + private String clazz; + @TableField(value = "PlanCount") + private Integer planCount; + @TableField(value = "CompletionCount") + private Integer completionCount; + @TableField(value = "QualifiedCount") + private Integer qualifiedCount; + @TableField(value = "ProcessRoute") + private String processRoute; + @TableField(value = "EquipmentID") + private String equipmentId; + @TableField(value = "IsAutomaticLine") + private String isAutomaticLine; + +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/ProductMonthlyschedule.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/ProductMonthlyschedule.java new file mode 100644 index 0000000..1363131 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/ProductMonthlyschedule.java @@ -0,0 +1,37 @@ +package org.jeecg.modules.mdcJc.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * @author clown + * * @date 2024/7/16 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("T_ProductMonthlyschedule") +@ApiModel(value = "褰撴湀闆堕儴浠惰鍒掕繘搴�") +public class ProductMonthlyschedule implements Serializable { + + @TableField(value = "ID") + private Integer id; + @TableField(value = "NY") + private String ny; + @TableField(value = "ProductNo") + private String productNo; + @TableField(value = "ProductName") + private String productName; + @TableField(value = "PlanCount") + private Integer PlanCount; + @TableField(value = "CompletionCount") + private Integer completionCount; + @TableField(value = "QualifideCount") + private Integer qualifiedCount; +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/QualityMonth.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/QualityMonth.java new file mode 100644 index 0000000..6d65cf5 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/QualityMonth.java @@ -0,0 +1,33 @@ +package org.jeecg.modules.mdcJc.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * @author clown + * * @date 2024/7/17 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("T_Quality_monthy") +@ApiModel(value = "褰撴湀闆堕儴浠惰鍒掕繘搴�") +public class QualityMonth implements Serializable { + + @TableField(value = "ID") + private Integer id; + @TableField(value = "NY") + private String ny; + @TableField(value = "ProductNo") + private String productNo; + @TableField(value = "ProductName") + private String productName; + @TableField(value = "CompletionCount") + private Integer completionCount; +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/UnderLineQueue.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/UnderLineQueue.java new file mode 100644 index 0000000..813b84a --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/entity/UnderLineQueue.java @@ -0,0 +1,36 @@ +package org.jeecg.modules.mdcJc.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + * @author clown + * * @date 2024/7/19 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("T_UnderLine_Queue") +@ApiModel(value = "鑷姩绾夸笅绾块槦鍒桵ES") +public class UnderLineQueue { + @TableField(value = "ID") + private Integer id; + @TableField(value = "PartBarCode") + private String partBarCode; + @TableField(value = "ProductNo") + private String productNo; + @TableField(value = "ProductName") + private String productName; + @TableField(value = "DevCode") + private String devCode; + @TableField(value = "UnderTime") + private Date underTime; + @TableField(value = "Remark") + private Integer remark; +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/ClassMonthlyscheduleMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/ClassMonthlyscheduleMapper.java new file mode 100644 index 0000000..048c896 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/ClassMonthlyscheduleMapper.java @@ -0,0 +1,38 @@ +package org.jeecg.modules.mdcJc.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.mdcJc.entity.ClassMonthlyschedule; +import org.jeecg.modules.mdcJc.entity.ProductMonthlyschedule; +import org.jeecg.modules.mdcJc.entity.QualityMonth; + +import java.util.List; + +/** + * @author clown + * * @date 2024/7/15 E:\work_yb\yt\mdc_yituo\lxzn-module-mdc\src\main\java\org\jeecg\modules\mdcJc\mapper + */ +public interface ClassMonthlyscheduleMapper extends BaseMapper<ClassMonthlyschedule> { + /** + * 鏌ヨ鏌愪釜鏈堟暟鎹� 鏈堢彮缁勫畬鎴愭儏鍐� + * + * @param dateTime + * @return + */ + List<ClassMonthlyschedule> findListClass(@Param("dateTime") String dateTime); + + /** + * 褰撴湀闆堕儴浠惰鍒掕繘搴︿俊鎭� + * @param dateTime + * @return + */ + List<ProductMonthlyschedule> findListProductMonth(@Param("dateTime") String dateTime); + + /** + * 鏈堝悎鏍煎拰涓嶅悎鏍� + * @param dateTime + * @return + */ + List<QualityMonth> findListQualityMonth(@Param("dateTime") String dateTime); +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/MdcClassMonthlyscheduleMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/MdcClassMonthlyscheduleMapper.java new file mode 100644 index 0000000..99845a5 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/MdcClassMonthlyscheduleMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.mdcJc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.mdcJc.entity.MdcClassMonthlyschedule; + +import java.util.List; + +/** + * @author clown + * * @date 2024/7/16 + */ + +public interface MdcClassMonthlyscheduleMapper extends BaseMapper<MdcClassMonthlyschedule> { + + List<String> selectDateList(@Param("dateTime")String dateTime); +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/MdcProductMonthScheduleMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/MdcProductMonthScheduleMapper.java new file mode 100644 index 0000000..337be82 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/MdcProductMonthScheduleMapper.java @@ -0,0 +1,16 @@ +package org.jeecg.modules.mdcJc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.mdcJc.entity.MdcProductMonthlyschedule; + +import java.util.List; + +/** + * @author clown + * * @date 2024/7/17 + */ +public interface MdcProductMonthScheduleMapper extends BaseMapper<MdcProductMonthlyschedule> { + + List<String> selectDateList(@Param("dateTime")String dateTime); +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/MdcQualityMonthMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/MdcQualityMonthMapper.java new file mode 100644 index 0000000..935a9c1 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/MdcQualityMonthMapper.java @@ -0,0 +1,20 @@ +package org.jeecg.modules.mdcJc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.mdcJc.entity.MdcQualityMonth; + +import java.util.List; + +/** + * @author clown + * * @date 2024/7/17 + */ +public interface MdcQualityMonthMapper extends BaseMapper<MdcQualityMonth> { + /** + * 鏌ヨ + * @param dateTime + * @return + */ + List<String> selectDateList(@Param("dateTime")String dateTime); +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/xml/ClassMonthlyscheduleMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/xml/ClassMonthlyscheduleMapper.xml new file mode 100644 index 0000000..a13637a --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/xml/ClassMonthlyscheduleMapper.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="org.jeecg.modules.mdcJc.mapper.ClassMonthlyscheduleMapper"> + <select id="findListClass" resultType="org.jeecg.modules.mdcJc.entity.ClassMonthlyschedule"> + SELECT * FROM T_ClassMonthlyschedule WHERE NY = #{ dateTime } + </select> + + + <select id="findListProductMonth" resultType="org.jeecg.modules.mdcJc.entity.ProductMonthlyschedule"> + SELECT * FROM T_ProductMonthlyschedule WHERE NY = #{ dateTime } + </select> + + <select id="findListQualityMonth" resultType="org.jeecg.modules.mdcJc.entity.QualityMonth"> + SELECT * FROM T_Quality_monthy WHERE NY = #{ dateTime } + </select> + +</mapper> \ No newline at end of file diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/xml/MdcClassMonthlyscheduleMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/xml/MdcClassMonthlyscheduleMapper.xml new file mode 100644 index 0000000..6ac68b5 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/xml/MdcClassMonthlyscheduleMapper.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="org.jeecg.modules.mdcJc.mapper.MdcClassMonthlyscheduleMapper"> + <select id="selectDateList" resultType="java.lang.String"> + SELECT mdc_id FROM mdcJc_ClassMonthlyschedule WHERE ny = #{ dateTime } + </select> + +</mapper> \ No newline at end of file diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/xml/MdcProductMonthScheduleMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/xml/MdcProductMonthScheduleMapper.xml new file mode 100644 index 0000000..bb314f1 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/xml/MdcProductMonthScheduleMapper.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="org.jeecg.modules.mdcJc.mapper.MdcProductMonthScheduleMapper"> + <select id="selectDateList" resultType="java.lang.String"> + SELECT mdc_id FROM mdcJc_ProductMonthlyschedule WHERE ny = #{ dateTime } + </select> +</mapper> \ No newline at end of file diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/xml/MdcQualityMonthMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/xml/MdcQualityMonthMapper.xml new file mode 100644 index 0000000..b2edafa --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/mapper/xml/MdcQualityMonthMapper.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="org.jeecg.modules.mdcJc.mapper.MdcQualityMonthMapper"> + <select id="selectDateList" resultType="java.lang.String"> + SELECT mdc_id FROM mdcJc_qualityMonthy WHERE ny = #{ dateTime } + </select> +</mapper> \ No newline at end of file diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/IClassMonthlyscheduleService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/IClassMonthlyscheduleService.java new file mode 100644 index 0000000..5c37923 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/IClassMonthlyscheduleService.java @@ -0,0 +1,37 @@ +package org.jeecg.modules.mdcJc.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.mdcJc.entity.ClassMonthlyschedule; +import org.jeecg.modules.mdcJc.entity.ProductMonthlyschedule; +import org.jeecg.modules.mdcJc.entity.QualityMonth; + +import java.util.List; + +/** + * @author clown + * * @date 2024/7/15 + */ +public interface IClassMonthlyscheduleService extends IService<ClassMonthlyschedule> { + + /** + * 鏌ヨ鏌愪釜鏈堟暟鎹� 鏈堢彮缁勫畬鎴愭儏鍐� + * @param dateTime + * @return + */ + List<ClassMonthlyschedule> findListClass(String dateTime); + + /** + * 褰撴湀闆堕儴浠� + * @param dateTime + * @return + */ + List<ProductMonthlyschedule> findListProductMonth(String dateTime); + + + /** + * 鏈堝悎鏍煎拰涓嶅悎鏍� + * @param dateTime + * @return + */ + List<QualityMonth> findListQualityMonth( String dateTime); +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/IMdcClassMonthService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/IMdcClassMonthService.java new file mode 100644 index 0000000..4620b2c --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/IMdcClassMonthService.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.mdcJc.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.mdcJc.entity.MdcClassMonthlyschedule; + +/** + * @author clown + * * @date 2024/7/16 + */ +public interface IMdcClassMonthService extends IService<MdcClassMonthlyschedule> { + + /** + * 鑾峰彇褰撴湀鐝粍瀹屾垚鎯呭喌 + * @return + */ + boolean saveOrUpdateClassMonthSchedule(); +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/IMdcProductMonthScheduleService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/IMdcProductMonthScheduleService.java new file mode 100644 index 0000000..4ec4597 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/IMdcProductMonthScheduleService.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.mdcJc.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import javafx.concurrent.Service; +import org.jeecg.modules.mdcJc.entity.MdcProductMonthlyschedule; + +/** + * @author clown + * * @date 2024/7/17 + */ +public interface IMdcProductMonthScheduleService extends IService<MdcProductMonthlyschedule> { + + /** + * 褰撴湀闆堕儴浠� + * @return + */ + boolean scheduleProductMonthList(); +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/IMdcQualityMonthService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/IMdcQualityMonthService.java new file mode 100644 index 0000000..2098f9c --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/IMdcQualityMonthService.java @@ -0,0 +1,13 @@ +package org.jeecg.modules.mdcJc.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.mdcJc.entity.MdcQualityMonth; + +/** + * @author clown + * * @date 2024/7/17 + */ +public interface IMdcQualityMonthService extends IService<MdcQualityMonth> { + + boolean saveQualityMonth(); +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/IMesInfoInMdcService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/IMesInfoInMdcService.java new file mode 100644 index 0000000..5e2bedc --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/IMesInfoInMdcService.java @@ -0,0 +1,23 @@ +package org.jeecg.modules.mdcJc.service; + + +import org.jeecg.modules.mdcJc.entity.MdcClassMonthlyschedule; +import org.jeecg.modules.mdcJc.vo.MesClassMonthlyschedule; + +import java.util.List; + +/** + * @author clown + * * @date 2024/7/15 + */ + +public interface IMesInfoInMdcService { + + /** + * 褰撴湀鐝粍瀹屾垚鎯呭喌 + * @return + */ + List<MdcClassMonthlyschedule> mesClass(); + + +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/ClassMonthlyscheduleServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/ClassMonthlyscheduleServiceImpl.java new file mode 100644 index 0000000..8e76cb2 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/ClassMonthlyscheduleServiceImpl.java @@ -0,0 +1,39 @@ +package org.jeecg.modules.mdcJc.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.mdcJc.entity.ClassMonthlyschedule; +import org.jeecg.modules.mdcJc.entity.ProductMonthlyschedule; +import org.jeecg.modules.mdcJc.entity.QualityMonth; +import org.jeecg.modules.mdcJc.mapper.ClassMonthlyscheduleMapper; +import org.jeecg.modules.mdcJc.service.IClassMonthlyscheduleService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author clown + * * @date 2024/7/15 + */ + +@Service +@DS("mesSoAdb") +public class ClassMonthlyscheduleServiceImpl extends ServiceImpl<ClassMonthlyscheduleMapper,ClassMonthlyschedule> implements IClassMonthlyscheduleService { + + @Override + public List<ClassMonthlyschedule> findListClass(String dateTime) { + return super.baseMapper.findListClass(dateTime); + } + + @Override + public List<ProductMonthlyschedule> findListProductMonth(String dateTime) { + return super.baseMapper.findListProductMonth(dateTime); + } + + @Override + public List<QualityMonth> findListQualityMonth(String dateTime) { + return super.baseMapper.findListQualityMonth(dateTime); + } + + +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcClassMonthServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcClassMonthServiceImpl.java new file mode 100644 index 0000000..d14fc57 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcClassMonthServiceImpl.java @@ -0,0 +1,48 @@ +package org.jeecg.modules.mdcJc.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.mdc.util.DateUtils; +import org.jeecg.modules.mdcJc.entity.ClassMonthlyschedule; +import org.jeecg.modules.mdcJc.entity.MdcClassMonthlyschedule; +import org.jeecg.modules.mdcJc.mapper.MdcClassMonthlyscheduleMapper; +import org.jeecg.modules.mdcJc.service.IClassMonthlyscheduleService; +import org.jeecg.modules.mdcJc.service.IMdcClassMonthService; +import org.jeecg.modules.utils.BeanMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author clown + * * @date 2024/7/16 + */ +@Service +public class MdcClassMonthServiceImpl extends ServiceImpl<MdcClassMonthlyscheduleMapper,MdcClassMonthlyschedule> implements IMdcClassMonthService { + + @Autowired + private IClassMonthlyscheduleService classMonthlyscheduleService; + + @Override + public boolean saveOrUpdateClassMonthSchedule() { + String date = DateUtils.format(DateUtils.getNow(),DateUtils.STR_YEAR_MONTH); + List<ClassMonthlyschedule> list = classMonthlyscheduleService.findListClass(date); + if (list == null || list.isEmpty()) { + return true; + } + List<String> mdcListIds = super.baseMapper.selectDateList(date); + if (mdcListIds != null && !mdcListIds.isEmpty()) { + this.removeBatchByIds(mdcListIds); + } + List<MdcClassMonthlyschedule> mesC = new ArrayList<>(); + for (ClassMonthlyschedule c : list) { + MdcClassMonthlyschedule mdc = new MdcClassMonthlyschedule(); + BeanMapper.copy(c,mdc); + mdc.setPlanCount(c.getPlanCont()); + mesC.add(mdc); + } + boolean b = this.saveBatch(mesC); + return b; + } +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcProductMonthScheduleServiceImp.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcProductMonthScheduleServiceImp.java new file mode 100644 index 0000000..3f49351 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcProductMonthScheduleServiceImp.java @@ -0,0 +1,47 @@ +package org.jeecg.modules.mdcJc.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.mdc.util.DateUtils; +import org.jeecg.modules.mdcJc.entity.MdcProductMonthlyschedule; +import org.jeecg.modules.mdcJc.entity.ProductMonthlyschedule; +import org.jeecg.modules.mdcJc.mapper.MdcProductMonthScheduleMapper; +import org.jeecg.modules.mdcJc.service.IClassMonthlyscheduleService; +import org.jeecg.modules.mdcJc.service.IMdcProductMonthScheduleService; +import org.jeecg.modules.utils.BeanMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author clown + * * @date 2024/7/17 + */ +@Service +public class MdcProductMonthScheduleServiceImp extends ServiceImpl<MdcProductMonthScheduleMapper,MdcProductMonthlyschedule> implements IMdcProductMonthScheduleService { + + @Autowired + private IClassMonthlyscheduleService classMonthlyscheduleService; + + @Override + public boolean scheduleProductMonthList() { + String date = DateUtils.format(DateUtils.getNow(),DateUtils.STR_YEAR_MONTH); + List<ProductMonthlyschedule> list = classMonthlyscheduleService.findListProductMonth(date); + if (list == null || list.isEmpty()) { + return true; + } + List<String> mdcListIds = super.baseMapper.selectDateList(date); + if (mdcListIds != null && !mdcListIds.isEmpty()) { + this.removeBatchByIds(mdcListIds); + } + List<MdcProductMonthlyschedule> mesC = new ArrayList<>(); + for (ProductMonthlyschedule c : list) { + MdcProductMonthlyschedule mdc = new MdcProductMonthlyschedule(); + BeanMapper.copy(c,mdc); + mesC.add(mdc); + } + boolean b = this.saveBatch(mesC); + return b; + } +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcQualityMonthServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcQualityMonthServiceImpl.java new file mode 100644 index 0000000..33dcb22 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcQualityMonthServiceImpl.java @@ -0,0 +1,49 @@ +package org.jeecg.modules.mdcJc.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.mdc.util.DateUtils; +import org.jeecg.modules.mdcJc.entity.ClassMonthlyschedule; +import org.jeecg.modules.mdcJc.entity.MdcClassMonthlyschedule; +import org.jeecg.modules.mdcJc.entity.MdcQualityMonth; +import org.jeecg.modules.mdcJc.entity.QualityMonth; +import org.jeecg.modules.mdcJc.mapper.MdcQualityMonthMapper; +import org.jeecg.modules.mdcJc.service.IClassMonthlyscheduleService; +import org.jeecg.modules.mdcJc.service.IMdcQualityMonthService; +import org.jeecg.modules.utils.BeanMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author clown + * * @date 2024/7/17 + */ +@Service +public class MdcQualityMonthServiceImpl extends ServiceImpl<MdcQualityMonthMapper,MdcQualityMonth> implements IMdcQualityMonthService { + + @Autowired + private IClassMonthlyscheduleService classMonthlyscheduleService; + + @Override + public boolean saveQualityMonth() { + String date = DateUtils.format(DateUtils.getNow(),DateUtils.STR_YEAR_MONTH); + List<QualityMonth> list = classMonthlyscheduleService.findListQualityMonth(date); + if (list == null || list.isEmpty()) { + return true; + } + List<String> mdcListIds = super.baseMapper.selectDateList(date); + if (mdcListIds != null && !mdcListIds.isEmpty()) { + this.removeBatchByIds(mdcListIds); + } + List<MdcQualityMonth> mesC = new ArrayList<>(); + for ( QualityMonth c : list) { + MdcQualityMonth mdc = new MdcQualityMonth(); + BeanMapper.copy(c,mdc); + mesC.add(mdc); + } + boolean b = this.saveBatch(mesC); + return b; + } +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MesInfoInMdcServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MesInfoInMdcServiceImpl.java new file mode 100644 index 0000000..c3310b9 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MesInfoInMdcServiceImpl.java @@ -0,0 +1,35 @@ +package org.jeecg.modules.mdcJc.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.jeecg.modules.mdc.util.DateUtils; +import org.jeecg.modules.mdcJc.entity.ClassMonthlyschedule; +import org.jeecg.modules.mdcJc.entity.MdcClassMonthlyschedule; +import org.jeecg.modules.mdcJc.service.IClassMonthlyscheduleService; +import org.jeecg.modules.mdcJc.service.IMesInfoInMdcService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author clown + * * @date 2024/7/15 + */ +@DS("mesSoAdb") +@Service +public class MesInfoInMdcServiceImpl implements IMesInfoInMdcService { + + @Autowired + private IClassMonthlyscheduleService classMonthlyscheduleService; + + @Override + public List<MdcClassMonthlyschedule> mesClass() { + String date = DateUtils.format(DateUtils.getNow(),DateUtils.STR_YEAR_MONTH); + List<ClassMonthlyschedule> list = classMonthlyscheduleService.findListClass(date); + List<MdcClassMonthlyschedule> mesC = new ArrayList<>(); + BeanUtils.copyProperties(list,mesC); + return mesC; + } +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/vo/MesClassMonthlyschedule.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/vo/MesClassMonthlyschedule.java new file mode 100644 index 0000000..1db63fa --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/vo/MesClassMonthlyschedule.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.mdcJc.vo; + +import lombok.Data; + +/** + * @author clown + * * @date 2024/7/15 + */ +@Data +public class MesClassMonthlyschedule { + private Integer id; + private String ny; + private String clazz; + private Integer planCount; + private Integer completionCount; + private Integer qualifiedCount; +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/vo/MesProductMonthlyschedule.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/vo/MesProductMonthlyschedule.java new file mode 100644 index 0000000..87b1334 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/vo/MesProductMonthlyschedule.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.mdcJc.vo; + +import java.io.Serializable; + +/** + * @author clown + * * @date 2024/7/16 + */ +public class MesProductMonthlyschedule { + + private Integer id; + private String ny; + private String clazz; + private Integer planCont; + private Integer completionCount; + private Integer qualifiedCount; +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/vo/QualityMonthyVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/vo/QualityMonthyVo.java new file mode 100644 index 0000000..42a40a2 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/vo/QualityMonthyVo.java @@ -0,0 +1,10 @@ +package org.jeecg.modules.mdcJc.vo; + +/** + * @author clown + * * @date 2024/7/17 + */ +public class QualityMonthyVo { + + +} diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/utils/BeanMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/utils/BeanMapper.java new file mode 100644 index 0000000..4282f60 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/utils/BeanMapper.java @@ -0,0 +1,59 @@ +package org.jeecg.modules.utils; + +import ma.glasnost.orika.MapperFacade; +import ma.glasnost.orika.MapperFactory; +import ma.glasnost.orika.converter.builtin.PassThroughConverter; +import ma.glasnost.orika.impl.DefaultMapperFactory; + +import java.util.List; +import java.util.Set; + +/** + * 澶嶅埗瀵硅薄灞炴�х殑宸ュ叿绫汇�� + * Created by sanerhe on 2014/12/28. + */ +public class BeanMapper { + + /** + * 瀹炰緥. + */ + private static MapperFacade mapper; + + static { + // 濡傛灉src涓睘鎬т负null锛屽氨涓嶅鍒跺埌dest + MapperFactory mapperFactory = new DefaultMapperFactory.Builder().mapNulls(false).build(); + // 濡傛灉灞炴�ф槸Object锛屽氨鍙鍒跺紩鐢紝涓嶅鍒跺�硷紝鍙互閬垮厤寰幆澶嶅埗 + mapperFactory.getConverterFactory().registerConverter(new PassThroughConverter(Object.class)); + mapper = mapperFactory.getMapperFacade(); + } + + /** + * 鎶妔ource涓殑鍊煎鍒跺埌destination涓�. + */ + public static void copy(Object source, Object destination) { + mapper.map(source, destination); + } + + /** + * 鎶妔ource涓殑鍊煎鍒跺埌destinationCls涓�. + */ + public static <S, D> List<D> copyList(List<S> source, Class<D> destinationCls) { + return mapper.mapAsList(source, destinationCls); + } + + /** + * 鎶妔ource涓殑鍊煎鍒跺埌destination涓�. + */ + public static <S, D> List<D> copyCollection(List<S> source, List<D> destination, Class<D> destinationCls) { + mapper.mapAsCollection(source, destination, destinationCls); + return destination; + } + + /** + * 鎶妔ource涓殑鍊煎鍒跺埌destination涓�. + */ + public static <S, D> Set<D> copyCollection(Set<S> source, Class<D> destinationCls) { + Set<D> destination = mapper.mapAsSet(source, destinationCls); + return destination; + } +} diff --git a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml index 1795f47..b3e5fb3 100644 --- a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml +++ b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml @@ -130,6 +130,11 @@ username: sa password: 123 driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver + mesSoAdb: + url: jdbc:sqlserver://192.168.124.118:1433;databasename=SOADB + username: sa + password: 123 + driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver #redis 閰嶇疆 redis: database: 0 diff --git a/lxzn-module-system/lxzn-system-start/src/main/resources/application.yml b/lxzn-module-system/lxzn-system-start/src/main/resources/application.yml index d52c03d..1ad7c0b 100644 --- a/lxzn-module-system/lxzn-system-start/src/main/resources/application.yml +++ b/lxzn-module-system/lxzn-system-start/src/main/resources/application.yml @@ -2,5 +2,5 @@ application: name: jeecg-system profiles: - active: '@profile.name@' -# active: dev \ No newline at end of file + #active: '@profile.name@' + active: dev \ No newline at end of file diff --git a/lxzn-module-system/lxzn-system-start/src/test/java/org/jeecg/TestMain.java b/lxzn-module-system/lxzn-system-start/src/test/java/org/jeecg/TestMain.java index aed920e..c91b6b9 100644 --- a/lxzn-module-system/lxzn-system-start/src/test/java/org/jeecg/TestMain.java +++ b/lxzn-module-system/lxzn-system-start/src/test/java/org/jeecg/TestMain.java @@ -15,17 +15,18 @@ public class TestMain { public static void main(String[] args) { // 璇锋眰鍦板潃 - String url = "https://api.boot.jeecg.com/sys/user/list"; + String url = "https://836u458t54.vicp.fun/chat/test_chat"; // 璇锋眰 Header 锛堢敤浜庝紶閫扵oken锛� HttpHeaders headers = getHeaders(); // 璇锋眰鏂瑰紡鏄� GET 浠h〃鑾峰彇鏁版嵁 - HttpMethod method = HttpMethod.GET; + HttpMethod method = HttpMethod.POST; System.out.println("璇锋眰鍦板潃锛�" + url); System.out.println("璇锋眰鏂瑰紡锛�" + method); + String data = "{\"id\":\"683a65fd-8feb-4446-ad32-714c4785f667\",\"messages\":[{\"role\":\"user\",\"content\":\"缁欐垜璁蹭釜鏁呬簨锛焅"}],\"stream\":false,\"max_tokens\":500}"; // 鍒╃敤 RestUtil 璇锋眰璇rl - ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, null, JSONObject.class); + ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, data, JSONObject.class); if (result != null && result.getBody() != null) { System.out.println("杩斿洖缁撴灉锛�" + result.getBody().toJSONString()); } else { diff --git a/lxzn-module-system/lxzn-system-start/src/test/java/org/jeecg/modules/mdcJc/MesTest.java b/lxzn-module-system/lxzn-system-start/src/test/java/org/jeecg/modules/mdcJc/MesTest.java new file mode 100644 index 0000000..bc2ebd8 --- /dev/null +++ b/lxzn-module-system/lxzn-system-start/src/test/java/org/jeecg/modules/mdcJc/MesTest.java @@ -0,0 +1,45 @@ +package org.jeecg.modules.mdcJc; + +import org.jeecg.JeecgSystemApplication; +import org.jeecg.modules.mdc.util.DateUtils; +import org.jeecg.modules.mdcJc.service.IClassMonthlyscheduleService; +import org.jeecg.modules.mdcJc.service.IMdcClassMonthService; +import org.jeecg.modules.mdcJc.service.IMdcProductMonthScheduleService; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +/** + * @author clown + * * @date 2024/7/16 + */ +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class) +public class MesTest { + @Autowired + private IClassMonthlyscheduleService mesInfoInMdcService; + @Autowired + private IMdcClassMonthService mdcClassMonthService; + @Autowired + private IMdcProductMonthScheduleService mdcProductMonthScheduleService; + + @Test + public void scheduleProductMonthList() { + mdcProductMonthScheduleService.scheduleProductMonthList(); + } + + + @Test + public void classMonthSchedule() { + mdcClassMonthService.saveOrUpdateClassMonthSchedule(); + } + + @Test + public void testQuery() { + String date = DateUtils.format(DateUtils.getNow(),DateUtils.STR_YEAR_MONTH); + + mesInfoInMdcService.findListClass(date); + } +} -- Gitblit v1.9.3