diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java index 0081f53..31f7534 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java @@ -3,9 +3,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.MessageDto; import com.casic.missiles.modular.system.dto.UserDto; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.modular.system.model.VisitorApply; import org.apache.ibatis.annotations.Param; +import java.util.HashMap; import java.util.List; public interface UserActionMapper extends BaseMapper { @@ -26,4 +29,8 @@ void insertMessageLog(@Param("message") MessageDto message); List getPropertyManager(); + + List selectApplyList(@Param("request") VisitorApplyListRequest request); + + List> getMessageList(@Param("openid") String openid); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java index 0081f53..31f7534 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java @@ -3,9 +3,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.MessageDto; import com.casic.missiles.modular.system.dto.UserDto; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.modular.system.model.VisitorApply; import org.apache.ibatis.annotations.Param; +import java.util.HashMap; import java.util.List; public interface UserActionMapper extends BaseMapper { @@ -26,4 +29,8 @@ void insertMessageLog(@Param("message") MessageDto message); List getPropertyManager(); + + List selectApplyList(@Param("request") VisitorApplyListRequest request); + + List> getMessageList(@Param("openid") String openid); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java index 0da4e71..0f66d88 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -17,7 +17,5 @@ public interface VisitorApplyMapper extends BaseMapper { - List selectApplyList(@Param("request") VisitorApplyListRequest request); - List> getMessageList(@Param("openid") String openid); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java index 0081f53..31f7534 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java @@ -3,9 +3,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.MessageDto; import com.casic.missiles.modular.system.dto.UserDto; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.modular.system.model.VisitorApply; import org.apache.ibatis.annotations.Param; +import java.util.HashMap; import java.util.List; public interface UserActionMapper extends BaseMapper { @@ -26,4 +29,8 @@ void insertMessageLog(@Param("message") MessageDto message); List getPropertyManager(); + + List selectApplyList(@Param("request") VisitorApplyListRequest request); + + List> getMessageList(@Param("openid") String openid); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java index 0da4e71..0f66d88 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -17,7 +17,5 @@ public interface VisitorApplyMapper extends BaseMapper { - List selectApplyList(@Param("request") VisitorApplyListRequest request); - List> getMessageList(@Param("openid") String openid); } 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 44ff06d..ec16d89 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 @@ -48,7 +48,7 @@ private UserActionService userActionService; @Resource - private UserActionMapper userActionDao; + private UserActionMapper userActionMapper; @Override @@ -64,7 +64,7 @@ visitorApply.setApplyNo(messageId); visitorApply.setVisitorApplyStatus(VisitorApplyStatusDict.APPLY_SUBMITTED); if(visitorApplyMapper.insert(visitorApply) > 0){ - List list = userActionDao.getPropertyManager(); + List list = userActionMapper.getPropertyManager(); // 向物业管理员推送消息 for (String openid : list) { String accTime = visitorApply.getInTime()+"-"+visitorApply.getOutTime(); @@ -93,7 +93,7 @@ if(null == jsonObject){ return ResponseData.error(2401,Status.TOKEN_EXPIRES); } - List list = visitorApplyMapper.selectApplyList(visitorApplyListRequest); + List list = userActionMapper.selectApplyList(visitorApplyListRequest); if(CollectionUtils.isEmpty(list)){ return ResponseData.success(new ArrayList<>()); } @@ -145,7 +145,7 @@ return ResponseData.error(2401,Status.TOKEN_EXPIRES); } String openid = jsonObject.get("openid").toString(); - List> resMap = visitorApplyMapper.getMessageList(openid); + List> resMap = userActionMapper.getMessageList(openid); for (HashMap map : resMap){ map.put("apply_time",map.get("in_time").toString()+"-"+map.get("out_time").toString()); map.put("send_time",DateUtils.parseDate(map.get("create_time").toString()).getTime()); @@ -197,11 +197,11 @@ public String getToUser(String staffCode) { UserDto userDto = new UserDto(); userDto.setAccount(staffCode); - UserDto userInfo = userActionDao.getUserInfo(userDto); + UserDto userInfo = userActionMapper.getUserInfo(userDto); return userInfo.getSyncId(); } public void insertMessageLog(String messageId,String status,String toUser){ MessageDto message = new MessageDto(UuidUtils.getId(),messageId,status,DateUtils.format(new Date()),toUser); - userActionDao.insertMessageLog(message); + userActionMapper.insertMessageLog(message); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java index 0081f53..31f7534 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java @@ -3,9 +3,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.MessageDto; import com.casic.missiles.modular.system.dto.UserDto; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.modular.system.model.VisitorApply; import org.apache.ibatis.annotations.Param; +import java.util.HashMap; import java.util.List; public interface UserActionMapper extends BaseMapper { @@ -26,4 +29,8 @@ void insertMessageLog(@Param("message") MessageDto message); List getPropertyManager(); + + List selectApplyList(@Param("request") VisitorApplyListRequest request); + + List> getMessageList(@Param("openid") String openid); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java index 0da4e71..0f66d88 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -17,7 +17,5 @@ public interface VisitorApplyMapper extends BaseMapper { - List selectApplyList(@Param("request") VisitorApplyListRequest request); - List> getMessageList(@Param("openid") String openid); } 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 44ff06d..ec16d89 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 @@ -48,7 +48,7 @@ private UserActionService userActionService; @Resource - private UserActionMapper userActionDao; + private UserActionMapper userActionMapper; @Override @@ -64,7 +64,7 @@ visitorApply.setApplyNo(messageId); visitorApply.setVisitorApplyStatus(VisitorApplyStatusDict.APPLY_SUBMITTED); if(visitorApplyMapper.insert(visitorApply) > 0){ - List list = userActionDao.getPropertyManager(); + List list = userActionMapper.getPropertyManager(); // 向物业管理员推送消息 for (String openid : list) { String accTime = visitorApply.getInTime()+"-"+visitorApply.getOutTime(); @@ -93,7 +93,7 @@ if(null == jsonObject){ return ResponseData.error(2401,Status.TOKEN_EXPIRES); } - List list = visitorApplyMapper.selectApplyList(visitorApplyListRequest); + List list = userActionMapper.selectApplyList(visitorApplyListRequest); if(CollectionUtils.isEmpty(list)){ return ResponseData.success(new ArrayList<>()); } @@ -145,7 +145,7 @@ return ResponseData.error(2401,Status.TOKEN_EXPIRES); } String openid = jsonObject.get("openid").toString(); - List> resMap = visitorApplyMapper.getMessageList(openid); + List> resMap = userActionMapper.getMessageList(openid); for (HashMap map : resMap){ map.put("apply_time",map.get("in_time").toString()+"-"+map.get("out_time").toString()); map.put("send_time",DateUtils.parseDate(map.get("create_time").toString()).getTime()); @@ -197,11 +197,11 @@ public String getToUser(String staffCode) { UserDto userDto = new UserDto(); userDto.setAccount(staffCode); - UserDto userInfo = userActionDao.getUserInfo(userDto); + UserDto userInfo = userActionMapper.getUserInfo(userDto); return userInfo.getSyncId(); } public void insertMessageLog(String messageId,String status,String toUser){ MessageDto message = new MessageDto(UuidUtils.getId(),messageId,status,DateUtils.format(new Date()),toUser); - userActionDao.insertMessageLog(message); + userActionMapper.insertMessageLog(message); } } diff --git a/casic-web/src/main/resources/mapper/UserActionMapper.xml b/casic-web/src/main/resources/mapper/UserActionMapper.xml index c0e9d65..9b5a965 100644 --- a/casic-web/src/main/resources/mapper/UserActionMapper.xml +++ b/casic-web/src/main/resources/mapper/UserActionMapper.xml @@ -78,4 +78,42 @@ WHERE ru.ROLEID = '1319814546311985641') + + \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java index 0081f53..31f7534 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/UserActionMapper.java @@ -3,9 +3,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.dto.MessageDto; import com.casic.missiles.modular.system.dto.UserDto; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; import com.casic.missiles.modular.system.model.Dict; +import com.casic.missiles.modular.system.model.VisitorApply; import org.apache.ibatis.annotations.Param; +import java.util.HashMap; import java.util.List; public interface UserActionMapper extends BaseMapper { @@ -26,4 +29,8 @@ void insertMessageLog(@Param("message") MessageDto message); List getPropertyManager(); + + List selectApplyList(@Param("request") VisitorApplyListRequest request); + + List> getMessageList(@Param("openid") String openid); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java index 0da4e71..0f66d88 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -17,7 +17,5 @@ public interface VisitorApplyMapper extends BaseMapper { - List selectApplyList(@Param("request") VisitorApplyListRequest request); - List> getMessageList(@Param("openid") String openid); } 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 44ff06d..ec16d89 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 @@ -48,7 +48,7 @@ private UserActionService userActionService; @Resource - private UserActionMapper userActionDao; + private UserActionMapper userActionMapper; @Override @@ -64,7 +64,7 @@ visitorApply.setApplyNo(messageId); visitorApply.setVisitorApplyStatus(VisitorApplyStatusDict.APPLY_SUBMITTED); if(visitorApplyMapper.insert(visitorApply) > 0){ - List list = userActionDao.getPropertyManager(); + List list = userActionMapper.getPropertyManager(); // 向物业管理员推送消息 for (String openid : list) { String accTime = visitorApply.getInTime()+"-"+visitorApply.getOutTime(); @@ -93,7 +93,7 @@ if(null == jsonObject){ return ResponseData.error(2401,Status.TOKEN_EXPIRES); } - List list = visitorApplyMapper.selectApplyList(visitorApplyListRequest); + List list = userActionMapper.selectApplyList(visitorApplyListRequest); if(CollectionUtils.isEmpty(list)){ return ResponseData.success(new ArrayList<>()); } @@ -145,7 +145,7 @@ return ResponseData.error(2401,Status.TOKEN_EXPIRES); } String openid = jsonObject.get("openid").toString(); - List> resMap = visitorApplyMapper.getMessageList(openid); + List> resMap = userActionMapper.getMessageList(openid); for (HashMap map : resMap){ map.put("apply_time",map.get("in_time").toString()+"-"+map.get("out_time").toString()); map.put("send_time",DateUtils.parseDate(map.get("create_time").toString()).getTime()); @@ -197,11 +197,11 @@ public String getToUser(String staffCode) { UserDto userDto = new UserDto(); userDto.setAccount(staffCode); - UserDto userInfo = userActionDao.getUserInfo(userDto); + UserDto userInfo = userActionMapper.getUserInfo(userDto); return userInfo.getSyncId(); } public void insertMessageLog(String messageId,String status,String toUser){ MessageDto message = new MessageDto(UuidUtils.getId(),messageId,status,DateUtils.format(new Date()),toUser); - userActionDao.insertMessageLog(message); + userActionMapper.insertMessageLog(message); } } diff --git a/casic-web/src/main/resources/mapper/UserActionMapper.xml b/casic-web/src/main/resources/mapper/UserActionMapper.xml index c0e9d65..9b5a965 100644 --- a/casic-web/src/main/resources/mapper/UserActionMapper.xml +++ b/casic-web/src/main/resources/mapper/UserActionMapper.xml @@ -78,4 +78,42 @@ WHERE ru.ROLEID = '1319814546311985641') + + \ No newline at end of file diff --git a/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml b/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml index 0097567..af11619 100644 --- a/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml +++ b/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml @@ -2,42 +2,5 @@ - - + \ No newline at end of file