Merge remote-tracking branch 'origin/ScrmStores' into ScrmStores

fs-admin/src/main/java/com/fs/course/controller/FsCoursePlaySourceConfigController.java

@@ -2,10 +2,12 @@ package com.fs.course.controller;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.bean.BeanUtils;
@@ -112,4 +114,9 @@ public class FsCoursePlaySourceConfigController extends BaseController {
         fsCoursePlaySourceConfigService.update(updateWrapper);
         return AjaxResult.success();
     }
+
+    @GetMapping("/listAll")
+    public R listAll() {
+        return R.ok().put("data", fsCoursePlaySourceConfigService.list(new QueryWrapper<FsCoursePlaySourceConfig>().eq("is_del", 0)));
+    }
 }

fs-service/src/main/java/com/fs/company/service/impl/CompanyUserServiceImpl.java

@@ -9,7 +9,10 @@ import com.fs.common.core.redis.RedisCache;
 import com.fs.common.exception.CustomException;
 import com.fs.common.exception.ServiceException;
 import com.fs.common.exception.file.OssException;
-import com.fs.common.utils.*;
+import com.fs.common.utils.DateUtils;
+import com.fs.common.utils.PatternUtils;
+import com.fs.common.utils.SecurityUtils;
+import com.fs.common.utils.StringUtils;
 import com.fs.company.domain.*;
 import com.fs.company.mapper.*;
 import com.fs.company.param.CompanyUserAreaParam;

fs-service/src/main/java/com/fs/qw/service/impl/QwTagGroupServiceImpl.java

@@ -46,8 +46,7 @@ import java.util.*;
  */
 @Service
 @Slf4j
