Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
cloud-fb
Overview
Overview
Details
Activity
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
王衍超
cloud-fb
Commits
ca3cc71b
Commit
ca3cc71b
authored
Mar 25, 2021
by
高晓磊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
场站,砂石类型,摄像头,船只增加组织机构的筛选条件.
parent
21bc9e58
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
144 additions
and
66 deletions
+144
-66
DictDataInitializer.java
.../java/com/beecode/inz/basis/init/DictDataInitializer.java
+2
-1
CameraConfiguration.java
...n/java/com/xyst/dinas/biz/config/CameraConfiguration.java
+2
-17
DinasTypeConfiguration.java
...ava/com/xyst/dinas/biz/config/DinasTypeConfiguration.java
+1
-1
CameraInfoDao.java
...z/src/main/java/com/xyst/dinas/biz/dao/CameraInfoDao.java
+3
-3
DinasTypeDao.java
...iz/src/main/java/com/xyst/dinas/biz/dao/DinasTypeDao.java
+1
-0
CameraInfoDaoImpl.java
...va/com/xyst/dinas/biz/internal/dao/CameraInfoDaoImpl.java
+17
-12
DinasOrganizationDaoImpl.java
...xyst/dinas/biz/internal/dao/DinasOrganizationDaoImpl.java
+1
-0
DinasTypeDaoImpl.java
...ava/com/xyst/dinas/biz/internal/dao/DinasTypeDaoImpl.java
+29
-3
ShipInfoDaoImpl.java
...java/com/xyst/dinas/biz/internal/dao/ShipInfoDaoImpl.java
+9
-2
StationDaoImpl.java
.../java/com/xyst/dinas/biz/internal/dao/StationDaoImpl.java
+15
-7
CameraInfoServiceImpl.java
...yst/dinas/biz/internal/service/CameraInfoServiceImpl.java
+30
-3
StationServiceImpl.java
...m/xyst/dinas/biz/internal/service/StationServiceImpl.java
+2
-0
CameraInfoService.java
...in/java/com/xyst/dinas/biz/service/CameraInfoService.java
+1
-0
Organization$sequence.jmx
...sources/com/xyst/dinas/biz/bill/Organization$sequence.jmx
+1
-1
Organization$serial.jmx
...resources/com/xyst/dinas/biz/bill/Organization$serial.jmx
+1
-1
Organization.jmx
...c/main/resources/com/xyst/dinas/biz/bill/Organization.jmx
+1
-1
Position.jmx
...z/src/main/resources/com/xyst/dinas/biz/bill/Position.jmx
+1
-1
Station$sequence.jmx
...in/resources/com/xyst/dinas/biz/bill/Station$sequence.jmx
+1
-1
Station$serial.jmx
...main/resources/com/xyst/dinas/biz/bill/Station$serial.jmx
+1
-1
Station.jmx
...iz/src/main/resources/com/xyst/dinas/biz/bill/Station.jmx
+1
-1
Organization.jmx
.../main/resources/com/xyst/dinas/biz/query/Organization.jmx
+10
-10
ShipInfo.jmx
.../src/main/resources/com/xyst/dinas/biz/query/ShipInfo.jmx
+7
-0
StationInfoApply.jmx
...n/resources/com/xyst/dinas/biz/query/StationInfoApply.jmx
+7
-0
No files found.
backend/inz.basis/src/main/java/com/beecode/inz/basis/init/DictDataInitializer.java
View file @
ca3cc71b
...
...
@@ -31,7 +31,8 @@ public class DictDataInitializer implements DataInitializer{
private
DictService
dictService
;
public
void
init
(){
@Override
public
void
init
(){
for
(
Resource
resource
:
dictdatas
){
DictDataInfo
dictDataInfo
=
objectMapper
.
convertValue
(
load
(
resource
),
DictDataInfo
.
class
);
try
{
...
...
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/config/CameraConfiguration.java
View file @
ca3cc71b
...
...
@@ -4,24 +4,11 @@ import com.beecode.amino.metadata.runtime.MetadataMech;
import
com.beecode.bcp.type.KClass
;
import
com.beecode.bcp.type.TypeConstants
;
import
com.xyst.dinas.biz.constant.CameraInfoConstant
;
import
com.xyst.dinas.biz.constant.StationConstant
;
import
com.xyst.dinas.biz.dao.CameraInfoDao
;
import
com.xyst.dinas.biz.dao.PositionDao
;
import
com.xyst.dinas.biz.internal.StationInfoQueryProcessor
;
import
com.xyst.dinas.biz.internal.dao.CameraInfoDaoImpl
;
import
com.xyst.dinas.biz.internal.dao.DinasTypeDaoImpl
;
import
com.xyst.dinas.biz.internal.dao.PositionDaoImpl
;
import
com.xyst.dinas.biz.internal.dao.StationDaoImpl
;
import
com.xyst.dinas.biz.internal.service.CameraInfoServiceImpl
;
import
com.xyst.dinas.biz.internal.service.DinasTypeServiceImpl
;
import
com.xyst.dinas.biz.internal.service.PositionServiceImpl
;
import
com.xyst.dinas.biz.internal.service.StationServiceImpl
;
import
com.xyst.dinas.biz.service.CameraInfoService
;
import
com.xyst.dinas.biz.service.PositionService
;
import
com.xyst.dinas.biz.web.CameraInfoController
;
import
com.xyst.dinas.biz.web.DinasTypeController
;
import
com.xyst.dinas.biz.web.PositionController
;
import
com.xyst.dinas.biz.web.StationController
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.context.annotation.Bean
;
...
...
@@ -32,8 +19,7 @@ public class CameraConfiguration {
@Autowired
@Qualifier
(
TypeConstants
.
CLASS_MECH
)
private
MetadataMech
<
KClass
>
typeMech
;
//DinasTypeDaoImpl相关bean配置
//CameraInfoDao相关bean配置
@Bean
public
CameraInfoDao
cameraInfotDao
()
{
return
new
CameraInfoDaoImpl
();
...
...
@@ -48,10 +34,9 @@ public class CameraConfiguration {
}
@Bean
(
CameraInfoConstant
.
ENTITY
)
public
KClass
station
InfoEntity
()
{
public
KClass
camera
InfoEntity
()
{
return
typeMech
.
createStaticBeanByResource
(
new
ClassPathResource
(
"/com/xyst/dinas/biz/datamodel/CameraInfo.jmx"
,
KClass
.
class
));
}
}
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/config/DinasTypeConfiguration.java
View file @
ca3cc71b
...
...
@@ -36,7 +36,7 @@ public class DinasTypeConfiguration {
@Bean
(
DinasTypeConstant
.
ENTITY
)
public
KClass
station
InfoEntity
()
{
public
KClass
dinasType
InfoEntity
()
{
return
typeMech
.
createStaticBeanByResource
(
new
ClassPathResource
(
"/com/xyst/dinas/biz/datamodel/DinasType.jmx"
,
KClass
.
class
));
}
...
...
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/dao/CameraInfoDao.java
View file @
ca3cc71b
...
...
@@ -11,13 +11,13 @@ public interface CameraInfoDao extends BaseDao {
KObject
load
(
UUID
id
);
Page
<
KObject
>
listCameraInfoPaging
(
Page
<
KObject
>
page
,
UUID
stationId
,
UUID
watershedId
,
String
cameraName
);
Page
<
KObject
>
listCameraInfoPaging
(
Page
<
KObject
>
page
,
UUID
stationId
,
UUID
watershedId
,
String
cameraName
,
KObject
currentLoginRegionalCompany
);
UUID
create
(
KObject
kObject
);
UUID
create
(
KObject
object
,
KObject
regionalCompany
);
void
deleteById
(
UUID
id
);
List
<
KObject
>
getByName
(
String
name
,
UUID
id
);
void
modify
(
KObject
kobject
);
void
modify
(
KObject
kobject
,
KObject
currentLoginRegionalCompany
);
}
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/dao/DinasTypeDao.java
View file @
ca3cc71b
...
...
@@ -24,4 +24,5 @@ public interface DinasTypeDao extends BaseDao {
boolean
checkedStation
(
UUID
dinasTypeId
,
UUID
stationId
);
boolean
unCheckedStation
(
UUID
dinasTypeId
,
UUID
stationId
);
KObject
getCurrentLoginRegionalCompany
();
}
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/CameraInfoDaoImpl.java
View file @
ca3cc71b
...
...
@@ -19,7 +19,6 @@ import java.util.UUID;
public
class
CameraInfoDaoImpl
extends
AbstractBaseDao
implements
CameraInfoDao
,
CameraInfoConstant
{
@Autowired
private
HibernateTemplate
template
;
...
...
@@ -40,7 +39,7 @@ public class CameraInfoDaoImpl extends AbstractBaseDao implements CameraInfoDao,
*/
@Override
protected
String
getModelName
()
{
return
null
;
return
ENTITY
;
}
@Override
...
...
@@ -50,10 +49,12 @@ public class CameraInfoDaoImpl extends AbstractBaseDao implements CameraInfoDao,
@Override
public
Page
<
KObject
>
listCameraInfoPaging
(
Page
<
KObject
>
page
,
UUID
stationId
,
UUID
watershedId
,
String
cameraName
)
{
public
Page
<
KObject
>
listCameraInfoPaging
(
Page
<
KObject
>
page
,
UUID
stationId
,
UUID
watershedId
,
String
cameraName
,
KObject
currentLoginRegionalCompany
)
{
KClass
bean
=
Amino
.
getStaticMetadataContext
().
getBean
(
ENTITY
,
KClass
.
class
);
DetachedCriteria
detachedCriteria
=
DetachedCriteria
.
forEntityName
(
bean
.
getName
());
detachedCriteria
.
add
(
Restrictions
.
eq
(
"del"
,
false
));
detachedCriteria
.
add
(
Restrictions
.
eq
(
"regionalCompany.id"
,
currentLoginRegionalCompany
.
getUuid
(
"id"
)));
if
(
null
!=
stationId
){
detachedCriteria
.
add
(
Restrictions
.
eq
(
"stationId"
,
stationId
));
}
...
...
@@ -83,13 +84,14 @@ public class CameraInfoDaoImpl extends AbstractBaseDao implements CameraInfoDao,
}
@Override
public
void
modify
(
KObject
kobject
)
{
public
void
modify
(
KObject
kobject
,
KObject
currentLoginRegionalCompany
)
{
KObject
id
=
load
(
kobject
.
getUuid
(
"id"
));
kobject
.
set
(
"creator"
,
id
.
get
(
"creator"
));
kobject
.
set
(
"createTime"
,
id
.
getDate
(
"createTime"
));
kobject
.
set
(
"regionalCompany"
,
currentLoginRegionalCompany
);
KObject
staff
=
AminoContextHolder
.
getContext
().
getStaff
();
kobject
.
set
(
"modifyTime"
,
new
Date
());
kobject
.
set
(
"modifier"
,
staff
.
getUuid
(
"id"
)
);
kobject
.
set
(
"modifier"
,
staff
);
kobject
.
set
(
"del"
,
false
);
template
.
merge
(
kobject
);
}
...
...
@@ -97,14 +99,15 @@ public class CameraInfoDaoImpl extends AbstractBaseDao implements CameraInfoDao,
@Override
public
UUID
create
(
KObject
kObject
)
{
public
UUID
create
(
KObject
object
,
KObject
regionalCompany
)
{
KObject
staff
=
AminoContextHolder
.
getContext
().
getStaff
();
kObject
.
set
(
"id"
,
UUID
.
randomUUID
());
kObject
.
set
(
"creator"
,
staff
);
kObject
.
set
(
"createTime"
,
new
Date
());
kObject
.
set
(
"del"
,
false
);
kObject
.
validate
();
return
((
UUID
)
template
.
save
(
kObject
));
object
.
set
(
"id"
,
UUID
.
randomUUID
());
object
.
set
(
"creator"
,
staff
);
object
.
set
(
"createTime"
,
new
Date
());
object
.
set
(
"del"
,
false
);
object
.
set
(
"regionalCompany"
,
regionalCompany
);
object
.
validate
();
return
((
UUID
)
template
.
save
(
object
));
}
@Override
...
...
@@ -117,4 +120,6 @@ public class CameraInfoDaoImpl extends AbstractBaseDao implements CameraInfoDao,
template
.
update
(
kobject
);
}
}
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/DinasOrganizationDaoImpl.java
View file @
ca3cc71b
...
...
@@ -108,4 +108,5 @@ public class DinasOrganizationDaoImpl implements DinasOrganizationDao, DinasOrga
return
(
KObject
)
template
.
load
(
ORGANIZATION_ENTITY
,
id
);
}
}
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/DinasTypeDaoImpl.java
View file @
ca3cc71b
...
...
@@ -2,20 +2,24 @@ package com.xyst.dinas.biz.internal.dao;
import
com.beecode.amino.core.Amino
;
import
com.beecode.bap.attachment.common.Page
;
import
com.beecode.bap.staff.BapContext
;
import
com.beecode.bcp.core.context.AminoContextHolder
;
import
com.beecode.bcp.type.KClass
;
import
com.beecode.bcp.type.KObject
;
import
com.beecode.inz.basis.internal.dao.AbstractBaseDao
;
import
com.xyst.dinas.biz.constant.DinasTypeConstant
;
import
com.xyst.dinas.biz.dao.DinasOrganizationDao
;
import
com.xyst.dinas.biz.dao.DinasTypeDao
;
import
org.hibernate.criterion.DetachedCriteria
;
import
org.hibernate.criterion.Restrictions
;
import
org.hibernate.query.NativeQuery
;
import
org.json.JSONObject
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.orm.hibernate5.HibernateTemplate
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.UUID
;
public
class
DinasTypeDaoImpl
extends
AbstractBaseDao
implements
DinasTypeDao
,
DinasTypeConstant
{
...
...
@@ -23,6 +27,10 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
@Autowired
private
HibernateTemplate
template
;
@Autowired
private
BapContext
bapContext
;
@Autowired
private
DinasOrganizationDao
dinasOrganizationDao
;
private
String
insertOrUpdateDinasTypeStationHql
=
" xyst_dinas_biz_station_dinas_type "
+
"set station_id = :stationId , dinas_type_id =:dinasTypeId "
;
...
...
@@ -47,7 +55,7 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
*/
@Override
protected
String
getModelName
()
{
return
null
;
return
ENTITY
;
}
@Override
...
...
@@ -58,10 +66,9 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
@Override
public
Page
<
KObject
>
listDinasTypeInfoPaging
(
Page
<
KObject
>
page
)
{
// UUID departmentId = AminoContextHolder.getContext().getStaff().get("department").getUuid("id");
KClass
bean
=
Amino
.
getStaticMetadataContext
().
getBean
(
ENTITY
,
KClass
.
class
);
DetachedCriteria
detachedCriteria
=
DetachedCriteria
.
forEntityName
(
bean
.
getName
());
// detachedCriteria.add(Restrictions.eq("department.id", departmentId
));
detachedCriteria
.
add
(
Restrictions
.
eq
(
"regionalCompany.id"
,
getCurrentLoginRegionalCompany
().
getUuid
(
"id"
)
));
detachedCriteria
.
add
(
Restrictions
.
eq
(
"del"
,
false
));
int
offset
=
page
.
getPageSize
()
*
(
page
.
getPageNo
()
-
1
);
List
<
KObject
>
list
=
(
List
<
KObject
>)
template
.
findByCriteria
(
detachedCriteria
,
offset
,
page
.
getPageSize
());
...
...
@@ -79,6 +86,8 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
// detachedCriteria.add(Restrictions.eq("department.id", departmentId));
detachedCriteria
.
add
(
Restrictions
.
eq
(
"del"
,
false
));
detachedCriteria
.
add
(
Restrictions
.
eq
(
"dinasTypeName"
,
name
));
detachedCriteria
.
add
(
Restrictions
.
eq
(
"regionalCompany.id"
,
getCurrentLoginRegionalCompany
().
getUuid
(
"id"
)));
if
(
id
!=
null
)
{
detachedCriteria
.
add
(
Restrictions
.
ne
(
"id"
,
id
));
}
...
...
@@ -93,6 +102,7 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
kobject
.
set
(
"createTime"
,
id
.
getDate
(
"createTime"
));
KObject
staff
=
AminoContextHolder
.
getContext
().
getStaff
();
kobject
.
set
(
"modifyTime"
,
new
Date
());
kobject
.
set
(
"regionalCompany"
,
getCurrentLoginRegionalCompany
());
kobject
.
set
(
"modifier"
,
staff
.
getUuid
(
"id"
));
kobject
.
set
(
"del"
,
false
);
template
.
merge
(
kobject
);
...
...
@@ -152,6 +162,7 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
kObject
.
set
(
"creator"
,
staff
);
kObject
.
set
(
"createTime"
,
new
Date
());
kObject
.
set
(
"del"
,
false
);
kObject
.
set
(
"regionalCompany"
,
getCurrentLoginRegionalCompany
());
return
((
UUID
)
template
.
save
(
kObject
));
}
...
...
@@ -165,4 +176,19 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
template
.
update
(
kobject
);
}
/**
* 获取当前登录的区域公司
* @return
*/
@Override
public
KObject
getCurrentLoginRegionalCompany
()
{
Map
<
String
,
String
>
map
=
bapContext
.
getCurrentUserDatas
();
String
currentRegionalCompany
=
map
.
get
(
"currentRegionalCompany"
);
JSONObject
obj
=
new
JSONObject
(
currentRegionalCompany
);
KObject
regionalCompany
=
dinasOrganizationDao
.
load
(
UUID
.
fromString
(
obj
.
getString
(
"id"
)));
return
regionalCompany
;
}
}
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/ShipInfoDaoImpl.java
View file @
ca3cc71b
...
...
@@ -9,7 +9,9 @@ import com.beecode.inz.basis.internal.dao.AbstractBaseDao;
import
com.xyst.dinas.biz.constant.CameraInfoConstant
;
import
com.xyst.dinas.biz.constant.ShipInfoConstant
;
import
com.xyst.dinas.biz.dao.CameraInfoDao
;
import
com.xyst.dinas.biz.dao.DinasTypeDao
;
import
com.xyst.dinas.biz.dao.ShipInfoDao
;
import
com.xyst.dinas.biz.service.CameraInfoService
;
import
org.apache.commons.lang3.StringUtils
;
import
org.hibernate.criterion.DetachedCriteria
;
import
org.hibernate.criterion.Restrictions
;
...
...
@@ -25,6 +27,8 @@ public class ShipInfoDaoImpl extends AbstractBaseDao implements ShipInfoDao, Shi
@Autowired
private
HibernateTemplate
template
;
@Autowired
private
DinasTypeDao
dinasTypeDao
;
/**
* 抽象方法,需要实现类提供HibernateTemplate
...
...
@@ -43,7 +47,7 @@ public class ShipInfoDaoImpl extends AbstractBaseDao implements ShipInfoDao, Shi
*/
@Override
protected
String
getModelName
()
{
return
null
;
return
ENTITY
;
}
@Override
...
...
@@ -58,6 +62,7 @@ public class ShipInfoDaoImpl extends AbstractBaseDao implements ShipInfoDao, Shi
KClass
bean
=
Amino
.
getStaticMetadataContext
().
getBean
(
ENTITY
,
KClass
.
class
);
DetachedCriteria
detachedCriteria
=
DetachedCriteria
.
forEntityName
(
bean
.
getName
());
detachedCriteria
.
add
(
Restrictions
.
eq
(
"del"
,
false
));
detachedCriteria
.
add
(
Restrictions
.
eq
(
"regionalCompany.id"
,
dinasTypeDao
.
getCurrentLoginRegionalCompany
().
getUuid
(
"id"
)));
if
(
StringUtils
.
isNotBlank
(
shipName
)){
detachedCriteria
.
add
(
Restrictions
.
like
(
"shipName"
,
"%"
+
shipName
+
"%"
));
...
...
@@ -92,7 +97,8 @@ public class ShipInfoDaoImpl extends AbstractBaseDao implements ShipInfoDao, Shi
kobject
.
set
(
"createTime"
,
id
.
getDate
(
"createTime"
));
KObject
staff
=
AminoContextHolder
.
getContext
().
getStaff
();
kobject
.
set
(
"modifyTime"
,
new
Date
());
kobject
.
set
(
"modifier"
,
staff
.
getUuid
(
"id"
));
kobject
.
set
(
"modifier"
,
staff
);
kobject
.
set
(
"regionalCompany"
,
dinasTypeDao
.
getCurrentLoginRegionalCompany
());
kobject
.
set
(
"del"
,
false
);
template
.
merge
(
kobject
);
}
...
...
@@ -119,6 +125,7 @@ public class ShipInfoDaoImpl extends AbstractBaseDao implements ShipInfoDao, Shi
kObject
.
set
(
"creator"
,
staff
);
kObject
.
set
(
"createTime"
,
new
Date
());
kObject
.
set
(
"del"
,
false
);
kObject
.
set
(
"regionalCompany"
,
dinasTypeDao
.
getCurrentLoginRegionalCompany
());
kObject
.
validate
();
return
((
UUID
)
template
.
save
(
kObject
));
}
...
...
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/StationDaoImpl.java
View file @
ca3cc71b
...
...
@@ -7,11 +7,12 @@ import com.beecode.bcp.type.KClass;
import
com.beecode.bcp.type.KObject
;
import
com.beecode.inz.basis.internal.dao.AbstractBaseDao
;
import
com.xyst.dinas.biz.constant.StationConstant
;
import
com.xyst.dinas.biz.dao.DinasTypeDao
;
import
com.xyst.dinas.biz.dao.StationDao
;
import
com.xyst.dinas.biz.service.CameraInfoService
;
import
org.hibernate.criterion.DetachedCriteria
;
import
org.hibernate.criterion.Restrictions
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.orm.hibernate5.HibernateOperations
;
import
org.springframework.orm.hibernate5.HibernateTemplate
;
import
java.util.Date
;
...
...
@@ -19,12 +20,13 @@ import java.util.List;
import
java.util.UUID
;
public
class
StationDaoImpl
extends
AbstractBaseDao
implements
StationDao
,
StationConstant
{
@Autowired
private
HibernateOperations
operations
;
@Autowired
private
HibernateTemplate
template
;
@Autowired
private
DinasTypeDao
dinasTypeDao
;
@Override
public
KObject
load
(
UUID
id
)
{
return
(
KObject
)
template
.
load
(
ENTITY
,
id
);
...
...
@@ -53,7 +55,8 @@ public class StationDaoImpl extends AbstractBaseDao implements StationDao, Stat
// UUID departmentId = AminoContextHolder.getContext().getStaff().get("department").getUuid("id");
KClass
bean
=
Amino
.
getStaticMetadataContext
().
getBean
(
StationConstant
.
ENTITY
,
KClass
.
class
);
DetachedCriteria
detachedCriteria
=
DetachedCriteria
.
forEntityName
(
bean
.
getName
());
// detachedCriteria.add(Restrictions.eq("department.id", departmentId));
KObject
currentLoginRegionalCompany
=
dinasTypeDao
.
getCurrentLoginRegionalCompany
();
detachedCriteria
.
add
(
Restrictions
.
eq
(
"regionalCompany.id"
,
currentLoginRegionalCompany
.
getUuid
(
"id"
)));
detachedCriteria
.
add
(
Restrictions
.
eq
(
"del"
,
false
));
detachedCriteria
.
add
(
Restrictions
.
eq
(
"stationName"
,
name
));
if
(
id
!=
null
){
...
...
@@ -69,8 +72,9 @@ public class StationDaoImpl extends AbstractBaseDao implements StationDao, Stat
kobject
.
set
(
"creator"
,
id
.
get
(
"creator"
));
kobject
.
set
(
"createTime"
,
id
.
getDate
(
"createTime"
));
KObject
staff
=
AminoContextHolder
.
getContext
().
getStaff
();
kobject
.
set
(
"regionalCompany"
,
dinasTypeDao
.
getCurrentLoginRegionalCompany
());
kobject
.
set
(
"modifyTime"
,
new
Date
());
kobject
.
set
(
"modifier"
,
staff
.
getUuid
(
"id"
)
);
kobject
.
set
(
"modifier"
,
staff
);
kobject
.
set
(
"del"
,
false
);
template
.
merge
(
kobject
);
}
...
...
@@ -80,7 +84,10 @@ public class StationDaoImpl extends AbstractBaseDao implements StationDao, Stat
public
UUID
create
(
KObject
kObject
)
{
KObject
staff
=
AminoContextHolder
.
getContext
().
getStaff
();
// kObject.set("department", staff.get("department"));
// kObject.set("id",UUID.randomUUID());
if
(
null
==
kObject
.
getUuid
(
"id"
)){
kObject
.
set
(
"id"
,
UUID
.
randomUUID
());
}
kObject
.
set
(
"regionalCompany"
,
dinasTypeDao
.
getCurrentLoginRegionalCompany
());
kObject
.
set
(
"creator"
,
staff
);
kObject
.
set
(
"createTime"
,
new
Date
());
kObject
.
set
(
"del"
,
false
);
...
...
@@ -123,4 +130,5 @@ public class StationDaoImpl extends AbstractBaseDao implements StationDao, Stat
protected
String
getModelName
()
{
return
StationConstant
.
ENTITY
;
}
}
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/service/CameraInfoServiceImpl.java
View file @
ca3cc71b
package
com
.
xyst
.
dinas
.
biz
.
internal
.
service
;
import
com.beecode.bap.attachment.common.Page
;
import
com.beecode.bap.staff.BapContext
;
import
com.beecode.bcp.type.KObject
;
import
com.xyst.dinas.biz.dao.CameraInfoDao
;
import
com.xyst.dinas.biz.service.CameraInfoService
;
import
com.xyst.dinas.biz.service.DinasOrganizationService
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.json.JSONObject
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.UUID
;
@Transactional
(
rollbackFor
=
Exception
.
class
)
...
...
@@ -16,18 +20,23 @@ public class CameraInfoServiceImpl implements CameraInfoService {
@Autowired
private
CameraInfoDao
cameraInfoDao
;
@Autowired
private
DinasOrganizationService
dinasOrganizationService
;
@Autowired
private
BapContext
bapContext
;
@Override
public
Page
<
KObject
>
queryByPaging
(
Page
<
KObject
>
page
,
UUID
stationId
,
UUID
watershedId
,
String
cameraName
)
throws
Exception
{
if
(
page
.
getPageNo
()==
0
||
page
.
getPageSize
()==
0
)
{
throw
new
Exception
(
"pageSize or offset is null"
);
}
return
cameraInfoDao
.
listCameraInfoPaging
(
page
,
stationId
,
watershedId
,
cameraName
);
return
cameraInfoDao
.
listCameraInfoPaging
(
page
,
stationId
,
watershedId
,
cameraName
,
getCurrentLoginRegionalCompany
());
}
@Override
public
UUID
addCamera
(
KObject
kObject
)
{
return
cameraInfoDao
.
create
(
kObject
);
return
cameraInfoDao
.
create
(
kObject
,
getCurrentLoginRegionalCompany
()
);
}
@Override
...
...
@@ -46,11 +55,29 @@ public class CameraInfoServiceImpl implements CameraInfoService {
@Override
public
void
update
(
KObject
kobject
)
{
cameraInfoDao
.
modify
(
kobject
);
cameraInfoDao
.
modify
(
kobject
,
getCurrentLoginRegionalCompany
()
);
}
@Override
public
void
deleteById
(
UUID
id
)
{
cameraInfoDao
.
deleteById
(
id
);
}
/**
* 获取当前登录的区域公司
* @return
*/
@Override
public
KObject
getCurrentLoginRegionalCompany
()
{
Map
<
String
,
String
>
map
=
bapContext
.
getCurrentUserDatas
();
String
currentRegionalCompany
=
map
.
get
(
"currentRegionalCompany"
);
JSONObject
obj
=
new
JSONObject
(
currentRegionalCompany
);
KObject
regionalCompany
=
dinasOrganizationService
.
load
(
UUID
.
fromString
(
obj
.
getString
(
"id"
)));
return
regionalCompany
;
}
}
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/service/StationServiceImpl.java
View file @
ca3cc71b
...
...
@@ -59,4 +59,6 @@ public class StationServiceImpl implements StationService {
public
void
deleteById
(
UUID
id
)
{
stationDao
.
deleteById
(
id
);
}
}
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/service/CameraInfoService.java
View file @
ca3cc71b
...
...
@@ -18,4 +18,5 @@ public interface CameraInfoService {
void
update
(
KObject
kobject
);
void
deleteById
(
UUID
id
);
public
KObject
getCurrentLoginRegionalCompany
();
}
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization$sequence.jmx
View file @
ca3cc71b
<?xml version="1.0" encoding="UTF-8"?>
<metadata
xmlns=
"http://www.beecode.cn/schema/amino-metadata"
xmlns:m=
"http://www.beecode.cn/schema/bcp-sequence"
>
<specification>
1.0
</specification>
<id>
364bfc1a-50aa-4289-8d43-33a5b2236efc
</id>
<id>
a2cc3d5e-7dc3-4cb2-946c-705e4ff89aef
</id>
<name>
com.xyst.dinas.biz.bill.Organization$sequence
</name>
<title>
组织机构$sequence
</title>
<description>
组织机构
</description>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization$serial.jmx
View file @
ca3cc71b
<?xml version="1.0" encoding="UTF-8"?>
<metadata
xmlns=
"http://www.beecode.cn/schema/amino-metadata"
xmlns:m=
"http://www.beecode.cn/schema/bcp-serial"
>
<specification>
1.0
</specification>
<id>
9422322e-20be-405e-817e-9607ada356cf
</id>
<id>
5989a00c-f64e-4086-9415-b79d1b2640ba
</id>
<name>
com.xyst.dinas.biz.bill.Organization$serial
</name>
<title>
组织机构$serial
</title>
<description>
组织机构
</description>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization.jmx
View file @
ca3cc71b
<?xml version="1.0" encoding="UTF-8"?>
<metadata
xmlns=
"http://www.beecode.cn/schema/amino-metadata"
xmlns:m=
"http://www.beecode.cn/schema/bcp-biztype"
>
<specification>
1.0
</specification>
<id>
24274558-867d-4ad4-aa2b-d12e39c2d3a0
</id>
<id>
42a96c63-e3ab-4340-8f63-411aa04f0986
</id>
<name>
com.xyst.dinas.biz.bill.Organization
</name>
<title>
组织机构
</title>
<description>
组织机构
</description>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position.jmx
View file @
ca3cc71b
<?xml version="1.0" encoding="UTF-8"?>
<metadata
xmlns=
"http://www.beecode.cn/schema/amino-metadata"
xmlns:m=
"http://www.beecode.cn/schema/bcp-biztype"
>
<specification>
1.0
</specification>
<id>
bd507082-d5d9-4b82-ae89-e8190d21efb9
</id>
<id>
7251c910-eca4-4862-9635-2397de244761
</id>
<name>
com.xyst.dinas.biz.bill.Position
</name>
<title>
岗位
</title>
<description>
岗位
</description>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station$sequence.jmx
View file @
ca3cc71b
<?xml version="1.0" encoding="UTF-8"?>
<metadata
xmlns=
"http://www.beecode.cn/schema/amino-metadata"
xmlns:m=
"http://www.beecode.cn/schema/bcp-sequence"
>
<specification>
1.0
</specification>
<id>
74af0162-d2f8-4761-ba64-51dd1a4cfa29
</id>
<id>
4da57641-c5c9-4cc0-9663-be2ea146a510
</id>
<name>
com.xyst.dinas.biz.bill.Station$sequence
</name>
<title>
场站$sequence
</title>
<description>
场站
</description>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station$serial.jmx
View file @
ca3cc71b
<?xml version="1.0" encoding="UTF-8"?>
<metadata
xmlns=
"http://www.beecode.cn/schema/amino-metadata"
xmlns:m=
"http://www.beecode.cn/schema/bcp-serial"
>
<specification>
1.0
</specification>
<id>
eabc5787-8607-4b02-9a35-78f679b41418
</id>
<id>
4a3a3921-b9d0-40ae-b6cb-c53416d706ed
</id>
<name>
com.xyst.dinas.biz.bill.Station$serial
</name>
<title>
场站$serial
</title>
<description>
场站
</description>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station.jmx
View file @
ca3cc71b
<?xml version="1.0" encoding="UTF-8"?>
<metadata
xmlns=
"http://www.beecode.cn/schema/amino-metadata"
xmlns:m=
"http://www.beecode.cn/schema/bcp-biztype"
>
<specification>
1.0
</specification>
<id>
d448c109-3a1d-439e-b117-e3dceb0f236c
</id>
<id>
cc020715-8ad6-496a-90bd-efb1e3d4f4b6
</id>
<name>
com.xyst.dinas.biz.bill.Station
</name>
<title>
场站
</title>
<description>
场站
</description>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/query/Organization.jmx
View file @
ca3cc71b
...
...
@@ -111,6 +111,16 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>
pic
</m:name>
<m:title>
负责人
</m:title>
<m:type>
uuid
</m:type>
<m:ref>
<m:name>
com.beecode.bap.staff.datamodel.Staff
</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>
modifyTime
</m:name>
<m:title>
修改时间
</m:title>
<m:type>
datetime
</m:type>
...
...
@@ -150,16 +160,6 @@
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>
pic.id
</m:name>
<m:title>
负责人id
</m:title>
<m:type>
uuid
</m:type>
<m:ref>
<m:name>
com.beecode.bap.staff.datamodel.Staff
</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
</m:fields>
</m:query>
</content>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/query/ShipInfo.jmx
View file @
ca3cc71b
...
...
@@ -28,6 +28,13 @@
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
<m:innerScene>
<m:id>
ead5a5c4-b84f-47e3-a59b-6fad59287ddd
</m:id>
<m:title>
权限过滤
</m:title>
<m:javaImplement>
com.xyst.dinas.biz.scene.XystDinasCommonAllScene
</m:javaImplement>
<m:defaultExecute>
true
</m:defaultExecute>
<m:hide>
true
</m:hide>
</m:innerScene>
</m:innerScenes>
<m:fields>
<m:field>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/query/StationInfoApply.jmx
View file @
ca3cc71b
...
...
@@ -28,6 +28,13 @@
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
<m:innerScene>
<m:id>
e4b6205f-1d35-4f82-b565-6f7ae42d0b98
</m:id>
<m:title>
权限过滤
</m:title>
<m:javaImplement>
com.xyst.dinas.biz.scene.XystDinasCommonAllScene
</m:javaImplement>
<m:defaultExecute>
true
</m:defaultExecute>
<m:hide>
true
</m:hide>
</m:innerScene>
</m:innerScenes>
<m:fields>
<m:field>
...
...
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