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

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/UserMessageDTO.java

@@ -5,19 +5,19 @@ import java.util.Date;
 
 public class UserMessageDTO implements Serializable {
     private Integer messageId;
-    private String classifyName;
+    private String classify;
     private String title;
     private String content;
     private Date createTime;
     private Integer status;
     private Integer sign;
 
-    public String getClassifyName() {
-        return classifyName;
+    public String getClassify() {
+        return classify;
     }
 
-    public void setClassifyName(String classifyName) {
-        this.classifyName = classifyName;
+    public void setClassify(String classify) {
+        this.classify = classify;
     }
 
     public String getTitle() {

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/PushMessageApiService.java

@@ -70,6 +70,8 @@ public interface PushMessageApiService {
     */
     ServiceResponse<PushMessageDTO> getPushMessageById(Integer messageId);
 
+    ServiceResponse<UserMessageDTO> getUserMessageDetail(Integer messageId);
+
     /** @Description: 删除通知消息
      * @author taogs
      * @Date 16:54 2019/11/27
@@ -154,5 +156,5 @@ public interface PushMessageApiService {
      * @Param 
      * @return 
     */
-    ServiceResponse<Integer> readMessage(Integer messageId, Integer userId);
+    ServiceResponse<Integer> readMessage(Integer messageId);
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabPushUserMessageMapper.java

@@ -61,6 +61,5 @@ public interface TabPushUserMessageMapper {
 
     int readAll(@Param("userId") Integer userId);
 
-    int readMessage(@Param("messageId") Integer messageId,
-                    @Param("userId") Integer userId);
+    int readMessage(@Param("messageId") Integer messageId);
 }
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/PushUserMessageService.java

 package com.gic.enterprise.service;
 
+import com.gic.enterprise.entity.TabPushUserMessage;
+
 public interface PushUserMessageService {
     int save(Integer enterpriseId, Integer userId, Integer messageId, String classify, String title, String content);
 
@@ -9,5 +11,7 @@ public interface PushUserMessageService {
 
     int readAll(Integer userId);
 
-    int readMessage(Integer messageId, Integer userId);
+    int readMessage(Integer messageId);
+
+    TabPushUserMessage getById(Integer id);
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/HelpCenterServiceImpl.java

@@ -51,6 +51,6 @@ public class HelpCenterServiceImpl implements HelpCenterService {
 
     @Override
     public Integer countHelpCenterByIsShow() {
-        return null;
+        return listHelpCenter().size();
     }
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/PushUserMessageServiceImpl.java

@@ -46,7 +46,12 @@ public class PushUserMessageServiceImpl implements PushUserMessageService {
     }
 
     @Override
-    public int readMessage(Integer messageId, Integer userId) {
-        return this.tabPushUserMessageMapper.readMessage(messageId, userId);
+    public int readMessage(Integer messageId) {
+        return this.tabPushUserMessageMapper.readMessage(messageId);
+    }
+
+    @Override
+    public TabPushUserMessage getById(Integer id) {
+        return this.tabPushUserMessageMapper.selectByPrimaryKey(id);
     }
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/HelpCenterApiServiceImpl.java

@@ -6,6 +6,7 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.enterprise.dto.HelpCenterDTO;
 import com.gic.enterprise.entity.TabHelpCenter;
+import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.service.HelpCenterApiService;
 import com.gic.enterprise.service.HelpCenterService;
 import com.github.pagehelper.PageHelper;
@@ -38,6 +39,12 @@ public class HelpCenterApiServiceImpl implements HelpCenterApiService {
                 tabHelpCenter.setIsShow(0);
             }
         }
+        if(tabHelpCenter.getIsShow() == 1){
+            Integer integer = this.helpCenterService.countHelpCenterByIsShow();
+            if(integer >=5){
+                return ServiceResponse.failure(ErrorCode.SYSTEM_ERROR.getCode(), "显示数量超过5个了");
+            }
+        }
         Integer i = this.helpCenterService.saveHelpCenter(tabHelpCenter);
         return ServiceResponse.success(i);
     }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/PushMessageApiServiceImpl.java

@@ -14,6 +14,7 @@ import com.gic.enterprise.dto.PushTypeDTO;
 import com.gic.enterprise.dto.UserMessageDTO;
 import com.gic.enterprise.entity.TabPushClassify;
 import com.gic.enterprise.entity.TabPushMessage;
+import com.gic.enterprise.entity.TabPushUserMessage;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.service.*;
 import com.gic.mq.sdk.GicMQClient;
@@ -201,8 +202,8 @@ public class PushMessageApiServiceImpl implements PushMessageApiService {
     }
 
     @Override
-    public ServiceResponse<Integer> readMessage(Integer messageId, Integer userId) {
-        int i = this.pushUserMessageService.readMessage(messageId, userId);
+    public ServiceResponse<Integer> readMessage(Integer messageId) {
+        int i = this.pushUserMessageService.readMessage(messageId);
         if(i > 0){
             this.pushMessageService.readCount(messageId);
         }
@@ -225,6 +226,12 @@ public class PushMessageApiServiceImpl implements PushMessageApiService {
     }
 
     @Override
+    public ServiceResponse<UserMessageDTO> getUserMessageDetail(Integer messageId){
+        TabPushUserMessage message = this.pushUserMessageService.getById(messageId);
+        return ServiceResponse.success(EntityUtil.changeEntityByJSON(UserMessageDTO.class, message));
+    }
+
+    @Override
     public ServiceResponse<Integer> deletePushMessage(Integer messageId) {
         int i = this.pushMessageService.delete(messageId);
         return ServiceResponse.success(i);

gic-platform-enterprise-service/src/main/resources/mapper/TabPushMessageMapper.xml

@@ -20,8 +20,8 @@
     <result column="push_status" jdbcType="INTEGER" property="pushStatus" />
   </resultMap>
   <resultMap id="userMessageResult" type="com.gic.enterprise.dto.UserMessageDTO">
-    <id column="message_id" jdbcType="INTEGER" property="messageId" />
-    <result column="classify" jdbcType="VARCHAR" property="classifyName" />
+    <id column="id" jdbcType="INTEGER" property="messageId" />
+    <result column="classify" jdbcType="VARCHAR" property="classify" />
     <result column="title" jdbcType="VARCHAR" property="title" />
     <result column="content" jdbcType="VARCHAR" property="content" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -260,7 +260,7 @@
   </select>
   <select id="pageUserMessage" resultMap="userMessageResult">
     select
-      t1.classify,t1.title,t1.content,t1.message_id,t1.create_time,t1.status, t3.sign
+      t1.classify,t1.title,t1.content,t1.id,t1.create_time,t1.status, t3.sign
     from tab_push_user_message t1 left join tab_push_message t3 on t1.message_id = t3.message_id
     where t1.user_id=#{userId}
     and (t1.status = 1 or t1.status = 2)

gic-platform-enterprise-service/src/main/resources/mapper/TabPushUserMessageMapper.xml

@@ -169,6 +169,6 @@
   <update id="readMessage">
     update tab_push_user_message
     set status=2
-    where user_id = #{userId,jdbcType=INTEGER} and status=1 and message_id=#{messageId}
+    where status=1 and id=#{messageId}
   </update>
 </mapper>
\ No newline at end of file

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/IndexModuleController.java

@@ -84,9 +84,9 @@ public class IndexModuleController {
 
     @RequestMapping("message-detail")
     public RestResponse messageDetail(Integer messageId){
-        ServiceResponse<PushMessageDTO> response = this.pushMessageApiService.getPushMessageById(messageId);
-        this.pushMessageApiService.readMessage(messageId, UserDetailUtils.getUserDetail().getUserId());
-        return RestResponse.success(response.getResult());
+        ServiceResponse<UserMessageDTO> userMessageDetail = this.pushMessageApiService.getUserMessageDetail(messageId);
+        this.pushMessageApiService.readMessage(messageId);
+        return RestResponse.success(userMessageDetail.getResult());
     }
 
     @RequestMapping("message-classify")

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/HelpCenterController.java

@@ -5,6 +5,7 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.dto.HelpCenterDTO;
+import com.gic.enterprise.response.EnterpriseRestResponse;
 import com.gic.enterprise.service.HelpCenterApiService;
 import com.gic.operation.web.qo.PageQO;
 import com.gic.operation.web.vo.HelpCenterVO;
@@ -27,7 +28,10 @@ public class HelpCenterController {
     @RequestMapping("save-help-center")
     public RestResponse saveHelpCenter(HelpCenterVO vo){
         ServiceResponse<Integer> response = this.helpCenterApiService.saveHelpCenter(EntityUtil.changeEntityByJSON(HelpCenterDTO.class, vo));
-        return RestResponse.success(response.getResult());
+        if(response.isSuccess()){
+            return RestResponse.success();
+        }
+        return EnterpriseRestResponse.failure(response);
     }
 
     @RequestMapping("help-center-detail")