Merge remote-tracking branch 'origin/master'

src/main/java/com/dragon/tj/portal/auth/web/entity/SysUser.java

@@ -1,14 +1,15 @@
 package com.dragon.tj.portal.auth.web.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.List;
+
 /**
  * <p>
  * 用户信息表
@@ -34,6 +35,9 @@ public class SysUser implements Serializable {
 
     private String orgCode;
 
+    @TableField(exist = false)
+    private List<String> orgCodes;
+
     private String orgName;
 
     private String userType;

src/main/java/com/dragon/tj/portal/auth/web/service/impl/SysDeptServiceImpl.java

@@ -46,10 +46,10 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         Set<String> keySet = Sets.newHashSet();
         for (List<String> itemCodes : scopeIdSplit) {
             List<SysUser> sysUsers;
-            if (messageType.equals(BusinessConstants.DICT_ITEM_ID_1)) {
-                sysUsers = sysUserMapper.getUserInfoByOrgIds(itemCodes);
-            } else {
+            if (messageType.equals(BusinessConstants.DICT_ITEM_ID_2)) {
                 sysUsers = sysUserMapper.getUserInfoByIds(itemCodes);
+            } else {
+                sysUsers = sysUserMapper.getUserInfoByOrgIds(itemCodes);
             }
             if (CollectionUtils.isNotEmpty(sysUsers)) {
                 collect.putAll(sysUsers.stream().collect(Collectors.toMap(SysUser::getIdcard, o -> o)));

src/main/java/com/dragon/tj/portal/auth/web/service/impl/SysUserServiceImpl.java

@@ -16,6 +16,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import retrofit2.Call;
 
 import java.util.Objects;
@@ -60,7 +61,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(StringUtils.isNotEmpty(sysUser.getName()), SysUser::getName, sysUser.getName());
         queryWrapper.like(StringUtils.isNotEmpty(sysUser.getPoliceNumber()), SysUser::getPoliceNumber, sysUser.getPoliceNumber());
-        queryWrapper.eq(sysUser.getOrgCode() != null, SysUser::getOrgCode, sysUser.getOrgCode());
+        queryWrapper.eq(StringUtils.isNotBlank(sysUser.getOrgCode()), SysUser::getOrgCode, sysUser.getOrgCode());
+        queryWrapper.in(!CollectionUtils.isEmpty(sysUser.getOrgCodes()), SysUser::getOrgCode, sysUser.getOrgCodes());
         queryWrapper.eq(SysUser::getDeleted, "0");
         return baseMapper.selectPage(page, queryWrapper);
     }

src/main/java/com/dragon/tj/portal/common/enums/log/ModuleEnum.java

@@ -23,12 +23,14 @@ public enum ModuleEnum {
     APP_DELETE("3003", "应用删除"),
     APP_QUERY("3004", "应用查询"),
     APP_COLLECTION("3005", "应用收藏"),
+    APP_CLICK("3006", "应用点击日志"),
 
     BUSINESS_ADD("4001", "业务添加"),
     BUSINESS_UPDATE("4002", "业务修改"),
     BUSINESS_DELETE("4003", "业务删除"),
     BUSINESS_QUERY("4004", "业务查询"),
     BUSINESS_COLLECTION("4005", "业务收藏"),
+    BUSINESS_CLICK("4006", "业务点击日志"),
 
     FILE_UPLOAD("5001", "文件上传"),
     FILE_QUERY("5002", "文件查询"),

src/main/java/com/dragon/tj/portal/common/vo/log/LogPageParam.java

@@ -1,6 +1,7 @@
 package com.dragon.tj.portal.common.vo.log;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dragon.tj.portal.common.constants.DateTimeFormatterConstant;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
@@ -36,10 +37,11 @@ public class LogPageParam extends Page {
      * 操作类型
      */
     private String title;
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime creatTimeStart;
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime creatTimeEnd;
+
+    @JsonFormat(pattern = DateTimeFormatterConstant.OF_PATTERN_1)
+    private LocalDateTime createTimeStart;
+    @JsonFormat(pattern = DateTimeFormatterConstant.OF_PATTERN_1)
+    private LocalDateTime createTimeEnd;
 
 
 

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

