Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
d2d7af27
Commit
d2d7af27
authored
May 28, 2019
by
季圣华
Browse files
增加根据id查询明细的接口
parent
90b09cf7
Changes
29
Show whitespace changes
Inline
Side-by-side
src/main/java/com/jsh/erp/controller/ResourceController.java
View file @
d2d7af27
...
@@ -32,6 +32,20 @@ public class ResourceController {
...
@@ -32,6 +32,20 @@ public class ResourceController {
return
JsonUtils
.
ok
();
return
JsonUtils
.
ok
();
}
}
@GetMapping
(
value
=
"/{apiName}/info"
)
public
String
getList
(
@PathVariable
(
"apiName"
)
String
apiName
,
@RequestParam
(
"id"
)
Long
id
,
HttpServletRequest
request
)
throws
Exception
{
Object
obj
=
configResourceManager
.
selectOne
(
apiName
,
id
);
Map
<
String
,
Object
>
objectMap
=
new
HashMap
<
String
,
Object
>();
if
(
obj
!=
null
)
{
objectMap
.
put
(
"info"
,
obj
);
return
returnJson
(
objectMap
,
ErpInfo
.
OK
.
name
,
ErpInfo
.
OK
.
code
);
}
else
{
return
returnJson
(
objectMap
,
ErpInfo
.
ERROR
.
name
,
ErpInfo
.
ERROR
.
code
);
}
}
@GetMapping
(
value
=
"/{apiName}/list"
)
@GetMapping
(
value
=
"/{apiName}/list"
)
public
String
getList
(
@PathVariable
(
"apiName"
)
String
apiName
,
public
String
getList
(
@PathVariable
(
"apiName"
)
String
apiName
,
@RequestParam
(
value
=
Constants
.
PAGE_SIZE
,
required
=
false
)
Integer
pageSize
,
@RequestParam
(
value
=
Constants
.
PAGE_SIZE
,
required
=
false
)
Integer
pageSize
,
...
...
src/main/java/com/jsh/erp/service/CommonQueryManager.java
View file @
d2d7af27
...
@@ -30,8 +30,8 @@ public class CommonQueryManager {
...
@@ -30,8 +30,8 @@ public class CommonQueryManager {
* @param apiName 接口名称
* @param apiName 接口名称
* @param id ID
* @param id ID
*/
*/
public
Object
selectOne
(
String
apiName
,
Stri
ng
id
)
throws
Exception
{
public
Object
selectOne
(
String
apiName
,
Lo
ng
id
)
throws
Exception
{
if
(
StringUtil
.
isNotEmpty
(
apiName
)
&&
StringUtil
.
isNotEmpty
(
id
)
)
{
if
(
StringUtil
.
isNotEmpty
(
apiName
)
&&
id
!=
null
)
{
return
container
.
getCommonQuery
(
apiName
).
selectOne
(
id
);
return
container
.
getCommonQuery
(
apiName
).
selectOne
(
id
);
}
}
return
null
;
return
null
;
...
...
src/main/java/com/jsh/erp/service/ICommonQuery.java
View file @
d2d7af27
...
@@ -13,12 +13,12 @@ import java.util.Map;
...
@@ -13,12 +13,12 @@ import java.util.Map;
*/
*/
public
interface
ICommonQuery
{
public
interface
ICommonQuery
{
/**
/**
*
查询:解析JSON,查询资源
。
*
根据id查询明细
。
*
*
* @param
condition
资源id
* @param
id
资源id
* @return 资源
* @return 资源
*/
*/
Object
selectOne
(
String
condition
)
throws
Exception
;
Object
selectOne
(
Long
id
)
throws
Exception
;
/**
/**
* 自定义查询
* 自定义查询
...
...
src/main/java/com/jsh/erp/service/account/AccountComponent.java
View file @
d2d7af27
...
@@ -19,8 +19,8 @@ public class AccountComponent implements ICommonQuery {
...
@@ -19,8 +19,8 @@ public class AccountComponent implements ICommonQuery {
private
AccountService
accountService
;
private
AccountService
accountService
;
@Override
@Override
public
Object
selectOne
(
String
condi
tion
)
{
public
Object
selectOne
(
Long
id
)
throws
Excep
tion
{
return
null
;
return
accountService
.
getAccount
(
id
)
;
}
}
@Override
@Override
...
...
src/main/java/com/jsh/erp/service/account/AccountService.java
View file @
d2d7af27
...
@@ -58,7 +58,7 @@ public class AccountService {
...
@@ -58,7 +58,7 @@ public class AccountService {
@Resource
@Resource
private
UserService
userService
;
private
UserService
userService
;
public
Account
getAccount
(
long
id
)
{
public
Account
getAccount
(
long
id
)
throws
Exception
{
return
accountMapper
.
selectByPrimaryKey
(
id
);
return
accountMapper
.
selectByPrimaryKey
(
id
);
}
}
...
...
src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java
View file @
d2d7af27
...
@@ -19,8 +19,8 @@ public class AccountHeadComponent implements ICommonQuery {
...
@@ -19,8 +19,8 @@ public class AccountHeadComponent implements ICommonQuery {
private
AccountHeadService
accountHeadService
;
private
AccountHeadService
accountHeadService
;
@Override
@Override
public
Object
selectOne
(
String
condition
)
throws
Exception
{
public
Object
selectOne
(
Long
id
)
throws
Exception
{
return
null
;
return
accountHeadService
.
getAccountHead
(
id
)
;
}
}
@Override
@Override
...
...
src/main/java/com/jsh/erp/service/accountItem/AccountItemComponent.java
View file @
d2d7af27
...
@@ -19,8 +19,8 @@ public class AccountItemComponent implements ICommonQuery {
...
@@ -19,8 +19,8 @@ public class AccountItemComponent implements ICommonQuery {
private
AccountItemService
accountItemService
;
private
AccountItemService
accountItemService
;
@Override
@Override
public
Object
selectOne
(
String
condition
)
throws
Exception
{
public
Object
selectOne
(
Long
id
)
throws
Exception
{
return
null
;
return
accountItemService
.
getAccountItem
(
id
)
;
}
}
@Override
@Override
...
...
src/main/java/com/jsh/erp/service/app/AppComponent.java
View file @
d2d7af27
...
@@ -19,8 +19,8 @@ public class AppComponent implements ICommonQuery {
...
@@ -19,8 +19,8 @@ public class AppComponent implements ICommonQuery {
private
AppService
appService
;
private
AppService
appService
;
@Override
@Override
public
Object
selectOne
(
String
condition
)
throws
Exception
{
public
Object
selectOne
(
Long
id
)
throws
Exception
{
return
null
;
return
appService
.
getApp
(
id
)
;
}
}
@Override
@Override
...
...
src/main/java/com/jsh/erp/service/depot/DepotComponent.java
View file @
d2d7af27
...
@@ -20,8 +20,8 @@ public class DepotComponent implements ICommonQuery {
...
@@ -20,8 +20,8 @@ public class DepotComponent implements ICommonQuery {
private
DepotService
depotService
;
private
DepotService
depotService
;
@Override
@Override
public
Object
selectOne
(
String
condition
)
throws
Exception
{
public
Object
selectOne
(
Long
id
)
throws
Exception
{
return
null
;
return
depotService
.
getDepot
(
id
)
;
}
}
@Override
@Override
...
...
src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java
View file @
d2d7af27
...
@@ -19,8 +19,8 @@ public class DepotHeadComponent implements ICommonQuery {
...
@@ -19,8 +19,8 @@ public class DepotHeadComponent implements ICommonQuery {
private
DepotHeadService
depotHeadService
;
private
DepotHeadService
depotHeadService
;
@Override
@Override
public
Object
selectOne
(
String
condition
)
throws
Exception
{
public
Object
selectOne
(
Long
id
)
throws
Exception
{
return
null
;
return
depotHeadService
.
getDepotHead
(
id
)
;
}
}
@Override
@Override
...
...
src/main/java/com/jsh/erp/service/depotItem/DepotItemComponent.java
View file @
d2d7af27
...
@@ -19,8 +19,8 @@ public class DepotItemComponent implements ICommonQuery {
...
@@ -19,8 +19,8 @@ public class DepotItemComponent implements ICommonQuery {
private
DepotItemService
depotItemService
;
private
DepotItemService
depotItemService
;
@Override
@Override
public
Object
selectOne
(
String
condition
)
throws
Exception
{
public
Object
selectOne
(
Long
id
)
throws
Exception
{
return
null
;
return
depotItemService
.
getDepotItem
(
id
)
;
}
}
@Override
@Override
...
...
src/main/java/com/jsh/erp/service/functions/FunctionsComponent.java
View file @
d2d7af27
...
@@ -21,8 +21,8 @@ public class FunctionsComponent implements ICommonQuery {
...
@@ -21,8 +21,8 @@ public class FunctionsComponent implements ICommonQuery {
private
FunctionsService
functionsService
;
private
FunctionsService
functionsService
;
@Override
@Override
public
Object
selectOne
(
String
condition
)
throws
Exception
{
public
Object
selectOne
(
Long
id
)
throws
Exception
{
return
null
;
return
functionsService
.
getFunctions
(
id
)
;
}
}
@Override
@Override
...
...
src/main/java/com/jsh/erp/service/inOutItem/InOutItemComponent.java
View file @
d2d7af27
...
@@ -19,8 +19,8 @@ public class InOutItemComponent implements ICommonQuery {
...
@@ -19,8 +19,8 @@ public class InOutItemComponent implements ICommonQuery {
private
InOutItemService
inOutItemService
;
private
InOutItemService
inOutItemService
;
@Override
@Override
public
Object
selectOne
(
String
condition
)
throws
Exception
{
public
Object
selectOne
(
Long
id
)
throws
Exception
{
return
null
;
return
inOutItemService
.
getInOutItem
(
id
)
;
}
}
@Override
@Override
...
...
src/main/java/com/jsh/erp/service/log/LogComponent.java
View file @
d2d7af27
...
@@ -19,8 +19,8 @@ public class LogComponent implements ICommonQuery {
...
@@ -19,8 +19,8 @@ public class LogComponent implements ICommonQuery {
private
LogService
logService
;
private
LogService
logService
;
@Override
@Override
public
Object
selectOne
(
String
condition
)
throws
Exception
{
public
Object
selectOne
(
Long
id
)
throws
Exception
{
return
null
;
return
logService
.
getLog
(
id
)
;
}
}
@Override
@Override
...
...
src/main/java/com/jsh/erp/service/material/MaterialComponent.java
View file @
d2d7af27
...
@@ -21,8 +21,8 @@ public class MaterialComponent implements ICommonQuery {
...
@@ -21,8 +21,8 @@ public class MaterialComponent implements ICommonQuery {
private
MaterialService
materialService
;
private
MaterialService
materialService
;
@Override
@Override
public
Object
selectOne
(
String
condition
)
throws
Exception
{
public
Object
selectOne
(
Long
id
)
throws
Exception
{
return
null
;
return
materialService
.
getMaterial
(
id
)
;
}
}
@Override
@Override
...
...
src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryComponent.java
View file @
d2d7af27
...
@@ -21,8 +21,8 @@ public class MaterialCategoryComponent implements ICommonQuery {
...
@@ -21,8 +21,8 @@ public class MaterialCategoryComponent implements ICommonQuery {
private
MaterialCategoryService
materialCategoryService
;
private
MaterialCategoryService
materialCategoryService
;
@Override
@Override
public
Object
selectOne
(
String
condition
)
throws
Exception
{
public
Object
selectOne
(
Long
id
)
throws
Exception
{
return
null
;
return
materialCategoryService
.
getMaterialCategory
(
id
)
;
}
}
@Override
@Override
...
...
src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyComponent.java
View file @
d2d7af27
...
@@ -19,8 +19,8 @@ public class MaterialPropertyComponent implements ICommonQuery {
...
@@ -19,8 +19,8 @@ public class MaterialPropertyComponent implements ICommonQuery {
private
MaterialPropertyService
materialPropertyService
;
private
MaterialPropertyService
materialPropertyService
;
@Override
@Override
public
Object
selectOne
(
String
condition
)
throws
Exception
{
public
Object
selectOne
(
Long
id
)
throws
Exception
{
return
null
;
return
materialPropertyService
.
getMaterialProperty
(
id
)
;
}
}
@Override
@Override
...
...
src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelComponent.java
View file @
d2d7af27
...
@@ -21,9 +21,10 @@ import java.util.Map;
...
@@ -21,9 +21,10 @@ import java.util.Map;
public
class
OrgaUserRelComponent
implements
ICommonQuery
{
public
class
OrgaUserRelComponent
implements
ICommonQuery
{
@Resource
@Resource
private
OrgaUserRelService
orgaUserRelService
;
private
OrgaUserRelService
orgaUserRelService
;
@Override
@Override
public
Object
selectOne
(
String
condition
)
throws
Exception
{
public
Object
selectOne
(
Long
id
)
throws
Exception
{
return
null
;
return
orgaUserRelService
.
getOrgaUserRel
(
id
)
;
}
}
@Override
@Override
...
...
src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelService.java
View file @
d2d7af27
...
@@ -41,6 +41,11 @@ public class OrgaUserRelService {
...
@@ -41,6 +41,11 @@ public class OrgaUserRelService {
private
UserService
userService
;
private
UserService
userService
;
@Resource
@Resource
private
LogService
logService
;
private
LogService
logService
;
public
OrgaUserRel
getOrgaUserRel
(
long
id
)
throws
Exception
{
return
orgaUserRelMapper
.
selectByPrimaryKey
(
id
);
}
@Transactional
(
value
=
"transactionManager"
,
rollbackFor
=
Exception
.
class
)
@Transactional
(
value
=
"transactionManager"
,
rollbackFor
=
Exception
.
class
)
public
int
insertOrgaUserRel
(
String
beanJson
,
HttpServletRequest
request
)
throws
Exception
{
public
int
insertOrgaUserRel
(
String
beanJson
,
HttpServletRequest
request
)
throws
Exception
{
OrgaUserRel
orgaUserRel
=
JSONObject
.
parseObject
(
beanJson
,
OrgaUserRel
.
class
);
OrgaUserRel
orgaUserRel
=
JSONObject
.
parseObject
(
beanJson
,
OrgaUserRel
.
class
);
...
...
src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java
View file @
d2d7af27
...
@@ -22,9 +22,10 @@ import java.util.Map;
...
@@ -22,9 +22,10 @@ import java.util.Map;
public
class
OrganizationComponent
implements
ICommonQuery
{
public
class
OrganizationComponent
implements
ICommonQuery
{
@Resource
@Resource
private
OrganizationService
organizationService
;
private
OrganizationService
organizationService
;
@Override
@Override
public
Object
selectOne
(
String
condition
)
throws
Exception
{
public
Object
selectOne
(
Long
id
)
throws
Exception
{
return
null
;
return
organizationService
.
getOrganization
(
id
)
;
}
}
@Override
@Override
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
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