APP信息采集业务

fs-service/src/main/java/com/fs/his/service/IFsQuestionAndAnswerService.java

@@ -62,4 +62,6 @@ public interface IFsQuestionAndAnswerService extends IService<FsQuestionAndAnswe
     int deleteFsQuestionAndAnswerById(Long id);
 
     List<OptionsVO> selectAllQuestionOptions();
+
+    List<FsQuestionAndAnswerVO> selectFsQuestionAndAnswerVOList();
 }

fs-service/src/main/java/com/fs/his/service/impl/FsQuestionAndAnswerServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fs.his.service.impl;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -17,6 +18,7 @@ import org.springframework.stereotype.Service;
 import com.fs.his.mapper.FsQuestionAndAnswerMapper;
 import com.fs.his.domain.FsQuestionAndAnswer;
 import com.fs.his.service.IFsQuestionAndAnswerService;
+import org.springframework.util.CollectionUtils;
 
 /**
  * 问答Service业务层处理
@@ -114,4 +116,21 @@ public class FsQuestionAndAnswerServiceImpl extends ServiceImpl<FsQuestionAndAns
     public List<OptionsVO> selectAllQuestionOptions() {
         return fsQuestionAndAnswerMapper.selectAllQuestionOptions();
     }
+
+    @Override
+    public List<FsQuestionAndAnswerVO> selectFsQuestionAndAnswerVOList() {
+        List<FsQuestionAndAnswer> answers = fsQuestionAndAnswerMapper.selectFsQuestionAndAnswerList(new FsQuestionAndAnswer());
+        List<FsQuestionAndAnswerVO> vos = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(answers)) {
+            answers.forEach(answer -> {
+                FsQuestionAndAnswerVO vo = new FsQuestionAndAnswerVO();
+                vo.setQuestionName(answer.getQuestionName());
+                List<AnswerVO> answerVOS = JSON.parseArray(answer.getJsonInfo(), AnswerVO.class);
+                vo.setAnswers(answerVOS);
+                vo.setId(answer.getId());
+                vos.add(vo);
+            });
+        }
+        return vos;
+    }
 }

fs-service/src/main/java/com/fs/hisStore/service/IFsUserInformationCollectionService.java

@@ -99,4 +99,8 @@ public interface IFsUserInformationCollectionService extends IService<FsUserInfo
     R salesHelpConfirm(Long collectionId, Long operateId);
 
     List<FsUserInformationCollection> selectFsUserInformationCollectionListByUserIds(List<Long> fsUserIds);
+    //APP--查询用户是否有信息采集数据
+    void hasUserCollectionInfo(Long userId);
+
+    R addUserCollection(FsUserInformationCollectionParam param);
 }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsUserInformationCollectionServiceImpl.java

@@ -1142,6 +1142,34 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         return resultList;
     }
 
+    @Override
+    public void hasUserCollectionInfo(Long userId) {
+        FsUserInformationCollection fsUserInformationCollection = fsUserInformationCollectionMapper.selectByUserId(userId);
+        if (fsUserInformationCollection != null) {
+            throw new CustomException("用户已有信息采集数据");
+        }
+    }
+
+    @Override
+    public R addUserCollection(FsUserInformationCollectionParam param) {
+        //用户是否已存在采集信息
+        FsUserInformationCollection fsUserInformationCollection = fsUserInformationCollectionMapper.selectByUserId(param.getUserId());
+        if (fsUserInformationCollection != null) {
+            throw new CustomException("用户已有信息采集数据");
+        }
+        FsUserInformationCollection collection = new FsUserInformationCollection();
+        collection.setUserId(param.getUserId());
+        collection.setJsonInfo(JSON.toJSONString(param.getAnswers()));
+        collection.setQuestionId(param.getQuestionId());
+        collection.setCreateTime(DateUtils.getNowDate());
+
+        int i = fsUserInformationCollectionMapper.insertFsUserInformationCollection(collection);
+        if (i > 0) {
+            return R.ok();
+        }
+        return R.error("添加信息采集失败");
+    }
+
     private List<AnswerVO> getAnswerVOs(List<AnswerVO> target,List<AnswerVO> source) {
         target.addAll(source);
         return target.stream()

fs-user-app/src/main/java/com/fs/app/controller/QuestionAndAnswerController.java

@@ -41,4 +41,12 @@ public class QuestionAndAnswerController {
         List<OptionsVO> list = questionAndAnswerService.selectAllQuestionOptions();
         return R.ok().put("data",list);
     }
+
+    @ApiOperation("APP-问答列表")
+    @GetMapping("/list")
+    public R list() {
+        List<FsQuestionAndAnswerVO> vos = questionAndAnswerService.selectFsQuestionAndAnswerVOList();
+        return R.ok().put("data",vos);
+    }
+
 }

fs-user-app/src/main/java/com/fs/app/controller/UserInfoCollectionController.java

@@ -1,5 +1,6 @@
 package com.fs.app.controller;
 
+import com.fs.app.annotation.Login;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
@@ -183,4 +184,25 @@ public class UserInfoCollectionController extends AppBaseController {
         }
         return userInformationCollectionService.salesHelpConfirm(param.getCollectionId(),param.getCompanyUserId());
     }
+
+
+    //APP---查询用户是否有信息采集数据
+    @Login
+    @ApiOperation("app获取用户是否有信息采集")
+    @GetMapping("/hasUserCollectionInfo")
+    public R hasUserCollectionInfo(){
+        long userId = Long.parseLong(getUserId());
+        log.info("查询APP用户信息采集，用户id：{}",userId);
+        userInformationCollectionService.hasUserCollectionInfo(userId);
+        return R.ok();
+    }
+
+    @Login
+    @ApiOperation("app添加用户信息采集")
+    @PostMapping("/addUserCollection")
+    public R addUserCollection(@RequestBody FsUserInformationCollectionParam param){
+        Long userId = Long.parseLong(getUserId());
+        param.setUserId(userId);
+        return userInformationCollectionService.addUserCollection(param);
+    }
 }