From dd7d945df987881c384fa41614050c396a6aca66 Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Thu, 3 Aug 2023 13:56:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=97=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E5=92=8C=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ArchivesTypeController.java | 4 +- .../hxgk/zxxy/mapper/GraphicformMapper.java | 2 + .../hxgk/zxxy/model/entity/ArchivesType.java | 10 ++++ .../model/request/ArchivesTypeRequest.java | 18 ++++++++ .../zxxy/service/ArchivesTypeService.java | 2 +- .../service/impl/ArchivesTypeServiceImpl.java | 46 ++++++++++++++++++- src/main/resources/application.properties | 2 +- .../resources/mapper/GraphicformMapper.xml | 34 ++++++++++++++ 8 files changed, 113 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/hxgk/zxxy/controller/ArchivesTypeController.java b/src/main/java/com/hxgk/zxxy/controller/ArchivesTypeController.java index 38767f9..5ed89f0 100644 --- a/src/main/java/com/hxgk/zxxy/controller/ArchivesTypeController.java +++ b/src/main/java/com/hxgk/zxxy/controller/ArchivesTypeController.java @@ -20,7 +20,9 @@ public class ArchivesTypeController { public JsonData getZxxyArchivesType(@RequestBody ArchivesTypeRequest archivesTypeRequest){ Long L = Long.parseLong(archivesTypeRequest.getAtParentId()); - List archivesTypeList = archivesTypeService.getZxxyArchivesType(L); + String userkey = archivesTypeRequest.getUserkey(); + String usertoken = archivesTypeRequest.getUsertoken(); + List archivesTypeList = archivesTypeService.getZxxyArchivesType(L,userkey,usertoken); return JsonData.buildSuccess(archivesTypeList); } } diff --git a/src/main/java/com/hxgk/zxxy/mapper/GraphicformMapper.java b/src/main/java/com/hxgk/zxxy/mapper/GraphicformMapper.java index 24004a7..6e722b7 100644 --- a/src/main/java/com/hxgk/zxxy/mapper/GraphicformMapper.java +++ b/src/main/java/com/hxgk/zxxy/mapper/GraphicformMapper.java @@ -40,4 +40,6 @@ public interface GraphicformMapper { List queryListByParam(@Param("g_parent") String gParent,@Param("g_parent_sun") String gParentSun, @Param("gBfIdList") List gBfIdList, @Param("gWsIdList") List gWsIdList, @Param("key") Long key); List queryCarousel(@Param("g_parent") String gParent,@Param("g_parent_sun") String gParentSun, @Param("gBfIdList") List gBfIdList, @Param("gWsIdList") List gWsIdList, @Param("key") Long key); + + int queryCountByParam(@Param("g_parent") String gParent,@Param("g_parent_sun") String gParentSun, @Param("gBfIdList") List gBfIdList, @Param("gWsIdList") List gWsIdList, @Param("key") Long key); } diff --git a/src/main/java/com/hxgk/zxxy/model/entity/ArchivesType.java b/src/main/java/com/hxgk/zxxy/model/entity/ArchivesType.java index 3043a36..cb52d47 100644 --- a/src/main/java/com/hxgk/zxxy/model/entity/ArchivesType.java +++ b/src/main/java/com/hxgk/zxxy/model/entity/ArchivesType.java @@ -31,6 +31,16 @@ public class ArchivesType { private String atUid; //排序 private Short atSort; + //本次查询有无数据 + private Boolean hasCard; + + public Boolean getHasCard() { + return hasCard; + } + + public void setHasCard(Boolean hasCard) { + this.hasCard = hasCard; + } public String getAtId() { return atId; diff --git a/src/main/java/com/hxgk/zxxy/model/request/ArchivesTypeRequest.java b/src/main/java/com/hxgk/zxxy/model/request/ArchivesTypeRequest.java index 42b0aa5..fe0a8ac 100644 --- a/src/main/java/com/hxgk/zxxy/model/request/ArchivesTypeRequest.java +++ b/src/main/java/com/hxgk/zxxy/model/request/ArchivesTypeRequest.java @@ -5,6 +5,24 @@ import com.fasterxml.jackson.annotation.JsonProperty; public class ArchivesTypeRequest { //@JsonProperty("at_parent_id") private String atParentId; + private String userkey; + private String usertoken; + + public String getUserkey() { + return userkey; + } + + public void setUserkey(String userkey) { + this.userkey = userkey; + } + + public String getUsertoken() { + return usertoken; + } + + public void setUsertoken(String usertoken) { + this.usertoken = usertoken; + } public String getAtParentId() { return atParentId; diff --git a/src/main/java/com/hxgk/zxxy/service/ArchivesTypeService.java b/src/main/java/com/hxgk/zxxy/service/ArchivesTypeService.java index 61ac2bb..46033bb 100644 --- a/src/main/java/com/hxgk/zxxy/service/ArchivesTypeService.java +++ b/src/main/java/com/hxgk/zxxy/service/ArchivesTypeService.java @@ -7,5 +7,5 @@ import java.util.Map; public interface ArchivesTypeService { - List getZxxyArchivesType(long atParentId); + List getZxxyArchivesType(long atParentId,String userkey,String usertoken); } diff --git a/src/main/java/com/hxgk/zxxy/service/impl/ArchivesTypeServiceImpl.java b/src/main/java/com/hxgk/zxxy/service/impl/ArchivesTypeServiceImpl.java index 6131225..851bdac 100644 --- a/src/main/java/com/hxgk/zxxy/service/impl/ArchivesTypeServiceImpl.java +++ b/src/main/java/com/hxgk/zxxy/service/impl/ArchivesTypeServiceImpl.java @@ -1,25 +1,67 @@ package com.hxgk.zxxy.service.impl; import com.hxgk.zxxy.mapper.ArchivesTypeMapper; +import com.hxgk.zxxy.mapper.GraphicformMapper; import com.hxgk.zxxy.model.entity.ArchivesType; +import com.hxgk.zxxy.model.entity.UserDetail; import com.hxgk.zxxy.service.ArchivesTypeService; +import com.hxgk.zxxy.service.HrService; +import com.hxgk.zxxy.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.HashMap; +import java.util.Iterator; import java.util.List; +import java.util.Map; @Service public class ArchivesTypeServiceImpl implements ArchivesTypeService { @Autowired private ArchivesTypeMapper archivesTypeMapper; + @Autowired + private UserService userService; + @Autowired + private HrService hrService; + @Autowired + private GraphicformMapper graphicformMapper; + /** * 根据atParentId获取知行学院的navi列表 + * * @param atParentId * @return */ @Override - public List getZxxyArchivesType(long atParentId) { - return archivesTypeMapper.getZxxyArchivesType(atParentId); + public List getZxxyArchivesType(long atParentId, String userkey, String usertoken) { + String atParentIdStr = Long.toString(atParentId); + Map userInfo = new HashMap<>(); + userInfo.put("userkey", userkey); + userInfo.put("usertoken", usertoken); + UserDetail userDetail = userService.getUserDetailFromRedis(userInfo); + //去Hr中查询分厂(部门)和工段,工段可能是list(如果该用户层级较高,则拥有多个工段的权限.)当该用户层级低时,需向上查询他的上级机构码 + List gBfIdList = hrService.queryGBfId(userDetail.getAdminorg()); + //工段(list) + List gWsIdList = null; + try { + gWsIdList = hrService.queryGWsId(userDetail.getAdminorg()); + } catch (Exception e) { + e.printStackTrace(); + } + List list = archivesTypeMapper.getZxxyArchivesType(atParentId); + Iterator iterator = list.iterator(); + while (iterator.hasNext()) { + ArchivesType a = iterator.next(); + int count = graphicformMapper + .queryCountByParam(atParentIdStr, a.getAtId(), gBfIdList, gWsIdList, userDetail.getWmKey()); + if (count > 0) { + a.setHasCard(true); + } else { + a.setHasCard(false); + iterator.remove();//使用迭代器的删除方法删除 + } + } + return list; } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 7a47997..033bf39 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -131,7 +131,7 @@ spring.redis.lettuce.pool.max-wait= -1ms #̨ӡsql -mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl +#mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl # mybatis »תշ,߶ #mybatis.configuration.mapUnderscoreToCamelCase=true diff --git a/src/main/resources/mapper/GraphicformMapper.xml b/src/main/resources/mapper/GraphicformMapper.xml index c65a306..fd006a2 100644 --- a/src/main/resources/mapper/GraphicformMapper.xml +++ b/src/main/resources/mapper/GraphicformMapper.xml @@ -70,4 +70,38 @@ g_recommend ASC + + + \ No newline at end of file