From 70f4756f9efd7e27f7b0489dd6a16f6137777f01 Mon Sep 17 00:00:00 2001 From: yitonglei Date: Thu, 30 Jun 2022 16:10:24 +0800 Subject: [PATCH 1/7] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E8=83=BD?= =?UTF-8?q?=E5=8A=9B=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8=E5=92=8C=E8=AF=A6?= =?UTF-8?q?=E6=83=85-=E5=BA=94=E7=94=A8=E8=B5=84=E6=BA=90=E7=9A=84?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=83=85=E5=86=B5=E5=A2=9E=E5=8A=A0=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=94?= =?UTF-8?q?=E5=A4=A7=E8=B5=84=E6=BA=90=E5=8F=91=E5=B8=83=E6=83=85=E5=86=B5?= =?UTF-8?q?=E7=9A=84sql=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ResourceServiceImpl.java | 4 +- .../resources/mapper/resource/ResourceDao.xml | 39 ++++++++++++------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java index 36d3ffb6..32bf4397 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java @@ -1192,8 +1192,8 @@ public class ResourceServiceImpl extends CrudServiceImpl voidCompletableFuture02 = CompletableFuture.runAsync(() -> { //应用收藏量 result.forEach(r -> { Object[] qu = {r.get("deptId")}; - Integer integer = baseDao.selectResourceCarNum(params); - r.put("resourceCarNum", integer); + Integer integer = baseDao.selectResourceCollectionNum(params); + r.put("resourceCollectionNum", integer); }); }); diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index ac485517..111f74e9 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -1161,10 +1161,12 @@ tb_data_resource b ON a.resource_id = b.id + INNER JOIN sys_dept c + ON b.dept_id = c.id WHERE - a.del_flag = 0 + a.del_flag = 0 AND b.del_flag = 0 - and b.dept_id = #{id} + and (c.id= #{id} OR INSTR(c.pids,#{id})) AND b.type = #{resourceType} @@ -1179,10 +1181,12 @@ tb_data_resource b ON a.resource_id = b.id + INNER JOIN sys_dept c + ON b.dept_id = c.id WHERE - a.del_flag = 0 + a.del_flag = 0 AND b.del_flag = 0 - and b.dept_id = #{id} + and (c.id = #{id} OR INSTR(c.pids,#{id})) AND b.type = #{resourceType} @@ -1196,10 +1200,12 @@ tb_data_resource b ON a.resource_id = b.id + INNER JOIN sys_dept c + ON b.dept_id = c.id WHERE - a.state = 0 + a.state = 0 AND b.del_flag = 0 - and b.dept_id = #{id} + and (c.id = #{id} OR INSTR(c.pids,#{id})) AND b.type = #{resourceType} @@ -1213,32 +1219,35 @@ tb_data_resource b ON a.reference_id = b.id + INNER JOIN sys_dept c + ON b.dept_id = c.id WHERE - a.del_flag = 0 + a.del_flag = 0 AND b.del_flag = 0 - and b.dept_id = #{id} + and (c.id = #{id} OR INSTR(c.pids,#{id})) AND b.type = #{resourceType} From 6005903b1aa3b41a9eddee5c1792254af4cbd9e1 Mon Sep 17 00:00:00 2001 From: lizhicheng Date: Thu, 30 Jun 2022 16:31:22 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=EF=BC=9A?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=81=94=E8=B0=83=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TDemandDataServiceImpl.java | 9 +- .../controller/ResourceController.java | 13 +++ .../modules/resource/dao/ResourceDao.java | 6 ++ .../resource/service/ResourceService.java | 6 ++ .../service/impl/ResourceServiceImpl.java | 92 +++++++++++++++++-- .../impl/TResourceMountApplyServiceImpl.java | 2 + .../mapper/demanData/TDemandDataDao.xml | 10 +- .../resources/mapper/resource/ResourceDao.xml | 61 ++++++++++-- 8 files changed, 174 insertions(+), 25 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/demanData/service/impl/TDemandDataServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/demanData/service/impl/TDemandDataServiceImpl.java index d5f640b4..5b40bfca 100644 --- a/renren-admin/src/main/java/io/renren/modules/demanData/service/impl/TDemandDataServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/demanData/service/impl/TDemandDataServiceImpl.java @@ -10,6 +10,7 @@ import io.renren.modules.demanData.entity.TDemandDataEntityFlag; import io.renren.modules.demanData.service.TDemandDataService; import io.renren.modules.security.user.SecurityUser; import io.renren.modules.sys.dao.SysDeptDao; +import io.renren.modules.sys.service.SysDeptService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,7 +28,7 @@ import java.util.Map; public class TDemandDataServiceImpl extends CrudServiceImpl implements TDemandDataService { @Autowired - private SysDeptDao sysDeptDao; + private SysDeptService deptService; @Override @@ -71,8 +72,10 @@ public class TDemandDataServiceImpl extends CrudServiceImpl resultMap = new HashMap<>(); Long deptId = SecurityUser.getUser().getDeptId(); - List deptList = sysDeptDao.getSubDeptIdList(deptId.toString()); - deptList.add(deptId); + List deptList=null; + if(deptId != null){ + deptList = deptService.getSubDeptIdList(deptId); + } List list = baseDao.selectFlagCountByDepts(deptList); list.forEach(temp -> { temp.put("flag", TDemandDataEntityFlag.getByFlag(Integer.parseInt(temp.get("flag").toString())).getTip()); diff --git a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java index b27d86ba..9438a2d0 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java @@ -493,6 +493,19 @@ public class ResourceController { return new Result().ok(resourceService.getByDept(params)); } + @PostMapping("/trafficDeptResource") + @ApiOperation("按天统计指定时间内本部门发布的资源") + @LogOperation("按天统计指定时间内本部门发布的资源") + public Result trafficDeptResource(@RequestBody JSONObject jsonObject) { + HashMap resultMap = new HashMap<>(); + String startDate = jsonObject.getString("startDate"); + String endDate = jsonObject.getString("endDate"); + resultMap.put("browseAvg", resourceService.selectDayAvg()); + resultMap.put("browseMax", resourceService.selectDayMax()); + resultMap.put("browseDayList", resourceService.trafficDeptResource(startDate, endDate)); + return new Result().ok(resultMap); + } + @GetMapping("/selectTotalByDept") @ApiOperation("按照资源类型统计本部门发布的资源") @LogOperation("按照资源类型统计本部门发布的资源") diff --git a/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java b/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java index c3078d8d..20582f73 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java @@ -158,4 +158,10 @@ public interface ResourceDao extends BaseDao { List selectCameraDTOById(@Param("id") Long id); List selectDeptResourceByApplyNum(List deptIds); + + List trafficDeptResource(Map params); + + Long selectDayAvg(@Param("days") Long days); + + Integer selectDayMax(); } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java b/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java index eea1b112..e6752e16 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java @@ -119,4 +119,10 @@ public interface ResourceService extends CrudService params); + Object trafficDeptResource(String startDate, String endDate); + + Object selectDayAvg(); + + Object selectDayMax(); + } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java index 32bf4397..09a065bb 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java @@ -14,6 +14,9 @@ import io.renren.common.constant.Constant; import io.renren.common.domain.Tsingtao_xhaProperties; import io.renren.common.page.PageData; import io.renren.common.service.impl.CrudServiceImpl; +import io.renren.common.utils.ConvertUtils; +import io.renren.common.utils.DateUtils; +import io.renren.modules.activiti.dto.ProcessActivityDTO; import io.renren.modules.processForm.dao.TAbilityApplicationDao; import io.renren.modules.processForm.dto.TAbilityApplicationDTO; import io.renren.modules.processForm.entity.TAbilityApplicationEntity; @@ -36,7 +39,9 @@ import io.renren.modules.resourceMountApply.service.TResourceMountApplyService; import io.renren.modules.resourceScore.dao.ResourceScoreDao; import io.renren.modules.security.user.SecurityUser; import io.renren.modules.sys.dao.SysDeptDao; +import io.renren.modules.sys.dto.SysPostDTO; import io.renren.modules.sys.dto.SysUserDTO; +import io.renren.modules.sys.service.SysDeptService; import io.renren.modules.sys.service.SysUserService; import okhttp3.FormBody; import okhttp3.OkHttpClient; @@ -113,6 +118,9 @@ public class ResourceServiceImpl extends CrudServiceImpl getWrapper(Map params) { QueryWrapper wrapper = new QueryWrapper<>(); @@ -1472,8 +1483,10 @@ public class ResourceServiceImpl extends CrudServiceImpl deptList = sysDeptDao.getSubDeptIdList(deptId.toString()); - deptList.add(deptId); + List deptList=null; + if(deptId != null){ + deptList = deptService.getSubDeptIdList(deptId); + } boolean isAsc = false; if (params.get(Constant.ORDER) != null && "asc".equals(params.get(Constant.ORDER))) { isAsc = true; @@ -1481,7 +1494,10 @@ public class ResourceServiceImpl extends CrudServiceImpl page = new Page<>(curPage, limit); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("dept_id", deptList).eq("del_flag", ResourceEntityDelFlag.NORMAL.getFlag()).orderBy(true, isAsc, orderColumn); + if(deptList != null){ + queryWrapper.in("dept_id", deptList); + } + queryWrapper.eq("del_flag", ResourceEntityDelFlag.NORMAL.getFlag()).orderBy(true, isAsc, orderColumn); return resourceDao.selectPage(page, queryWrapper); } @@ -1489,8 +1505,10 @@ public class ResourceServiceImpl extends CrudServiceImpl resultMap = new HashMap<>(); Long deptId = SecurityUser.getUser().getDeptId(); - List deptList = sysDeptDao.getSubDeptIdList(deptId.toString()); - deptList.add(deptId); + List deptList=null; + if(deptId != null){ + deptList = deptService.getSubDeptIdList(deptId); + } resultMap.put("total", resourceDao.selectCountByDepts(deptList)); return resultMap; } @@ -1522,7 +1540,13 @@ public class ResourceServiceImpl extends CrudServiceImpl page = new Page<>(curPage, limit); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("id", resourceIds).eq("del_flag", ResourceEntityDelFlag.NORMAL.getFlag()).orderBy(true, isAsc, orderColumn); - return resourceDao.selectPage(page, queryWrapper); + List dtoList=ConvertUtils.sourceToTarget(resourceDao.selectPage(page, queryWrapper).getRecords(), ResourceDTO.class); + dtoList.forEach(temp->{ + Map p=new HashMap(); + p.put("resource_id", temp.getId()); + temp.setApplyCount(String.valueOf(tResourceMountApplyService.list(p).size())); + }); + return new PageData<>(dtoList, dtoList.size()); } @Override @@ -1551,10 +1575,12 @@ public class ResourceServiceImpl extends CrudServiceImpl deptList = sysDeptDao.getSubDeptIdList(deptId.toString()); - deptList.add(deptId); - List result = resourceDao.selectDeptResourceByApplyNum(deptList); + Long deptId=SecurityUser.getUser().getDeptId(); + List deptList=null; + if(deptId != null){ + deptList=deptService.getSubDeptIdList(deptId); + } + List result=resourceDao.selectDeptResourceByApplyNum(deptList); Page page = new Page(curPage, limit); int j = Math.min(curPage * limit, result.size()); if (result.isEmpty()) { @@ -1571,6 +1597,52 @@ public class ResourceServiceImpl extends CrudServiceImpl deptList=null; + if(deptId != null){ + deptList = deptService.getSubDeptIdList(deptId); + } + params.put("deptIds", deptList); + List maps = resourceDao.trafficDeptResource(params); + Date startDay = DateUtils.parse(startDate, DateUtils.DATE_PATTERN); + Date endDay = DateUtils.parse(endDate, DateUtils.DATE_PATTERN); + ArrayList dayList = new ArrayList<>(); + while (startDay.before(endDay) || startDay.compareTo(endDay) == 0) { + dayList.add(DateUtils.format(startDay, DateUtils.DATE_PATTERN)); + startDay = DateUtils.addDateDays(startDay, 1); + } + ArrayList> resultMap = new ArrayList<>(); + for (String s : dayList) { + HashMap dayMap = new HashMap<>(); + dayMap.put(s, 0); + for (Map map : maps) { + if (s.equals(map.get("date"))) { + dayMap.put(s, map.get("count")); + } + } + resultMap.add(dayMap); + } + return resultMap; + } + + @Override + public Object selectDayAvg() { + Date startDay = DateUtils.stringToDate(systemDay, DateUtils.DATE_PATTERN); + Date today = new Date(); + Long days = (today.getTime() - startDay.getTime()) / (1000 * 60 * 60 * 24); + return resourceDao.selectDayAvg(days); + } + + @Override + public Object selectDayMax() { + return resourceDao.selectDayMax(); + } + private List getSourceIdsByProcess(List list) { List resourceIds = new ArrayList<>(); for (HistoricProcessInstance his : list) { diff --git a/renren-admin/src/main/java/io/renren/modules/resourceMountApply/service/impl/TResourceMountApplyServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resourceMountApply/service/impl/TResourceMountApplyServiceImpl.java index b54d4886..26198413 100644 --- a/renren-admin/src/main/java/io/renren/modules/resourceMountApply/service/impl/TResourceMountApplyServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resourceMountApply/service/impl/TResourceMountApplyServiceImpl.java @@ -24,6 +24,8 @@ public class TResourceMountApplyServiceImpl extends CrudServiceImpl wrapper = new QueryWrapper<>(); if (params.containsKey("creator")) { //查该用户创建的资源 wrapper.eq("creator", Long.valueOf(params.get("creator").toString())); + }else if(params.containsKey("resource_id")){ + wrapper.eq("resource_id", Long.valueOf(params.get("resource_id").toString())); } return wrapper; diff --git a/renren-admin/src/main/resources/mapper/demanData/TDemandDataDao.xml b/renren-admin/src/main/resources/mapper/demanData/TDemandDataDao.xml index 3ddc92c0..9516f3e8 100644 --- a/renren-admin/src/main/resources/mapper/demanData/TDemandDataDao.xml +++ b/renren-admin/src/main/resources/mapper/demanData/TDemandDataDao.xml @@ -38,10 +38,12 @@ count(id) AS "count" FROM t_demand_data WHERE 1=1 - AND apply_user_dept_id in - - #{deptId} - + + AND apply_user_dept_id in + + #{deptId} + + GROUP BY flag ORDER BY flag diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index 111f74e9..36748eef 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -1308,10 +1308,12 @@ FROM tb_data_resource WHERE 1=1 AND del_flag = 0 - AND dept_id in - - #{deptId} - + + AND dept_id in + + #{deptId} + + GROUP BY type ORDER BY type @@ -1334,13 +1336,56 @@ + + + + + + From 511bcc78507cef9e8e12214d77ed31e0a8283a7a Mon Sep 17 00:00:00 2001 From: yitonglei Date: Thu, 30 Jun 2022 16:33:53 +0800 Subject: [PATCH 3/7] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E8=83=BD?= =?UTF-8?q?=E5=8A=9B=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8=E5=92=8C=E8=AF=A6?= =?UTF-8?q?=E6=83=85-=E5=BA=94=E7=94=A8=E8=B5=84=E6=BA=90=E7=9A=84?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=83=85=E5=86=B5=E5=92=8C=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=BD=BF=E7=94=A8=E6=83=85=E5=86=B5=E5=85=B3?= =?UTF-8?q?=E4=BA=8E=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E7=9A=84=E5=88=A4?= =?UTF-8?q?=E6=96=AD=EF=BC=8C=E8=A7=A3=E5=86=B3=E7=A9=BA=E6=8C=87=E9=92=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/controller/CensusControllerV3.java | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV3.java b/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV3.java index 246e6061..d2acce0b 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV3.java +++ b/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV3.java @@ -62,14 +62,19 @@ public class CensusControllerV3 { }) public Result>> resourceAssemblerDetails(@ApiIgnore @RequestParam Map params){ UserDetail user = SecurityUser.getUser(); - SysDeptDTO sysDeptDTO = sysDeptService.get(user.getDeptId()); - if(StringUtils.equals(user.getUsername(),"admin") || StringUtils.equals(sysDeptDTO.getName(),qddsjj)){//admin和市大数据局显示所有 + if(StringUtils.equals(user.getUsername(),"admin")){ params.put("id",0); - }else if(StringUtils.contains(sysDeptDTO.getName(),"大数据") && sysDeptDTO.getType() == 3){//各区大数据局 - params.put("id",sysDeptDTO.getPid()); }else{ - params.put("id",sysDeptDTO.getId()); + SysDeptDTO sysDeptDTO = sysDeptService.get(user.getDeptId()); + if(StringUtils.equals(sysDeptDTO.getName(),qddsjj)){ + params.put("id",0); + }else if(StringUtils.contains(sysDeptDTO.getName(),"大数据") && sysDeptDTO.getType() == 3){ + params.put("id",sysDeptDTO.getPid()); + }else{ + params.put("id",sysDeptDTO.getId()); + } } + String type = params.get("resourceType").toString(); List> list = new ArrayList<>(); @@ -104,14 +109,19 @@ public class CensusControllerV3 { }) public Result>> resourceUsedDetails(@ApiIgnore @RequestParam Map params){ UserDetail user = SecurityUser.getUser(); - SysDeptDTO sysDeptDTO = sysDeptService.get(user.getDeptId()); - if(StringUtils.equals(user.getUsername(),"admin") || StringUtils.equals(sysDeptDTO.getName(),qddsjj)){//admin和市大数据局显示所有 + if(StringUtils.equals(user.getUsername(),"admin")){ params.put("id",0); - }else if(StringUtils.contains(sysDeptDTO.getName(),"大数据") && sysDeptDTO.getType() == 3){//各区大数据局 - params.put("id",sysDeptDTO.getPid()); }else{ - params.put("id",sysDeptDTO.getId()); + SysDeptDTO sysDeptDTO = sysDeptService.get(user.getDeptId()); + if(StringUtils.equals(sysDeptDTO.getName(),qddsjj)){ + params.put("id",0); + }else if(StringUtils.contains(sysDeptDTO.getName(),"大数据") && sysDeptDTO.getType() == 3){ + params.put("id",sysDeptDTO.getPid()); + }else{ + params.put("id",sysDeptDTO.getId()); + } } + String type = params.get("resourceType").toString(); List> list = new ArrayList<>(); From 20a426cb9a42cd615c9d206c4665a055336dc4bc Mon Sep 17 00:00:00 2001 From: wangliwen Date: Thu, 30 Jun 2022 16:37:38 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=A4=84=E7=90=86pageWithAttr=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E7=BC=BA=E5=A4=B1infoList=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resource/service/impl/ResourceServiceImpl.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java index 36d3ffb6..a263af9f 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java @@ -318,11 +318,10 @@ public class ResourceServiceImpl extends CrudServiceImpl recordLists = resourceDTOS.stream() .skip((pageNum - 1) * pageSize).limit(pageSize) - .peek(dto_ -> { - ResourceDTO temp = dto_; - ResourceDTO get = this.get(dto_.getId()); + .map(dto_ -> { + ResourceDTO get = this.selectWithAttrs(dto_.getId()); BeanUtils.copyProperties(get, dto_); - dto_.setInfoList(temp.getInfoList()); + return dto_; }).collect(Collectors.toList()); resultPage.setRecords(recordLists); resultPage.setTotal(resourceDTOS.size()); @@ -419,10 +418,8 @@ public class ResourceServiceImpl extends CrudServiceImpl recordLists = resourceDTOS.stream() .skip((pageNum - 1) * pageSize).limit(pageSize) .map(dto_ -> { - ResourceDTO temp = dto_; - ResourceDTO get = this.get(dto_.getId()); + ResourceDTO get = this.selectWithAttrs(dto_.getId()); BeanUtils.copyProperties(get, dto_); - dto_.setInfoList(temp.getInfoList()); return dto_; }).collect(Collectors.toList()); resultPage.setRecords(recordLists); From 19d1cdde412d76f982313a5f64bd1a2b1fbebf18 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Thu, 30 Jun 2022 16:46:34 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=96=87=E6=A1=88=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demandComment/service/impl/TDemandCommentServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/renren-admin/src/main/java/io/renren/modules/demandComment/service/impl/TDemandCommentServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/demandComment/service/impl/TDemandCommentServiceImpl.java index 70123568..dbab5c15 100644 --- a/renren-admin/src/main/java/io/renren/modules/demandComment/service/impl/TDemandCommentServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/demandComment/service/impl/TDemandCommentServiceImpl.java @@ -88,7 +88,9 @@ public class TDemandCommentServiceImpl extends CrudServiceImpl { // 发起人 Optional tDemandDataDTO = Optional.ofNullable(tDemandDataService.get(tDemandCommentDTO.getTargetId())); Optional sysUserDTO = Optional.ofNullable(sysUserService.get(tDemandDataDTO.isPresent() ? tDemandDataDTO.get().getCreator() : null)); - String content = "【评论】" + (sysUserDTO.isPresent() ? sysUserDTO.get().getRealName() : "") + "您发起的需求 " + tDemandDataDTO.orElse(new TDemandDataDTO()).getDemandSubject() + "有新的评论，请前往查看详情"; + String content = "【评论】" + (sysUserDTO.isPresent() ? sysUserDTO.get().getRealName() : "") + "您发起的需求 " + tDemandDataDTO.orElse(new TDemandDataDTO()).getDemandSubject() +// + "有新的评论，请前往查看详情" + ; SysNoticeDTO dto = new SysNoticeDTO(); dto.setType(2); dto.setTitle("需求评论系统通知"); From 8fb6924557b513c936561e47e80e53de0325b937 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Thu, 30 Jun 2022 17:02:26 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- renren-admin/src/main/resources/mapper/resource/ResourceDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index 36748eef..9b2cc6d1 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -419,6 +419,7 @@ tb_data_resource tdr WHERE 1 = 1 + AND tdr.del_flag = 0 AND MATCH (tdr.name) AGAINST ( #{dto.name} IN BOOLEAN MODE) From 75b7de00528950b7c65d3a2c2a63f9ca183043ea Mon Sep 17 00:00:00 2001 From: yitonglei Date: Thu, 30 Jun 2022 17:21:24 +0800 Subject: [PATCH 7/7] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E8=83=BD?= =?UTF-8?q?=E5=8A=9B=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8=E5=92=8C=E8=AF=A6?= =?UTF-8?q?=E6=83=85-=E9=83=A8=E5=88=86=E6=9F=A5=E8=AF=A2=E7=9A=84?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/controller/CensusControllerV3.java | 33 ++++++++----------- .../resources/mapper/resource/ResourceDao.xml | 5 +-- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV3.java b/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV3.java index d2acce0b..c47d96ba 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV3.java +++ b/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV3.java @@ -186,22 +186,16 @@ public class CensusControllerV3 { @ApiImplicitParam(name = "resourceType",value = "资源类型(组件服务、应用资源、基础设施、数据资源、知识库)", paramType = "query", dataType = "String") }) public Result>> assemblerCaredTopInfo(@ApiIgnore @RequestParam Map params){ - Object[] args = {params.get("id"),params.get("resourceType")}; + Object[] args = {params.get("id"),params.get("id"),params.get("resourceType")}; - List> maps = jdbcTemplate.queryForList("SELECT a.resource_id,b.name,COUNT(a.id) AS resourceCarNum\n" + - "FROM tb_resource_car a \n" + - "INNER JOIN tb_data_resource b \n" + - "ON a.resource_id = b.id\n" + - "WHERE\n" + - "b.dept_id = ?\n" + - "AND\n" + - "b.type = ?\n" + - "AND \n" + - "a.del_flag = 0\n" + - "\n" + - "GROUP BY a.resource_id,b.name \n" + - "ORDER BY COUNT(a.id) DESC\n" + - "LIMIT 5", args); + List> maps = jdbcTemplate.queryForList("SELECT a.resource_id,b.name,COUNT(a.id) AS resourceCarNum FROM tb_resource_car a \n" + + " INNER JOIN tb_data_resource b ON a.resource_id = b.id\n" + + " INNER JOIN sys_dept c ON b.dept_id = c.id\n" + + " WHERE (c.id = ? OR INSTR(c.pids,?)) AND b.type = ?\n" + + " AND a.del_flag = 0\n" + + " GROUP BY a.resource_id,b.name \n" + + " ORDER BY COUNT(a.id) DESC\n" + + " LIMIT 5", args); return new Result>>().ok(maps); } @@ -215,9 +209,10 @@ public class CensusControllerV3 { @ApiImplicitParam(name = "resourceType",value = "资源类型(组件服务、应用资源、基础设施、数据资源、知识库)", paramType = "query", dataType = "String") }) public Result>> assemblerUsedInfo(@ApiIgnore @RequestParam Map params){ - Object[] ps = {params.get("id"),params.get("resourceType")}; + Object[] ps = {params.get("id"),params.get("id"),params.get("resourceType")}; List> maps = jdbcTemplate.queryForList("SELECT count(b.attr_value) as nums,b.attr_value FROM tb_data_resource a INNER JOIN tb_data_attr b ON a.id = b.data_resource_id\n" + - "WHERE a.dept_id = ? and a.type = ? and b.attr_type = '组件类型'\n" + + "INNER JOIN sys_dept c ON a.dept_id = c.id \n" + + "WHERE (c.id = ? OR INSTR(c.pids,?)) and a.type = ? and b.attr_type = '组件类型'\n" + "GROUP BY b.attr_value", ps); return new Result>>().ok(maps); @@ -239,9 +234,9 @@ public class CensusControllerV3 { @ApiImplicitParam(name = "resourceType",value = "资源类型(组件服务、应用资源、基础设施、数据资源、知识库)", paramType = "query", dataType = "String") }) public Result>> assemblerUseTopInfo(@ApiIgnore @RequestParam Map params){ - Object[] ps = {params.get("resourceType"),params.get("id")}; + Object[] ps = {params.get("resourceType"),params.get("id"),params.get("id")}; List> maps = jdbcTemplate.queryForList("SELECT b.name,count(a.id) AS useNum FROM tb_data_resource_rel a INNER JOIN tb_data_resource b ON a.reference_id = b.id\n" + - "WHERE a.del_flag = 0 AND b.type = ? AND b.dept_id = ? GROUP BY b.name ORDER BY useNum desc LIMIT 5", ps); + "INNER JOIN sys_dept c ON b.dept_id = c.id WHERE a.del_flag = 0 AND b.type = ? AND (c.id = ? OR INSTR(c.pids,?)) GROUP BY b.name ORDER BY useNum desc LIMIT 5", ps); return new Result>>().ok(maps); } diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index 36748eef..eefc166a 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -1057,8 +1057,9 @@ SUBSTRING_INDEX( SUBSTRING_INDEX( tdav.attr_value, ';', b.help_topic_id + 1 ), ';',- 1 ) AS type , COUNT( tdav.data_resource_id ) AS total FROM - (select a.* from tb_data_attr a inner join tb_data_resource c on a.data_resource_id = c.id where c.type = - #{resourceType} AND c.dept_id = #{id} ) tdav + (SELECT a.* FROM tb_data_attr a INNER JOIN tb_data_resource c ON a.data_resource_id = c.id + INNER JOIN sys_dept b ON c.dept_id = b.id WHERE c.type = + #{resourceType} AND (b.id = #{id} OR INSTR(b.pids,#{id})) ) tdav JOIN mysql.help_topic b ON b.help_topic_id < ( LENGTH( tdav.attr_value ) - LENGTH( REPLACE ( tdav.attr_value, ';', '' ) ) + 1 ) WHERE