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

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/BusinessCaseVo.java

+package com.mmc.iuav.user.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BusinessCaseVo implements Serializable {
+
+    @ApiModelProperty(value = "绑定的后台账户")
+    private Integer backUserId;
+
+    @ApiModelProperty(value = "业务案例说明（除了飞手团队其他的）")
+    private String businessDescription;
+
+    @ApiModelProperty(value = "业务案例视频")
+    private String businessVideo;
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/BackUserAccountController.java

@@ -8,6 +8,7 @@ import com.mmc.iuav.user.entity.BackUserSuggestionDO;
 import com.mmc.iuav.user.model.qo.BUserAccountQO;
 import com.mmc.iuav.user.model.vo.BUserAccountVO;
 import com.mmc.iuav.user.model.vo.BackUserAccountVO;
+import com.mmc.iuav.user.model.vo.BusinessCaseVo;
 import com.mmc.iuav.user.model.vo.NewMessageVO;
 import com.mmc.iuav.user.service.BackUserAccountService;
 import io.swagger.annotations.*;
@@ -119,4 +120,28 @@ public class BackUserAccountController extends BaseController {
     public ResultBody deleteSuggestion(@RequestParam Integer id) {
         return backUserAccountService.deleteSuggestion(id);
     }
+
+
+    @ApiOperation("添加业务案例")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("insertBusinessCase")
+    public ResultBody insertBusinessCase(@RequestBody BusinessCaseVo businessCaseVo) {
+        return backUserAccountService.insertBusinessCase(businessCaseVo);
+    }
+
+    @ApiOperation("查询业务案例通过backUserId")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("getBusinessCase")
+    public ResultBody getBusinessCase(@RequestParam Integer id) {
+        return backUserAccountService.getBusinessCase(id);
+    }
+
+    @ApiOperation("删除业务案例通过backUserId")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("deleteBusinessCase")
+    public ResultBody deleteBusinessCase(@RequestParam Integer backUserId) {
+        return backUserAccountService.deleteBusinessCase(backUserId);
+    }
+
+
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/CompanyController.java

@@ -163,4 +163,11 @@ public class CompanyController extends BaseController {
     public ResultBody updateAliasImgByUid(@RequestBody AliasAndImgVo aliasAndImgVo) {
         return companyService.updateAliasImgByUid(aliasAndImgVo);
     }
+
+    @ApiOperation(value = "统计每周用户咨询客服次数")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CompanyInfoVO.class)})
+    @GetMapping("consultUserMessageNum")
+    public ResultBody consultUserMessageNum(@RequestParam Integer companyInfoId) {
+        return companyService.consultUserMessageNum(companyInfoId);
+    }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/BackUserSuggestionDao.java

 package com.mmc.iuav.user.dao;
 
 import com.mmc.iuav.user.entity.BackUserSuggestionDO;
