From d2d7af27acc96aca8ecd67b72c7f10258ee688d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <852955+jishenghua@users.noreply.gitee.com> Date: Tue, 28 May 2019 23:37:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AEid=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=98=8E=E7=BB=86=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsh/erp/controller/ResourceController.java | 14 ++++++++++++++ .../com/jsh/erp/service/CommonQueryManager.java | 4 ++-- .../java/com/jsh/erp/service/ICommonQuery.java | 6 +++--- .../jsh/erp/service/account/AccountComponent.java | 4 ++-- .../jsh/erp/service/account/AccountService.java | 2 +- .../service/accountHead/AccountHeadComponent.java | 4 ++-- .../service/accountItem/AccountItemComponent.java | 4 ++-- .../java/com/jsh/erp/service/app/AppComponent.java | 4 ++-- .../com/jsh/erp/service/depot/DepotComponent.java | 4 ++-- .../erp/service/depotHead/DepotHeadComponent.java | 4 ++-- .../erp/service/depotItem/DepotItemComponent.java | 4 ++-- .../erp/service/functions/FunctionsComponent.java | 4 ++-- .../erp/service/inOutItem/InOutItemComponent.java | 4 ++-- .../java/com/jsh/erp/service/log/LogComponent.java | 4 ++-- .../erp/service/material/MaterialComponent.java | 4 ++-- .../MaterialCategoryComponent.java | 4 ++-- .../MaterialPropertyComponent.java | 4 ++-- .../service/orgaUserRel/OrgaUserRelComponent.java | 5 +++-- .../service/orgaUserRel/OrgaUserRelService.java | 5 +++++ .../organization/OrganizationComponent.java | 5 +++-- .../service/organization/OrganizationService.java | 5 +++++ .../jsh/erp/service/person/PersonComponent.java | 4 ++-- .../com/jsh/erp/service/role/RoleComponent.java | 4 ++-- .../serialNumber/SerialNumberComponent.java | 4 ++-- .../erp/service/supplier/SupplierComponent.java | 4 ++-- .../systemConfig/SystemConfigComponent.java | 4 ++-- .../com/jsh/erp/service/unit/UnitComponent.java | 4 ++-- .../com/jsh/erp/service/user/UserComponent.java | 4 ++-- .../userBusiness/UserBusinessComponent.java | 4 ++-- 29 files changed, 78 insertions(+), 52 deletions(-) diff --git a/src/main/java/com/jsh/erp/controller/ResourceController.java b/src/main/java/com/jsh/erp/controller/ResourceController.java index f1d15ab4..16c1dc1c 100644 --- a/src/main/java/com/jsh/erp/controller/ResourceController.java +++ b/src/main/java/com/jsh/erp/controller/ResourceController.java @@ -32,6 +32,20 @@ public class ResourceController { 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 objectMap = new HashMap(); + 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") public String getList(@PathVariable("apiName") String apiName, @RequestParam(value = Constants.PAGE_SIZE, required = false) Integer pageSize, diff --git a/src/main/java/com/jsh/erp/service/CommonQueryManager.java b/src/main/java/com/jsh/erp/service/CommonQueryManager.java index 7525a062..311a5223 100644 --- a/src/main/java/com/jsh/erp/service/CommonQueryManager.java +++ b/src/main/java/com/jsh/erp/service/CommonQueryManager.java @@ -30,8 +30,8 @@ public class CommonQueryManager { * @param apiName 接口名称 * @param id ID */ - public Object selectOne(String apiName, String id) throws Exception{ - if (StringUtil.isNotEmpty(apiName) && StringUtil.isNotEmpty(id)) { + public Object selectOne(String apiName, Long id) throws Exception { + if (StringUtil.isNotEmpty(apiName) && id!=null) { return container.getCommonQuery(apiName).selectOne(id); } return null; diff --git a/src/main/java/com/jsh/erp/service/ICommonQuery.java b/src/main/java/com/jsh/erp/service/ICommonQuery.java index 0927a71e..25d19880 100644 --- a/src/main/java/com/jsh/erp/service/ICommonQuery.java +++ b/src/main/java/com/jsh/erp/service/ICommonQuery.java @@ -13,12 +13,12 @@ import java.util.Map; */ public interface ICommonQuery { /** - * 查询：解析JSON，查询资源。 + * 根据id查询明细。 * - * @param condition 资源id + * @param id 资源id * @return 资源 */ - Object selectOne(String condition) throws Exception; + Object selectOne(Long id) throws Exception; /** * 自定义查询 diff --git a/src/main/java/com/jsh/erp/service/account/AccountComponent.java b/src/main/java/com/jsh/erp/service/account/AccountComponent.java index 3676bd8f..a1b159f9 100644 --- a/src/main/java/com/jsh/erp/service/account/AccountComponent.java +++ b/src/main/java/com/jsh/erp/service/account/AccountComponent.java @@ -19,8 +19,8 @@ public class AccountComponent implements ICommonQuery { private AccountService accountService; @Override - public Object selectOne(String condition) { - return null; + public Object selectOne(Long id) throws Exception { + return accountService.getAccount(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/account/AccountService.java b/src/main/java/com/jsh/erp/service/account/AccountService.java index ba995fce..e49c5fc3 100644 --- a/src/main/java/com/jsh/erp/service/account/AccountService.java +++ b/src/main/java/com/jsh/erp/service/account/AccountService.java @@ -58,7 +58,7 @@ public class AccountService { @Resource private UserService userService; - public Account getAccount(long id) { + public Account getAccount(long id) throws Exception{ return accountMapper.selectByPrimaryKey(id); } diff --git a/src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java b/src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java index a9b67219..01f9ca98 100644 --- a/src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java +++ b/src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java @@ -19,8 +19,8 @@ public class AccountHeadComponent implements ICommonQuery { private AccountHeadService accountHeadService; @Override - public Object selectOne(String condition) throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return accountHeadService.getAccountHead(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/accountItem/AccountItemComponent.java b/src/main/java/com/jsh/erp/service/accountItem/AccountItemComponent.java index f7ae1daf..b2fd6d5d 100644 --- a/src/main/java/com/jsh/erp/service/accountItem/AccountItemComponent.java +++ b/src/main/java/com/jsh/erp/service/accountItem/AccountItemComponent.java @@ -19,8 +19,8 @@ public class AccountItemComponent implements ICommonQuery { private AccountItemService accountItemService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return accountItemService.getAccountItem(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/app/AppComponent.java b/src/main/java/com/jsh/erp/service/app/AppComponent.java index a5759efd..9afec67f 100644 --- a/src/main/java/com/jsh/erp/service/app/AppComponent.java +++ b/src/main/java/com/jsh/erp/service/app/AppComponent.java @@ -19,8 +19,8 @@ public class AppComponent implements ICommonQuery { private AppService appService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return appService.getApp(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/depot/DepotComponent.java b/src/main/java/com/jsh/erp/service/depot/DepotComponent.java index 7dc0f06c..aa78ad79 100644 --- a/src/main/java/com/jsh/erp/service/depot/DepotComponent.java +++ b/src/main/java/com/jsh/erp/service/depot/DepotComponent.java @@ -20,8 +20,8 @@ public class DepotComponent implements ICommonQuery { private DepotService depotService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return depotService.getDepot(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java index ba817286..a755bd55 100644 --- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java +++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java @@ -19,8 +19,8 @@ public class DepotHeadComponent implements ICommonQuery { private DepotHeadService depotHeadService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return depotHeadService.getDepotHead(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/depotItem/DepotItemComponent.java b/src/main/java/com/jsh/erp/service/depotItem/DepotItemComponent.java index 898d3999..0adc4089 100644 --- a/src/main/java/com/jsh/erp/service/depotItem/DepotItemComponent.java +++ b/src/main/java/com/jsh/erp/service/depotItem/DepotItemComponent.java @@ -19,8 +19,8 @@ public class DepotItemComponent implements ICommonQuery { private DepotItemService depotItemService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return depotItemService.getDepotItem(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/functions/FunctionsComponent.java b/src/main/java/com/jsh/erp/service/functions/FunctionsComponent.java index a48aaff3..ebb0c67a 100644 --- a/src/main/java/com/jsh/erp/service/functions/FunctionsComponent.java +++ b/src/main/java/com/jsh/erp/service/functions/FunctionsComponent.java @@ -21,8 +21,8 @@ public class FunctionsComponent implements ICommonQuery { private FunctionsService functionsService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return functionsService.getFunctions(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/inOutItem/InOutItemComponent.java b/src/main/java/com/jsh/erp/service/inOutItem/InOutItemComponent.java index 9cce46bc..cc8812f9 100644 --- a/src/main/java/com/jsh/erp/service/inOutItem/InOutItemComponent.java +++ b/src/main/java/com/jsh/erp/service/inOutItem/InOutItemComponent.java @@ -19,8 +19,8 @@ public class InOutItemComponent implements ICommonQuery { private InOutItemService inOutItemService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return inOutItemService.getInOutItem(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/log/LogComponent.java b/src/main/java/com/jsh/erp/service/log/LogComponent.java index 00857c87..1432c9f3 100644 --- a/src/main/java/com/jsh/erp/service/log/LogComponent.java +++ b/src/main/java/com/jsh/erp/service/log/LogComponent.java @@ -19,8 +19,8 @@ public class LogComponent implements ICommonQuery { private LogService logService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return logService.getLog(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/material/MaterialComponent.java b/src/main/java/com/jsh/erp/service/material/MaterialComponent.java index 7b2ca3d2..77a9d271 100644 --- a/src/main/java/com/jsh/erp/service/material/MaterialComponent.java +++ b/src/main/java/com/jsh/erp/service/material/MaterialComponent.java @@ -21,8 +21,8 @@ public class MaterialComponent implements ICommonQuery { private MaterialService materialService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return materialService.getMaterial(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryComponent.java b/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryComponent.java index 70598d69..b6bb92ac 100644 --- a/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryComponent.java +++ b/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryComponent.java @@ -21,8 +21,8 @@ public class MaterialCategoryComponent implements ICommonQuery { private MaterialCategoryService materialCategoryService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return materialCategoryService.getMaterialCategory(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyComponent.java b/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyComponent.java index 4d681484..33a39ccc 100644 --- a/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyComponent.java +++ b/src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyComponent.java @@ -19,8 +19,8 @@ public class MaterialPropertyComponent implements ICommonQuery { private MaterialPropertyService materialPropertyService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return materialPropertyService.getMaterialProperty(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelComponent.java b/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelComponent.java index 1d6776d4..2024d2df 100644 --- a/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelComponent.java +++ b/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelComponent.java @@ -21,9 +21,10 @@ import java.util.Map; public class OrgaUserRelComponent implements ICommonQuery { @Resource private OrgaUserRelService orgaUserRelService; + @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return orgaUserRelService.getOrgaUserRel(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelService.java b/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelService.java index d422ae07..aaea62d6 100644 --- a/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelService.java +++ b/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelService.java @@ -41,6 +41,11 @@ public class OrgaUserRelService { private UserService userService; @Resource private LogService logService; + + public OrgaUserRel getOrgaUserRel(long id) throws Exception{ + return orgaUserRelMapper.selectByPrimaryKey(id); + } + @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int insertOrgaUserRel(String beanJson, HttpServletRequest request) throws Exception{ OrgaUserRel orgaUserRel = JSONObject.parseObject(beanJson, OrgaUserRel.class); diff --git a/src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java b/src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java index 3b0a226a..435c8379 100644 --- a/src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java +++ b/src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java @@ -22,9 +22,10 @@ import java.util.Map; public class OrganizationComponent implements ICommonQuery { @Resource private OrganizationService organizationService; + @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return organizationService.getOrganization(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/organization/OrganizationService.java b/src/main/java/com/jsh/erp/service/organization/OrganizationService.java index fcec30dc..cdae2fc0 100644 --- a/src/main/java/com/jsh/erp/service/organization/OrganizationService.java +++ b/src/main/java/com/jsh/erp/service/organization/OrganizationService.java @@ -44,6 +44,11 @@ public class OrganizationService { private UserService userService; @Resource private LogService logService; + + public Organization getOrganization(long id) throws Exception { + return organizationMapper.selectByPrimaryKey(id); + } + @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int insertOrganization(String beanJson, HttpServletRequest request)throws Exception { Organization organization = JSONObject.parseObject(beanJson, Organization.class); diff --git a/src/main/java/com/jsh/erp/service/person/PersonComponent.java b/src/main/java/com/jsh/erp/service/person/PersonComponent.java index b7b6a6cc..bb3f27dd 100644 --- a/src/main/java/com/jsh/erp/service/person/PersonComponent.java +++ b/src/main/java/com/jsh/erp/service/person/PersonComponent.java @@ -21,8 +21,8 @@ public class PersonComponent implements ICommonQuery { private PersonService personService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return personService.getPerson(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/role/RoleComponent.java b/src/main/java/com/jsh/erp/service/role/RoleComponent.java index 9c491a15..b4b513ec 100644 --- a/src/main/java/com/jsh/erp/service/role/RoleComponent.java +++ b/src/main/java/com/jsh/erp/service/role/RoleComponent.java @@ -19,8 +19,8 @@ public class RoleComponent implements ICommonQuery { private RoleService roleService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return roleService.getRole(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberComponent.java b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberComponent.java index 7cc89dde..992a3117 100644 --- a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberComponent.java +++ b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberComponent.java @@ -26,8 +26,8 @@ public class SerialNumberComponent implements ICommonQuery { private SerialNumberService serialNumberService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return serialNumberService.getSerialNumber(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/supplier/SupplierComponent.java b/src/main/java/com/jsh/erp/service/supplier/SupplierComponent.java index c018e2ac..67943682 100644 --- a/src/main/java/com/jsh/erp/service/supplier/SupplierComponent.java +++ b/src/main/java/com/jsh/erp/service/supplier/SupplierComponent.java @@ -21,8 +21,8 @@ public class SupplierComponent implements ICommonQuery { private SupplierService supplierService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return supplierService.getSupplier(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java b/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java index 427cd516..7fd76977 100644 --- a/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java +++ b/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java @@ -21,8 +21,8 @@ public class SystemConfigComponent implements ICommonQuery { private SystemConfigService systemConfigService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return systemConfigService.getSystemConfig(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/unit/UnitComponent.java b/src/main/java/com/jsh/erp/service/unit/UnitComponent.java index 98a66249..cc17fb54 100644 --- a/src/main/java/com/jsh/erp/service/unit/UnitComponent.java +++ b/src/main/java/com/jsh/erp/service/unit/UnitComponent.java @@ -20,8 +20,8 @@ public class UnitComponent implements ICommonQuery { private UnitService unitService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return unitService.getUnit(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/user/UserComponent.java b/src/main/java/com/jsh/erp/service/user/UserComponent.java index 3a7bc58d..eabdfa2a 100644 --- a/src/main/java/com/jsh/erp/service/user/UserComponent.java +++ b/src/main/java/com/jsh/erp/service/user/UserComponent.java @@ -18,8 +18,8 @@ public class UserComponent implements ICommonQuery { private UserService userService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return userService.getUser(id); } @Override diff --git a/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessComponent.java b/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessComponent.java index 04ca587f..74b8e033 100644 --- a/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessComponent.java +++ b/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessComponent.java @@ -22,8 +22,8 @@ public class UserBusinessComponent implements ICommonQuery { private UserBusinessService userBusinessService; @Override - public Object selectOne(String condition)throws Exception { - return null; + public Object selectOne(Long id) throws Exception { + return userBusinessService.getUserBusiness(id); } @Override