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
5da02a78
Commit
5da02a78
authored
Mar 19, 2021
by
王衍超
Browse files
Options
Browse Files
Download
Plain Diff
解决冲突
parents
f27ceb4b
e1eeb4e1
Hide whitespace changes
Inline
Side-by-side
Showing
32 changed files
with
140 additions
and
73 deletions
+140
-73
AuthcConstants.java
.../beecode/inz/authentication/constants/AuthcConstants.java
+2
-1
RESTWarehouseUserAuthenticationSuccessHandler.java
...andler/RESTWarehouseUserAuthenticationSuccessHandler.java
+2
-0
WarehouseUserDao.java
...main/java/com/beecode/inz/basis/dao/WarehouseUserDao.java
+3
-0
WarehouseUserDaoImpl.java
.../beecode/inz/basis/internal/dao/WarehouseUserDaoImpl.java
+16
-1
WarehouseUser.mk
...in/model/com/beecode/inz/basis/datamodel/WarehouseUser.mk
+3
-0
WarehouseUser.jmx
...sources/com/beecode/inz/basis/datamodel/WarehouseUser.jmx
+9
-0
DefaultFunctionTree.jmx
...m/beecode/inz/portal/functiontree/DefaultFunctionTree.jmx
+14
-14
WarehouseUser.hbm.xml
...inz.basis/src/main/resources/config/WarehouseUser.hbm.xml
+3
-0
DinasTypeConfiguration.java
...ava/com/xyst/dinas/biz/config/DinasTypeConfiguration.java
+0
-1
StationConfiguration.java
.../java/com/xyst/dinas/biz/config/StationConfiguration.java
+5
-7
DinasTypeDaoImpl.java
...ava/com/xyst/dinas/biz/internal/dao/DinasTypeDaoImpl.java
+9
-10
DinasTypeServiceImpl.java
...xyst/dinas/biz/internal/service/DinasTypeServiceImpl.java
+2
-1
DinasTypeController.java
...main/java/com/xyst/dinas/biz/web/DinasTypeController.java
+4
-4
StationController.java
...c/main/java/com/xyst/dinas/biz/web/StationController.java
+3
-11
Position$sequence.jmx
...n/resources/com/xyst/dinas/biz/bill/Position$sequence.jmx
+4
-0
Position$serial.jmx
...ain/resources/com/xyst/dinas/biz/bill/Position$serial.jmx
+4
-0
Position.jmx
...z/src/main/resources/com/xyst/dinas/biz/bill/Position.jmx
+4
-0
Station.jmx
...c/main/resources/com/xyst/dinas/biz/datamodel/Station.jmx
+0
-13
DinasType.hbm.xml
...yst.dinas.biz/src/main/resources/config/DinasType.hbm.xml
+4
-3
Station.hbm.xml
.../xyst.dinas.biz/src/main/resources/config/Station.hbm.xml
+1
-7
BusinessTripApply$sequence.jmx
...ces/com/xyst/dinas/oa/bill/BusinessTripApply$sequence.jmx
+4
-0
BusinessTripApply$serial.jmx
...urces/com/xyst/dinas/oa/bill/BusinessTripApply$serial.jmx
+4
-0
BusinessTripApply.jmx
...in/resources/com/xyst/dinas/oa/bill/BusinessTripApply.jmx
+4
-0
ProtocolDocument$sequence.jmx
...rces/com/xyst/dinas/oa/bill/ProtocolDocument$sequence.jmx
+4
-0
ProtocolDocument$serial.jmx
...ources/com/xyst/dinas/oa/bill/ProtocolDocument$serial.jmx
+4
-0
ProtocolDocument.jmx
...ain/resources/com/xyst/dinas/oa/bill/ProtocolDocument.jmx
+4
-0
SealBorrow$sequence.jmx
.../resources/com/xyst/dinas/oa/bill/SealBorrow$sequence.jmx
+4
-0
SealBorrow$serial.jmx
...in/resources/com/xyst/dinas/oa/bill/SealBorrow$serial.jmx
+4
-0
SealBorrow.jmx
.../src/main/resources/com/xyst/dinas/oa/bill/SealBorrow.jmx
+4
-0
UseCarApply$sequence.jmx
...resources/com/xyst/dinas/oa/bill/UseCarApply$sequence.jmx
+4
-0
UseCarApply$serial.jmx
...n/resources/com/xyst/dinas/oa/bill/UseCarApply$serial.jmx
+4
-0
UseCarApply.jmx
...src/main/resources/com/xyst/dinas/oa/bill/UseCarApply.jmx
+4
-0
No files found.
backend/inz.authentication/src/main/java/com/beecode/inz/authentication/constants/AuthcConstants.java
View file @
5da02a78
...
...
@@ -36,8 +36,9 @@ public interface AuthcConstants {
public
String
SESSION_TENANTID
=
"tenant-id"
;
public
String
TENANT_Id
=
"tenantId"
;
public
String
TENANT
=
"tenant"
;
public
String
MESSAGE
=
"message"
;
public
String
TITLE
=
"title"
;
public
String
TOKEN
=
"token"
;
public
String
X_AUTH_TOKEN
=
"x-auth-token"
;
...
...
backend/inz.authentication/src/main/java/com/beecode/inz/authentication/handler/RESTWarehouseUserAuthenticationSuccessHandler.java
View file @
5da02a78
...
...
@@ -54,6 +54,7 @@ public class RESTWarehouseUserAuthenticationSuccessHandler extends SimpleUrlAuth
request
.
getSession
().
setAttribute
(
AuthcConstants
.
USERID
,
warehouseUser
.
getId
());
request
.
getSession
().
setAttribute
(
AuthcConstants
.
USERNAME
,
warehouseUser
.
getUsername
());
request
.
getSession
().
setAttribute
(
AuthcConstants
.
TELEPHONE
,
warehouseUser
.
getTelephone
());
request
.
getSession
().
setAttribute
(
AuthcConstants
.
TITLE
,
warehouseUser
.
getTitle
());
request
.
getSession
().
setAttribute
(
"mobile"
,
true
);
request
.
getSession
().
setMaxInactiveInterval
(
30
*
24
*
60
*
60
);
...
...
@@ -65,6 +66,7 @@ public class RESTWarehouseUserAuthenticationSuccessHandler extends SimpleUrlAuth
returnJson
.
put
(
AuthcConstants
.
USERID
,
warehouseUser
.
getId
());
returnJson
.
put
(
AuthcConstants
.
USERNAME
,
warehouseUser
.
getUsername
());
returnJson
.
put
(
AuthcConstants
.
TELEPHONE
,
warehouseUser
.
getTelephone
());
returnJson
.
put
(
AuthcConstants
.
TITLE
,
warehouseUser
.
getTitle
());
returnJson
.
put
(
AuthcConstants
.
MESSAGE
,
"success"
);
returnJson
.
put
(
AuthcConstants
.
TOKEN
,
attr
.
getSessionId
());
returnJson
.
put
(
AuthcConstants
.
TENANT
,
tenant
);
...
...
backend/inz.basis/src/main/java/com/beecode/inz/basis/dao/WarehouseUserDao.java
View file @
5da02a78
package
com
.
beecode
.
inz
.
basis
.
dao
;
import
java.util.List
;
import
java.util.UUID
;
import
com.beecode.bcp.type.KObject
;
...
...
@@ -11,4 +12,6 @@ public interface WarehouseUserDao extends BaseDao {
List
<
KObject
>
listByTelephone
(
String
telephone
);
KObject
findByUsernameOrTelephone
(
String
username
);
List
<
KObject
>
findAllByStationId
(
UUID
stationId
);
}
backend/inz.basis/src/main/java/com/beecode/inz/basis/internal/dao/WarehouseUserDaoImpl.java
View file @
5da02a78
package
com
.
beecode
.
inz
.
basis
.
internal
.
dao
;
import
java.util.List
;
import
java.util.UUID
;
import
org.hibernate.query.Query
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -34,7 +35,7 @@ public class WarehouseUserDaoImpl extends AbstractBaseDao implements WarehouseUs
@Override
public
KObject
findByUsernameOrTelephone
(
String
username
)
{
return
getHibernateTemplate
().
execute
(
session
->
{
StringBuffer
sql
=
new
StringBuffer
(
"FROM "
+
getModelName
()
+
" WHERE
username = :username OR telephone = :username
"
);
StringBuffer
sql
=
new
StringBuffer
(
"FROM "
+
getModelName
()
+
" WHERE
(username = :username OR telephone = :username) AND enabled = 1 AND discard = 0
"
);
//创建查询
Query
<
KObject
>
query
=
session
.
createQuery
(
sql
.
toString
(),
KObject
.
class
);
query
.
setParameter
(
"username"
,
username
);
...
...
@@ -46,6 +47,20 @@ public class WarehouseUserDaoImpl extends AbstractBaseDao implements WarehouseUs
});
}
/**
* 获取场站所有用户
*/
@Override
public
List
<
KObject
>
findAllByStationId
(
UUID
stationId
)
{
return
getHibernateTemplate
().
execute
(
session
->
{
StringBuffer
sql
=
new
StringBuffer
(
"FROM "
+
getModelName
()
+
" WHERE stationId = :stationId AND enabled = 1 AND discard = 0 "
);
//创建查询
Query
<
KObject
>
query
=
session
.
createQuery
(
sql
.
toString
(),
KObject
.
class
);
query
.
setParameter
(
"stationId"
,
stationId
);
return
query
.
getResultList
();
});
}
@Override
public
List
<
KObject
>
listByUserName
(
String
username
)
{
return
listByAttributes
(
buildSingleMap
(
WarehouseUserConstants
.
USERNAME
,
username
));
...
...
backend/inz.basis/src/main/model/com/beecode/inz/basis/datamodel/WarehouseUser.mk
View file @
5da02a78
...
...
@@ -33,6 +33,9 @@
<attribute id='77aa55d6-853e-11eb-b258-54ee750ba9b2' name='telephone' columnName='telephone' title='手机号' type='string' default='' precision='' isArray='false'>
<annotation id='77aa55d7-853e-11eb-b258-54ee750ba9b2' attributeId='77aa55d8-853e-11eb-b258-54ee750ba9b2' name='length' value='20'></annotation>
</attribute>
<attribute id='650ad03e-87d2-11eb-b258-54ee750ba9b2' name='stationId' columnName='station_id' title='所属场站id' type='uuid' default='' precision='' isArray='false'>
<annotation id='650ad059-87d2-11eb-b258-54ee750ba9b2' attributeId='650ad05d-87d2-11eb-b258-54ee750ba9b2' name='length' value='undefined'></annotation>
</attribute>
<attribute id='8f8ad8b3-853e-11eb-b258-54ee750ba9b2' name='org' columnName='org' title='所属组织' type='string' default='' precision='' isArray='false'>
<annotation id='8f8ad8b7-853e-11eb-b258-54ee750ba9b2' attributeId='8f8ad8bb-853e-11eb-b258-54ee750ba9b2' name='length' value='100'></annotation>
</attribute>
...
...
backend/inz.basis/src/main/resources/com/beecode/inz/basis/datamodel/WarehouseUser.jmx
View file @
5da02a78
...
...
@@ -106,6 +106,15 @@
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:id>
650ad03e-87d2-11eb-b258-54ee750ba9b2
</m:id>
<m:name>
stationId
</m:name>
<m:title>
所属场站id
</m:title>
<m:type>
uuid
</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>
bcp.type.constraint.StringLength
</m:type>
...
...
backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/DefaultFunctionTree.jmx
View file @
5da02a78
...
...
@@ -1092,20 +1092,6 @@
</m:function-definition>
<m:children>
<m:function-node>
<m:id>
a3c517ea-9b1c-4ec8-893a-9f831ec984ce
</m:id>
<m:name>
region_company_list
</m:name>
<m:title>
区域公司管理
</m:title>
<m:index>
4000
</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:role></m:role>
<m:function-definition>
<m:view>
function-region-company-list
</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>
ivu-icon ivu-icon-ios-cog
</m:icon>
</m:function-node>
<m:function-node>
<m:id>
bb45f3c7-3866-4e5a-abe7-a292851a44af
</m:id>
<m:name>
warehouse_list
</m:name>
<m:title>
场站管理
</m:title>
...
...
@@ -1246,6 +1232,20 @@
<m:view-config></m:view-config>
</m:function-definition>
<m:children>
<m:function-node>
<m:id>
a3c517ea-9b1c-4ec8-893a-9f831ec984ce
</m:id>
<m:name>
org_list
</m:name>
<m:title>
组织机构管理
</m:title>
<m:index>
4000
</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:role></m:role>
<m:function-definition>
<m:view>
function-org-list
</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>
ivu-icon ivu-icon-ios-cog
</m:icon>
</m:function-node>
<m:function-node>
<m:id>
20392688-7dd2-40d7-9115-3dbed7b9cfcd
</m:id>
<m:name>
userMgr
</m:name>
...
...
backend/inz.basis/src/main/resources/config/WarehouseUser.hbm.xml
View file @
5da02a78
...
...
@@ -28,6 +28,9 @@
<property
name=
"telephone"
type=
"string"
>
<column
name=
"telephone"
length=
"20"
></column>
</property>
<property
name=
"stationId"
type=
"uuid-binary"
>
<column
name=
"station_id"
length=
"16"
></column>
</property>
<property
name=
"org"
type=
"string"
>
<column
name=
"org"
length=
"100"
></column>
</property>
...
...
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/config/DinasTypeConfiguration.java
View file @
5da02a78
...
...
@@ -4,7 +4,6 @@ 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.DinasTypeConstant
;
import
com.xyst.dinas.biz.constant.StationConstant
;
import
com.xyst.dinas.biz.internal.dao.DinasTypeDaoImpl
;
import
com.xyst.dinas.biz.internal.service.DinasTypeServiceImpl
;
import
com.xyst.dinas.biz.web.DinasTypeController
;
...
...
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/config/StationConfiguration.java
View file @
5da02a78
...
...
@@ -4,20 +4,18 @@ 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.StationConstant
;
import
com.xyst.dinas.biz.dao.PositionDao
;
import
com.xyst.dinas.biz.internal.StationInfoQueryProcessor
;
import
com.xyst.dinas.biz.internal.dao.PositionDaoImpl
;
import
com.xyst.dinas.biz.internal.dao.StationDaoImpl
;
import
com.xyst.dinas.biz.internal.service.PositionServiceImpl
;
import
com.xyst.dinas.biz.internal.service.StationServiceImpl
;
import
com.xyst.dinas.biz.service.PositionService
;
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
;
import
com.xyst.dinas.biz.dao.PositionDao
;
import
com.xyst.dinas.biz.internal.StationInfoQueryProcessor
;
import
com.xyst.dinas.biz.internal.dao.PositionDaoImpl
;
import
com.xyst.dinas.biz.internal.service.PositionServiceImpl
;
import
com.xyst.dinas.biz.service.PositionService
;
import
com.xyst.dinas.biz.web.PositionController
;
import
org.springframework.core.io.ClassPathResource
;
public
class
StationConfiguration
{
...
...
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/DinasTypeDaoImpl.java
View file @
5da02a78
...
...
@@ -24,7 +24,6 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
@Autowired
private
HibernateTemplate
template
;
private
String
insertOrUpdateDinasTypeStationHql
=
" inz_kunlun01.xyst_dinas_biz_station_dinas_type "
+
"set station_id = :stationId , dinas_type_id =:dinasTypeId "
;
...
...
@@ -102,10 +101,10 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
@Override
public
boolean
checkedStation
(
UUID
dinasTypeId
,
UUID
stationId
)
{
Boolean
hasCount
=
getHasCount
(
dinasTypeId
,
stationId
);
if
(
hasCount
){
if
(
!
hasCount
){
return
template
.
executeWithNativeSession
(
session
->
{
NativeQuery
<
Integer
>
nativeQuery
=
session
.
createNativeQuery
(
"insert into "
+
insertOrUpdateDinasTypeStationHql
,
Integer
.
class
);
NativeQuery
nativeQuery
=
session
.
createNativeQuery
(
"insert into "
+
insertOrUpdateDinasTypeStationHql
);
nativeQuery
.
setParameter
(
"stationId"
,
stationId
);
nativeQuery
.
setParameter
(
"dinasTypeId"
,
dinasTypeId
);
int
count
=
nativeQuery
.
executeUpdate
();
...
...
@@ -122,8 +121,8 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
if
(
hasCount
){
return
template
.
executeWithNativeSession
(
session
->
{
NativeQuery
<
Integer
>
nativeQuery
=
session
.
createNativeQuery
(
"delete "
+
deleteOrSelectDinasTypeStationHql
,
Integer
.
class
);
NativeQuery
nativeQuery
=
session
.
createNativeQuery
(
"delete "
+
deleteOrSelectDinasTypeStationHql
);
nativeQuery
.
setParameter
(
"stationId"
,
stationId
);
nativeQuery
.
setParameter
(
"dinasTypeId"
,
dinasTypeId
);
int
count
=
nativeQuery
.
executeUpdate
();
...
...
@@ -135,12 +134,12 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
private
Boolean
getHasCount
(
UUID
dinasTypeId
,
UUID
stationId
)
{
return
template
.
executeWithNativeSession
(
session
->
{
NativeQuery
<
Integer
>
nativeQuery
=
session
.
createNativeQuery
(
"select count(1) "
+
deleteOrSelectDinasTypeStationHql
,
Integer
.
class
);
NativeQuery
nativeQuery
=
session
.
createNativeQuery
(
"select count(1) "
+
deleteOrSelectDinasTypeStationHql
);
nativeQuery
.
setParameter
(
"stationId"
,
stationId
);
nativeQuery
.
setParameter
(
"dinasTypeId"
,
dinasTypeId
);
Integer
singleResult
=
nativeQuery
.
getSingleResult
(
);
return
singleResult
!=
null
&&
singleResult
==
0
;
Integer
singleResult
=
Integer
.
valueOf
(
nativeQuery
.
getSingleResult
().
toString
()
);
return
singleResult
==
1
;
});
}
...
...
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/service/DinasTypeServiceImpl.java
View file @
5da02a78
...
...
@@ -6,10 +6,11 @@ import com.xyst.dinas.biz.dao.DinasTypeDao;
import
com.xyst.dinas.biz.service.DinasTypeService
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.List
;
import
java.util.UUID
;
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
class
DinasTypeServiceImpl
implements
DinasTypeService
{
@Autowired
...
...
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/DinasTypeController.java
View file @
5da02a78
...
...
@@ -24,14 +24,14 @@ public class DinasTypeController {
private
DinasTypeService
dinasTypeService
;
@RequestMapping
(
value
=
"list/page"
,
method
=
RequestMethod
.
GET
)
public
Page
<
KObject
>
getStaffByRole
(
public
ResponseObj
getDinasTypeList
(
@RequestParam
(
name
=
"pageNo"
,
required
=
false
)
Integer
pageNo
,
@RequestParam
(
name
=
"pageSize"
,
required
=
false
)
Integer
pageSize
)
throws
Exception
{
Page
<
KObject
>
objectPage
=
new
Page
<>();
objectPage
.
setPageNo
(
pageNo
);
objectPage
.
setPageSize
(
pageSize
);
return
dinasTypeService
.
queryByPaging
(
objectPage
);
return
ResponseObj
.
success
(
"操作成功"
,
dinasTypeService
.
queryByPaging
(
objectPage
)
);
}
/**
...
...
@@ -59,7 +59,7 @@ public class DinasTypeController {
public
ResponseObj
update
(
@RequestBody
String
body
){
KObject
kobject
=
JSONObjectUtils
.
toObject
(
body
,
Amino
.
getApplicationMetadataContext
().
getBean
(
DinasTypeConstant
.
ENTITY
,
KClass
.
class
));
if
(
StringUtils
.
isEmpty
(
kobject
.
getString
(
"
station
Name"
))){
if
(
StringUtils
.
isEmpty
(
kobject
.
getString
(
"
dinasType
Name"
))){
return
ResponseObj
.
error
(
400
,
"砂石种类名称不能为空"
);
}
if
(
kobject
.
getUuid
(
"id"
)
==
null
){
...
...
@@ -89,7 +89,7 @@ public class DinasTypeController {
* @return
*/
@DeleteMapping
(
"/{id}"
)
public
ResponseObj
<
Object
>
delete
MemberByStaff
Id
(
@PathVariable
(
"id"
)
UUID
id
){
public
ResponseObj
<
Object
>
delete
By
Id
(
@PathVariable
(
"id"
)
UUID
id
){
if
(
id
==
null
){
return
ResponseObj
.
error
(
400
,
"'id' must be not null!"
);
}
...
...
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/StationController.java
View file @
5da02a78
...
...
@@ -5,23 +5,15 @@ import com.beecode.bap.attachment.common.Page;
import
com.beecode.bcp.type.KClass
;
import
com.beecode.bcp.type.KObject
;
import
com.beecode.bcp.type.json.JSONObjectUtils
;
import
com.beecode.inz.basis.team.entity.OperationTeam
;
import
com.beecode.inz.basis.team.pojo.ResponseObj
;
import
com.beecode.inz.message.internal.QueryParam
;
import
com.beecode.inz.message.remind.RemindSettingsInfo
;
import
com.beecode.inz.workflow.constants.InzWorkflowDefinitionConstants
;
import
com.beecode.nlib.utils.StringUtils
;
import
com.google.gson.Gson
;
import
com.google.gson.JsonSyntaxException
;
import
com.xyst.dinas.biz.constant.StationConstant
;
import
com.xyst.dinas.biz.entity.Station
;
import
com.xyst.dinas.biz.service.StationService
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
import
java.util.UUID
;
/**
...
...
@@ -41,14 +33,14 @@ public class StationController {
@RequestMapping
(
value
=
"list/page"
,
method
=
RequestMethod
.
GET
)
public
Page
<
KObject
>
getStaffByRol
e
(
public
ResponseObj
getListPag
e
(
@RequestParam
(
name
=
"pageNo"
,
required
=
false
)
Integer
pageNo
,
@RequestParam
(
name
=
"pageSize"
,
required
=
false
)
Integer
pageSize
)
throws
Exception
{
Page
<
KObject
>
objectPage
=
new
Page
<>();
objectPage
.
setPageNo
(
pageNo
);
objectPage
.
setPageSize
(
pageSize
);
return
stationService
.
queryByPaging
(
objectPage
);
return
ResponseObj
.
success
(
"查询成功"
,
stationService
.
queryByPaging
(
objectPage
)
);
}
...
...
@@ -135,7 +127,7 @@ public class StationController {
* @return
*/
@DeleteMapping
(
"/{id}"
)
public
ResponseObj
delete
MemberByStaff
Id
(
@PathVariable
(
"id"
)
UUID
id
){
public
ResponseObj
delete
By
Id
(
@PathVariable
(
"id"
)
UUID
id
){
if
(
id
==
null
){
return
ResponseObj
.
error
(
400
,
"'id' must be not null!"
);
}
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position$sequence.jmx
View file @
5da02a78
<?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>
<<<<<<
< HEAD
<id
>
7f76e0b6-30c6-4365-b7a8-ed44b83ac742
</id>
=======
<id>
2a96eab1-c316-400c-8dfe-73277f5a618e
</id>
>>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
<name>
com.xyst.dinas.biz.bill.Position$sequence
</name>
<title>
岗位$sequence
</title>
<description>
岗位
</description>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position$serial.jmx
View file @
5da02a78
<?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>
<<<<<<
< HEAD
<id
>
4ab0c98c-a865-4cc5-aa98-65062df17a7e
</id>
=======
<id>
15a90012-30db-4266-b2dc-f05cac8f5865
</id>
>>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
<name>
com.xyst.dinas.biz.bill.Position$serial
</name>
<title>
岗位$serial
</title>
<description>
岗位
</description>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position.jmx
View file @
5da02a78
<?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>
<<<<<<
< HEAD
<id
>
33903504-3e8e-48a9-bdc3-05c7197f842c
</id>
=======
<id>
be913aae-6093-474c-b008-ba25211f107e
</id>
>>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
<name>
com.xyst.dinas.biz.bill.Position
</name>
<title>
岗位
</title>
<description>
岗位
</description>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/Station.jmx
View file @
5da02a78
...
...
@@ -80,19 +80,6 @@
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>
com.beecode.bap.biztrait.datamodel.SubTableAnnotation
</m:type>
</m:annotation>
</m:annotations>
<m:id>
726e8dac-46c8-429f-94db-9922840c5998
</m:id>
<m:name>
dinasTypes
</m:name>
<m:title>
售卖的砂石
</m:title>
<m:type>
com.xyst.dinas.biz.datamodel.DinasType[]
</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:id>
b4211477-b5b7-4036-9814-7e5affff7ea0
</m:id>
<m:name>
openingDate
</m:name>
...
...
backend/xyst.dinas.biz/src/main/resources/config/DinasType.hbm.xml
View file @
5da02a78
...
...
@@ -3,7 +3,8 @@
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://www.hibernate.org/xsd/hibernate-mapping
http://www.hibernate.org/xsd/hibernate-mapping/hibernate-mapping-4.0.xsd"
>
<class
entity-name=
"com.xyst.dinas.biz.datamodel.DinasType"
table=
"xyst_dinas_biz_dinas_type"
optimistic-lock=
"version"
>
<class
entity-name=
"com.xyst.dinas.biz.datamodel.DinasType"
table=
"xyst_dinas_biz_dinas_type"
optimistic-lock=
"version"
>
<tuplizer
entity-mode=
"dynamic-map"
class=
"com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"
/>
<id
name=
"id"
type=
"uuid-binary"
column=
"id"
length=
"16"
>
<generator
class=
"assigned"
/>
...
...
@@ -43,9 +44,9 @@
<comment>
砂石是否售卖,0不售卖 1还售卖
</comment>
</column>
</property>
<bag
name=
"stations"
cascade=
"none"
table=
"xyst_dinas_biz_station_dinas_type"
>
<bag
name=
"stations"
cascade=
"none"
table=
"xyst_dinas_biz_station_dinas_type"
lazy=
"extra"
>
<key
column=
"dinas_type_id"
not-null=
"true"
/>
<many-to-many
class=
"com.xyst.dinas.biz.datamodel.Station"
column=
"station_id"
fetch=
"join"
/>
<many-to-many
class=
"com.xyst.dinas.biz.datamodel.Station"
column=
"station_id"
/>
</bag>
<property
name=
"reason"
type=
"nstring"
not-null=
"false"
>
<column
name=
"reason"
length=
"300"
>
...
...
backend/xyst.dinas.biz/src/main/resources/config/Station.hbm.xml
View file @
5da02a78
...
...
@@ -80,15 +80,10 @@
<comment>
备注
</comment>
</column>
</property>
<property
name=
"sortOrder"
type=
"int"
not-null=
"true"
unique=
"true"
update=
"false"
insert=
"false"
index=
"station_sort_index"
>
<property
name=
"sortOrder"
type=
"int"
not-null=
"true"
unique=
"true"
index=
"station_sort_index"
>
<column
name=
"sort_order"
length=
"10"
>
<comment
>
排序
</comment>
</column>
</property>
<bag
name=
"dinasTypes"
cascade=
"none"
inverse=
"true"
table=
"xyst_dinas_biz_station_dinas_type"
>
<key
column=
"station_id"
not-null=
"true"
/>
<many-to-many
class=
"com.xyst.dinas.biz.datamodel.DinasType"
column=
"dinas_type_id"
/>
</bag>
</class>
</hibernate-mapping>
\ No newline at end of file
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply$sequence.jmx
View file @
5da02a78
<?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>
<<<<<<
< HEAD
<id
>
e7136a79-9d58-4402-a53c-af0629a9b9a4
</id>
=======
<id>
61aee674-615d-4458-8f8d-c05110452d33
</id>
>>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
<name>
com.xyst.dinas.oa.bill.BusinessTripApply$sequence
</name>
<title>
出差申请$sequence
</title>
<description>
出差申请
</description>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply$serial.jmx
View file @
5da02a78
<?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>
<<<<<<
< HEAD
<id
>
55bb1063-d13c-4862-a854-cb60be8239d5
</id>
=======
<id>
79839413-2bfb-4318-a1eb-e7814f596d32
</id>
>>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
<name>
com.xyst.dinas.oa.bill.BusinessTripApply$serial
</name>
<title>
出差申请$serial
</title>
<description>
出差申请
</description>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply.jmx
View file @
5da02a78
<?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>
<<<<<<
< HEAD
<id
>
ec447a08-5c30-4ecc-a85a-f277f50dbc4e
</id>
=======
<id>
49c6c36a-38a9-46b4-a84b-899535ce796b
</id>
>>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
<name>
com.xyst.dinas.oa.bill.BusinessTripApply
</name>
<title>
出差申请
</title>
<description>
出差申请
</description>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument$sequence.jmx
View file @
5da02a78
<?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>
<<<<<<
< HEAD
<id
>
9409d229-d33b-433d-9e26-2633c863fea4
</id>
=======
<id>
322b4f87-72ba-4d4e-8455-512d61b449e1
</id>
>>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
<name>
com.xyst.dinas.oa.bill.ProtocolDocument$sequence
</name>
<title>
拟文$sequence
</title>
<description>
拟文
</description>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument$serial.jmx
View file @
5da02a78
<?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>
<<<<<<
< HEAD
<id
>
defcdd02-7707-4a13-a368-5d5d5080ee23
</id>
=======
<id>
b050fc3f-9e62-4dee-8e53-a1ab61737dde
</id>
>>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
<name>
com.xyst.dinas.oa.bill.ProtocolDocument$serial
</name>
<title>
拟文$serial
</title>
<description>
拟文
</description>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument.jmx
View file @
5da02a78
<?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>
<<<<<<
< HEAD
<id
>
c6741756-a59b-448f-ba12-7573d0916500
</id>
=======
<id>
4c19c3a8-6955-4f7a-aa97-989e22b20ffe
</id>
>>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
<name>
com.xyst.dinas.oa.bill.ProtocolDocument
</name>
<title>
拟文
</title>
<description>
拟文
</description>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow$sequence.jmx
View file @
5da02a78
<?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>
<<<<<<
< HEAD
<id
>
3a4943d0-5867-4e75-bd3a-4383cdbe177e
</id>
=======
<id>
5a583754-de0c-4884-a37e-613a82e0db8f
</id>
>>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
<name>
com.xyst.dinas.oa.bill.SealBorrow$sequence
</name>
<title>
证章借出$sequence
</title>
<description>
证章借出
</description>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow$serial.jmx
View file @
5da02a78
<?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>
<<<<<<
< HEAD
<id
>
a05be48f-04b2-4ce4-8479-6b72b61f60ad
</id>
=======
<id>
9311fb59-73d8-4241-a570-a962f280034f
</id>
>>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
<name>
com.xyst.dinas.oa.bill.SealBorrow$serial
</name>
<title>
证章借出$serial
</title>
<description>
证章借出
</description>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow.jmx
View file @
5da02a78
<?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>
<<<<<<
< HEAD
<id
>
e37cda04-f87d-4654-9f21-584266c2943d
</id>
=======
<id>
e705d36c-0ca6-46be-9f89-48389d162e3e
</id>
>>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
<name>
com.xyst.dinas.oa.bill.SealBorrow
</name>
<title>
证章借出
</title>
<description>
证章借出
</description>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply$sequence.jmx
View file @
5da02a78
<?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>
<<<<<<
< HEAD
<id
>
c9f4221c-5f56-43d8-bf3f-823fdee8e35a
</id>
=======
<id>
cf3798f9-c744-4ee5-afe5-52cf07e246cb
</id>
>>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
<name>
com.xyst.dinas.oa.bill.UseCarApply$sequence
</name>
<title>
用车申请$sequence
</title>
<description>
用车申请
</description>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply$serial.jmx
View file @
5da02a78
<?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>
<<<<<<
< HEAD
<id
>
13edff2f-bc4d-4041-9d09-2881245d1ccd
</id>
=======
<id>
8087d2fa-7450-4054-961e-01f5cc35b3c9
</id>
>>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
<name>
com.xyst.dinas.oa.bill.UseCarApply$serial
</name>
<title>
用车申请$serial
</title>
<description>
用车申请
</description>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply.jmx
View file @
5da02a78
<?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>
<<<<<<
< HEAD
<id
>
4ede1d03-e4a0-4a64-836c-e6e9f8f203a3
</id>
=======
<id>
6f73f099-8c03-4ee5-80f3-527c0bd4ed37
</id>
>>>>>>> e1eeb4e1cecf0ac7f3c02d6be14a7a3c953e6551
<name>
com.xyst.dinas.oa.bill.UseCarApply
</name>
<title>
用车申请
</title>
<description>
用车申请
</description>
...
...
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