Merge remote-tracking branch 'origin/master'

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/feign/IWorkCenterClient.java

@@ -28,6 +28,7 @@ package org.springblade.desk.basic.feign;
 
 import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.tool.api.R;
+import org.springblade.desk.basic.pojo.entity.BasicClazz;
 import org.springblade.desk.basic.pojo.entity.TeamSet;
 import org.springblade.desk.basic.pojo.entity.WorkCenter;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -47,6 +48,7 @@ public interface IWorkCenterClient {
 	String API_PREFIX = "/feign/client/workCenter";
 	String GET_BY_ID = API_PREFIX + "/getById";
 	String GET_TeamSet_BY_ID = API_PREFIX + "/getTeamSetById";
+	String GET_Clazz_BY_ID = API_PREFIX + "/getClazzById";
 	/**
 	 * 根据id获取作业中心
 	 *
@@ -58,4 +60,7 @@ public interface IWorkCenterClient {
 
 	@GetMapping(GET_TeamSet_BY_ID)
 	R<TeamSet> getTeamSetById(@RequestParam("id") Long id);
+
+	@GetMapping(GET_Clazz_BY_ID)
+	R<BasicClazz> getClazzById(@RequestParam("id") Long id);
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java

@@ -3,6 +3,7 @@
  */
 package org.springblade.desk.basic.pojo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -10,6 +11,7 @@ import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
 
 import java.io.Serial;
+import java.util.List;
 
 /**
  * [基础分类] 实体类
@@ -75,4 +77,15 @@ public class BasicClazz extends BaseEntity {
      */
     @Schema(description = "排序")
     private Long sort;
+
+    /**
+     * 班组成员
+     */
+    @Schema(description = "")
+    private String teamMember;
+    @Schema(description = "")
+    private String teamMemberId;
+
+    @TableField(exist = false)
+    private List<Long> userIds;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/WorkCenterVO.java

@@ -21,4 +21,6 @@ public class WorkCenterVO extends WorkCenter {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+	private String leaderUserName;
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BasicClazzController.java

@@ -32,11 +32,15 @@ import org.springblade.desk.basic.constant.BAModuleConst;
 import org.springblade.desk.basic.constant.BasicClazzConst;
 import org.springblade.desk.basic.excel.BasicClazzExcel;
 import org.springblade.desk.basic.pojo.entity.BasicClazz;
+import org.springblade.desk.basic.pojo.entity.TeamSet;
 import org.springblade.desk.basic.pojo.vo.BasicClazzVO;
 import org.springblade.desk.basic.service.IBasicClazzService;
 import org.springblade.desk.basic.util.ExcelExtUtil;
 import org.springblade.desk.basic.wrapper.BasicClazzWrapper;
+import org.springblade.system.feign.IUserClient;
+import org.springblade.system.pojo.entity.User;
 import org.springframework.http.ResponseEntity;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -62,7 +66,8 @@ public class BasicClazzController extends BladeController {
 
     @Resource
     private IBasicClazzService service;
-
+    @Resource
+    private IUserClient iUserClient;
     /**
      * [基础分类] 详情
      */
@@ -109,6 +114,35 @@ public class BasicClazzController extends BladeController {
         return R.data(pagesVO);
     }
 
+    @PostMapping("/updateUserId")
+    @ApiOperationSupport(order = 31)
+    @Operation(summary = "设置人员Id保存", description = "传入WorkCenter List")
+    @Transactional
+    public R updateUserId(@Valid @RequestBody BasicClazz basicClazz) {
+        QueryWrapper<BasicClazz> qw = Condition.getQueryWrapper(basicClazz);
+        BasicClazz detail = service.getOne(qw);
+        List<Long> teamIds = basicClazz.getUserIds();
+        String result = null;
+        String team = null;
+        if(null != teamIds){
+            result = teamIds.stream()
+                    .map(Object::toString) // 或者直接使用String::valueOf，效果相同
+                    .collect(Collectors.joining(","));
+
+
+            List<User> teams = iUserClient.userListByIds(result);
+
+            team= teams.stream()
+                    .map(user -> String.valueOf(user.getRealName()))
+                    .collect(Collectors.joining(","));
+        }
+
+        detail.setTeamMemberId(result);
+        detail.setTeamMember(team);
+        service.updateById(detail);
+        return R.status(true);
+    }
+
     /**
      * SELECT
      * *

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java

@@ -279,10 +279,20 @@ public class CraftAbilityController extends BladeController {
 		return R.data(list);
 	}
 
+//	@GetMapping("/downloadExcelTemplate")
+//	@ApiOperationSupport(order = 71)
+//	@Operation(summary = "下载Excel模板", description = "")
+//	public ResponseEntity<Resource> downloadExcelTemplate() {
+//		return ExcelExtUtil.downloadXlsTemplate(
+//				"Excel/QA/工艺能力.xls",
+//				"导入模版-工艺能力.xls");
+//	}
+
+
 	@GetMapping("/downloadExcelTemplate")
 	@ApiOperationSupport(order = 71)
 	@Operation(summary = "下载Excel模板", description = "")
-	public ResponseEntity<Resource> downloadExcelTemplate() {
+	public ResponseEntity<org.springframework.core.io.Resource> downloadExcelTemplate() {
 		return ExcelExtUtil.downloadXlsTemplate(
 				"Excel/QA/工艺能力.xls",
 				"导入模版-工艺能力.xls");

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java

@@ -176,16 +176,20 @@ public class OemController extends BladeController {
                     queryWrapperOemCraft.eq("CRAFT_ABILITY_ID",team.getId());
                     OemCraftAbilityEntity craft = oemCraftAbilityService.getOne(queryWrapperOemCraft);
 
-                    BeanUtils.copyProperties(craft,team);
-                    team.setId(id);
-                    R<User> user= iUserClient.userInfoById(craft.getDispatcher());
-                    if(null != user && null != user.getData()){
-                        team.setDispatcherName(user.getData().getRealName());
-                    }
-                    R<User> userplan= iUserClient.userInfoById(craft.getPlanner());
-                    if(null != userplan && null != userplan.getData()){
-                        team.setPlannerName(userplan.getData().getRealName());
+                    if(null != craft){
+                        BeanUtils.copyProperties(craft,team);
+
+                        R<User> user= iUserClient.userInfoById(craft.getDispatcher());
+                        if(null != user && null != user.getData()){
+                            team.setDispatcherName(user.getData().getRealName());
+                        }
+                        R<User> userplan= iUserClient.userInfoById(craft.getPlanner());
+                        if(null != userplan && null != userplan.getData()){
+                            team.setPlannerName(userplan.getData().getRealName());
+                        }
                     }
+
+                    team.setId(id);
                 }
             }
         }

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlanAssignSteerController.java

@@ -284,7 +284,7 @@ public class PlanAssignSteerController extends BladeController {
 
 			  //零件
 			  QueryWrapper<LocallyPlatedPart> queryWrapperPart = new QueryWrapper<>();
-			  queryWrapperPart.eq("NAME",noticeExcel.getDsPartName());
+			  queryWrapperPart.eq("PART_CODE",noticeExcel.getDsPartName());
 			  List<LocallyPlatedPart> parts = partService.list(queryWrapperPart);
 			  if(null != parts && parts.size() > 0){
 				  notice.setDsPart(parts.get(0).getId());

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java

@@ -33,10 +33,7 @@ import org.springblade.desk.basic.constant.BaseCol;
 import org.springblade.desk.basic.constant.BaseValue;
 import org.springblade.desk.basic.excel.PlatingExcel;
 import org.springblade.desk.basic.excel.PlatingSmallExcel;
-import org.springblade.desk.basic.pojo.entity.BasicClazz;
-import org.springblade.desk.basic.pojo.entity.Plating;
-import org.springblade.desk.basic.pojo.entity.PlatingSmall;
-import org.springblade.desk.basic.pojo.entity.Shifts;
+import org.springblade.desk.basic.pojo.entity.*;
 import org.springblade.desk.basic.pojo.vo.PlatingVO;
 import org.springblade.desk.basic.service.IBasicClazzService;
 import org.springblade.desk.basic.service.IPlatingService;
@@ -161,6 +158,13 @@ public class PlatingController extends BladeController {
     @ApiOperationSupport(order = 30)
     @Operation(summary = "新增一条", description = "传入Plating Obj")
     public R save(@Valid @RequestBody Plating addOne) {
+
+        QueryWrapper<Plating> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("CONFIG_NO",addOne.getConfigNo());
+        List<Plating> list = service.list(queryWrapper);
+        if(null != list && list.size()>0){
+            return R.fail("此配置码已存在");
+        }
         addOne.setId(null);
         return R.status(service.save(addOne));
     }
@@ -185,6 +189,16 @@ public class PlatingController extends BladeController {
     @ApiOperationSupport(order = 40)
     @Operation(summary = "修改一条", description = "传入Plating Obj")
     public R update(@Valid @RequestBody Plating updateOne) {
+
+        Plating plate = service.getById(updateOne.getId());
+        if(!plate.getConfigNo().equals(updateOne.getConfigNo())){
+            QueryWrapper<Plating> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("CONFIG_NO",updateOne.getConfigNo());
+            List<Plating> list = service.list(queryWrapper);
+            if(null != list && list.size()>0){
+                return R.fail("此配置码已存在");
+            }
+        }
         return R.status(service.updateById(updateOne));
     }
 

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java

@@ -38,6 +38,7 @@ import org.springblade.desk.basic.util.ExcelExtUtil;
 import org.springblade.desk.basic.wrapper.WorkCenterWrapper;
 import org.springblade.scheduling.pojo.entity.CraftAbilityEntity;
 import org.springblade.scheduling.pojo.entity.TeamSetEntity;
+import org.springblade.system.feign.IUserClient;
 import org.springblade.system.pojo.entity.User;
 import org.springframework.beans.BeanUtils;
 import org.springframework.http.ResponseEntity;
@@ -72,7 +73,8 @@ public class WorkCenterController extends BladeController {
     private ICraftAbilityService craftAbilityService;
     @Resource
     private IOemCraftAbilityService oemCraftAbilityService;
-
+    @Resource
+    private IUserClient iUserClient;
     /**
      * [作业中心] 详情
      */
@@ -106,6 +108,13 @@ public class WorkCenterController extends BladeController {
 
         IPage<WorkCenter> pages = service.page(Condition.getPage(query), qw);
         IPage<WorkCenterVO> pagesVO = WorkCenterWrapper.build().pageVO(pages);
+        List<WorkCenterVO> vos = pagesVO.getRecords();
+        for(WorkCenterVO one : vos){
+            R<User> user= iUserClient.userInfoById(one.getLeaderUser());
+            if(null != user && null != user.getData()){
+                one.setLeaderUserName(user.getData().getRealName());
+            }
+        }
         return R.data(pagesVO);
     }
 
@@ -120,6 +129,13 @@ public class WorkCenterController extends BladeController {
         IPage<WorkCenterVO> pagesVO = service.selectWorkCenterPage(
                 Condition.getPage(query), workCenter
         );
+        List<WorkCenterVO> vos = pagesVO.getRecords();
+        for(WorkCenterVO one : vos){
+            R<User> user= iUserClient.userInfoById(one.getLeaderUser());
+            if(null != user && null != user.getData()){
+                one.setLeaderUserName(user.getData().getRealName());
+            }
+        }
         return R.data(pagesVO);
     }
 
@@ -223,10 +239,10 @@ public class WorkCenterController extends BladeController {
                     queryWrapperOemCraft.eq("OTHER_ID",detail.getId());
                     queryWrapperOemCraft.eq("CRAFT_ABILITY_ID",team.getId());
                     OemCraftAbilityEntity craft = oemCraftAbilityService.getOne(queryWrapperOemCraft);
-
-                    BeanUtils.copyProperties(craft,team);
+                    if(null != craft){
+                        BeanUtils.copyProperties(craft,team);
+                    }
                     team.setId(id);
-
                 }
 			}
 		}

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java

@@ -27,6 +27,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.constant.BAModuleConst;
 import org.springblade.desk.basic.excel.PlatingSmallExcel;
 import org.springblade.desk.basic.excel.WorkTankExcel;
+import org.springblade.desk.basic.pojo.entity.Plating;
 import org.springblade.desk.basic.pojo.entity.PlatingSmall;
 import org.springblade.desk.basic.pojo.entity.WorkTank;
 import org.springblade.desk.basic.pojo.vo.WorkTankVO;
@@ -89,8 +90,15 @@ public class WorkTankController extends BladeController {
         IPage<WorkTankVO> pagesVO = WorkTankWrapper.build().pageVO(pages);
         List<WorkTankVO> listVO = pagesVO.getRecords();
         for(WorkTankVO one : listVO){
-            if(null != one.getOpUserId()){
-                R<User> userplan= iUserClient.userInfoById(one.getOpUserId());
+//            if(null != one.getOpUserId()){
+//                R<User> userplan= iUserClient.userInfoById(one.getOpUserId());
+//                one.setOpUserRealName(userplan.getData().getRealName());
+//            }
+            if(null != one.getUpdateUser() && !"".equals(one.getUpdateUser())){
+                R<User> userplan= iUserClient.userInfoById(one.getUpdateUser());
+                one.setOpUserRealName(userplan.getData().getRealName());
+            }else{
+                R<User> userplan= iUserClient.userInfoById(one.getCreateUser());
                 one.setOpUserRealName(userplan.getData().getRealName());
             }
 
@@ -137,6 +145,14 @@ public class WorkTankController extends BladeController {
     @ApiOperationSupport(order = 30)
     @Operation(summary = "新增一条", description = "传入WorkTank Obj")
     public R save(@Valid @RequestBody WorkTank addOne) {
+
+        QueryWrapper<WorkTank> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("WORK_TANK_CODE",addOne.getWorkTankCode());
+        List<WorkTank> list = service.list(queryWrapper);
+        if(null != list && list.size()>0){
+            return R.fail("此槽号已存在");
+        }
+
         addOne.setId(null);
         return R.status(service.save(addOne));
     }
@@ -161,6 +177,18 @@ public class WorkTankController extends BladeController {
     @ApiOperationSupport(order = 40)
     @Operation(summary = "修改一条", description = "传入WorkTank Obj")
     public R update(@Valid @RequestBody WorkTank updateOne) {
+
+
+        WorkTank plate = service.getById(updateOne.getId());
+        if(!plate.getWorkTankCode().equals(updateOne.getWorkTankCode())){
+            QueryWrapper<WorkTank> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("WORK_TANK_CODE",updateOne.getWorkTankCode());
+            List<WorkTank> list = service.list(queryWrapper);
+            if(null != list && list.size()>0){
+                return R.fail("此槽号已存在");
+            }
+        }
+
         return R.status(service.updateById(updateOne));
     }
 
@@ -230,8 +258,8 @@ public class WorkTankController extends BladeController {
     @Operation(summary = "下载Excel模板", description = "")
     public ResponseEntity<org.springframework.core.io.Resource> downloadExcelTemplate() {
         return ExcelExtUtil.downloadXlsTemplate(
-                "Excel/QA/ImportTemplate-CycleTestItem.xls",
-                "导入模版-周期试验项目.xls");
+                "Excel/QA/作业槽.xls",
+                "导入模版-作业槽.xls");
     }
 
     /**
@@ -255,6 +283,10 @@ public class WorkTankController extends BladeController {
         list.forEach(noticeExcel -> {
 
             WorkTank notice = BeanUtil.copy(noticeExcel, WorkTank.class);
+            List<User> userLeaders = iUserClient.listByNameNolike(noticeExcel.getOpUserName());
+            if(null != userLeaders && userLeaders.size() > 0){
+                notice.setOpUserId(userLeaders.get(0).getId());
+            }
             noticeList.add(notice);
         });
         return R.data(service.saveBatch(noticeList));

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/CoatingThicknessExcel.java

@@ -46,13 +46,13 @@ public class CoatingThicknessExcel implements Serializable {
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("质量等级")
-	private Long level;
+	private Integer levelNum;
 	/**
 	 * 是否以21E8-210开头
 	 */
 //	@ColumnWidth(20)
 //	@ExcelProperty("是否以21E8-210开头")
-	private Short startF21e8;
+//	private Short startF21e8;
 
 	@ColumnWidth(20)
 	@ExcelProperty("是否以21E8-210开头")

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlanAssignSteerExcel.java

@@ -87,7 +87,7 @@ public class PlanAssignSteerExcel implements Serializable {
 	 * 维护时间
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("维护时间")
+	@ExcelProperty("维护时间-示例[1998-08-09 16:33:11]")
 	private LocalDateTime maintainTime;
 	/**
 	 * 日分派量

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/WorkTankExcel.java

@@ -82,6 +82,7 @@ public class WorkTankExcel implements Serializable {
 	 * 操作[用户]id
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("操作[用户]id")
-	private BigDecimal opUserId;
+	@ExcelProperty("操作[用户]")
+//	private BigDecimal opUserId;
+	private String opUserName;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/feign/WorkCenterClient.java

@@ -6,8 +6,10 @@ import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
+import org.springblade.desk.basic.pojo.entity.BasicClazz;
 import org.springblade.desk.basic.pojo.entity.TeamSet;
 import org.springblade.desk.basic.pojo.entity.WorkCenter;
+import org.springblade.desk.basic.service.IBasicClazzService;
 import org.springblade.desk.basic.service.ITeamSetService;
 import org.springblade.desk.basic.service.IWorkCenterService;
 import org.springframework.web.bind.annotation.RestController;
@@ -26,6 +28,8 @@ public class WorkCenterClient implements IWorkCenterClient {
 	private final IWorkCenterService workCenterService;
 	@Resource
 	private ITeamSetService service;
+	@Resource
+	private IBasicClazzService clazzService;
 	@Override
 	public R<WorkCenter> getById(Long workCenterId) {
 		WorkCenter workCenter = workCenterService.getById(workCenterId);
@@ -36,4 +40,9 @@ public class WorkCenterClient implements IWorkCenterClient {
 	public R<TeamSet> getTeamSetById(Long id) {
 		return R.data(service.getById(id));
 	}
+
+	@Override
+	public R<BasicClazz> getClazzById(Long id) {
+		return R.data(clazzService.getById(id));
+	}
 }

blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java

@@ -182,6 +182,16 @@ public class DeptController extends BladeController {
 		return R.data(map);
 	}
 
+	@GetMapping("/findUserByClazz")
+	@ApiOperationSupport(order = 5)
+	@Operation(summary = "懒加载树形结构", description = "树形结构")
+	public R findUserByClazz(Long clazzId) {
+
+
+		Map<String, List> map = deptService.findUserByClazz(clazzId);
+		return R.data(map);
+	}
+
 
 	/**
 	 * 新增或修改

blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java

@@ -69,6 +69,8 @@ public interface IDeptService extends IService<Dept> {
 	 */
 	List<DeptVO> lazyTree(String tenantId, Long parentId);
 	Map<String, List> findUserByTeam(Long teamSetId);
+	Map<String, List> findUserByClazz(Long clazzId);
+
 	/**
 	 * 获取部门ID
 	 *

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java

@@ -40,6 +40,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.desk.basic.feign.IWorkCenterClient;
+import org.springblade.desk.basic.pojo.entity.BasicClazz;
 import org.springblade.desk.basic.pojo.entity.TeamSet;
 import org.springblade.system.cache.SysCache;
 import org.springblade.system.mapper.DeptMapper;
@@ -166,6 +167,59 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 		return map;
 	}
 
+	@Override
+	public Map<String, List> findUserByClazz(Long clazzId) {
+		Map<String, List> map = new HashMap<>();
+
+		List<User> teamUnSelects = new ArrayList<>();
+		List<User> teamSelects = new ArrayList<>();
+
+		Map<String, List<User>> noChooseMap = new HashMap<>();
+		Map<String, List<User>> chooseMap = new HashMap<>();
+
+		BasicClazz detail = workCenterClient.getClazzById(clazzId).getData();
+		if(detail != null){
+			String teamId = detail.getTeamMemberId();
+			if(null != teamId && !"".equals(teamId)){
+				List<Long> ids = Func.toLongList(teamId);
+				QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+				queryWrapper.notIn("id",ids);
+//				queryWrapper.eq("dept_id",parentId);
+				teamUnSelects = userService.list(queryWrapper);
+			}else{
+				QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+//				queryWrapper.eq("dept_id",parentId);
+				teamUnSelects = userService.list(queryWrapper);
+			}
+
+
+			if(null != teamId && !"".equals(teamId)){
+				List<Long> ids = Func.toLongList(teamId);
+				QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+				queryWrapper.in("id",ids);
+//				queryWrapper.eq("dept_id",parentId);
+				teamSelects = userService.list(queryWrapper);
+
+			}
+
+
+			if(teamUnSelects != null && teamUnSelects.size() > 0){
+				noChooseMap = teamUnSelects.stream().collect(Collectors.groupingBy(User::getDeptId));
+			}
+			if(teamSelects != null && teamSelects.size() > 0){
+				chooseMap = teamSelects.stream().collect(Collectors.groupingBy(User::getDeptId));
+			}
+		}
+
+		Map<Long, List<Dept>> deptMap = this.loadDeptMap();
+
+		// 获取所有父级部门并排序
+		List<Dept> dataList = deptMap.get(0L);
+		map.put("clazzUnSelects",this.loadDeptUserTreeJSON(dataList, deptMap, noChooseMap));
+		map.put("clazzSelects",this.loadDeptUserTreeJSON(dataList, deptMap, chooseMap));
+		return map;
+	}
+
 	private JSONArray loadDeptUserTreeJSON(List<Dept> deptList, Map<Long, List<Dept>> map,
 										   Map<String, List<User>> userMap) {
 		JSONArray array = new JSONArray();