From 05c6d3a06f13dc3bf244cfa129f42abadd0cf2c5 Mon Sep 17 00:00:00 2001 From: zc Date: Wed, 16 Jul 2025 11:02:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B4=E5=AE=89=E4=BC=98=E5=8C=96=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/VisCarryStuffController.java | 53 +++++++++++++++++++ .../visitor/controller/VisitorController.java | 2 +- .../system/visitor/domain/VisExitOutVo.java | 4 ++ .../system/visitor/VisCarryStuffMapper.xml | 1 + 4 files changed, 59 insertions(+), 1 deletion(-) diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java index d74a680..6c222bf 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java @@ -20,10 +20,12 @@ import com.dcsoft.common.log.annotation.Log; import com.dcsoft.common.log.enums.BusinessType; import com.dcsoft.common.redis.service.RedisService; import com.dcsoft.common.security.annotation.RequiresPermissions; +import com.dcsoft.common.security.utils.SecurityUtils; import com.dcsoft.common.sms.config.properties.SmsProperties; import com.dcsoft.system.api.RemoteFileService; import com.dcsoft.system.api.domain.SysFile; import com.dcsoft.system.api.domain.SysUser; +import com.dcsoft.system.api.model.LoginUser; import com.dcsoft.system.domain.SysPeople; import com.dcsoft.system.domain.vo.IdNamelVo; import com.dcsoft.system.service.ISysDictDataService; @@ -101,6 +103,9 @@ public class VisCarryStuffController extends BaseController { @Value("${sms.parkName:'兴安智慧园区'}") private String parkName; + @Value("${app.deptId:228}") + private String appDeptId; + @Autowired private RemoteFileService remoteFileService; @@ -148,6 +153,54 @@ public class VisCarryStuffController extends BaseController { return getDataTable(list); } + + @GetMapping("/appList") + public TableDataInfo appList(VisExitOutVo vo) { + startPage(); + if (!StringUtils.equals(appDeptId, vo.getAppDeptId())) { + LoginUser user = SecurityUtils.getLoginUser(); + vo.setCreateBy(user.getUsername()); + } + List list = visCarryStuffService.selectList(vo); + if (CollUtil.isEmpty(list)) { + return getDataTable(list); + } + + //查询物品信息列表 + List collect = list.stream().map(VisExitOutVo::getId).collect(Collectors.toList()); + VisStuffInfoVo visStuffInfoVo = new VisStuffInfoVo(); + visStuffInfoVo.setExitIds(collect); + List stuffList = visCarryStuffService.selectStuffList(visStuffInfoVo); + if (CollUtil.isEmpty(stuffList)) { + return getDataTable(list); + } + + //处理字典值 + Map map = dictDataService.queryDictData("vis_out_stuff_type"); + stuffList.forEach(stuff -> { + if (StrUtil.isNotBlank(stuff.getType())) { + stuff.setTypeName(map.get(stuff.getType())); + } + if (StrUtil.isNotBlank(stuff.getBackType())) { + stuff.setBackTypeName(map.get(stuff.getBackType())); + } + if (StrUtil.isNotBlank(stuff.getImgUrls())) { + stuff.setImgUrlList(Arrays.asList(stuff.getImgUrls().split(","))); + } + if (StrUtil.isNotBlank(stuff.getBackImgUrls())) { + stuff.setBackImgUrlList(Arrays.asList(stuff.getBackImgUrls().split(","))); + } + }); + + //构造数据 + Map> collect1 = stuffList.stream().collect(Collectors.groupingBy(VisStuffInfoVo::getExitId)); + list.forEach(exit -> { + exit.setVisStuffInfoList(collect1.get(exit.getId())); + }); + + return getDataTable(list); + } + /** * 获取携物信息详细信息（详情） */ diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java index bd3f43d..fbbc885 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java @@ -833,7 +833,7 @@ public class VisitorController extends BaseController { .execute() .body(); JSONObject object = JSON.parseObject(body); - log.info("企微消息发送结果：{}", body); + log.info("企微消息发送：{}结果：{}", phone, body); if(!Constants.ZERO.equals(object.get("errcode").toString())) { log.error("企微消息发送失败" + object.get("errcode").toString()); } diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/VisExitOutVo.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/VisExitOutVo.java index a05bd48..ad4c77b 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/VisExitOutVo.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/VisExitOutVo.java @@ -161,4 +161,8 @@ public class VisExitOutVo extends BaseEntity { private List reviewProcessList; + /** + * 小程序判断是否是保安 + */ + private String appDeptId; } diff --git a/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/visitor/VisCarryStuffMapper.xml b/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/visitor/VisCarryStuffMapper.xml index 276096a..a38b371 100644 --- a/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/visitor/VisCarryStuffMapper.xml +++ b/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/visitor/VisCarryStuffMapper.xml @@ -164,6 +164,7 @@ and e.exitPermit_no = #{exitPermitNo} and e.examine_state = #{examineState} and e.is_exist_back = #{isExistBack} + and e.create_by = #{createBy} order by create_time desc