diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/MessageServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/MessageServiceImpl.java index b68b83ea..a7533e51 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/MessageServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/MessageServiceImpl.java @@ -21,8 +21,8 @@ import java.util.List; import java.util.Map; /** -* 消息 -* */ + * 消息 + */ @Service public class MessageServiceImpl implements IMessageService { @@ -38,9 +38,9 @@ public class MessageServiceImpl implements IMessageService { builder.addOrder(OrderCondition.desc("id")); builder.setPageIndex(pageIndex); builder.setPageSize(pageSize); - builder.addFilter(FieldFilters.eq("acceptId",aid)); - if(isRead!=null){ - builder.addFilter(FieldFilters.eq("isRead",isRead)); + builder.addFilter(FieldFilters.eq("acceptId", aid)); + if (isRead != null) { + builder.addFilter(FieldFilters.eq("isRead", isRead)); } PageList list = dao.findPage(builder.builder()); return list; @@ -52,12 +52,12 @@ public class MessageServiceImpl implements IMessageService { builder.addOrder(OrderCondition.desc("id")); builder.setPageIndex(pageIndex); builder.setPageSize(pageSize); - builder.addFilter(FieldFilters.eq("acceptId",aid)); - builder.addFilter(FieldFilters.ne("refType","3")); - builder.addFilter(FieldFilters.ne("refType","6")); + builder.addFilter(FieldFilters.eq("acceptId", aid)); + builder.addFilter(FieldFilters.ne("refType", "3")); + builder.addFilter(FieldFilters.ne("refType", "6")); // builder.addFilter(FieldFilters.ne("refType","3", FilterCheckValue.NONE)); - if(isRead!=null){ - builder.addFilter(FieldFilters.eq("isRead",isRead)); + if (isRead != null) { + builder.addFilter(FieldFilters.eq("isRead", isRead)); } PageList list = dao.findPage(builder.builder()); return list; @@ -66,21 +66,21 @@ public class MessageServiceImpl implements IMessageService { @Override @Transactional public void delete(List ids) { - dao.deleteByFilter(FieldFilters.in("id",ids)); + dao.deleteByFilter(FieldFilters.in("id", ids)); } @Override @Transactional public Message detail(String id) { Message message = dao.get(id); - if(!message.getIsRead()){ - dao.updateFieldById(id,"isRead",true); + if (!message.getIsRead()) { + dao.updateFieldById(id, "isRead", true); - if("99".equals(message.getRefType())){ + if ("99".equals(message.getRefType())) { casesRecommendPushRecordDao.update(UpdateBuilder.from(CasesRecommendPushRecord.class) - .addUpdateField("readFlag",1) - .addUpdateField("readStartTime",new Date()) - .addFilter(FieldFilters.eq("id",message.getRefId())) + .addUpdateField("readFlag", 1) + .addUpdateField("readStartTime", new Date()) + .addFilter(FieldFilters.eq("id", message.getRefId())) .builder()); } } @@ -96,8 +96,8 @@ public class MessageServiceImpl implements IMessageService { @Override public Integer isRead(String aid) { QueryBuilder builder = QueryBuilder.from(Message.class); - builder.addFilter(FieldFilters.eq("isRead",false)); - builder.addFilter(FieldFilters.eq("acceptId",aid)); + builder.addFilter(FieldFilters.eq("isRead", false)); + builder.addFilter(FieldFilters.eq("acceptId", aid)); PageList page = dao.findPage(builder.builder()); return page.getCount(); } @@ -105,23 +105,23 @@ public class MessageServiceImpl implements IMessageService { @Override @Transactional public void updateIsRead(List ids) { - if(CollectionUtils.isEmpty(ids)){ + if (CollectionUtils.isEmpty(ids)) { return; } //更新最后读时间 - for (String id:ids){ + for (String id : ids) { Message message = dao.get(id); - if("99".equals(message.getRefType())){ + if ("99".equals(message.getRefType())) { casesRecommendPushRecordDao.update(UpdateBuilder.from(CasesRecommendPushRecord.class) - .addUpdateField("readEndTime",new Date()) - .addFilter(FieldFilters.eq("id",message.getRefId())) + .addUpdateField("readEndTime", new Date()) + .addFilter(FieldFilters.eq("id", message.getRefId())) .builder()); } } dao.update(UpdateBuilder.from(Message.class) - .addUpdateField("isRead",true) - .addFilter(FieldFilters.in("id",ids)) + .addUpdateField("isRead", true) + .addFilter(FieldFilters.in("id", ids)) .builder()); } @@ -130,52 +130,53 @@ public class MessageServiceImpl implements IMessageService { public Map messGroup(String aid) { Map map = new HashMap<>(); QueryBuilder builder = QueryBuilder.from(Message.class); - builder.addFilter(FieldFilters.eq("acceptId",aid)); + builder.addFilter(FieldFilters.eq("acceptId", aid)); builder.addGroupBy("acceptId"); List list = dao.findList(builder.builder()); - map.put("mess",list); + map.put("mess", list); //在查出未读消息数 - String sql="select count(1) from boe_message where is_read=false and acceptId=?1"; + String sql = "select count(1) from boe_message where is_read=false and acceptId=?1"; int count = dao.sqlCount(sql, aid); - map.put("count",count); + map.put("count", count); return map; } @Override @Transactional public void remove(String aid) { - dao.deleteByFilter(FieldFilters.eq("acceptId",aid)); + dao.deleteByFilter(FieldFilters.eq("acceptId", aid)); } @Override public List userMess(String aid) { QueryBuilder builder = QueryBuilder.from(Message.class); - builder.addFilter(FieldFilters.eq("acceptId",aid)); + builder.addFilter(FieldFilters.eq("acceptId", aid)); builder.addGroupBy("acceptId"); builder.addOrder(OrderCondition.desc("msgTime")); List list = dao.findList(builder.builder()); return list; } - @Override - @Transactional - public void setReadByAcceptId(String aid) { - dao.update("Update "+Message.class.getSimpleName()+" set isRead=?1 where acceptId=?2 and isRead=?3", true,aid,false); - } + @Override + @Transactional + public void setReadByAcceptId(String aid) { + dao.update("Update " + Message.class.getSimpleName() + " set isRead=?1 where acceptId=?2 and isRead=?3", true, aid, false); + } - @Override - public void cleanByAcceptId(String aid) { - dao.deleteByField("acceptId", aid); + @Override + @Transactional + public void cleanByAcceptId(String aid) { + dao.deleteByField("acceptId", aid); - } + } - @Override - @Transactional - public void batchSave(List list) { + @Override + @Transactional + public void batchSave(List list) { // for(Message msg : list) { // // } - dao.saveList(list); - } + dao.saveList(list); + } }