mt-ck/mt-qj-wms-hd
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd

Browse Source 
 Conflicts:
	6.program/wms-gateway/src/main/resources/config/application.yml
This commit is contained in:
徐晨晨
2022-07-08 15:44:04 +08:00
parent 81b9f5c45e 9cc6ef98f9
commit c324aa524f
103 changed files with 6846 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
6.program/wms-core/src/main/java/com/mt/wms/core/MyGenerator.java
View File

@@ -106,7 +106,7 @@ public class MyGenerator {
@Test
public void generateCodeWithInjectConfigForAllTable() {
generateByTablesWithInjectConfig(new String[]{"t_apms_check_result"});
generateByTablesWithInjectConfig(new String[]{"t_auto_exe_task"});
}
public static void main(String[] args) {

12
6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/AlarmInfo.java
View File

@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-02-28
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -92,7 +92,7 @@ public class AlarmInfo extends Model<AlarmInfo> {
* 设备id
*/
@TableField("equipment_id")
private Integer equipmentId;
private Long equipmentId;
/**
* 设备名称
@@ -130,6 +130,12 @@ public class AlarmInfo extends Model<AlarmInfo> {
@TableField("note")
private String note;
/**
* 加工任务编码（炉子报警时记录）
*/
@TableField("task_code")
private String taskCode;
public static final String ID = "id";
@@ -165,6 +171,8 @@ public class AlarmInfo extends Model<AlarmInfo> {
public static final String NOTE = "note";
public static final String TASK_CODE = "task_code";
@Override
protected Serializable pkVal() {
return this.id;

28
6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/AutoExeTask.java
View File

@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
* </p>
*
* @author mt
* @since 2021-12-14
* @since 2022-03-04
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -46,7 +46,7 @@ public class AutoExeTask extends Model<AutoExeTask> {
private LocalDateTime createTime;
/**
* 状态，0：新增，1：执行中，2完成
* 状态，0：新增，1：执行中，2完成，3 终止
*/
@TableField("status")
private Integer status;
@@ -117,6 +117,12 @@ public class AutoExeTask extends Model<AutoExeTask> {
@TableField("f_equipment_id")
private Long fEquipmentId;
/**
* 设备名称（炉子名称）
*/
@TableField("f_equipment_name")
private String fEquipmentName;
/**
* 工艺号ID，关联工艺号表：t_craft_info
*/
@@ -165,6 +171,12 @@ public class AutoExeTask extends Model<AutoExeTask> {
@TableField("t_equipment_type_id")
private Long tEquipmentTypeId;
/**
* 设备名称
*/
@TableField("t_equipment_name")
private String tEquipmentName;
/**
* 设备ID，关联设备表：t_kiln_info
*/
@@ -219,6 +231,12 @@ public class AutoExeTask extends Model<AutoExeTask> {
@TableField("th_equipment_type_id")
private Long thEquipmentTypeId;
/**
* 设备名称
*/
@TableField("th_equipment_name")
private String thEquipmentName;
/**
* 设备ID，关联设备表：t_kiln_info
*/
@@ -292,6 +310,8 @@ public class AutoExeTask extends Model<AutoExeTask> {
public static final String F_EQUIPMENT_ID = "f_equipment_id";
public static final String F_EQUIPMENT_NAME = "f_equipment_name";
public static final String F_CRAFT_CODE_ID = "f_craft_code_id";
public static final String F_PLC_VALUE = "f_plc_value";
@@ -308,6 +328,8 @@ public class AutoExeTask extends Model<AutoExeTask> {
public static final String T_EQUIPMENT_TYPE_ID = "t_equipment_type_id";
public static final String T_EQUIPMENT_NAME = "t_equipment_name";
public static final String T_EQUIPMENT_ID = "t_equipment_id";
public static final String T_CRAFT_CODE_ID = "t_craft_code_id";
@@ -326,6 +348,8 @@ public class AutoExeTask extends Model<AutoExeTask> {
public static final String TH_EQUIPMENT_TYPE_ID = "th_equipment_type_id";
public static final String TH_EQUIPMENT_NAME = "th_equipment_name";
public static final String TH_EQUIPMENT_ID = "th_equipment_id";
public static final String TH_CRAFT_CODE_ID = "th_craft_code_id";

12
6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/KilnInfo.java
View File

@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-02-28
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -71,7 +71,7 @@ public class KilnInfo extends Model<KilnInfo> {
private String version;
/**
* 状态 0初始化，1损坏
* 状态 0初始化，1损坏 ，2 工作中
*/
@TableField("status")
private Integer status;
@@ -83,7 +83,7 @@ public class KilnInfo extends Model<KilnInfo> {
private String interCode;
/**
* 编码
* 编码 必须与AMPS相同
*/
@TableField("code")
private String code;
@@ -95,7 +95,7 @@ public class KilnInfo extends Model<KilnInfo> {
private Integer factoryId;
/**
* 窑炉名称
* 窑炉名称 建议与AMPS相同
*/
@TableField("kiln_name")
private String kilnName;
@@ -113,10 +113,10 @@ public class KilnInfo extends Model<KilnInfo> {
private String en;
/**
* 设备类型，存储数据字典编码
* 设备类型，存储数据字典编码，修改为1：加工炉，2：回火炉，3：氮化炉，4：清洗炉
*/
@TableField("type")
private String type;
private Integer type;
/**
* ip地址

20
6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ParEleValue.java
View File

@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-03-01
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -53,7 +53,13 @@ public class ParEleValue extends Model<ParEleValue> {
* 窑炉id，关联设备窑炉表：t_kiln_info
*/
@TableField("kiln_id")
private Integer kilnId;
private Long kilnId;
/**
* 任务id
*/
@TableField("task_id")
private Long taskId;
/**
* 参数id，关联参数表：t_par_info
@@ -104,10 +110,10 @@ public class ParEleValue extends Model<ParEleValue> {
private Float totalBat;
/**
* 扩展字段1
* 时间段类型。0：半小时，1：天，2:月
*/
@TableField("add_a")
private Float addA;
@TableField("date_type")
private Integer dateType;
/**
* 扩展字段2
@@ -150,6 +156,8 @@ public class ParEleValue extends Model<ParEleValue> {
public static final String KILN_ID = "kiln_id";
public static final String TASK_ID = "task_id";
public static final String PAR_ID = "par_id";
public static final String A_VOLTAGEV_VALUE = "a_voltagev_value";
@@ -166,7 +174,7 @@ public class ParEleValue extends Model<ParEleValue> {
public static final String TOTAL_BAT = "total_bat";
public static final String ADD_A = "add_a";
public static final String DATE_TYPE = "date_type";
public static final String ADD_B = "add_b";

54
6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ParGasValue.java
View File

@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-03-01
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -53,7 +53,13 @@ public class ParGasValue extends Model<ParGasValue> {
* 窑炉id，关联设备窑炉表：t_kiln_info
*/
@TableField("kiln_id")
private Integer kilnId;
private Long kilnId;
/**
* 任务id
*/
@TableField("task_id")
private Long taskId;
/**
* 参数id，关联参数表：t_par_info
@@ -62,13 +68,13 @@ public class ParGasValue extends Model<ParGasValue> {
private Integer parId;
/**
* 设定氮势值
* 设定氮/碳势值
*/
@TableField("set_nit_pot_value")
private Float setNitPotValue;
/**
* 实际氮势值
* 实际氮/碳势值
*/
@TableField("actual_nit_pot_value")
private Float actualNitPotValue;
@@ -80,46 +86,46 @@ public class ParGasValue extends Model<ParGasValue> {
private Float acceptNitPotValue;
/**
* 氮气流量
* 氮气量
*/
@TableField("nit_flow_value")
private Float nitFlowValue;
/**
* 氨气流量
* 氨气量
*/
@TableField("ammonia_flow_value")
private Float ammoniaFlowValue;
/**
* 二氧化碳流量
* 二氧化碳量
*/
@TableField("car_dioxide_flow_value")
private Float carDioxideFlowValue;
/**
* 扩展字段1
* 甲烷量
*/
@TableField("add_a")
private Float addA;
@TableField("methanol_flow")
private Float methanolFlow;
/**
* 扩展字段2
* 丙烷量
*/
@TableField("add_b")
private Float addB;
@TableField("propane_flow")
private Float propaneFlow;
/**
* 扩展字段3
* 氢含量
*/
@TableField("add_c")
private Float addC;
@TableField("hydrogen_content")
private Float hydrogenContent;
/**
* 扩展字段4
* 分解率
*/
@TableField("orther_a")
private String ortherA;
@TableField("decomposition_rate")
private Float decompositionRate;
/**
* 扩展字段5
@@ -144,6 +150,8 @@ public class ParGasValue extends Model<ParGasValue> {
public static final String KILN_ID = "kiln_id";
public static final String TASK_ID = "task_id";
public static final String PAR_ID = "par_id";
public static final String SET_NIT_POT_VALUE = "set_nit_pot_value";
@@ -158,13 +166,13 @@ public class ParGasValue extends Model<ParGasValue> {
public static final String CAR_DIOXIDE_FLOW_VALUE = "car_dioxide_flow_value";
public static final String ADD_A = "add_a";
public static final String METHANOL_FLOW = "methanol_flow";
public static final String ADD_B = "add_b";
public static final String PROPANE_FLOW = "propane_flow";
public static final String ADD_C = "add_c";
public static final String HYDROGEN_CONTENT = "hydrogen_content";
public static final String ORTHER_A = "orther_a";
public static final String DECOMPOSITION_RATE = "decomposition_rate";
public static final String ORTHER_B = "orther_b";

12
6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ParRotSpeedValue.java
View File

@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-03-01
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -53,7 +53,13 @@ public class ParRotSpeedValue extends Model<ParRotSpeedValue> {
* 窑炉id，关联设备窑炉表：t_kiln_info
*/
@TableField("kiln_id")
private Integer kilnId;
private Long kilnId;
/**
* 任务id
*/
@TableField("task_id")
private Long taskId;
/**
* 参数id，关联参数表：t_par_info
@@ -156,6 +162,8 @@ public class ParRotSpeedValue extends Model<ParRotSpeedValue> {
public static final String KILN_ID = "kiln_id";
public static final String TASK_ID = "task_id";
public static final String PAR_ID = "par_id";
public static final String FAN_SPEED_A_VALUE = "fan_speed_a_value";

36
6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ParTemValue.java
View File

@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-03-01
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -53,7 +53,13 @@ public class ParTemValue extends Model<ParTemValue> {
* 窑炉id，关联设备窑炉表：t_kiln_info
*/
@TableField("kiln_id")
private Integer kilnId;
private Long kilnId;
/**
* 任务id
*/
@TableField("task_id")
private Long taskId;
/**
* 参数id，关联参数表：t_par_info
@@ -98,22 +104,22 @@ public class ParTemValue extends Model<ParTemValue> {
private Float takeOverOilSetTemValue;
/**
* 扩展字段1
* 外一区温度
*/
@TableField("add_a")
private Float addA;
@TableField("outer_zone1_temp")
private Float outerZone1Temp;
/**
* 扩展字段2
* 外二区温度
*/
@TableField("add_b")
private Float addB;
@TableField("outer_zone2_temp")
private Float outerZone2Temp;
/**
* 扩展字段3
* 炉压
*/
@TableField("add_c")
private Float addC;
@TableField("furnace_pressure")
private Float furnacePressure;
/**
* 扩展字段4
@@ -144,6 +150,8 @@ public class ParTemValue extends Model<ParTemValue> {
public static final String KILN_ID = "kiln_id";
public static final String TASK_ID = "task_id";
public static final String PAR_ID = "par_id";
public static final String SET_TEM_VALUE = "set_tem_value";
@@ -158,11 +166,11 @@ public class ParTemValue extends Model<ParTemValue> {
public static final String TAKE_OVER_OIL_SET_TEM_VALUE = "take_over_oil_set_tem_value";
public static final String ADD_A = "add_a";
public static final String OUTER_ZONE1_TEMP = "outer_zone1_temp";
public static final String ADD_B = "add_b";
public static final String OUTER_ZONE2_TEMP = "outer_zone2_temp";
public static final String ADD_C = "add_c";
public static final String FURNACE_PRESSURE = "furnace_pressure";
public static final String ORTHER_A = "orther_a";

98
6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/PlcNameSpace.java Normal file
View File

@@ -0,0 +1,98 @@
package com.mt.wms.core.dal.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
* PLC变量nameSpace对照表
* </p>
*
* @author mt
* @since 2022-02-28
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_plc_name_space")
public class PlcNameSpace extends Model<PlcNameSpace> {
private static final long serialVersionUID = 1L;
/**
* id
*/
@TableField("id")
private Long id;
/**
* 设备类型，1：多用加工炉，2：氮化炉，3：回火炉，4：清洗机，5:rgv
*/
@TableField("eq_type")
private Integer eqType;
/**
* 变量名称
*/
@TableField("name")
private String name;
/**
* 变量的含义
*/
@TableField("note")
private String note;
/**
* 设备id
*/
@TableField("eq_id")
private Long eqId;
/**
* 设备名称
*/
@TableField("eq_name")
private String eqName;
/**
* 变量类型，0：变量，1：报警变量
*/
@TableField("type")
private Integer type;
/**
* 备注
*/
@TableField("remark")
private String remark;
public static final String ID = "id";
public static final String EQ_TYPE = "eq_type";
public static final String NAME = "name";
public static final String NOTE = "note";
public static final String EQ_ID = "eq_id";
public static final String EQ_NAME = "eq_name";
public static final String TYPE = "type";
public static final String REMARK = "remark";
@Override
protected Serializable pkVal() {
return null;
}
}

91
6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/PointInfo.java Normal file
View File

@@ -0,0 +1,91 @@
package com.mt.wms.core.dal.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import java.time.LocalDate;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
* 点位信息表
* </p>
*
* @author mt
* @since 2022-03-02
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_point_info")
public class PointInfo extends Model<PointInfo> {
private static final long serialVersionUID = 1L;
/**
* id
*/
@TableField("id")
private Integer id;
/**
* 点位编码，对应plc
*/
@TableField("code")
private Long code;
/**
* 点位对应的设备名称
*/
@TableField("name")
private String name;
/**
* 点位说明；关联对应表数据的code，窑炉code,库位code等等
*/
@TableField("note")
private String note;
/**
* 类型：1 炉子，2 液压台，3 库位
*/
@TableField("type")
private Integer type;
/**
* 距离原点的距离
*/
@TableField("distance")
private Double distance;
/**
* 创建时间
*/
@TableField("create_time")
private LocalDate createTime;
public static final String ID = "id";
public static final String CODE = "code";
public static final String NAME = "name";
public static final String NOTE = "note";
public static final String TYPE = "type";
public static final String DISTANCE = "distance";
public static final String CREATE_TIME = "create_time";
@Override
protected Serializable pkVal() {
return null;
}
}

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/AlarmInfoMapper.java
View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-02-28
*/
public interface AlarmInfoMapper extends BaseMapper<AlarmInfo> {

3
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/AlarmInfoMapper.xml
View File

@@ -21,11 +21,12 @@
<result column="alarm_info" property="alarmInfo" />
<result column="description" property="description" />
<result column="note" property="note" />
<result column="task_code" property="taskCode" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, code, equipment_id, equipment_name, type, alarm_code, alarm_info, description, note
id, valid, create_time, creator_id, updater_id, update_time, version, status, inter_code, code, equipment_id, equipment_name, type, alarm_code, alarm_info, description, note, task_code
</sql>
</mapper>

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/AutoExeTaskMapper.java
View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* </p>
*
* @author mt
* @since 2021-12-14
* @since 2022-03-04
*/
public interface AutoExeTaskMapper extends BaseMapper<AutoExeTask> {

5
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/AutoExeTaskMapper.xml
View File

@@ -19,6 +19,7 @@
<result column="f_det_task_code" property="fDetTaskCode" />
<result column="f_equipment_type_id" property="fEquipmentTypeId" />
<result column="f_equipment_id" property="fEquipmentId" />
<result column="f_equipment_name" property="fEquipmentName" />
<result column="f_craft_code_id" property="fCraftCodeId" />
<result column="f_plc_value" property="fPlcValue" />
<result column="f_in_tran_status" property="fInTranStatus" />
@@ -27,6 +28,7 @@
<result column="t_task_id" property="tTaskId" />
<result column="t_det_task_code" property="tDetTaskCode" />
<result column="t_equipment_type_id" property="tEquipmentTypeId" />
<result column="t_equipment_name" property="tEquipmentName" />
<result column="t_equipment_id" property="tEquipmentId" />
<result column="t_craft_code_id" property="tCraftCodeId" />
<result column="t_plc_value" property="tPlcValue" />
@@ -36,6 +38,7 @@
<result column="th_task_id" property="thTaskId" />
<result column="th_det_task_code" property="thDetTaskCode" />
<result column="th_equipment_type_id" property="thEquipmentTypeId" />
<result column="th_equipment_name" property="thEquipmentName" />
<result column="th_equipment_id" property="thEquipmentId" />
<result column="th_craft_code_id" property="thCraftCodeId" />
<result column="th_plc_value" property="thPlcValue" />
@@ -47,7 +50,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, valid, create_time, status, inter_code, process_flow_id, process_flow_name, process_flow_type, craft_code_id, craft_code, warehouse_id, f_task_id, f_det_task_code, f_equipment_type_id, f_equipment_id, f_craft_code_id, f_plc_value, f_in_tran_status, f_pro_status, f_out_tran_status, t_task_id, t_det_task_code, t_equipment_type_id, t_equipment_id, t_craft_code_id, t_plc_value, t_in_tran_status, t_pro_status, t_out_tran_status, th_task_id, th_det_task_code, th_equipment_type_id, th_equipment_id, th_craft_code_id, th_plc_value, th_in_tran_status, th_pro_status, th_out_tran_status, content
id, valid, create_time, status, inter_code, process_flow_id, process_flow_name, process_flow_type, craft_code_id, craft_code, warehouse_id, f_task_id, f_det_task_code, f_equipment_type_id, f_equipment_id, f_equipment_name, f_craft_code_id, f_plc_value, f_in_tran_status, f_pro_status, f_out_tran_status, t_task_id, t_det_task_code, t_equipment_type_id, t_equipment_name, t_equipment_id, t_craft_code_id, t_plc_value, t_in_tran_status, t_pro_status, t_out_tran_status, th_task_id, th_det_task_code, th_equipment_type_id, th_equipment_name, th_equipment_id, th_craft_code_id, th_plc_value, th_in_tran_status, th_pro_status, th_out_tran_status, content
</sql>
</mapper>

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/KilnInfoMapper.java
View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-02-28
*/
public interface KilnInfoMapper extends BaseMapper<KilnInfo> {

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParEleValueMapper.java
View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-03-01
*/
public interface ParEleValueMapper extends BaseMapper<ParEleValue> {

5
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParEleValueMapper.xml
View File

@@ -9,6 +9,7 @@
<result column="inter_code" property="interCode" />
<result column="status" property="status" />
<result column="kiln_id" property="kilnId" />
<result column="task_id" property="taskId" />
<result column="par_id" property="parId" />
<result column="a_voltagev_value" property="aVoltagevValue" />
<result column="b_voltagev_value" property="bVoltagevValue" />
@@ -17,7 +18,7 @@
<result column="b_current_value" property="bCurrentValue" />
<result column="c_current_value" property="cCurrentValue" />
<result column="total_bat" property="totalBat" />
<result column="add_a" property="addA" />
<result column="date_type" property="dateType" />
<result column="add_b" property="addB" />
<result column="add_c" property="addC" />
<result column="orther_a" property="ortherA" />
@@ -27,7 +28,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, create_time, inter_code, status, kiln_id, par_id, a_voltagev_value, b_voltagev_value, c_voltagev_value, a_current_value, b_current_value, c_current_value, total_bat, add_a, add_b, add_c, orther_a, orther_b, orther_c
id, create_time, inter_code, status, kiln_id, task_id, par_id, a_voltagev_value, b_voltagev_value, c_voltagev_value, a_current_value, b_current_value, c_current_value, total_bat, date_type, add_b, add_c, orther_a, orther_b, orther_c
</sql>
</mapper>

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParGasValueMapper.java
View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-03-01
*/
public interface ParGasValueMapper extends BaseMapper<ParGasValue> {

11
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParGasValueMapper.xml
View File

@@ -9,6 +9,7 @@
<result column="inter_code" property="interCode" />
<result column="status" property="status" />
<result column="kiln_id" property="kilnId" />
<result column="task_id" property="taskId" />
<result column="par_id" property="parId" />
<result column="set_nit_pot_value" property="setNitPotValue" />
<result column="actual_nit_pot_value" property="actualNitPotValue" />
@@ -16,17 +17,17 @@
<result column="nit_flow_value" property="nitFlowValue" />
<result column="ammonia_flow_value" property="ammoniaFlowValue" />
<result column="car_dioxide_flow_value" property="carDioxideFlowValue" />
<result column="add_a" property="addA" />
<result column="add_b" property="addB" />
<result column="add_c" property="addC" />
<result column="orther_a" property="ortherA" />
<result column="methanol_flow" property="methanolFlow" />
<result column="propane_flow" property="propaneFlow" />
<result column="hydrogen_content" property="hydrogenContent" />
<result column="decomposition_rate" property="decompositionRate" />
<result column="orther_b" property="ortherB" />
<result column="orther_c" property="ortherC" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, create_time, inter_code, status, kiln_id, par_id, set_nit_pot_value, actual_nit_pot_value, accept_nit_pot_value, nit_flow_value, ammonia_flow_value, car_dioxide_flow_value, add_a, add_b, add_c, orther_a, orther_b, orther_c
id, create_time, inter_code, status, kiln_id, task_id, par_id, set_nit_pot_value, actual_nit_pot_value, accept_nit_pot_value, nit_flow_value, ammonia_flow_value, car_dioxide_flow_value, methanol_flow, propane_flow, hydrogen_content, decomposition_rate, orther_b, orther_c
</sql>
</mapper>

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParRotSpeedValueMapper.java
View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-03-01
*/
public interface ParRotSpeedValueMapper extends BaseMapper<ParRotSpeedValue> {

3
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParRotSpeedValueMapper.xml
View File

@@ -9,6 +9,7 @@
<result column="inter_code" property="interCode" />
<result column="status" property="status" />
<result column="kiln_id" property="kilnId" />
<result column="task_id" property="taskId" />
<result column="par_id" property="parId" />
<result column="fan_speed_a_value" property="fanSpeedAValue" />
<result column="fan_speed_b_value" property="fanSpeedBValue" />
@@ -28,7 +29,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, create_time, inter_code, status, kiln_id, par_id, fan_speed_a_value, fan_speed_b_value, oil_sti_speed_a_value, oil_sti_speed_b_value, oil_sti_speed_c_value, oil_sti_speed_d_value, oil_sti_speed_e_value, oil_sti_speed_f_value, add_a, add_b, add_c, orther_a, orther_b, orther_c
id, create_time, inter_code, status, kiln_id, task_id, par_id, fan_speed_a_value, fan_speed_b_value, oil_sti_speed_a_value, oil_sti_speed_b_value, oil_sti_speed_c_value, oil_sti_speed_d_value, oil_sti_speed_e_value, oil_sti_speed_f_value, add_a, add_b, add_c, orther_a, orther_b, orther_c
</sql>
</mapper>

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParTemValueMapper.java
View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-03-01
*/
public interface ParTemValueMapper extends BaseMapper<ParTemValue> {

9
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ParTemValueMapper.xml
View File

@@ -9,6 +9,7 @@
<result column="inter_code" property="interCode" />
<result column="status" property="status" />
<result column="kiln_id" property="kilnId" />
<result column="task_id" property="taskId" />
<result column="par_id" property="parId" />
<result column="set_tem_value" property="setTemValue" />
<result column="act_tem_value" property="actTemValue" />
@@ -16,9 +17,9 @@
<result column="oil_tank_set_tem_value" property="oilTankSetTemValue" />
<result column="take_over_set_tem_value" property="takeOverSetTemValue" />
<result column="take_over_oil_set_tem_value" property="takeOverOilSetTemValue" />
<result column="add_a" property="addA" />
<result column="add_b" property="addB" />
<result column="add_c" property="addC" />
<result column="outer_zone1_temp" property="outerZone1Temp" />
<result column="outer_zone2_temp" property="outerZone2Temp" />
<result column="furnace_pressure" property="furnacePressure" />
<result column="orther_a" property="ortherA" />
<result column="orther_b" property="ortherB" />
<result column="orther_c" property="ortherC" />
@@ -26,7 +27,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, create_time, inter_code, status, kiln_id, par_id, set_tem_value, act_tem_value, oil_tank_act_tem_value, oil_tank_set_tem_value, take_over_set_tem_value, take_over_oil_set_tem_value, add_a, add_b, add_c, orther_a, orther_b, orther_c
id, create_time, inter_code, status, kiln_id, task_id, par_id, set_tem_value, act_tem_value, oil_tank_act_tem_value, oil_tank_set_tem_value, take_over_set_tem_value, take_over_oil_set_tem_value, outer_zone1_temp, outer_zone2_temp, furnace_pressure, orther_a, orther_b, orther_c
</sql>
</mapper>

16
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/PlcNameSpaceMapper.java Normal file
View File

@@ -0,0 +1,16 @@
package com.mt.wms.core.dal.mapper;
import com.mt.wms.core.dal.entity.PlcNameSpace;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* PLC变量nameSpace对照表 Mapper 接口
* </p>
*
* @author mt
* @since 2022-02-28
*/
public interface PlcNameSpaceMapper extends BaseMapper<PlcNameSpace> {
}

22
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/PlcNameSpaceMapper.xml Normal file
View File

@@ -0,0 +1,22 @@
<?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="com.mt.wms.core.dal.mapper.PlcNameSpaceMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.mt.wms.core.dal.entity.PlcNameSpace">
<result column="id" property="id" />
<result column="eq_type" property="eqType" />
<result column="name" property="name" />
<result column="note" property="note" />
<result column="eq_id" property="eqId" />
<result column="eq_name" property="eqName" />
<result column="type" property="type" />
<result column="remark" property="remark" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, eq_type, name, note, eq_id, eq_name, type, remark
</sql>
</mapper>

16
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/PointInfoMapper.java Normal file
View File

@@ -0,0 +1,16 @@
package com.mt.wms.core.dal.mapper;
import com.mt.wms.core.dal.entity.PointInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 点位信息表 Mapper 接口
* </p>
*
* @author mt
* @since 2022-03-02
*/
public interface PointInfoMapper extends BaseMapper<PointInfo> {
}

21
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/PointInfoMapper.xml Normal file
View File

@@ -0,0 +1,21 @@
<?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="com.mt.wms.core.dal.mapper.PointInfoMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.mt.wms.core.dal.entity.PointInfo">
<result column="id" property="id" />
<result column="code" property="code" />
<result column="name" property="name" />
<result column="note" property="note" />
<result column="type" property="type" />
<result column="distance" property="distance" />
<result column="create_time" property="createTime" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, code, name, note, type, distance, create_time
</sql>
</mapper>

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/AlarmInfoServiceBiz.java
View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-02-28
*/
public interface AlarmInfoServiceBiz extends IService<AlarmInfo> {

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/AutoExeTaskServiceBiz.java
View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author mt
* @since 2021-12-14
* @since 2022-03-04
*/
public interface AutoExeTaskServiceBiz extends IService<AutoExeTask> {

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/KilnInfoServiceBiz.java
View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-02-28
*/
public interface KilnInfoServiceBiz extends IService<KilnInfo> {

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/ParEleValueServiceBiz.java
View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-03-01
*/
public interface ParEleValueServiceBiz extends IService<ParEleValue> {

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/ParGasValueServiceBiz.java
View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-03-01
*/
public interface ParGasValueServiceBiz extends IService<ParGasValue> {

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/ParRotSpeedValueServiceBiz.java
View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-03-01
*/
public interface ParRotSpeedValueServiceBiz extends IService<ParRotSpeedValue> {

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/ParTemValueServiceBiz.java
View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-03-01
*/
public interface ParTemValueServiceBiz extends IService<ParTemValue> {

16
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/PlcNameSpaceServiceBiz.java Normal file
View File

@@ -0,0 +1,16 @@
package com.mt.wms.core.dal.service;
import com.mt.wms.core.dal.entity.PlcNameSpace;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* PLC变量nameSpace对照表 服务类
* </p>
*
* @author mt
* @since 2022-02-28
*/
public interface PlcNameSpaceServiceBiz extends IService<PlcNameSpace> {
}

16
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/PointInfoServiceBiz.java Normal file
View File

@@ -0,0 +1,16 @@
package com.mt.wms.core.dal.service;
import com.mt.wms.core.dal.entity.PointInfo;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 点位信息表 服务类
* </p>
*
* @author mt
* @since 2022-03-02
*/
public interface PointInfoServiceBiz extends IService<PointInfo> {
}

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/AlarmInfoServiceBizImpl.java
View File

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-02-28
*/
@Service
public class AlarmInfoServiceBizImpl extends ServiceImpl<AlarmInfoMapper, AlarmInfo> implements AlarmInfoServiceBiz {

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/AutoExeTaskServiceBizImpl.java
View File

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author mt
* @since 2021-12-14
* @since 2022-03-04
*/
@Service
public class AutoExeTaskServiceBizImpl extends ServiceImpl<AutoExeTaskMapper, AutoExeTask> implements AutoExeTaskServiceBiz {

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/KilnInfoServiceBizImpl.java
View File

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-02-28
*/
@Service
public class KilnInfoServiceBizImpl extends ServiceImpl<KilnInfoMapper, KilnInfo> implements KilnInfoServiceBiz {

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/ParEleValueServiceBizImpl.java
View File

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-03-01
*/
@Service
public class ParEleValueServiceBizImpl extends ServiceImpl<ParEleValueMapper, ParEleValue> implements ParEleValueServiceBiz {

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/ParGasValueServiceBizImpl.java
View File

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-03-01
*/
@Service
public class ParGasValueServiceBizImpl extends ServiceImpl<ParGasValueMapper, ParGasValue> implements ParGasValueServiceBiz {

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/ParRotSpeedValueServiceBizImpl.java
View File

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-03-01
*/
@Service
public class ParRotSpeedValueServiceBizImpl extends ServiceImpl<ParRotSpeedValueMapper, ParRotSpeedValue> implements ParRotSpeedValueServiceBiz {

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/ParTemValueServiceBizImpl.java
View File

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author mt
* @since 2021-11-18
* @since 2022-03-01
*/
@Service
public class ParTemValueServiceBizImpl extends ServiceImpl<ParTemValueMapper, ParTemValue> implements ParTemValueServiceBiz {

20
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/PlcNameSpaceServiceBizImpl.java Normal file
View File

@@ -0,0 +1,20 @@
package com.mt.wms.core.dal.service.impl;
import com.mt.wms.core.dal.entity.PlcNameSpace;
import com.mt.wms.core.dal.mapper.PlcNameSpaceMapper;
import com.mt.wms.core.dal.service.PlcNameSpaceServiceBiz;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* PLC变量nameSpace对照表 服务实现类
* </p>
*
* @author mt
* @since 2022-02-28
*/
@Service
public class PlcNameSpaceServiceBizImpl extends ServiceImpl<PlcNameSpaceMapper, PlcNameSpace> implements PlcNameSpaceServiceBiz {
}

20
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/PointInfoServiceBizImpl.java Normal file
View File

@@ -0,0 +1,20 @@
package com.mt.wms.core.dal.service.impl;
import com.mt.wms.core.dal.entity.PointInfo;
import com.mt.wms.core.dal.mapper.PointInfoMapper;
import com.mt.wms.core.dal.service.PointInfoServiceBiz;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 点位信息表 服务实现类
* </p>
*
* @author mt
* @since 2022-03-02
*/
@Service
public class PointInfoServiceBizImpl extends ServiceImpl<PointInfoMapper, PointInfo> implements PointInfoServiceBiz {
}

24
6.program/wms-core/src/main/java/com/mt/wms/core/utils/CodeGeneratorHelper.java
View File

@@ -27,7 +27,23 @@ public class CodeGeneratorHelper {
*/
public static final String ORDER_CODE = "ORDER_CODE";
/**
* 报警编码
*/
public static final String ALARM_CODE = "ALARM_CODE";
/**
* 自动任务编码
*/
public static final String AUTO_TASK_CODE = "AUTO_TASK_CODE";
/**
* 生成自动任务编码
*
* @return 订单编号
*/
public static String getAutoTaskCode() {
return IDGenerator.gen("ZD", "yyyyMMdd", 6, AUTO_TASK_CODE);
}
/**
* 生成订单编号
*
@@ -36,5 +52,13 @@ public class CodeGeneratorHelper {
public static String getOrderCode() {
return IDGenerator.gen("20", "yyyyMMdd", 6, ORDER_CODE);
}
/**
* 生成报警编码
*
* @return 报警编码
*/
public static String getAlarmCode() {
return IDGenerator.gen("BJ", "yyyyMMdd", 6, ALARM_CODE);
}
}

7
6.program/wms-core/src/main/java/com/mt/wms/core/utils/HttpClient.java
View File

@@ -27,6 +27,7 @@ import java.io.IOException;
import java.nio.charset.Charset;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.concurrent.TimeUnit;
/**
* 使用 OKhttp 请求 Api 数据
@@ -46,7 +47,11 @@ public class HttpClient {
}
public static String httpPost(String url, String json) throws IOException {
OkHttpClient httpClient = new OkHttpClient();
//OkHttpClient httpClient = new OkHttpClient();
OkHttpClient httpClient = new OkHttpClient().newBuilder().connectTimeout(300L, TimeUnit.MINUTES)
.writeTimeout(60*30, TimeUnit.SECONDS)
.readTimeout(60*30, TimeUnit.SECONDS)
.build();
RequestBody requestBody = RequestBody.create(JSON, json);
Request request = new Request.Builder()
.url(url)