-public class QwTagGroupServiceImpl implements IQwTagGroupService
-{
+public class QwTagGroupServiceImpl implements IQwTagGroupService {
     @Autowired
     private QwTagGroupMapper qwTagGroupMapper;
     @Autowired
@@ -104,7 +103,6 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
     QwAppContactWayLogsMapper qwAppContactWayLogsMapper;
 
 
-
     /**
      * 查询企微客户标签组
      *
@@ -112,8 +110,7 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
      * @return 企微客户标签组
      */
     @Override
-    public QwTagGroup selectQwTagGroupById(Long id)
-    {
+    public QwTagGroup selectQwTagGroupById(Long id) {
         return qwTagGroupMapper.selectQwTagGroupById(id);
     }
 
@@ -124,8 +121,7 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
      * @return 企微客户标签组
      */
     @Override
-    public List<QwTagGroup> selectQwTagGroupList(QwTagGroup qwTagGroup)
-    {
+    public List<QwTagGroup> selectQwTagGroupList(QwTagGroup qwTagGroup) {
         return qwTagGroupMapper.selectQwTagGroupList(qwTagGroup);
     }
 
@@ -136,8 +132,7 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
      * @return 结果
      */
     @Override
-    public int insertQwTagGroup(QwTagGroup qwTagGroup)
-    {
+    public int insertQwTagGroup(QwTagGroup qwTagGroup) {
         qwTagGroup.setCreateTime(DateUtils.getNowDate());
         return qwTagGroupMapper.insertQwTagGroup(qwTagGroup);
     }
@@ -149,8 +144,7 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
      * @return 结果
      */
     @Override
-    public int updateQwTagGroup(QwTagGroup qwTagGroup)
-    {
+    public int updateQwTagGroup(QwTagGroup qwTagGroup) {
         qwTagGroup.setUpdateTime(DateUtils.getNowDate());
         return qwTagGroupMapper.updateQwTagGroup(qwTagGroup);
     }
@@ -162,14 +156,13 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
      * @return 结果
      */
     @Override
-    public R deleteQwTagGroupByIds(Long[] ids)
-    {
+    public R deleteQwTagGroupByIds(Long[] ids) {
         for (Long id : ids) {
             QwTagGroup qwTagGroup = qwTagGroupMapper.selectQwTagGroupById(id);
-            if (qwTagGroup.getGroupFrom()!=null && qwTagGroup.getGroupFrom() == 1 ){
+            if (qwTagGroup.getGroupFrom() != null && qwTagGroup.getGroupFrom() == 1) {
                 QwTagParam qwTagParam = new QwTagParam();
                 qwTagParam.setGroup_id(Arrays.asList(qwTagGroup.getGroupId()));
-                qwApiService.delTag(qwTagParam,qwTagGroup.getCorpId());
+                qwApiService.delTag(qwTagParam, qwTagGroup.getCorpId());
 
                 qwTagMapper.deleteQwTagByGroupId(qwTagGroup.getGroupId());
 
@@ -177,7 +170,7 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
 
                 return R.ok();
 
-            }else {
+            } else {
                 //不能删除非本应用创建的标签组
             }
         }
@@ -191,8 +184,7 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
      * @return 结果
      */
     @Override
-    public int deleteQwTagGroupById(Long id)
-    {
+    public int deleteQwTagGroupById(Long id) {
         return qwTagGroupMapper.deleteQwTagGroupById(id);
     }
 
@@ -216,10 +208,10 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
             qwTagGroup.setOrder(group.getOrder());
             qwTagGroup.setCorpId(corpId);
             qwTagGroup.setCreateTime(new Date(group.getCreate_time()));
-            if (qwTagGroups==null||qwTagGroups.size()<1){
+            if (qwTagGroups == null || qwTagGroups.size() < 1) {
 
                 qwTagGroupMapper.insertQwTagGroup(qwTagGroup);
-            }else {
+            } else {
                 qwTagGroup.setId(qwTagGroups.get(0).getId());
                 qwTagGroupMapper.updateQwTagGroup(qwTagGroup);
             }
@@ -234,10 +226,10 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
                 tag1.setCorpId(corpId);
                 tag1.setCreateTime(new Date(tag.getCreate_time()));
 
-                if (qwTags==null||qwTags.size()<1){
+                if (qwTags == null || qwTags.size() < 1) {
 
                     qwTagMapper.insertQwTag(tag1);
-                }else {
+                } else {
                     tag1.setId(qwTags.get(0).getId());
                     qwTagMapper.updateQwTag(tag1);
 
@@ -309,31 +301,31 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
         qwAddTagParam.setTag(tag);
 
         QwAddTagResult result = qwApiService.addTag(qwAddTagParam, qwTagGroup.getCorpId());
-        System.out.println("标签组addTag-result:"+result);
-            TagGroup group = result.getTag_group();
-            List<InTag> tags = group.getTag();
-            QwTagGroup qwTagGroupAdd = new QwTagGroup();
-
-            qwTagGroupAdd.setGroupId(group.getGroup_id());
-            qwTagGroupAdd.setName(group.getGroup_name());
-            qwTagGroupAdd.setOrder(group.getOrder());
-            qwTagGroupAdd.setCorpId(qwTagGroup.getCorpId());
-            qwTagGroupAdd.setGroupFrom(1);
-            qwTagGroupAdd.setCreateTime(new Date(group.getCreate_time()));
-            qwTagGroupMapper.insertQwTagGroup(qwTagGroupAdd);
-
-            for (InTag tagA : tags) {
-                QwTag tag1 = new QwTag();
-                tag1.setGroupId(group.getGroup_id());
-                tag1.setTagId(tagA.getId());
-                tag1.setOrder(tagA.getOrder());
-                tag1.setName(tagA.getName());
-                tag1.setCorpId(qwTagGroup.getCorpId());
-                tag1.setTagFrom(1);
-                tag1.setCreateTime(new Date(tagA.getCreate_time()));
-                qwTagMapper.insertQwTag(tag1);
+        System.out.println("标签组addTag-result:" + result);
+        TagGroup group = result.getTag_group();
+        List<InTag> tags = group.getTag();
+        QwTagGroup qwTagGroupAdd = new QwTagGroup();
+
+        qwTagGroupAdd.setGroupId(group.getGroup_id());
+        qwTagGroupAdd.setName(group.getGroup_name());
+        qwTagGroupAdd.setOrder(group.getOrder());
+        qwTagGroupAdd.setCorpId(qwTagGroup.getCorpId());
+        qwTagGroupAdd.setGroupFrom(1);
+        qwTagGroupAdd.setCreateTime(new Date(group.getCreate_time()));
+        qwTagGroupMapper.insertQwTagGroup(qwTagGroupAdd);
+
+        for (InTag tagA : tags) {
+            QwTag tag1 = new QwTag();
+            tag1.setGroupId(group.getGroup_id());
+            tag1.setTagId(tagA.getId());
+            tag1.setOrder(tagA.getOrder());
+            tag1.setName(tagA.getName());
+            tag1.setCorpId(qwTagGroup.getCorpId());
+            tag1.setTagFrom(1);
+            tag1.setCreateTime(new Date(tagA.getCreate_time()));
+            qwTagMapper.insertQwTag(tag1);
 
-            }
+        }
 
 
         return 1;
@@ -341,7 +333,7 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
 
     @Override
     public int updateQwTagGroupParam(QwTagGroupAddParam qwTagGroup) {
-        System.out.println("传参："+qwTagGroup);
+        System.out.println("传参：" + qwTagGroup);
         QwEditTagParam qwEditTagParam = new QwEditTagParam();
         qwEditTagParam.setName(qwTagGroup.getName());
         qwEditTagParam.setId(qwTagGroup.getGroupId());
@@ -349,7 +341,6 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
         QwResult qwResult = qwApiService.editTag(qwEditTagParam, qwTagGroup.getCorpId());
 
 
-
         QwTagGroup copy = BeanCopyUtils.copy(qwTagGroup, QwTagGroup.class);
         qwTagGroupMapper.updateQwTagGroup(copy);
         List<QwTag> tag = qwTagGroup.getTag();
@@ -361,7 +352,7 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
 
         for (QwTag qwTag : tag) {
 
-            if (qwTag.getTagId()!=null){
+            if (qwTag.getTagId() != null) {
                 QwEditTagParam editTagParam = new QwEditTagParam();
                 editTagParam.setName(qwTag.getName());
                 editTagParam.setId(qwTag.getTagId());
@@ -371,7 +362,7 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
 
                 QwTag QwTagCopy = BeanCopyUtils.copy(qwTag, QwTag.class);
                 qwTagMapper.updateQwTag(QwTagCopy);
-            }else {
+            } else {
                 QwAddTagParam qwAddTagParam = new QwAddTagParam();
                 qwAddTagParam.setGroup_id(qwTagGroup.getGroupId());
                 TagData tagData = new TagData();
@@ -379,10 +370,10 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
                 tagData.setOrder(qwTag.getOrder());
                 List<TagData> list = Arrays.asList(tagData);
                 qwAddTagParam.setTag(list);
-                QwAddTagResult result= qwApiService.addTag(qwAddTagParam, qwTagGroup.getCorpId());
-                if (result.getErrcode()==0){
-                    List<InTag> addTag= result.getTag_group().getTag();
-                    if (addTag!=null&&addTag.size()>0){
+                QwAddTagResult result = qwApiService.addTag(qwAddTagParam, qwTagGroup.getCorpId());
+                if (result.getErrcode() == 0) {
+                    List<InTag> addTag = result.getTag_group().getTag();
+                    if (addTag != null && addTag.size() > 0) {
                         QwTag addQwTag = new QwTag();
                         addQwTag.setGroupId(qwTagGroup.getGroupId());
                         addQwTag.setTagId(addTag.get(0).getId());
@@ -400,13 +391,13 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
 
         ArrayList<String> delTags = new ArrayList<>();
         for (QwTag qwTag1 : qwTags) {
-            boolean b=true;
+            boolean b = true;
             for (QwTag qwTag : tag) {
-                if (qwTag.getId()!=null&&qwTag.getId()-qwTag1.getId()==0){
-                    b=false;
+                if (qwTag.getId() != null && qwTag.getId() - qwTag1.getId() == 0) {
+                    b = false;
                 }
             }
-            if (b){
+            if (b) {
                 delTags.add(qwTag1.getTagId());
                 qwTagMapper.deleteQwTagById(qwTag1.getId());
             }
@@ -414,13 +405,13 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
         QwTagParam qwTagParam = new QwTagParam();
         qwTagParam.setTag_id(delTags);
         qwApiService.delTag(qwTagParam, qwTagGroup.getCorpId());
-        System.out.println("delTagqwTagGroup:"+qwTagParam);
+        System.out.println("delTagqwTagGroup:" + qwTagParam);
         return 1;
     }
 
     @Override
-    public void addTagByTagId(String tagType, String tagId,String corpId) {
-        if (tagType.equals("tag")){
+    public void addTagByTagId(String tagType, String tagId, String corpId) {
+        if (tagType.equals("tag")) {
             QwTagParam qwTagParam = new QwTagParam();
             qwTagParam.setTag_id(Arrays.asList(tagId));
             QwTagResult tag = qwApiService.getTag(qwTagParam, corpId);
@@ -433,7 +424,7 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
                     tag1.setTagId(inTag.getId());
                     tag1.setCorpId(corpId);
                     List<QwTag> qwTags = qwTagMapper.selectQwTagList(tag1);
-                    if (qwTags==null||qwTags.size()<1){
+                    if (qwTags == null || qwTags.size() < 1) {
                         tag1.setOrder(inTag.getOrder());
                         tag1.setName(inTag.getName());
                         tag1.setCorpId(corpId);
@@ -443,7 +434,7 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
                 }
 
             }
-        }else {
+        } else {
             QwTagParam qwTagParam = new QwTagParam();
             qwTagParam.setGroup_id(Arrays.asList(tagId));
             QwTagResult qwTag = qwApiService.getTag(qwTagParam, corpId);
@@ -455,7 +446,7 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
                 qwTagGroup.setGroupId(group.getGroup_id());
                 List<QwTagGroup> qwTagGroups = qwTagGroupMapper.selectQwTagGroupList(qwTagGroup);
 
-                if (qwTagGroups==null||qwTagGroups.size()<1){
+                if (qwTagGroups == null || qwTagGroups.size() < 1) {
                     qwTagGroup.setName(group.getGroup_name());
                     qwTagGroup.setOrder(group.getOrder());
                     qwTagGroup.setCorpId(corpId);
@@ -469,7 +460,7 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
                     tag1.setCorpId(corpId);
                     List<QwTag> qwTags = qwTagMapper.selectQwTagList(tag1);
 
-                    if (qwTags==null||qwTags.size()<1){
+                    if (qwTags == null || qwTags.size() < 1) {
                         tag1.setOrder(tag.getOrder());
                         tag1.setName(tag.getName());
                         tag1.setCorpId(corpId);
@@ -508,7 +499,7 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
                 tag1.setCorpId(corpId);
                 List<QwTag> qwTags = qwTagMapper.selectQwTagList(tag1);
                 for (QwTag qwTag1 : qwTags) {
-                    if (qwTag1.getTagId().equals(tag.getId())){
+                    if (qwTag1.getTagId().equals(tag.getId())) {
                         tag1.setId(qwTag1.getId());
                         tag1.setName(tag.getName());
                         tag1.setOrder(tag.getOrder());
@@ -523,29 +514,29 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
 
     @Override
     public void deleteTagByTagId(String tagType, String id, String corpId) {
-        if (tagType.equals("tag")){
+        if (tagType.equals("tag")) {
             QwTag qwTag = new QwTag();
             qwTag.setCorpId(corpId);
             qwTag.setTagId(id);
             List<QwTag> qwTags = qwTagMapper.selectQwTagList(qwTag);
-            if (qwTags!=null&&qwTags.size()>0){
+            if (qwTags != null && qwTags.size() > 0) {
                 for (QwTag tag : qwTags) {
                     qwTagMapper.deleteQwTagById(tag.getId());
                 }
             }
-        }else {
+        } else {
             QwTagGroup qwTagGroup = new QwTagGroup();
             qwTagGroup.setGroupId(id);
             qwTagGroup.setCorpId(corpId);
             List<QwTagGroup> qwTagGroups = qwTagGroupMapper.selectQwTagGroupList(qwTagGroup);
-            if (qwTagGroups!=null&&qwTagGroups.size()>0){
+            if (qwTagGroups != null && qwTagGroups.size() > 0) {
                 for (QwTagGroup tagGroup : qwTagGroups) {
                     qwTagGroupMapper.deleteQwTagGroupById(tagGroup.getId());
                     QwTag qwTag = new QwTag();
                     qwTag.setCorpId(corpId);
                     qwTag.setGroupId(tagGroup.getGroupId());
                     List<QwTag> qwTags = qwTagMapper.selectQwTagList(qwTag);
-                    if (qwTags!=null&&qwTags.size()>0){
+                    if (qwTags != null && qwTags.size() > 0) {
                         for (QwTag tag : qwTags) {
                             qwTagMapper.deleteQwTagById(tag.getId());
                         }
@@ -558,12 +549,12 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
 
     @Override
     public void updateTagByTagId(String tagType, String id, String corpId) {
-        if (tagType.equals("tag")){
+        if (tagType.equals("tag")) {
             QwTag qwTag = new QwTag();
             qwTag.setCorpId(corpId);
             qwTag.setTagId(id);
             List<QwTag> qwTags = qwTagMapper.selectQwTagList(qwTag);
-            if (qwTags!=null&&qwTags.size()>0){
+            if (qwTags != null && qwTags.size() > 0) {
                 for (QwTag tag : qwTags) {
                     QwTagParam qwTagParam = new QwTagParam();
                     qwTagParam.setTag_id(Arrays.asList(id));
@@ -575,15 +566,15 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
                             QwTag tag1 = new QwTag();
                             tag1.setTagId(tag.getTagId());
                             tag1.setOrder(inTag.getOrder());
-                             tag1.setName(inTag.getName());
-                             tag1.setCorpId(corpId);
-                             qwTagMapper.updateQwTag(tag1);
+                            tag1.setName(inTag.getName());
+                            tag1.setCorpId(corpId);
+                            qwTagMapper.updateQwTag(tag1);
                         }
                     }
 
                 }
             }
-        }else {
+        } else {
             QwTagGroup tagGroup = new QwTagGroup();
             tagGroup.setCorpId(corpId);
             tagGroup.setGroupId(id);
@@ -607,32 +598,33 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService
     @Override
     public void addQwTagByAi(String trimTag, Long extId) {
         QwExternalContact qwExternalContact = qwExternalContactMapper.selectQwExternalContactById(extId);
-        if (qwExternalContact!=null){
+        if (qwExternalContact != null) {
             QwTagVO qwTagVO = qwTagMapper.selectQwTagByName(trimTag, qwExternalContact.getCorpId());
-            if (qwTagVO!=null){
-                log.info("Ai添加标签:"+qwTagVO.getName()+":"+qwTagVO.getTagId()+":"+qwExternalContact.getName());
+            if (qwTagVO != null) {
+                log.info("Ai添加标签:" + qwTagVO.getName() + ":" + qwTagVO.getTagId() + ":" + qwExternalContact.getName());
                 QwExternalContactAddTagParam qwExternalContactAddTagParam = new QwExternalContactAddTagParam();
                 qwExternalContactAddTagParam.setTagIds(Arrays.asList(qwTagVO.getTagId()));
                 qwExternalContactAddTagParam.setUserIds(Arrays.asList(extId));
                 qwExternalContactAddTagParam.setCorpId(qwExternalContact.getCorpId());
                 try {
                     qwExternalContactService.addUserTag(qwExternalContactAddTagParam);
-                }catch (Exception e){
-                    log.info("Ai添加标签出错:"+qwTagVO.getName()+":"+qwExternalContact.getName());
+                } catch (Exception e) {
+                    log.info("Ai添加标签出错:" + qwTagVO.getName() + ":" + qwExternalContact.getName());
                 }
             }
         }
     }
+
     @Autowired
     IQwExternalContactService qwExternalContactService;
 
     @Override
     public void delQwTagByAi(String trimTag, Long extId) {
         QwExternalContact qwExternalContact = qwExternalContactMapper.selectQwExternalContactById(extId);
-        if (qwExternalContact!=null){
+        if (qwExternalContact != null) {
             QwTagVO qwTagVO = qwTagMapper.selectQwTagByName(trimTag, qwExternalContact.getCorpId());
-            if (qwTagVO!=null){
-                log.info("Ai移除标签:"+qwTagVO.getName()+":"+qwTagVO.getTagId()+":"+qwExternalContact.getName());
+            if (qwTagVO != null) {
+                log.info("Ai移除标签:" + qwTagVO.getName() + ":" + qwTagVO.getTagId() + ":" + qwExternalContact.getName());
                 QwExternalContactAddTagParam qwExternalContactAddTagParam = new QwExternalContactAddTagParam();
                 qwExternalContactAddTagParam.setTagIds(Arrays.asList(qwTagVO.getTagId()));
                 qwExternalContactAddTagParam.setUserIds(Arrays.asList(extId));

fs-service/src/main/java/com/fs/qw/service/impl/QwUserServiceImpl.java

@@ -914,10 +914,13 @@ public class QwUserServiceImpl implements IQwUserService
     public R syncQwUser(String corpId) {
         QwUserIdResult userList = qwApiService.getUserList(corpId);
         List<DeptUser> deptUser = userList.getDept_user();
+        log.info("返回数据：{}", JSON.toJSONString(userList));
+        log.info("同步用户数量：{}", deptUser.size());
         QwCompany qwCompany = iQwCompanyService.selectQwCompanyByCorpId(corpId);
         for (DeptUser user : deptUser) {
             QwUser qw=qwUserMapper.selectQwUserByCorpIdAndUserId(corpId,user.getUserid());
             String serverQwUserName = qwApiService.getServerQwUserName(corpId, qwCompany.getOpenSecret(), user.getUserid());
+            log.info("同步用户名称：{}", serverQwUserName);
             QwUser qwUser = new QwUser();
             qwUser.setQwUserId(user.getUserid());
             qwUser.setDepartment(user.getDepartment().toString());

fs-service/src/main/java/com/fs/qwApi/service/impl/QwApiServiceImpl.java

@@ -17,6 +17,7 @@ import com.fs.qwApi.enums.Numbers;
 import com.fs.qwApi.param.*;
 import com.fs.qwApi.service.QwApiService;
 import com.fs.voice.utils.StringUtil;
+import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import org.apache.hc.core5.net.URIBuilder;
 import org.apache.http.HttpEntity;
@@ -41,6 +42,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
+@Slf4j
 @Service
 public class QwApiServiceImpl implements QwApiService {
 
@@ -935,6 +937,7 @@ public class QwApiServiceImpl implements QwApiService {
             HttpResponse response = httpClient.execute(httpGet);
 
             String tokenJson = EntityUtils.toString(response.getEntity());
+            log.info("获取token：{}", tokenJson);
             JSONObject jsonObject = JSON.parseObject(tokenJson);
             token = jsonObject.getString("access_token");
             redisCache.setCacheObject("qwServer:corpId:"+corpId+":"+corpSecret,token,1,TimeUnit.HOURS);
@@ -1092,6 +1095,7 @@ public class QwApiServiceImpl implements QwApiService {
             HttpPost httpPost  = new HttpPost(uri);
             HttpResponse response = httpClient.execute(httpPost);
             String reJson = EntityUtils.toString(response.getEntity());
+            log.info("接口返回数据：{}", reJson);
             JSONObject jsonObject = JSON.parseObject(reJson);
             name = jsonObject.getString("name");
 

fs-service/src/main/resources/application-config-druid-yjb.yml

@@ -4,6 +4,7 @@ baidu:
 #配置
 logging:
   level:
+    com.fs: info
     org.springframework.web: INFO
     com.github.binarywang.demo.wx.cp: DEBUG
     me.chanjar.weixin: DEBUG

fs-user-app/src/main/java/com/fs/app/controller/store/FsUserComplaintController.java

@@ -1,5 +1,6 @@
 package com.fs.app.controller.store;
 
+import com.fs.app.annotation.Login;
 import com.fs.app.controller.AppBaseController;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
@@ -8,6 +9,8 @@ import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.user.domain.FsUserComplaint;
+import com.fs.user.domain.FsUserComplaintMsg;
+import com.fs.user.service.IFsUserComplaintMsgService;
 import com.fs.user.service.IFsUserComplaintService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -27,6 +30,8 @@ public class FsUserComplaintController extends AppBaseController
 {
     @Autowired
     private IFsUserComplaintService fsUserComplaintService;
+    @Autowired
+    private IFsUserComplaintMsgService fsUserComplaintMsgService;
 
     /**
      * 查询用户投诉列表
@@ -93,4 +98,50 @@ public class FsUserComplaintController extends AppBaseController
     {
         return toAjax(fsUserComplaintService.deleteFsUserComplaintByIds(ids));
     }
+
+    /**
+     * 查询投诉消息记录列表
+     */
+    @GetMapping("/msg/list")
+    public TableDataInfo msgList(FsUserComplaintMsg fsUserComplaintMsg)
+    {
+        startPage();
+        List<FsUserComplaintMsg> list = fsUserComplaintMsgService.selectFsUserComplaintMsgList(fsUserComplaintMsg);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取投诉消息记录详细信息
+     */
+    @GetMapping(value = "/msg/{id}")
+    public AjaxResult getMsgInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(fsUserComplaintMsgService.selectFsUserComplaintMsgById(id));
+    }
+
+    /**
+     * 新增投诉消息记录
+     */
+    @PostMapping("/msgAdd")
+    @Login
+    public AjaxResult msgAdd(@RequestBody FsUserComplaintMsg fsUserComplaintMsg)
+    {
+        if (fsUserComplaintMsg.getComplaintId() == null){
+            return AjaxResult.error("未查询到相关投诉！");
+        }
+        String userId = getUserId();
+        fsUserComplaintMsg.setUserId(Long.valueOf(userId));
+        fsUserComplaintMsg.setSendType(1); //用户
+        return toAjax(fsUserComplaintMsgService.insertFsUserComplaintMsg(fsUserComplaintMsg));
+    }
+
+    /**
+     * 修改投诉消息记录
+     */
+    @PutMapping("/editMsg")
+    public AjaxResult editMsg(@RequestBody FsUserComplaintMsg fsUserComplaintMsg)
+    {
+        return toAjax(fsUserComplaintMsgService.updateFsUserComplaintMsg(fsUserComplaintMsg));
+    }
+
 }