Преглед на файлове

创建路由器、队列

home преди 2 години
родител
ревизия
f77ae3a4a6

+ 3 - 0
pom.xml

@@ -42,16 +42,19 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.5.0</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <version>4.5.7</version>
         </dependency>
+
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus</artifactId>
             <version>3.5.0</version>
         </dependency>
+
         <!-- SpringBoot Web容器 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

+ 0 - 19
src/main/java/com/fjhx/constant/ApiConstant.java

@@ -1,19 +0,0 @@
-package com.fjhx.constant;
-
-/**
- * @Author:caozj
- * @DATE:2022/9/8 14:38
- */
-public class ApiConstant {
-
-    public static final String URL = "http://192.168.2.15:8126";
-    /**
-     * 推送通道
-     */
-    public static final String PUSH_ANTNO = URL+"/saas/production/userantno/pushAntno";
-
-    /**
-     * 绑定工单
-     */
-    public static final String BIND_WORK = URL+"/saas/production/work/bindWork";
-}

+ 1 - 0
src/main/java/com/fjhx/constant/RFIDConstant.java

@@ -102,4 +102,5 @@ public class RFIDConstant {
      * RFID缓存存活时间
      */
     public static final Integer RFID_CACHE_TIME = 60;
+
 }

+ 0 - 81
src/main/java/com/fjhx/entity/enums/AntnoStatusEnum.java

@@ -1,81 +0,0 @@
-package com.fjhx.entity.enums;
-
-import org.apache.commons.collections4.MapUtils;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * 数据类型枚举
- */
-public enum AntnoStatusEnum {
-
-    STATUS_2("2", "纠偏"),
-    STATUS_4("4", "检测瑕疵"),
-    STATUS_3("3", "激光"),
-    STATUS_1("1", "质检"),
-    ;
-
-    private String key;
-
-    private String value;
-
-    private static Map<String, String> map = new LinkedHashMap<>();
-
-    AntnoStatusEnum(String key, String value) {
-        this.key = key;
-        this.value = value;
-    }
-
-    /**
-     * 是否存在
-     *
-     * @param key
-     * @return
-     */
-    public static boolean contain(Integer key) {
-        if (key == null) {
-            return false;
-        }
-        Map<String, String> map = getMap();
-        return map.containsKey(key);
-    }
-
-    /**
-     * 获取枚举map
-     *
-     * @return
-     */
-    public static Map<String, String> getMap() {
-        if (MapUtils.isNotEmpty(map)) {
-            return map;
-        }
-        for (AntnoStatusEnum ms : values()) {
-            map.put(ms.key, ms.value);
-        }
-        return map;
-    }
-
-    /**
-     * 通过key获取名称
-     *
-     * @param key
-     * @return
-     */
-    public static String getNameByKey(Integer key) {
-        if (key == null || key < 0) {
-            return "";
-        }
-        Map<String, String> map = getMap();
-        return map.getOrDefault(key, "");
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-}

+ 0 - 65
src/main/java/com/fjhx/entity/rfid/business/ProductionLineRoute.java

@@ -1,65 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.entity.rfid.business;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- * 工艺产线路线表实体类
- *
- * @author BladeX
- * @since 2022-08-17
- */
-@Data
-@TableName("t_sd_production_line_route")
-public class ProductionLineRoute{
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 主键id
-	 */
-	private String id;
-	/**
-	 * 工艺产线ID
-	 */
-	private String productionLineId;
-	/**
-	 * 工艺表ID
-	 */
-	private String workmanshipId;
-	/**
-	 * 设备表ID
-	 */
-	private String deviceManagementId;
-
-	/**
-	 * rfidIp
-	 */
-	private String rfidIp;
-
-	/**
-	 * rfid通道
-	 */
-	private String rfidPassageway;
-
-	/**
-	 * 排序
-	 */
-	private Integer sort;
-
-}

+ 0 - 91
src/main/java/com/fjhx/entity/rfid/business/RfidHasau.java

@@ -1,91 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.entity.rfid.business;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-/**
- * rfid已鉴权表实体类
- *
- * @author BladeX
- * @since 2022-09-01
- */
-@Data
-@TableName("t_pro_rfid_hasau")
-public class RfidHasau implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* id
-	*/
-	private String id;
-	/**
-	* rfid
-	*/
-	private String rfid;
-	/**
-	* ip值
-	*/
-	private String ip;
-	/**
-	* 工单ID
-	*/
-	private String workId;
-	/**
-	* bom主材ID
-	*/
-	private String bomColorId;
-	/**
-	* 产品规格ID
-	*/
-	private String productColorId;
-	/**
-	 * 工艺产线ID
-	 */
-	private String productLineId;
-	/**
-	* 订单ID
-	*/
-	private String contractId;
-	/**
-	* 订单产品ID
-	*/
-	private String contractProductId;
-	/**
-	* 工序ID
-	*/
-	private String workmanshipId;
-	/**
-	* 通道(工序)
-	*/
-	private String antno;
-	/**
-	* 是否删除  0:否  1:是
-	*/
-	private Integer delFlag;
-	/**
-	* 创建时间
-	*/
-	private Date createTime;
-
-
-}

+ 0 - 68
src/main/java/com/fjhx/entity/rfid/business/RfidNoau.java