+import com.mmc.iuav.user.model.vo.BusinessCaseVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -27,4 +28,9 @@ public interface BackUserSuggestionDao {
 
     int updateByPrimaryKey(BackUserSuggestionDO record);
 
+    void insertBusinessCase(Integer backUserId, String businessDescription, String businessVideo);
+
+    BusinessCaseVo selectBusinessCaseByUserId(Integer id);
+
+    void deleteBusinessCase(Integer backUserId);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/MessageDao.java

@@ -122,4 +122,6 @@ public interface MessageDao {
     Integer getUserMessageNum();
 
     Integer getUserAndUserMessageNum();
+
+    List<UserMessageDO> selectMessageByCompanyInfoId(Integer companyInfoId);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/BackUserAccountService.java

@@ -7,6 +7,7 @@ import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.qo.BUserAccountQO;
 import com.mmc.iuav.user.model.vo.BUserAccountVO;
 import com.mmc.iuav.user.model.vo.BackUserAccountVO;
+import com.mmc.iuav.user.model.vo.BusinessCaseVo;
 import io.swagger.models.auth.In;
 
 import java.util.List;
@@ -108,4 +109,10 @@ public interface BackUserAccountService {
     ResultBody getSuggestion(Integer backUserId);
 
     ResultBody deleteSuggestion(Integer id);
+
+    ResultBody insertBusinessCase(BusinessCaseVo businessCaseVo);
+
+    ResultBody getBusinessCase(Integer id);
+
+    ResultBody deleteBusinessCase(Integer backUserId);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/CompanyService.java

@@ -190,4 +190,6 @@ public interface CompanyService {
     Integer getCompanyBindUserId(Integer userId1,Integer userId2,Integer backUserId);
 
     ResultBody updateAliasImgByUid(AliasAndImgVo aliasAndImgVo);
+
+    ResultBody consultUserMessageNum(Integer companyInfoId);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/BackUserAccountServiceImpl.java

@@ -19,10 +19,7 @@ import com.mmc.iuav.user.enums.CompanyTypeEnums;
 import com.mmc.iuav.user.enums.RoleEnums;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.qo.BUserAccountQO;
-import com.mmc.iuav.user.model.vo.BUserAccountVO;
-import com.mmc.iuav.user.model.vo.BackUserAccountVO;
-import com.mmc.iuav.user.model.vo.CompanyInfoVO;
-import com.mmc.iuav.user.model.vo.NewMessageVO;
+import com.mmc.iuav.user.model.vo.*;
 import com.mmc.iuav.user.service.BackUserAccountService;
 import com.mmc.iuav.user.service.CompanyService;
 import org.apache.commons.lang.StringUtils;
@@ -343,4 +340,25 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
         return ResultBody.success();
     }
 
+    @Override
+    public ResultBody insertBusinessCase(BusinessCaseVo businessCaseVo) {
+        Integer backUserId = businessCaseVo.getBackUserId();
+        String businessDescription = businessCaseVo.getBusinessDescription();
+        String businessVideo = businessCaseVo.getBusinessVideo();
+        backUserSuggestionDao.insertBusinessCase(backUserId, businessDescription, businessVideo);
+        return ResultBody.success();
+    }
+
+    @Override
+    public ResultBody getBusinessCase(Integer id) {
+        BusinessCaseVo businessCaseVo = backUserSuggestionDao.selectBusinessCaseByUserId(id);
+        return ResultBody.success(businessCaseVo);
+    }
+
+    @Override
+    public ResultBody deleteBusinessCase(Integer backUserId) {
+        backUserSuggestionDao.deleteBusinessCase(backUserId);
+        return ResultBody.success();
+    }
+
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/CompanyServiceImpl.java

@@ -4,10 +4,7 @@ import com.mmc.iuav.page.PageResult;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.response.ResultEnum;
 import com.mmc.iuav.user.client.PmsClient;
-import com.mmc.iuav.user.dao.BackUserAccountDao;
-import com.mmc.iuav.user.dao.CompanyDao;
-import com.mmc.iuav.user.dao.CooperationDao;
-import com.mmc.iuav.user.dao.UserServiceDao;
+import com.mmc.iuav.user.dao.*;
 import com.mmc.iuav.user.entity.*;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.qo.CompanyInfoQO;
@@ -23,6 +20,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -47,6 +45,9 @@ public class CompanyServiceImpl implements CompanyService {
     @Autowired
     private CooperationDao cooperationDao;
 
+    @Autowired
+    private MessageDao messageDao;
+
     @Override
     public ResultBody addCompanyInfo(CompanyInfoVO companyInfo) {
         int count = companyDao.countCompanyNames(companyInfo.getId(), companyInfo.getCompanyName());
@@ -383,4 +384,19 @@ public class CompanyServiceImpl implements CompanyService {
         return ResultBody.success();
     }
 
+    @Override
+    public ResultBody consultUserMessageNum(Integer companyInfoId) {
+        int count = 0;
+        List<CompanyMemberDO> companyMemberDOS = companyDao.selectUserAndRoleList(companyInfoId);
+        //查询公司单位 客服id集合
+        Set<Integer> userAccountIds = companyMemberDOS.stream().map(CompanyMemberDO::getUserAccountId).collect(Collectors.toSet());
+        List<UserMessageDO> userMessageDOS = messageDao.selectMessageByCompanyInfoId(companyInfoId);
+        for (UserMessageDO message : userMessageDOS) {
+            if (userAccountIds.contains(message.getReceiverUserId())) {
+                count++;
+            }
+        }
+        return ResultBody.success(count);
+    }
+
 }

csm-service/cms-service-user/src/main/resources/mapper/BackUserSuggestionDao.xml

@@ -29,11 +29,21 @@
         from back_user_suggestion
         where back_user_id = #{backUserId}
     </select>
+    <select id="selectBusinessCaseByUserId" resultType="com.mmc.iuav.user.model.vo.BusinessCaseVo">
+        select back_user_id, business_description, business_video
+        from back_user_suggestion
+        where back_user_id = #{id}
+    </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
         delete from back_user_suggestion
         where  id = #{id,jdbcType=INTEGER} 
     </delete>
+    <delete id="deleteBusinessCase">
+        delete
+        from back_user_suggestion
+        where back_user_id = #{backUserId}
+    </delete>
     <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.mmc.iuav.user.entity.BackUserSuggestionDO" useGeneratedKeys="true">
         insert into back_user_suggestion
         ( id
@@ -60,6 +70,10 @@
                 <if test="backUserId != null">#{backUserId,jdbcType=INTEGER},</if>
         </trim>
     </insert>
+    <insert id="insertBusinessCase">
+        insert into back_user_suggestion (back_user_id, business_description, business_video)
+        values (#{backUserId}, #{businessDescription}, #{businessVideo})
+    </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.mmc.iuav.user.entity.BackUserSuggestionDO">
         update back_user_suggestion
         <set>

csm-service/cms-service-user/src/main/resources/mapper/MessageDao.xml

@@ -134,6 +134,14 @@ ORDER BY create_time desc
               WHERE DATE (create_time) = CURDATE() AND back_user_id IS NULL ) AS distinct_pairs
     </select>
 
+    <select id="selectMessageByCompanyInfoId" resultType="com.mmc.iuav.user.entity.UserMessageDO">
+        SELECT DISTINCT sender_user_id, receiver_user_id
+        FROM user_message
+        WHERE back_user_id = 1
+          AND create_time &gt;= CURDATE() - INTERVAL 7 DAY
+          AND create_time &lt; CURDATE();
+    </select>
+
     <insert id="insertSystemMessage">
         insert into message
         <trim prefix="(" suffix=")" suffixOverrides=",">

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 90ca63fa942059e8dafa4704b99d66b6d6e70573
+  newTag: 8c54efeae0cf88b5b4395abf655df377a7974429