|
|
@@ -1,19 +1,27 @@
|
|
|
package com.zhongshu.card.server.core.service.projectAbout;
|
|
|
|
|
|
import com.github.microservice.net.ResultContent;
|
|
|
+import com.zhongshu.card.client.model.base.ProjectOidParam;
|
|
|
import com.zhongshu.card.client.model.projectAbout.ProjectWeChatInfoModel;
|
|
|
import com.zhongshu.card.client.model.projectAbout.ProjectWeChatInfoParam;
|
|
|
+import com.zhongshu.card.client.model.xcx.ProjectXcxModel;
|
|
|
import com.zhongshu.card.server.core.dao.org.OrganizationDao;
|
|
|
import com.zhongshu.card.server.core.dao.projectAbout.ProjectWeChatInfoDao;
|
|
|
import com.zhongshu.card.server.core.domain.org.Organization;
|
|
|
+import com.zhongshu.card.server.core.domain.projectAbout.ProjectIotInfo;
|
|
|
import com.zhongshu.card.server.core.domain.projectAbout.ProjectWeChatInfo;
|
|
|
import com.zhongshu.card.server.core.service.base.SuperService;
|
|
|
import com.zhongshu.card.server.core.util.BeanUtils;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.List;
|
|
|
+import java.util.stream.Collectors;
|
|
|
+
|
|
|
/**
|
|
|
* 项目的 微信管理信息设置
|
|
|
*
|
|
|
@@ -121,16 +129,27 @@ public class ProjectWeChatInfoService extends SuperService {
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
- public String getProjectOidForXcx() {
|
|
|
- String projectOid = "";
|
|
|
+ public ResultContent<List<ProjectXcxModel>> getProjectOidForXcx() {
|
|
|
+ List<ProjectXcxModel> models = new ArrayList<>();
|
|
|
String appId = getHeadParam(new String[]{"appId", "appid"});
|
|
|
- if (ObjectUtils.isNotEmpty(appId)) {
|
|
|
- ProjectWeChatInfo projectWeChatInfo = projectWeChatInfoDao.findTopByAppIdOrderByUpdateTimeDesc(appId);
|
|
|
- if (ObjectUtils.isNotEmpty(projectWeChatInfo)) {
|
|
|
- projectOid = projectWeChatInfo.getProjectOid();
|
|
|
- }
|
|
|
+ if (StringUtils.isEmpty(appId)) {
|
|
|
+ return ResultContent.buildFail("未取得appId");
|
|
|
}
|
|
|
- return projectOid;
|
|
|
+
|
|
|
+ List<ProjectWeChatInfo> list = projectWeChatInfoDao.findByAppIdOrderByUpdateTimeDesc(appId);
|
|
|
+ if (ObjectUtils.isNotEmpty(list)) {
|
|
|
+ list.stream().map(it -> {
|
|
|
+ ProjectXcxModel model = new ProjectXcxModel();
|
|
|
+ Organization projectInfo = it.getProjectInfo();
|
|
|
+ if (ObjectUtils.isNotEmpty(projectInfo)) {
|
|
|
+ model.setProjectOid(projectInfo.getOid());
|
|
|
+ model.setProjectName(projectInfo.getName());
|
|
|
+ }
|
|
|
+ return model;
|
|
|
+ }).collect(Collectors.toUnmodifiableList());
|
|
|
+ }
|
|
|
+
|
|
|
+ return ResultContent.buildSuccess(models);
|
|
|
}
|
|
|
|
|
|
public ProjectWeChatInfoModel toModel(ProjectWeChatInfo entity) {
|