@@ -1,68 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.entity.rfid.business;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- * rfid未鉴权表实体类
- *
- * @author BladeX
- * @since 2022-09-01
- */
-@Data
-@TableName("t_pro_rfid_noau")
-public class RfidNoau implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* id
-	*/
-	private String id;
-	/**
-	* rfid
-	*/
-	private String rfid;
-	/**
-	* ip值
-	*/
-	private String ip;
-	/**
-	* 通道(工序)
-	*/
-	private String antno;
-	/**
-	* 工序ID
-	*/
-	private String workmanshipId;
-	/**
-	* 是否删除  0:否  1:是
-	*/
-	private Integer delFlag;
-	/**
-	* 创建时间
-	*/
-	private Date createTime;
-
-
-}

+ 0 - 98
src/main/java/com/fjhx/entity/rfid/business/Task.java

@@ -1,98 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.entity.rfid.business;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fjhx.entity.rfid.base.BasicsEntity;
-import lombok.Data;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 生产任务表实体类
- *
- * @author BladeX
- * @since 2022-08-19
- */
-@Data
-@TableName("t_pro_task")
-public class Task extends BasicsEntity {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 订单ID
-	*/
-	private String contractId;
-
-	/**
-	 * 产品ID
-	 */
-	private String productId;
-
-	/**
-	 * 产品规格ID
-	 */
-	private String productColorId;
-
-	/**
-	* 工艺线路ID
-	*/
-	private String processLineId;
-	/**
-	* 生产状态 0:待投产  10:生产中 20:待发货 30:已发货  40:订单结束
-	*/
-	private Integer status;
-	/**
-	* 真实投产时间
-	*/
-	private Date putTime;
-	/**
-	* 计划投产时间
-	*/
-	private Date planTime;
-	/**
-	 * 计划投产结束时间
-	 */
-	private Date planEndTime;
-	/**
-	* 完成时间
-	*/
-	private String completTime;
-	/**
-	* 生产用时(秒)
-	*/
-	private Integer elapsedTime;
-	/**
-	* 完成数量
-	*/
-	private Integer completNum;
-
-	/**
-	 * 完成数量
-	 */
-	private BigDecimal quantity;
-
-	/**
-	* 描述
-	*/
-	private String remark;
-	/**
-	* 是否结束
-	*/
-	private Integer isEnd;
-}

+ 0 - 57
src/main/java/com/fjhx/entity/rfid/business/TaskStep.java

@@ -1,57 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.entity.rfid.business;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fjhx.entity.rfid.base.BasicsEntity;
-import lombok.Data;
-
-/**
- * 任务工序进度表实体类
- *
- * @author BladeX
- * @since 2022-08-19
- */
-@Data
-@TableName("t_pro_task_step")
-public class TaskStep extends BasicsEntity {
-
-	private static final long serialVersionUID = 1L;
-
-
-	/**
-	* 任务ID
-	*/
-	private String taskId;
-	/**
-	* 工序ID
-	*/
-	private String workmanshipId;
-	/**
-	* 状态 0:正常  1删除
-	*/
-	private Integer status;
-	/**
-	* 完成数量
-	*/
-	private Integer completNum;
-	/**
-	* 描述
-	*/
-	private String remark;
-
-}

+ 0 - 100
src/main/java/com/fjhx/entity/rfid/business/Work.java

@@ -1,100 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.entity.rfid.business;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- * 生产任务工单表实体类
- *
- * @author BladeX
- * @since 2022-08-19
- */
-@Data
-@TableName("t_pro_work")
-public class Work {
-
-    private static final long serialVersionUID = 1L;
-
-
-    private String id;
-    /**
-     * 任务ID
-     */
-    private String taskId;
-
-    /**
-     * 工艺线路ID
-     */
-    private String processLineId;
-
-    /**
-     * 合同ID
-     */
-    private String contractId;
-
-    /**
-     * 工单号
-     */
-    private String code;
-
-    /**
-     * 产品规格ID
-     */
-    private String productColorId;
-    /**
-     * 真实投产时间
-     */
-    private String putTime;
-    /**
-     * 完成时间
-     */
-    private String completTime;
-    /**
-     * 生产用时(秒)
-     */
-    private Integer elapsedTime;
-    /**
-     * rfid
-     */
-    private String rfid;
-    /**
-     * 描述
-     */
-    private String remark;
-    /**
-     * 生产状态 0:待生产  10:生产中 30:已完成
-     */
-    private Integer status;
-
-    /**
-     * 唯一标识
-     */
-    private String uuid;
-
-    /**
-     * 通道
-     */
-    private String antnos;
-    /**
-     * bom规格ID
-     */
-    @TableField(exist = false)
-    private String bomColorId;
-}

+ 0 - 62
src/main/java/com/fjhx/entity/rfid/business/WorkFollow.java

@@ -1,62 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.entity.rfid.business;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fjhx.entity.rfid.base.BasicsEntity;
-import lombok.Data;
-
-/**
- * 生产任务工单跟进表实体类
- *
- * @author BladeX
- * @since 2022-08-19
- */
-@Data
-@TableName("t_pro_work_follow")
-public class WorkFollow extends BasicsEntity {
-
-	private static final long serialVersionUID = 1L;
-	/**
-	* 工单ID
-	*/
-	private String workId;
-	/**
-	* 工序ID
-	*/
-	private String workmanshipId;
-	/**
-	* 状态 0:成功  1:失败  2:生产中
-	*/
-	private Integer status;
-	/**
-	* 投产时间
-	*/
-	private String putTime;
-	/**
-	* 完成时间
-	*/
-	private String completTime;
-	/**
-	* 生产用时(秒)
-	*/
-	private Integer elapsedTime;
-	/**
-	* 描述
-	*/
-	private String remark;
-
-}