|
|
@@ -99,9 +99,7 @@ public class MessageServiceImpl extends BaseMybatisDao<MessageFromSystemMapper>
|
|
|
@Override
|
|
|
public String selectSendAdmin(Map<Integer, String> selectMap,Integer type) {
|
|
|
String sql = "";
|
|
|
- if(selectMap.containsKey(ConsumerType.COMPANY.getTypeCode())){
|
|
|
- // 123,123
|
|
|
-
|
|
|
+ if(selectMap.containsKey(ConsumerType.COMPANY.getTypeCode())){
|
|
|
sql = "select group_concat(id) from admin where department_id in ("+ changeSql(selectMap.get(ConsumerType.COMPANY.getTypeCode())) + ")";
|
|
|
}else if(selectMap.containsKey(ConsumerType.ROLE.getTypeCode())){
|
|
|
sql = "select group_concat(id) from admin a left join user_role b on a.id = b.uid where b.rid in (" + changeSql(selectMap.get(ConsumerType.ROLE.getTypeCode())) + ")";
|
|
|
@@ -114,19 +112,19 @@ public class MessageServiceImpl extends BaseMybatisDao<MessageFromSystemMapper>
|
|
|
public List<MessageFromSystem> selectRecommend(Map<Integer, String> selectMap,Integer type){
|
|
|
String sql = "";
|
|
|
if(selectMap.containsKey(RecommendType.TECH_SERVICE.getTypeCode())){ //科技服务
|
|
|
- sql = "select project_name as title,project_des as body,id as resourceId from tech_project where id in (" + changeSql(selectMap.get(RecommendType.TECH_SERVICE.getTypeCode())) + ")";
|
|
|
+ sql = "select bname as title,introduce as body,id as resourceId from business_project where id in (" + changeSql(selectMap.get(RecommendType.TECH_SERVICE.getTypeCode())) + ")";
|
|
|
}else if(selectMap.containsKey(RecommendType.PERSON_ACHIEVEMENT.getTypeCode())){ //个人成果
|
|
|
- sql = "select name as title,summary as body,id as resourceIdfrom achievement where id in (" + selectMap.get(RecommendType.PERSON_ACHIEVEMENT.getTypeCode()) +")";
|
|
|
+ sql = "select name as title,summary as body,id as resourceId from achievement where id in (" + changeSql(selectMap.get(RecommendType.PERSON_ACHIEVEMENT.getTypeCode())) +")";
|
|
|
}else if(selectMap.containsKey(RecommendType.ORGANIZATION_ACHIEVEMENT.getTypeCode())){ //组织成果
|
|
|
- sql = "select name as title,summary as body,id as resourceId from achievement where id in (" + selectMap.get(RecommendType.ORGANIZATION_ACHIEVEMENT.getTypeCode()) +")";
|
|
|
+ sql = "select name as title,summary as body,id as resourceId from achievement where id in (" + changeSql(selectMap.get(RecommendType.ORGANIZATION_ACHIEVEMENT.getTypeCode())) +")";
|
|
|
}else if(selectMap.containsKey(RecommendType.PERSONAL_DEMAND.getTypeCode())){ //个人需求
|
|
|
- sql = "select name as title,problem_des as body,id as resourceId from demand where id in (" + selectMap.get(RecommendType.PERSONAL_DEMAND.getTypeCode()) +")";
|
|
|
+ sql = "select name as title,problem_des as body,id as resourceId from demand where id in (" + changeSql(selectMap.get(RecommendType.PERSONAL_DEMAND.getTypeCode())) +")";
|
|
|
}else if(selectMap.containsKey(RecommendType.ORGANIZATION_DEMAND.getTypeCode())){ //组织需求
|
|
|
- sql = "select name as title,problem_des as body,id as resourceId from demand where id in (" + selectMap.get(RecommendType.ORGANIZATION_DEMAND.getTypeCode()) +")";
|
|
|
+ sql = "select name as title,problem_des as body,id as resourceId from demand where id in (" + changeSql(selectMap.get(RecommendType.ORGANIZATION_DEMAND.getTypeCode())) +")";
|
|
|
}else if(selectMap.containsKey(RecommendType.EXPERT.getTypeCode())){ //专家
|
|
|
- sql = "select nickname as title ,introduction as body,id as resourceId from user where id in("+ selectMap.get(RecommendType.EXPERT.getTypeCode()) +")";
|
|
|
+ sql = "select nickname as title ,introduction as body,id as resourceId from user where id in("+ changeSql(selectMap.get(RecommendType.EXPERT.getTypeCode())) +")";
|
|
|
}else if(selectMap.containsKey(RecommendType.NEWS.getTypeCode())){ //政策
|
|
|
- sql = "select title,summary as body,id as resourceId from news where id in("+ selectMap.get(RecommendType.NEWS.getTypeCode()) +")";
|
|
|
+ sql = "select title,summary as body,id as resourceId from news where id in("+ changeSql(selectMap.get(RecommendType.NEWS.getTypeCode())) +")";
|
|
|
}
|
|
|
if(!sql.equals("")) return messageFromSystemMapper.selectRecommendTarget(sql);
|
|
|
return null;
|
|
|
@@ -191,26 +189,28 @@ public class MessageServiceImpl extends BaseMybatisDao<MessageFromSystemMapper>
|
|
|
List<MessageProducer> producerTarget = new ArrayList<MessageProducer>();
|
|
|
List<MessageFromSystem> messageTarget = new ArrayList<MessageFromSystem>();
|
|
|
if(mfsList != null && mfsList.size()>0){
|
|
|
- MessageFromSystem message = new MessageFromSystem();
|
|
|
- String messageId = "";
|
|
|
- Date createTime = new Date();
|
|
|
- message.setCreateTime(createTime);
|
|
|
- message.setId(messageId);
|
|
|
- message.setSubject(subject);
|
|
|
- message.setConsumerType(targetType);
|
|
|
- message.setResourceType(getSourceType(sourceType)); //需要适配
|
|
|
- message.setIsDraft(isDraft);
|
|
|
- if(SecurityUtils.getSubject().getPrincipal() instanceof Admin){
|
|
|
- Admin admin = (Admin)SecurityUtils.getSubject().getPrincipal();
|
|
|
- message.setCreater(admin.getName());
|
|
|
- message.setProducerId(admin.getId());
|
|
|
- }
|
|
|
+ MessageFromSystem message = null;
|
|
|
for(MessageFromSystem mfs : mfsList){
|
|
|
+ message = new MessageFromSystem();
|
|
|
+ String messageId = "";
|
|
|
+ Date createTime = new Date();
|
|
|
+ message.setCreateTime(createTime);
|
|
|
+ message.setSubject(subject);
|
|
|
+ message.setConsumerType(targetType);
|
|
|
+ message.setResourceType(getSourceType(sourceType)); //需要适配
|
|
|
+ message.setIsDraft(isDraft);
|
|
|
+ message.setDeleteSign(Boolean.FALSE);
|
|
|
+ if(SecurityUtils.getSubject().getPrincipal() instanceof Admin){
|
|
|
+ Admin admin = (Admin)SecurityUtils.getSubject().getPrincipal();
|
|
|
+ message.setCreater(admin.getName());
|
|
|
+ message.setProducerId(admin.getId());
|
|
|
+ }
|
|
|
messageId = UUID.randomUUID().toString();
|
|
|
+ message.setId(messageId);
|
|
|
message.setTitle(mfs.getTitle());
|
|
|
message.setBody(mfs.getBody());
|
|
|
message.setResourceId(mfs.getResourceId());
|
|
|
- messageTarget.add(mfs);
|
|
|
+ messageTarget.add(message);
|
|
|
//插入消息推送表
|
|
|
if(subject == SubjectType.KE_HU.getTypeCode()){ //只推客户
|
|
|
MessageProducer mp = null;
|