Merge remote-tracking branch 'origin/master'

src/main/java/com/dragon/tj/portal/common/vo/message/MessageInfoVO.java

@@ -1,5 +1,6 @@
 package com.dragon.tj.portal.common.vo.message;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -47,6 +48,7 @@ public class MessageInfoVO {
      * 附件地址
      */
     private String attachmentPath;
+    private String attachmentName;
 
     /**
      * 创建人
@@ -54,6 +56,12 @@ public class MessageInfoVO {
     private String createBy;
     private String createUser;
 
+    /**
+     * 创建人部门名称和code
+     */
+    private String createOrgName;
+    private String createOrgCode;
+
     /**
      * 修改人
      */
@@ -63,11 +71,13 @@ public class MessageInfoVO {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
 
 

src/main/java/com/dragon/tj/portal/common/vo/message/MessagePageParam.java

@@ -43,9 +43,9 @@ public class MessagePageParam {
     /**
      * 发布时间
      */
-    @DateTimeFormat(pattern = DateTimeFormatterConstant.OF_PATTERN_0)
+    @DateTimeFormat(pattern = DateTimeFormatterConstant.OF_PATTERN_1)
     private LocalDateTime publishTimeStart;
-    @DateTimeFormat(pattern = DateTimeFormatterConstant.OF_PATTERN_0)
+    @DateTimeFormat(pattern = DateTimeFormatterConstant.OF_PATTERN_1)
     private LocalDateTime publishTimeEnd;
 
     /**

src/main/java/com/dragon/tj/portal/controller/AppController.java

@@ -143,7 +143,7 @@ public class AppController {
     /*
      *    4. 热门应用统计 定时、实时？
      * */
-    @Scheduled(fixedDelay = 1000 * 60 * 60)
+    // @Scheduled(fixedDelay = 1000 * 60 * 60)
     public void appStatHandler(){
 
         appService.updateAppStat();

src/main/java/com/dragon/tj/portal/controller/BusinessController.java

@@ -158,7 +158,7 @@ public class BusinessController {
     /*
      *    4. 热门应用统计 定时、实时？
      * */
-    @Scheduled(fixedDelay = 1000 * 60 * 60)
+    // @Scheduled(fixedDelay = 1000 * 60 * 60)
     public void appStatHandler(){
 
         businessService.updateAppStat();

src/main/java/com/dragon/tj/portal/service/impl/AppServiceImpl.java

@@ -174,7 +174,7 @@ public class AppServiceImpl implements AppService {
             SysDictItem  specialToolDict = appTypeList.stream().filter(item -> "专项工具".equals(item.getLabel())).findFirst().get();
             map.put("std", specialToolDict.getId());//专项工具
 
-            if (appType == specialToolDict.getId()){
+            if (specialToolDict.getId().compareTo(appType) == 0){
                 map.put("isSt", 1);//专项工具查询
             }
         }

src/main/resources/mapper/MessageInfoMapper.xml

@@ -39,9 +39,9 @@
     </select>
     <select id="getContactsMemberList" resultType="com.dragon.tj.portal.common.vo.message.ContactMemberVO">
         SELECT b.member_id as 'idCard',c.`name` as 'userName'  from message_info a
-        INNER JOIN  message_info_scope b on a.id = b.message_info_id
+        INNER JOIN  message_info_scope b on a.id = b.message_info_id and b.member_id != #{idCard}
         LEFT JOIN sys_user c on b.member_id = c.idcard
-        where create_by = #{idCard} and a.del_flag = 0
+        where create_by = #{idCard} and a.del_flag = 0 and a.message_type = 2
         GROUP BY member_id
         ORDER BY COUNT(1) DESC
         limit #{limit}