From f0a87f1ea34489a774549a88d586a9b3d4853158 Mon Sep 17 00:00:00 2001 From: xuwen Date: Mon, 28 Mar 2022 14:53:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9F=BA=E4=BA=8E=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=9F=A5=E6=89=BE=E6=89=80=E6=9C=89=E6=9D=83=E7=94=A8?= =?UTF-8?q?=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dh/common/response/PageDataResult.java | 8 +---- .../controller/rest/PritraceController.java | 36 ++++++++++++++----- .../{pritraceDTO.java => PriTraceDTO.java} | 2 +- .../entity/{pritrace.java => PriTrace.java} | 2 +- .../dh/mybatis/BaseAdminUserMapper.java | 2 ++ .../com/cetc32/dh/mybatis/pritraceMapper.java | 6 ++-- .../cetc32/dh/service/AdminUserService.java | 2 ++ .../cetc32/dh/service/PritraceService.java | 4 +-- .../dh/service/impl/AdminUserServiceImpl.java | 7 ++++ .../dh/service/impl/PritraceServiceImpl.java | 4 +-- .../resources/mapper/BaseAdminUserMapper.xml | 7 +++- src/main/resources/mapper/pritraceMapper.xml | 4 +-- 12 files changed, 56 insertions(+), 28 deletions(-) rename src/main/java/com/cetc32/dh/dto/{pritraceDTO.java => PriTraceDTO.java} (83%) rename src/main/java/com/cetc32/dh/entity/{pritrace.java => PriTrace.java} (90%) diff --git a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java index 141d9d6..05e73c8 100644 --- a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java +++ b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java @@ -10,8 +10,6 @@ package com.cetc32.dh.common.response; import com.cetc32.dh.entity.NumberS; -import com.cetc32.dh.entity.SysInfo; -import com.cetc32.dh.entity.pritrace; import java.util.List; @@ -30,11 +28,6 @@ public class PageDataResult extends ResponseMessage{ private List list; - public PageDataResult(Integer count, List pritraces, Integer offset) { - super(); - } - - public List getList_new() { return list_new; } @@ -94,6 +87,7 @@ public class PageDataResult extends ResponseMessage{ this.list = list; } + /** * 指定缓存失效时间 * @return diff --git a/src/main/java/com/cetc32/dh/controller/rest/PritraceController.java b/src/main/java/com/cetc32/dh/controller/rest/PritraceController.java index 98cebe8..fd7269c 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/PritraceController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/PritraceController.java @@ -1,26 +1,44 @@ package com.cetc32.dh.controller.rest; -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.dto.pritraceDTO; -import com.cetc32.dh.entity.pritrace; +import com.cetc32.dh.common.response.ResponseData; +import com.cetc32.dh.entity.BaseAdminUser; +import com.cetc32.dh.entity.PriTrace; +import com.cetc32.dh.service.AdminUserService; import com.cetc32.dh.service.PritraceService; import com.cetc32.webutil.common.annotations.LoginRequired; +import com.cetc32.webutil.common.bean.LoginUser; +import com.cetc32.webutil.common.util.SecurityUserUtil; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.lang.Nullable; import org.springframework.web.bind.annotation.*; import java.util.List; @LoginRequired @RestController -@RequestMapping("/pritrace") +@RequestMapping("/rest/pri/trace") public class PritraceController { @Autowired PritraceService pritraceService; - @PostMapping("/findbyuser") - public PageDataResult findByUser(@RequestBody pritraceDTO pritraceDTO){ - List pritraces = pritraceService.selectByUser(pritraceDTO.getUser()); - Integer count = pritraceService.selectByUser(pritraceDTO.getUser()).size(); - return new PageDataResult(count,pritraces); + @Autowired + AdminUserService adminUserService; + + @GetMapping("/user") + public ResponseData findByUser(String user){ + if(StringUtils.isBlank(user)) + return ResponseData.error(); + List pritraces = pritraceService.selectByUser(user); + return ResponseData.success(pritraces); + } + @GetMapping("/curuser") + public ResponseData pritraceCurUser(@Nullable Integer deviceType){ + LoginUser lu=SecurityUserUtil.getUser(); + if(null == lu || StringUtils.isBlank(lu.getUsername())) + return ResponseData.error(); + List pritraces = pritraceService.selectByUser(lu.getUsername()); + Listusers =adminUserService.selectUserByDepartmentId(pritraces); + return ResponseData.success(users); } } diff --git a/src/main/java/com/cetc32/dh/dto/pritraceDTO.java b/src/main/java/com/cetc32/dh/dto/PriTraceDTO.java similarity index 83% rename from src/main/java/com/cetc32/dh/dto/pritraceDTO.java rename to src/main/java/com/cetc32/dh/dto/PriTraceDTO.java index d47e030..de37171 100644 --- a/src/main/java/com/cetc32/dh/dto/pritraceDTO.java +++ b/src/main/java/com/cetc32/dh/dto/PriTraceDTO.java @@ -2,7 +2,7 @@ package com.cetc32.dh.dto; import com.cetc32.dh.entity.NumberS; -public class pritraceDTO extends NumberS { +public class PriTraceDTO extends NumberS { private String user; public String getUser() { diff --git a/src/main/java/com/cetc32/dh/entity/pritrace.java b/src/main/java/com/cetc32/dh/entity/PriTrace.java similarity index 90% rename from src/main/java/com/cetc32/dh/entity/pritrace.java rename to src/main/java/com/cetc32/dh/entity/PriTrace.java index 8f22271..dcf97a3 100644 --- a/src/main/java/com/cetc32/dh/entity/pritrace.java +++ b/src/main/java/com/cetc32/dh/entity/PriTrace.java @@ -1,6 +1,6 @@ package com.cetc32.dh.entity; -public class pritrace extends NumberS { +public class PriTrace extends NumberS { private String user; private Integer departid; diff --git a/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java b/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java index 3101dac..c312097 100644 --- a/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java @@ -70,4 +70,6 @@ public interface BaseAdminUserMapper extends MyMapper { Integer countActiveUserBetween(@Param("startTime") Date startTime,@Param("endTime") Date endTime); List getZQPoints(List idList); + + ListselectUserByDepartmentId(@Param("list")List list); } diff --git a/src/main/java/com/cetc32/dh/mybatis/pritraceMapper.java b/src/main/java/com/cetc32/dh/mybatis/pritraceMapper.java index 28c0f7b..424b86a 100644 --- a/src/main/java/com/cetc32/dh/mybatis/pritraceMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/pritraceMapper.java @@ -1,13 +1,13 @@ package com.cetc32.dh.mybatis; -import com.cetc32.dh.entity.pritrace; +import com.cetc32.dh.entity.PriTrace; import org.springframework.stereotype.Repository; import tk.mapper.MyMapper; import java.util.List; @Repository -public interface pritraceMapper extends MyMapper { +public interface pritraceMapper extends MyMapper { - List selectByUser(String user); + List selectByUser(String user); } \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/service/AdminUserService.java b/src/main/java/com/cetc32/dh/service/AdminUserService.java index 46259c8..acd07b6 100644 --- a/src/main/java/com/cetc32/dh/service/AdminUserService.java +++ b/src/main/java/com/cetc32/dh/service/AdminUserService.java @@ -62,4 +62,6 @@ public interface AdminUserService { Integer getAppLoginUser(); List getZQPoints(List idList); + + List selectUserByDepartmentId(Listids); } diff --git a/src/main/java/com/cetc32/dh/service/PritraceService.java b/src/main/java/com/cetc32/dh/service/PritraceService.java index ec2425b..8e1916e 100644 --- a/src/main/java/com/cetc32/dh/service/PritraceService.java +++ b/src/main/java/com/cetc32/dh/service/PritraceService.java @@ -1,9 +1,9 @@ package com.cetc32.dh.service; -import com.cetc32.dh.entity.pritrace; +import com.cetc32.dh.entity.PriTrace; import java.util.List; public interface PritraceService { - List selectByUser(String user); + List selectByUser(String user); } diff --git a/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java index 145e395..e2a91c0 100644 --- a/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java @@ -326,5 +326,12 @@ public class AdminUserServiceImpl implements AdminUserService { { return baseAdminUserMapper.getZQPoints(idList); } + + @Override + public List selectUserByDepartmentId(List ids) { + if(ids ==null || ids.size()<=0) + return null; + return baseAdminUserMapper.selectUserByDepartmentId(ids); + } } diff --git a/src/main/java/com/cetc32/dh/service/impl/PritraceServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/PritraceServiceImpl.java index e10048b..37a3b9b 100644 --- a/src/main/java/com/cetc32/dh/service/impl/PritraceServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/PritraceServiceImpl.java @@ -1,6 +1,6 @@ package com.cetc32.dh.service.impl; -import com.cetc32.dh.entity.pritrace; +import com.cetc32.dh.entity.PriTrace; import com.cetc32.dh.mybatis.pritraceMapper; import com.cetc32.dh.service.PritraceService; import org.springframework.beans.factory.annotation.Autowired; @@ -14,7 +14,7 @@ public class PritraceServiceImpl implements PritraceService { pritraceMapper pritraceMapper; @Override - public List selectByUser(String user){ + public List selectByUser(String user){ return pritraceMapper.selectByUser(user); } diff --git a/src/main/resources/mapper/BaseAdminUserMapper.xml b/src/main/resources/mapper/BaseAdminUserMapper.xml index 7212cb6..65286da 100644 --- a/src/main/resources/mapper/BaseAdminUserMapper.xml +++ b/src/main/resources/mapper/BaseAdminUserMapper.xml @@ -370,7 +370,12 @@ select sum(web_login_count) from base_admin_user - + +