Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zhongtong-avi-service
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
中通客车项目
zhongtong-avi-service
Commits
d69269fd
Commit
d69269fd
authored
Oct 20, 2019
by
夏东伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
化验室开发
parent
5d730e1a
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
526 additions
and
1 deletion
+526
-1
DustingLineMachine.java
...hongtong/avi/gateway/parts/domain/DustingLineMachine.java
+52
-0
PretreatmentMachine.java
...ongtong/avi/gateway/parts/domain/PretreatmentMachine.java
+113
-0
SteelCncCuttingMachine.java
...tong/avi/gateway/parts/domain/SteelCncCuttingMachine.java
+42
-0
DustingLineMachineJob.java
...hongtong/avi/gateway/parts/job/DustingLineMachineJob.java
+56
-0
PretreamentMachineJob.java
...hongtong/avi/gateway/parts/job/PretreamentMachineJob.java
+59
-0
SteelCncCuttingMachineJob.java
...tong/avi/gateway/parts/job/SteelCncCuttingMachineJob.java
+56
-0
PlateChainMachine.java
...ongtong/avi/gateway/welding/domain/PlateChainMachine.java
+46
-0
PlcControlTireMachine.java
...ong/avi/gateway/welding/domain/PlcControlTireMachine.java
+46
-0
PlateChainMachineJob.java
...ongtong/avi/gateway/welding/job/PlateChainMachineJob.java
+54
-0
MybatisMySQLConfig.java
...tstar/zhongtong/avi/global/config/MybatisMySQLConfig.java
+2
-1
No files found.
src/main/java/net/vtstar/zhongtong/avi/gateway/parts/domain/DustingLineMachine.java
0 → 100644
View file @
d69269fd
package
net
.
vtstar
.
zhongtong
.
avi
.
gateway
.
parts
.
domain
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
net.vtstar.scada.base.gather.domain.EquipmentData
;
import
net.vtstar.user.search.Search
;
import
net.vtstar.zhongtong.avi.global.web.Show
;
import
net.vtstar.zhongtong.avi.global.web.domain.enums.FieldType
;
import
javax.persistence.Column
;
import
javax.persistence.Table
;
import
java.util.Date
;
@Data
@Search
(
code
=
"DUSTING_LINE"
)
@ApiModel
(
"喷粉线"
)
@Table
(
name
=
"eqp_data_dusting_line"
)
public
class
DustingLineMachine
extends
EquipmentData
{
@Show
(
label
=
"设备编号"
)
@Column
(
name
=
"eqp_code"
)
@ApiModelProperty
(
notes
=
"设备编号"
)
private
String
eqpCode
;
@Show
(
label
=
"设备名称"
)
@Column
(
name
=
"eqp_name"
)
@ApiModelProperty
(
notes
=
"设备名称"
)
private
String
eqpName
;
@Show
(
label
=
"链速"
)
@Column
(
name
=
"chain_speed"
)
@ApiModelProperty
(
notes
=
"链速"
)
private
int
chainSpeed
;
@Show
(
label
=
"喷粉一状态"
)
@Column
(
name
=
"state_1"
)
@ApiModelProperty
(
notes
=
"喷粉一状态"
)
private
String
state1
;
@Show
(
label
=
"喷粉二状态"
)
@Column
(
name
=
"state_2"
)
@ApiModelProperty
(
notes
=
"喷粉二状态"
)
private
String
state2
;
@Show
(
label
=
"时间"
,
dataType
=
FieldType
.
DATETIME
)
@ApiModelProperty
(
"时间"
)
@Column
(
name
=
"create_time"
)
private
Date
createTime
;
private
Integer
state
;
}
src/main/java/net/vtstar/zhongtong/avi/gateway/parts/domain/PretreatmentMachine.java
0 → 100644
View file @
d69269fd
package
net
.
vtstar
.
zhongtong
.
avi
.
gateway
.
parts
.
domain
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
net.vtstar.scada.base.gather.domain.EquipmentData
;
import
net.vtstar.user.search.Search
;
import
net.vtstar.zhongtong.avi.global.web.Show
;
import
net.vtstar.zhongtong.avi.global.web.domain.enums.FieldType
;
import
javax.persistence.Column
;
import
javax.persistence.Table
;
import
java.math.BigDecimal
;
import
java.util.Date
;
@Data
@Search
(
code
=
"PRETREATMENT"
)
@ApiModel
(
"前处理"
)
@Table
(
name
=
"eqp_data_pretreatment"
)
public
class
PretreatmentMachine
extends
EquipmentData
{
@Show
(
label
=
"设备编号"
)
@Column
(
name
=
"eqp_code"
)
@ApiModelProperty
(
notes
=
"设备编号"
)
private
String
eqpCode
;
@Show
(
label
=
"设备名称"
)
@Column
(
name
=
"eqp_name"
)
@ApiModelProperty
(
notes
=
"设备名称"
)
private
String
eqpName
;
@Show
(
label
=
"热纯水燃烧机温度"
)
@Column
(
name
=
"rcs_temperature"
)
@ApiModelProperty
(
notes
=
"热纯水燃烧机温度"
)
private
String
rcsTemperature
;
@Show
(
label
=
"防锈工位燃烧机温度"
)
@Column
(
name
=
"fxgw_temperature"
)
@ApiModelProperty
(
notes
=
"防锈工位燃烧机温度"
)
private
String
fxgwTemperature
;
@Show
(
label
=
"磷化热说泵温度"
)
@Column
(
name
=
"lh_temperature"
)
@ApiModelProperty
(
notes
=
"磷化热说泵温度"
)
private
String
lhTemperature
;
@Show
(
label
=
"电动三通阀温度"
)
@Column
(
name
=
"ddst_temperature"
)
@ApiModelProperty
(
notes
=
"电动三通阀温度"
)
private
String
ddstTemperature
;
@Show
(
label
=
"脱脂电动三通阀温度"
)
@Column
(
name
=
"tz_temperature"
)
@ApiModelProperty
(
notes
=
"脱脂电动三通阀温度"
)
private
String
tzTemperature
;
@Show
(
label
=
"预脱脂电动三通阀温度"
)
@Column
(
name
=
"ytz_temperature"
)
@ApiModelProperty
(
notes
=
"预脱脂电动三通阀温度"
)
private
String
ytzTemperature
;
@Show
(
label
=
"2#若酸洗槽时间"
)
@Column
(
name
=
"rsc2_time"
)
@ApiModelProperty
(
notes
=
"2#若酸洗槽时间"
)
private
Integer
rsc2Time
;
@Show
(
label
=
"3#中和槽时间"
)
@Column
(
name
=
"zhc3_time"
)
@ApiModelProperty
(
notes
=
"3#中和槽时间"
)
private
Integer
zhc3Time
;
@Show
(
label
=
"4#水洗4槽时间"
)
@Column
(
name
=
"sx4_time"
)
@ApiModelProperty
(
notes
=
"4#水洗4槽时间"
)
private
Integer
sx4Time
;
@Show
(
label
=
"5#表调时间"
)
@Column
(
name
=
"bt5_time"
)
@ApiModelProperty
(
notes
=
"5#表调时间"
)
private
Integer
bt5Time
;
@Show
(
label
=
"6#磷化时间"
)
@Column
(
name
=
"lh6_time"
)
@ApiModelProperty
(
notes
=
"6#磷化时间"
)
private
Integer
lh6Time
;
@Show
(
label
=
"7#水洗5时间"
)
@Column
(
name
=
"sx7_time"
)
@ApiModelProperty
(
notes
=
"7#水洗5时间"
)
private
Integer
sx7Time
;
@Show
(
label
=
"8#表调时间"
)
@Column
(
name
=
"bt8_time"
)
@ApiModelProperty
(
notes
=
"8#表调时间"
)
private
Integer
bt8Time
;
@Show
(
label
=
"9#热纯水时间"
)
@Column
(
name
=
"rcs9_time"
)
@ApiModelProperty
(
notes
=
"9#热纯水时间"
)
private
Integer
rcs9Time
;
@Show
(
label
=
"10#防锈液时间"
)
@Column
(
name
=
"fx10_time"
)
@ApiModelProperty
(
notes
=
"10#防锈液时间"
)
private
Integer
fx10Time
;
@Show
(
label
=
"时间"
,
dataType
=
FieldType
.
DATETIME
)
@ApiModelProperty
(
"时间"
)
@Column
(
name
=
"create_time"
)
private
Date
createTime
;
private
Integer
state
;
}
src/main/java/net/vtstar/zhongtong/avi/gateway/parts/domain/SteelCncCuttingMachine.java
0 → 100644
View file @
d69269fd
package
net
.
vtstar
.
zhongtong
.
avi
.
gateway
.
parts
.
domain
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
net.vtstar.scada.base.gather.domain.EquipmentData
;
import
net.vtstar.user.search.Search
;
import
net.vtstar.zhongtong.avi.global.web.Show
;
import
net.vtstar.zhongtong.avi.global.web.domain.enums.FieldType
;
import
javax.persistence.Column
;
import
javax.persistence.Table
;
import
java.util.Date
;
@Data
@Search
(
code
=
"STEEL_CNC_CUTTING"
)
@ApiModel
(
"型钢数控下料"
)
@Table
(
name
=
"eqp_data_steel_cnc_cutting"
)
public
class
SteelCncCuttingMachine
extends
EquipmentData
{
@Show
(
label
=
"设备编号"
)
@Column
(
name
=
"eqp_code"
)
@ApiModelProperty
(
notes
=
"设备编号"
)
private
String
eqpCode
;
@Show
(
label
=
"设备名称"
)
@Column
(
name
=
"eqp_name"
)
@ApiModelProperty
(
notes
=
"设备名称"
)
private
String
eqpName
;
@Show
(
label
=
"设备状态"
)
@Column
(
name
=
"state"
)
@ApiModelProperty
(
notes
=
"设备状态"
)
private
String
stateString
;
@Show
(
label
=
"时间"
,
dataType
=
FieldType
.
DATETIME
)
@ApiModelProperty
(
"时间"
)
@Column
(
name
=
"create_time"
)
private
Date
createTime
;
private
Integer
state
;
}
src/main/java/net/vtstar/zhongtong/avi/gateway/parts/job/DustingLineMachineJob.java
0 → 100644
View file @
d69269fd
package
net
.
vtstar
.
zhongtong
.
avi
.
gateway
.
parts
.
job
;
import
lombok.extern.slf4j.Slf4j
;
import
net.vtstar.scada.base.equipmgt.domain.Enum.EquipStatusEnum
;
import
net.vtstar.scada.base.gather.domain.EquipmentData
;
import
net.vtstar.scada.base.gather.job.GatherJob
;
import
net.vtstar.zhongtong.avi.gateway.parts.domain.DustingLineMachine
;
import
net.vtstar.zhongtong.avi.gateway.parts.domain.PretreatmentMachine
;
import
org.quartz.JobExecutionContext
;
import
org.quartz.JobExecutionException
;
import
org.springframework.stereotype.Component
;
/**
* 喷粉线数据采集JOB
*/
@Slf4j
@Component
public
class
DustingLineMachineJob
extends
GatherJob
{
private
static
final
String
NAME
=
"DUSTING_LINE"
;
@Override
protected
void
executeInternal
(
JobExecutionContext
context
)
throws
JobExecutionException
{
log
.
info
(
"JobName: {}"
,
context
.
getJobDetail
().
getKey
().
getName
());
super
.
gatherByModbus
(
NAME
,
DustingLineMachine
.
class
);
}
protected
boolean
handleObject
(
EquipmentData
equipmentData
)
{
//0待机,1是喷粉
DustingLineMachine
data
=
(
DustingLineMachine
)
equipmentData
;
Integer
state
=
data
.
getState
();
if
(
state
==
null
)
{
return
false
;
}
switch
(
state
)
{
case
0
:
equipmentData
.
setEquipStatus
(
EquipStatusEnum
.
SHUTDOWN
);
break
;
case
1
:
equipmentData
.
setEquipStatus
(
EquipStatusEnum
.
RUN
);
break
;
case
2
:
equipmentData
.
setEquipStatus
(
EquipStatusEnum
.
ALARM
);
break
;
default
:
return
false
;
}
return
true
;
}
@Override
protected
Object
handleValue
(
String
fieldName
,
Object
value
)
{
return
value
;
}
}
src/main/java/net/vtstar/zhongtong/avi/gateway/parts/job/PretreamentMachineJob.java
0 → 100644
View file @
d69269fd
package
net
.
vtstar
.
zhongtong
.
avi
.
gateway
.
parts
.
job
;
import
lombok.extern.slf4j.Slf4j
;
import
net.vtstar.scada.base.equipmgt.domain.Enum.EquipStatusEnum
;
import
net.vtstar.scada.base.gather.domain.EquipmentData
;
import
net.vtstar.scada.base.gather.job.GatherJob
;
import
net.vtstar.zhongtong.avi.gateway.parts.domain.PretreatmentMachine
;
import
net.vtstar.zhongtong.avi.stamping.domain.LaserCuttingMachine
;
import
org.quartz.JobExecutionContext
;
import
org.quartz.JobExecutionException
;
import
org.springframework.stereotype.Component
;
/**
* 前处理数据采集JOB
*/
@Slf4j
@Component
public
class
PretreamentMachineJob
extends
GatherJob
{
private
static
final
String
NAME
=
"PRETREATMENT"
;
@Override
protected
void
executeInternal
(
JobExecutionContext
context
)
throws
JobExecutionException
{
log
.
info
(
"JobName: {}"
,
context
.
getJobDetail
().
getKey
().
getName
());
super
.
gatherByModbus
(
NAME
,
PretreatmentMachine
.
class
);
}
protected
boolean
handleObject
(
EquipmentData
equipmentData
)
{
PretreatmentMachine
data
=
(
PretreatmentMachine
)
equipmentData
;
Integer
state
=
data
.
getState
();
if
(
state
==
null
)
{
return
false
;
}
switch
(
state
)
{
case
0
:
equipmentData
.
setEquipStatus
(
EquipStatusEnum
.
SHUTDOWN
);
break
;
case
1
:
equipmentData
.
setEquipStatus
(
EquipStatusEnum
.
RUN
);
break
;
case
2
:
equipmentData
.
setEquipStatus
(
EquipStatusEnum
.
ALARM
);
break
;
default
:
return
false
;
}
return
true
;
}
@Override
protected
Object
handleValue
(
String
fieldName
,
Object
value
)
{
if
(
fieldName
.
endsWith
(
"Temperature"
)){
return
String
.
valueOf
(
Long
.
valueOf
(
value
.
toString
())
/
10
f
);
}
return
value
;
}
}
src/main/java/net/vtstar/zhongtong/avi/gateway/parts/job/SteelCncCuttingMachineJob.java
0 → 100644
View file @
d69269fd
package
net
.
vtstar
.
zhongtong
.
avi
.
gateway
.
parts
.
job
;
import
lombok.extern.slf4j.Slf4j
;
import
net.vtstar.scada.base.equipmgt.domain.Enum.EquipStatusEnum
;
import
net.vtstar.scada.base.gather.domain.EquipmentData
;
import
net.vtstar.scada.base.gather.job.GatherJob
;
import
net.vtstar.zhongtong.avi.gateway.parts.domain.PretreatmentMachine
;
import
net.vtstar.zhongtong.avi.gateway.parts.domain.SteelCncCuttingMachine
;
import
org.quartz.JobExecutionContext
;
import
org.quartz.JobExecutionException
;
import
org.springframework.stereotype.Component
;
/**
* 型钢下料数据采集JOB
*/
@Slf4j
@Component
public
class
SteelCncCuttingMachineJob
extends
GatherJob
{
private
static
final
String
NAME
=
"STEEL_CNC_CUTTING"
;
@Override
protected
void
executeInternal
(
JobExecutionContext
context
)
throws
JobExecutionException
{
log
.
info
(
"JobName: {}"
,
context
.
getJobDetail
().
getKey
().
getName
());
super
.
gatherByModbus
(
NAME
,
SteelCncCuttingMachine
.
class
);
}
protected
boolean
handleObject
(
EquipmentData
equipmentData
)
{
SteelCncCuttingMachine
data
=
(
SteelCncCuttingMachine
)
equipmentData
;
Integer
state
=
data
.
getState
();
if
(
state
==
null
)
{
return
false
;
}
switch
(
state
)
{
case
0
:
equipmentData
.
setEquipStatus
(
EquipStatusEnum
.
SHUTDOWN
);
break
;
case
1
:
equipmentData
.
setEquipStatus
(
EquipStatusEnum
.
RUN
);
break
;
case
2
:
equipmentData
.
setEquipStatus
(
EquipStatusEnum
.
ALARM
);
break
;
default
:
return
false
;
}
return
true
;
}
@Override
protected
Object
handleValue
(
String
fieldName
,
Object
value
)
{
return
value
;
}
}
src/main/java/net/vtstar/zhongtong/avi/gateway/welding/domain/PlateChainMachine.java
0 → 100644
View file @
d69269fd
package
net
.
vtstar
.
zhongtong
.
avi
.
gateway
.
welding
.
domain
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
net.vtstar.scada.base.gather.domain.EquipmentData
;
import
net.vtstar.user.search.Search
;
import
net.vtstar.zhongtong.avi.global.web.Show
;
import
net.vtstar.zhongtong.avi.global.web.domain.enums.FieldType
;
import
javax.persistence.Column
;
import
javax.persistence.Table
;
import
java.util.Date
;
@Data
@Search
(
code
=
"PLATE_CHAIN"
)
@ApiModel
(
"板链"
)
@Table
(
name
=
"eqp_data_plate_chain"
)
public
class
PlateChainMachine
extends
EquipmentData
{
@Show
(
label
=
"设备编号"
)
@Column
(
name
=
"eqp_code"
)
@ApiModelProperty
(
notes
=
"设备编号"
)
private
String
eqpCode
;
@Show
(
label
=
"设备名称"
)
@Column
(
name
=
"eqp_name"
)
@ApiModelProperty
(
notes
=
"设备名称"
)
private
String
eqpName
;
@Show
(
label
=
"系统是否报警"
)
@Column
(
name
=
"error_state"
)
@ApiModelProperty
(
notes
=
"系统是否报警"
)
private
int
errorState
;
@Show
(
label
=
"系统是否运行"
)
@Column
(
name
=
"state"
)
@ApiModelProperty
(
notes
=
"系统是否运行"
)
private
int
state
;
@Show
(
label
=
"时间"
,
dataType
=
FieldType
.
DATETIME
)
@ApiModelProperty
(
"时间"
)
@Column
(
name
=
"create_time"
)
private
Date
createTime
;
}
src/main/java/net/vtstar/zhongtong/avi/gateway/welding/domain/PlcControlTireMachine.java
0 → 100644
View file @
d69269fd
package
net
.
vtstar
.
zhongtong
.
avi
.
gateway
.
welding
.
domain
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
net.vtstar.scada.base.gather.domain.EquipmentData
;
import
net.vtstar.user.search.Search
;
import
net.vtstar.zhongtong.avi.global.web.Show
;
import
net.vtstar.zhongtong.avi.global.web.domain.enums.FieldType
;
import
javax.persistence.Column
;
import
javax.persistence.Table
;
import
java.util.Date
;
@Data
@Search
(
code
=
"PLC_CONTROL_TIRE_1"
)
@ApiModel
(
"PLC数控合装胎"
)
@Table
(
name
=
"eqp_data_control_tire"
)
public
class
PlcControlTireMachine
extends
EquipmentData
{
@Show
(
label
=
"设备编号"
)
@Column
(
name
=
"eqp_code"
)
@ApiModelProperty
(
notes
=
"设备编号"
)
private
String
eqpCode
;
@Show
(
label
=
"设备名称"
)
@Column
(
name
=
"eqp_name"
)
@ApiModelProperty
(
notes
=
"设备名称"
)
private
String
eqpName
;
@Show
(
label
=
"系统是否报警"
)
@Column
(
name
=
"error_state"
)
@ApiModelProperty
(
notes
=
"系统是否报警"
)
private
int
errorState
;
@Show
(
label
=
"系统是否运行"
)
@Column
(
name
=
"state"
)
@ApiModelProperty
(
notes
=
"系统是否运行"
)
private
int
state
;
@Show
(
label
=
"时间"
,
dataType
=
FieldType
.
DATETIME
)
@ApiModelProperty
(
"时间"
)
@Column
(
name
=
"create_time"
)
private
Date
createTime
;
}
src/main/java/net/vtstar/zhongtong/avi/gateway/welding/job/PlateChainMachineJob.java
0 → 100644
View file @
d69269fd
package
net
.
vtstar
.
zhongtong
.
avi
.
gateway
.
welding
.
job
;
import
lombok.extern.slf4j.Slf4j
;
import
net.vtstar.scada.base.equipmgt.domain.Enum.EquipStatusEnum
;
import
net.vtstar.scada.base.gather.domain.EquipmentData
;
import
net.vtstar.scada.base.gather.job.GatherJob
;
import
net.vtstar.zhongtong.avi.gateway.welding.domain.PlateChainMachine
;
import
org.quartz.JobExecutionContext
;
import
org.quartz.JobExecutionException
;
import
org.springframework.stereotype.Component
;
/**
* 焊装板链数据采集JOB
*/
@Slf4j
@Component
public
class
PlateChainMachineJob
extends
GatherJob
{
private
static
final
String
NAME
=
"PLATE_CHAIN"
;
@Override
protected
void
executeInternal
(
JobExecutionContext
context
)
throws
JobExecutionException
{
log
.
info
(
"JobName: {}"
,
context
.
getJobDetail
().
getKey
().
getName
());
super
.
gatherByModbus
(
NAME
,
PlateChainMachine
.
class
);
}
protected
boolean
handleObject
(
EquipmentData
equipmentData
)
{
PlateChainMachine
data
=
(
PlateChainMachine
)
equipmentData
;
Integer
state
=
data
.
getState
();
if
(
state
==
null
)
{
return
false
;
}
switch
(
state
)
{
case
0
:
equipmentData
.
setEquipStatus
(
EquipStatusEnum
.
SHUTDOWN
);
break
;
case
1
:
equipmentData
.
setEquipStatus
(
EquipStatusEnum
.
RUN
);
break
;
case
2
:
equipmentData
.
setEquipStatus
(
EquipStatusEnum
.
ALARM
);
break
;
default
:
return
false
;
}
return
true
;
}
@Override
protected
Object
handleValue
(
String
fieldName
,
Object
value
)
{
return
value
;
}
}
src/main/java/net/vtstar/zhongtong/avi/global/config/MybatisMySQLConfig.java
View file @
d69269fd
...
...
@@ -21,7 +21,8 @@ import javax.sql.DataSource;
"net.vtstar.scada.base.equipmgt.mapper"
,
"net.vtstar.zhongtong.avi.equipment.mapper"
,
"net.vtstar.zhongtong.avi.sqlserver.mapper"
,
"net.vtstar.zhongtong.avi.access.mapper"
"net.vtstar.zhongtong.avi.access.mapper"
,
"net.vtstar.zhongtong.avi.laboratory.mapper"
},
sqlSessionFactoryRef
=
"sqlSessionFactoryMySQL"
)
public
class
MybatisMySQLConfig
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment