diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java index 08c0cdb..01d099c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java @@ -77,11 +77,10 @@ if(null != user){ if(StringUtil.isEmpty(user.getSyncId())){ user.setSyncId(jsonObject.get("openid").toString()); - List list = userActionDao.getList(user.getSalt()); - user.setSalt(list.get(0).getName()); userActionDao.setUserOpenId(user); } - return ResponseData.success(); + List list = userActionDao.getList(user.getSalt()); + return ResponseData.success(list.get(0).getNum()); }else{ return ResponseData.error(2402,Status.USER_ALREADY_NOT_REGISTERED); } @@ -161,6 +160,8 @@ UserDto userDto = new UserDto(); userDto.setSyncId(jsonObject.get("openid").toString()); UserDto user = userActionDao.getUserInfo(userDto); + Dict dict = userActionDao.getList(user.getSalt()).get(0); + user.setSalt(dict.getName()); return ResponseData.success(user); }catch (Exception e){ e.printStackTrace(); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java index 08c0cdb..01d099c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java @@ -77,11 +77,10 @@ if(null != user){ if(StringUtil.isEmpty(user.getSyncId())){ user.setSyncId(jsonObject.get("openid").toString()); - List list = userActionDao.getList(user.getSalt()); - user.setSalt(list.get(0).getName()); userActionDao.setUserOpenId(user); } - return ResponseData.success(); + List list = userActionDao.getList(user.getSalt()); + return ResponseData.success(list.get(0).getNum()); }else{ return ResponseData.error(2402,Status.USER_ALREADY_NOT_REGISTERED); } @@ -161,6 +160,8 @@ UserDto userDto = new UserDto(); userDto.setSyncId(jsonObject.get("openid").toString()); UserDto user = userActionDao.getUserInfo(userDto); + Dict dict = userActionDao.getList(user.getSalt()).get(0); + user.setSalt(dict.getName()); return ResponseData.success(user); }catch (Exception e){ e.printStackTrace(); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java index 020f56d..8ff8493 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java @@ -146,6 +146,9 @@ } String openid = jsonObject.get("openid").toString(); List> resMap = visitorApplyMapper.getMessageList(openid); + for (HashMap map : resMap){ + + } return ResponseData.success(resMap); }catch (Exception e){ e.printStackTrace(); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java index 08c0cdb..01d099c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java @@ -77,11 +77,10 @@ if(null != user){ if(StringUtil.isEmpty(user.getSyncId())){ user.setSyncId(jsonObject.get("openid").toString()); - List list = userActionDao.getList(user.getSalt()); - user.setSalt(list.get(0).getName()); userActionDao.setUserOpenId(user); } - return ResponseData.success(); + List list = userActionDao.getList(user.getSalt()); + return ResponseData.success(list.get(0).getNum()); }else{ return ResponseData.error(2402,Status.USER_ALREADY_NOT_REGISTERED); } @@ -161,6 +160,8 @@ UserDto userDto = new UserDto(); userDto.setSyncId(jsonObject.get("openid").toString()); UserDto user = userActionDao.getUserInfo(userDto); + Dict dict = userActionDao.getList(user.getSalt()).get(0); + user.setSalt(dict.getName()); return ResponseData.success(user); }catch (Exception e){ e.printStackTrace(); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java index 020f56d..8ff8493 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java @@ -146,6 +146,9 @@ } String openid = jsonObject.get("openid").toString(); List> resMap = visitorApplyMapper.getMessageList(openid); + for (HashMap map : resMap){ + + } return ResponseData.success(resMap); }catch (Exception e){ e.printStackTrace(); diff --git a/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml b/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml index 2f50ea4..f374062 100644 --- a/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml +++ b/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml @@ -28,7 +28,9 @@ t1.message_id, t2.staff_code, t2.visitor_name, - CONCAT_WS('-',DATE_FORMAT(t2.in_time,'%Y/%m/%d %H:%i:%s'),DATE_FORMAT(t2.out_time,'%Y/%m/%d %H:%i:%s'))AS apply_time + DATE_FORMAT(t2.in_time,'%Y/%m/%d %H:%i:%s'), + DATE_FORMAT(t2.out_time,'%Y/%m/%d %H:%i:%s'), + DATE_FORMAT(t1.creat_time,'%Y/%m/%d %H:%i:%s') FROM bus_message t1 LEFT JOIN bus_visit_apply t2 ON t1.message_id = t2.apply_no