From bc2fe224aa18e0b503d26ceace086e90fadf5608 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 18 十二月 2020 14:41:40 +0800
Subject: [PATCH] 模块：api接口 修改：新增返回字段课题组 提出：秦老师
---
src/main/java/com/nanometer/smartlab/api/ApiAction.java | 32 ++------------------------------
1 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/api/ApiAction.java b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
index 10aa27a..3221c0c 100644
--- a/src/main/java/com/nanometer/smartlab/api/ApiAction.java
+++ b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
@@ -222,35 +222,6 @@
return retJSON.toJSONString();
}
- @ResponseBody
- @RequestMapping(value = "/userListByContainerCode")
- public Object userListByContainerCode(@RequestParam String containerCode,@RequestParam String startTime, @RequestParam String endTime) throws ApiException {
- logger.info("userListByContainerCode start...containerCode= " + containerCode
- + ",startTime=" + startTime
- + ",endTime=" + endTime);
-
- List<SysUser> userList = interfaceService.getUserListByContainerCode(containerCode, startTime, endTime);
-
- List<Map> datalist = Lists.newArrayListWithCapacity(userList.size());
- for (SysUser user : userList) {
- Map<String, Object> map = Maps.newHashMapWithExpectedSize(5);
- datalist.add(map);
- map.put("name", user.getName());
- map.put("role", user.getSeeFlag().getKey());
- map.put("validFlag", user.getValidFlag().getKey());
- map.put("idcard", user.getIdCard());
- map.put("point", user.getPoint());
- map.put("unit", user.getCompany());
- map.put("Arp", user.getArp());
- map.put("departmentName", user.getDepartment());
-
- }
- logger.info("getUserInfo end...");
- return ResponseModel.getOkInstence(datalist);
- }
-
-
-
@ResponseBody
@RequestMapping(value = "/openCabinetDoor")
@@ -1070,7 +1041,7 @@
//从柜子的设备码根据设备的所在实验室的课题组的课题组下的所有用户，没有课题组则返回用部门搜索
@ResponseBody
- @RequestMapping(value = "/userListByContainerCodeNew")
+ @RequestMapping(value = "/userListByContainerCode")
public Object userListByContainerCodeNew(@RequestParam String containerCode,@RequestParam String startTime, @RequestParam String endTime) throws ApiException {
logger.info("userListByContainerCodeNew start...containerCode= " + containerCode
+ ",startTime=" + startTime
@@ -1096,6 +1067,7 @@
map.put("unit", user.getCompany());
map.put("Arp", user.getArp());
map.put("departmentName", user.getDepartment());
+ map.put("project", user.getProject());
}
logger.info("getUserInfo end...");
--
Gitblit v1.9.2