Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

@@ -106,6 +106,9 @@ public class OrgPersonController extends BaseController {
         // 删除时，只作逻辑删除
         iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete",
                 CommonConstant.IS_DELETE_01));
+        if(redisUtils.get("userList")!= null){
+            redisUtils.del("userList");
+        }
         return ResponseHelper.buildResponse(null);
     }
 
@@ -214,7 +217,9 @@ public class OrgPersonController extends BaseController {
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
     public ResponseModel<Object> listPage(@RequestParam Map<String, Object> requestBody) {
-
+        if(redisUtils.get("userList") != null){
+            return ResponseHelper.buildResponse(redisUtils.get("userList"));
+        }
         return ResponseHelper.buildResponse(iOrgUsrService.pagePerson(
                 requestBody.containsKey("pageNum") ? requestBody.get("pageNum").toString()  :  null ,
                 requestBody.containsKey("pageSize") ? requestBody.get("pageSize").toString()  :  null ,

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -637,6 +637,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		}
 		/* Bug2652 根据名字和工号模糊查询失效 已添加模糊匹配 2021-09-01 陈召 结束 */
 		pageBean.setRecords(list);
+
+		Calendar calendar = Calendar.getInstance();
+		calendar.add(Calendar.DAY_OF_YEAR,1);
+		calendar.set(Calendar.HOUR_OF_DAY,0);
+		calendar.set(Calendar.SECOND,0);
+		calendar.set(Calendar.MINUTE,0);
+		calendar.set(Calendar.MILLISECOND,0);
+		//当前时间与晚上十二点的秒差
+		Long timeOut = (calendar.getTimeInMillis()-System.currentTimeMillis()) / 1000;
+		redisUtils.set("userList", pageBean, timeOut);
 		return pageBean;
 	}
 
@@ -928,7 +938,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		} else {
 			orgUsr.setBizOrgCode(getOrgCodeStr());
 		}
-
+		if(redisUtils.get("userList")!= null){
+			redisUtils.del("userList");
+		}
 		return saveOrgUsrDynamicFormInstance(orgUsr, OrgPersonVo.getDynamicFormValue());
 	}
 
@@ -1130,6 +1142,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		if (orgUsr.getBizOrgCode() != null) {
 			orgPersonDto.setBizOrgCode(orgUsr.getBizOrgCode());
 		}
+		if(redisUtils.get("userList")!= null){
+			redisUtils.del("userList");
+		}
 		return orgPersonDto;
 	}
 
@@ -2117,20 +2132,20 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	/*
 	 * public List<Map<String, Object>> getPersonDetailByCompanyIds(List<String>
 	 * ids) {
-	 * 
+	 *
 	 * List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
 	 * LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
 	 * wrapper.eq(OrgUsr::getIsDelete, false); wrapper.eq(OrgUsr::getBizOrgType,
 	 * OrgPersonEnum.人员.getKey()); wrapper.in(OrgUsr::getParentId, ids);
 	 * List<OrgUsr> orgPersonList = this.baseMapper.selectList(wrapper);
-	 * 
+	 *
 	 * List<String> fireStationSimpleList = new ArrayList<String>();
 	 * ids.forEach(id-> { List<Map<String, Object>> maps = fireStationServiceImpl
 	 * .queryForFireStationListByCompanyId(Long.parseLong(id));
 	 * maps.stream().forEach(i -> { String tagertString = i.get("name").toString() +
 	 * "@" + i.get("sequence_nbr").toString();
 	 * fireStationSimpleList.add(tagertString); }); });
-	 * 
+	 *
 	 * for (OrgUsr orgUsr : orgPersonList) { Map<String, Object> map = new
 	 * HashMap<String, Object>(); List<DynamicFormInstanceDto> dyList =
 	 * alertFormValueServiceImpl.queryByCalledId(orgUsr.getSequenceNbr()); if