Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
K
kwell-mes
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
gavelinfo
kwell-mes
Commits
0e3fac99
Commit
0e3fac99
authored
Mar 10, 2022
by
zhoumaotao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码调整
parent
f1d7e94a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
23 deletions
+25
-23
GpfkcxDaoImpl.java
...src/main/java/com/gavel/kwell/dao/impl/GpfkcxDaoImpl.java
+3
-2
KmesBoardDaoImpl.java
.../main/java/com/gavel/kwell/dao/impl/KmesBoardDaoImpl.java
+1
-1
KmesBoardServiceImpl.java
...va/com/gavel/kwell/service/impl/KmesBoardServiceImpl.java
+0
-3
UpointServiceImpl.java
.../java/com/gavel/kwell/service/impl/UpointServiceImpl.java
+14
-7
DataPointItem.java
gavel/src/main/java/com/gavel/kwell/vo/DataPointItem.java
+7
-0
GpfkHgVO.java
gavel/src/main/java/com/gavel/kwell/vo/GpfkHgVO.java
+0
-10
No files found.
gavel/src/main/java/com/gavel/kwell/dao/impl/GpfkcxDaoImpl.java
View file @
0e3fac99
...
...
@@ -122,10 +122,11 @@ public class GpfkcxDaoImpl extends BaseDaoImpl implements GpfkcxDao {
sqlMap
.
append
(
" GPFK_LFSL,WOGYLX_GXBZ "
);
sqlMap
.
append
(
"from GPFK "
);
sqlMap
.
append
(
" left join WOGYLX on WOGYLX_ID = GPFK_WOGYLX "
);
sqlMap
.
append
(
"where (GPFK_FKSJ >= :pStart and GPFK_FKSJ < :pEnd) and
WOGYLX_GXBZ = :pGxbz
"
);
//[a,b)
sqlMap
.
append
(
"where (GPFK_FKSJ >= :pStart and GPFK_FKSJ < :pEnd) and
(WOGYLX_GXBZ = :pDGxbz or WOGYLX_GXBZ = :pMGxbz)
"
);
//[a,b)
sqlMap
.
setParamValue
(
"pStart"
,
start
);
sqlMap
.
setParamValue
(
"pEnd"
,
end
);
sqlMap
.
setParamValue
(
"pGxbz"
,
GxlxGxbzEnum
.
LAST
.
getId
());
sqlMap
.
setParamValue
(
"pDGxbz"
,
GxlxGxbzEnum
.
ONLY
.
getId
());
sqlMap
.
setParamValue
(
"pMGxbz"
,
GxlxGxbzEnum
.
LAST
.
getId
());
return
sqlMap
.
query
(
Gpfk
.
class
);
}
...
...
gavel/src/main/java/com/gavel/kwell/dao/impl/KmesBoardDaoImpl.java
View file @
0e3fac99
...
...
@@ -76,7 +76,7 @@ public class KmesBoardDaoImpl extends BaseDaoImpl implements KmesBoardDao {
sqlMap
.
append
(
"where 1=1 and GPFK_CJSJ = (select max(GPFK_CJSJ) "
);
sqlMap
.
append
(
" from GPFK "
);
sqlMap
.
append
(
" left join WOGYLX on WOGYLX_ID = GPFK_WOGYLX "
);
sqlMap
.
append
(
" where WOGYLX_GXBZ = :pGxbz "
);
sqlMap
.
append
(
" where
(
WOGYLX_GXBZ = :pGxbz "
);
sqlMap
.
setParamValue
(
"pGxbz"
,
GxlxGxbzEnum
.
FIRST
.
getId
());
sqlMap
.
append
(
" ) "
);
return
sqlMap
.
queryEntity
(
UWoVO
.
class
);
...
...
gavel/src/main/java/com/gavel/kwell/service/impl/KmesBoardServiceImpl.java
View file @
0e3fac99
...
...
@@ -129,9 +129,6 @@ public class KmesBoardServiceImpl extends BaseEditServiceImpl implements KmesBoa
gpfkHgVO
.
setFkrq
(
date
);
gpfkHgVO
.
setFksl
(
fksl
);
gpfkHgVO
.
setHgsl
(
hgsl
);
if
(!
NumberUtils
.
isZero
(
fksl
)){
gpfkHgVO
.
setHgl
(
NumberUtils
.
round
(
hgsl
/
fksl
,
2
)*
100
);
}
gpfkHgVOList
.
add
(
gpfkHgVO
);
}
return
gpfkHgVOList
;
...
...
gavel/src/main/java/com/gavel/kwell/service/impl/UpointServiceImpl.java
View file @
0e3fac99
package
com
.
gavel
.
kwell
.
service
.
impl
;
import
com.alibaba.fastjson.JSONObject
;
import
com.gavel.common.base.entity.BaseEntity
;
import
com.gavel.common.base.service.impl.BaseEditServiceImpl
;
import
com.gavel.common.utils.NumberUtils
;
import
com.gavel.common.utils.RedisConnection
;
import
com.gavel.common.utils.StringUtils
;
import
com.gavel.kwell.dao.UpointDao
;
...
...
@@ -21,10 +19,8 @@ import org.springframework.stereotype.Service;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.ArrayList
;
import
java.util.
Collections
;
import
java.util.
Date
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
@Service
(
"upointService"
)
...
...
@@ -79,7 +75,7 @@ public class UpointServiceImpl extends BaseEditServiceImpl implements UpointServ
@Override
public
List
<
DataPointItem
>
queryringpoint
()
{
try
{
/*
try {
List<Upoint> ponitList = upointDao.queryList(PointTypeEnum.RIGN.getId());
if(ponitList==null || ponitList.size()==0){
logger.error("点位信息未配置,请检查!");
...
...
@@ -122,7 +118,18 @@ public class UpointServiceImpl extends BaseEditServiceImpl implements UpointServ
} catch (Exception e) {
logger.error("数据点采集出错!", e);
}
return
Collections
.
EMPTY_LIST
;
return Collections.EMPTY_LIST;*/
List
<
DataPointItem
>
dataPointItems
=
new
ArrayList
<
DataPointItem
>();
dataPointItems
.
add
(
new
DataPointItem
(
"R1"
,
new
Date
().
getTime
(),
1
,
"R1"
,
0
));
dataPointItems
.
add
(
new
DataPointItem
(
"R2"
,
new
Date
().
getTime
(),
1
,
"R2"
,
0
));
dataPointItems
.
add
(
new
DataPointItem
(
"R3"
,
new
Date
().
getTime
(),
1
,
"R3"
,
0
));
dataPointItems
.
add
(
new
DataPointItem
(
"R4"
,
new
Date
().
getTime
(),
1
,
"R4"
,
1
));
dataPointItems
.
add
(
new
DataPointItem
(
"R5"
,
new
Date
().
getTime
(),
1
,
"R5"
,
1
));
dataPointItems
.
add
(
new
DataPointItem
(
"R6"
,
new
Date
().
getTime
(),
1
,
"R6"
,
1
));
dataPointItems
.
add
(
new
DataPointItem
(
"R7"
,
new
Date
().
getTime
(),
1
,
"R7"
,-
1
));
dataPointItems
.
add
(
new
DataPointItem
(
"R8"
,
new
Date
().
getTime
(),
1
,
"R8"
,-
1
));
return
dataPointItems
;
}
}
gavel/src/main/java/com/gavel/kwell/vo/DataPointItem.java
View file @
0e3fac99
...
...
@@ -36,6 +36,13 @@ public class DataPointItem implements Serializable {
this
.
value
=
value
;
}
public
DataPointItem
(
String
itemId
,
long
timestamp
,
Integer
quality
,
String
name
,
Object
value
)
{
this
.
itemId
=
itemId
;
this
.
timestamp
=
timestamp
;
this
.
quality
=
quality
;
this
.
name
=
name
;
this
.
value
=
value
;
}
public
String
getItemId
()
{
return
itemId
;
...
...
gavel/src/main/java/com/gavel/kwell/vo/GpfkHgVO.java
View file @
0e3fac99
...
...
@@ -13,9 +13,6 @@ public class GpfkHgVO extends BaseEntity {
private
Double
hgsl
;
//合格数量
private
Double
hgl
;
//合格率
public
Date
getFkrq
()
{
return
fkrq
;
}
...
...
@@ -40,11 +37,4 @@ public class GpfkHgVO extends BaseEntity {
this
.
hgsl
=
hgsl
;
}
public
Double
getHgl
()
{
return
hgl
;
}
public
void
setHgl
(
Double
hgl
)
{
this
.
hgl
=
hgl
;
}
}
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