@@ -17,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/app")
@@ -132,10 +133,13 @@ public class AppController {
     /*
      *   点击量
      * */
-    @GetMapping("clickIncr/{id}")
-    public R clickIncr(@PathVariable("id") Long id) {
+    @PostMapping("clickIncr")
+    @SysLog(value = "应用点击", module = ModuleEnum.APP_CLICK)
+    public R clickIncr(@RequestBody Map<String,Object> params) {
+        Object id = params.get("id");
 
-        return R.ok(appService.clickIncr(id));
+        return id == null ? R.failed("应用Id不能为空")
+                :R.ok(appService.clickIncr(Long.valueOf(id.toString())));
     }
 
 

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

@@ -17,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/business")
@@ -147,10 +148,13 @@ public class BusinessController {
     /*
      *   点击量
      * */
-    @GetMapping("clickIncr/{id}")
-    public R clickIncr(@PathVariable("id") Long id) {
+    @PostMapping("clickIncr")
+    @SysLog(value = "业务点击", module = ModuleEnum.BUSINESS_CLICK)
+    public R clickIncr(@RequestBody Map<String,Object> params) {
+        Object id = params.get("id");
 
-        return R.ok(businessService.clickIncr(id));
+        return id == null ? R.failed("业务Id不能为空")
+                :R.ok(businessService.clickIncr(Long.valueOf(id.toString())));
     }
 
 

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

@@ -75,7 +75,7 @@ public class MessageInfoController {
      * 批阅
      */
     @GetMapping("reads")
-    public R reads(List<Long> ids) {
+    public R reads(@RequestParam List<Long> ids) {
         return R.ok(messageInfoService.reads(ids));
     }
 

src/main/java/com/dragon/tj/portal/mapper/SysLogMapper.java

@@ -19,5 +19,5 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface SysLogMapper extends BaseMapper<SysLog> {
 
-    IPage queryPage(Page page, @Param("req") LogPageParam req);
+    IPage<SysLog> queryPage(Page page, @Param("req") LogPageParam req);
 }

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

@@ -119,7 +119,7 @@ public class MessageInfoServiceImpl extends ServiceImpl<MessageInfoMapper, Messa
             MessageInfoScope messageInfo = new MessageInfoScope();
             messageInfo.setReadStatus(ReadStatusEnum.YES.value());
             messageInfo.setId(e);
-
+            list.add(messageInfo);
         });
         return messageInfoScopeService.updateBatchById(list);
     }

src/main/resources/mapper/NoticeInfoMapper.xml

@@ -4,8 +4,8 @@
 
 
     <select id="queryPage" resultType="com.dragon.tj.portal.entity.NoticeInfo">
-        SELECT b.id,member_id,scope_type,scope_id,message_type,read_status,title,content,attachment_path,a.id as target_id,b.message_level, b.create_user, b.create_time,a.read_status,
-               b.create_org_name
+        SELECT b.id,member_id,scope_type,a.scope_id,message_type,read_status,title,content,attachment_path,a.id as target_id,b.message_level, b.create_user, b.create_time,a.read_status,
+               b.create_org_name,b.scope_name, b.scope_url
         from notice_info_scope a
         LEFT JOIN notice_info b on a.notice_info_id = b.id
         where b.del_flag = 0

src/main/resources/mapper/SysLogMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dragon.tj.portal.mapper.SysLogMapper">
 
-    <select id="queryPage" resultType="com.baomidou.mybatisplus.core.metadata.IPage">
+    <select id="queryPage" resultType="com.dragon.tj.portal.entity.SysLog">
         SELECT * from sys_log b
         where del_flag = 0
         <if test="req.userName != null  and req.userName != ''">
@@ -23,8 +23,8 @@
         <if test="req.title != null and req.title != ''">
             and b.title like concat('%',#{req.title},'%')
         </if>
-        <if test="req.creatTimeStart != null and req.creatTimeEnd != null ">
-            and b.create_time >= #{req.creatTimeStart} and b.create_time &lt;= #{req.creatTimeEnd}
+        <if test="req.createTimeStart != null and req.createTimeEnd != null ">
+            and b.create_time >= #{req.createTimeStart} and b.create_time &lt;= #{req.createTimeEnd}
         </if>
     </select>
 </mapper>