增加根据id查询明细的接口

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<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")
     public String getList(@PathVariable("apiName") String apiName,
                         @RequestParam(value = Constants.PAGE_SIZE, required = false) Integer pageSize,

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{
+    public Object selectOne(String apiName, Long id) throws Exception {
-        if (StringUtil.isNotEmpty(apiName) && StringUtil.isNotEmpty(id)) {
+        if (StringUtil.isNotEmpty(apiName) && id!=null) {
             return container.getCommonQuery(apiName).selectOne(id);
         }
         return null;

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;
 
     /**
      * 自定义查询

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) {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return accountService.getAccount(id);
     }
 
     @Override

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);
     }
 

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 {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return accountHeadService.getAccountHead(id);
     }
 
     @Override

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 {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return accountItemService.getAccountItem(id);
     }
 
     @Override

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 {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return appService.getApp(id);
     }
 
     @Override

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 {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return depotService.getDepot(id);
     }
 
     @Override

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 {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return depotHeadService.getDepotHead(id);
     }
 
     @Override

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 {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return depotItemService.getDepotItem(id);
     }
 
     @Override

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 {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return functionsService.getFunctions(id);
     }
 
     @Override

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 {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return inOutItemService.getInOutItem(id);
     }
 
     @Override

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 {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return logService.getLog(id);
     }
 
     @Override

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 {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return materialService.getMaterial(id);
     }
 
     @Override

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 {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return materialCategoryService.getMaterialCategory(id);
     }
 
     @Override

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 {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return materialPropertyService.getMaterialProperty(id);
     }
 
     @Override

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 {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return orgaUserRelService.getOrgaUserRel(id);
     }
 
     @Override

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);

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 {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return organizationService.getOrganization(id);
     }
 
     @Override

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);

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 {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return personService.getPerson(id);
     }
 
     @Override

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 {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return roleService.getRole(id);
     }
 
     @Override

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 {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return serialNumberService.getSerialNumber(id);
     }
 
     @Override

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 {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return supplierService.getSupplier(id);
     }
 
     @Override

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 {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return systemConfigService.getSystemConfig(id);
     }
 
     @Override

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 {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return unitService.getUnit(id);
     }
 
     @Override

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 {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return userService.getUser(id);
     }
 
     @Override

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 {
+    public Object selectOne(Long id) throws Exception {
-        return null;
+        return userBusinessService.getUserBusiness(id);
     }
 
     @Override