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

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/ImQuestionBiz.java

@@ -86,6 +86,7 @@ public class ImQuestionBiz extends BaseBiz<ImQuestionMapper, ImQuestion> {
         if (appUserDTO == null) {
             return ObjectRestResponse.createFailedResult(508, "token is null or invalid");
         }
+        imQuestion.setSource(2);
         imQuestion.setUserId(Long.parseLong(appUserDTO.getImUserid() + ""));
         imQuestion.setNickname(appUserDTO.getNickname());
         imQuestion.setPicUrl(appUserDTO.getHeadimgurl());
@@ -115,6 +116,20 @@ public class ImQuestionBiz extends BaseBiz<ImQuestionMapper, ImQuestion> {
         return ObjectRestResponse.succ();
     }
 
+    /**
+     * 后台创建
+     * @return
+     */
+    public ObjectRestResponse bgAdd(ImQuestion imQuestion) {
+        if(imQuestion == null) {
+            return ObjectRestResponse.paramIsEmpty();
+        }
+        imQuestion.setSource(1);
+        insertSelectiveRe(imQuestion);
+        return ObjectRestResponse.succ();
+    }
+
+
     /**
      * 删除消息，修改isDel为true
      *

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

@@ -425,7 +425,7 @@ public class MsgBiz {
         if(!StringUtils.isEmpty(param.getMusicId())){
             updateUseCount(new ObjectId(param.getMusicId()));
         }
-
+        entity.setSource(1);
         if(null != param.getUserRemindLook()){
             if(null != param.getUserNotLook()){
                 List<Integer> collect = param.getUserRemindLook().stream().filter(item -> param.getUserNotLook().contains(item)).collect(Collectors.toList());

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/rest/ImQuestionController.java

@@ -53,4 +53,11 @@ public class ImQuestionController {
     public ObjectRestResponse update(@RequestBody ImQuestion imQuestion) {
         return imQuestionBiz.update(imQuestion);
     }
+
+    @PostMapping(value = "/bg/app/unauth/add")
+    @ApiOperation(value = "添加问答信息")
+    public ObjectRestResponse bgAdd(@RequestBody ImQuestion imQuestion) {
+        return imQuestionBiz.bgAdd(imQuestion);
+    }
+
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java

@@ -418,6 +418,7 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
         return vehicleBiz.dataCompany(dataZone, dataCompany);
     }
 
+    @CacheClear(pre = RedisKey.BRANCH_COMPANY_CACHE_ALL)
     public ObjectRestResponse delCompanyByBaseId(Integer id) {
         Example example = new Example(BranchCompany.class);
         example.createCriteria().andEqualTo("companyBaseId", id);