From 6bcca8cb4d810dc0988fafbd4ed5a032db9c3f0d Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 8 Aug 2022 14:29:49 +0800 Subject: [PATCH] ddd --- .../main/java/com/epmet/dto/IcWorkLogDTO.java | 5 +++ .../epmet/controller/IcWorkLogController.java | 6 ++++ .../main/java/com/epmet/dao/IcWorkLogDao.java | 7 +++- .../service/impl/IcWorkLogServiceImpl.java | 33 ++++++++++++++++--- .../main/resources/mapper/IcWorkLogDao.xml | 30 +++++++++++++++++ 5 files changed, 75 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java index 2289b460d2..4a936d7acd 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java @@ -101,4 +101,9 @@ public class IcWorkLogDTO implements Serializable { */ private Date updatedTime; + /** + * 创建人名称 + */ + private String createdUser; + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogController.java index 85b598337b..910b345827 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogController.java @@ -1,5 +1,6 @@ package com.epmet.controller; +import com.alibaba.nacos.client.naming.utils.CollectionUtils; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ExcelUtils; @@ -74,6 +75,11 @@ public class IcWorkLogController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { List list = icWorkLogService.list(params); + if(CollectionUtils.isEmpty(list)){ + IcWorkLogDTO dto = new IcWorkLogDTO(); + dto.setId(""); + list.add(dto); + } ExcelUtils.exportExcelToTarget(response, null, list, IcWorkLogExcel.class); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java index c1ce556739..108d0b4e25 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java @@ -1,9 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcWorkLogDTO; import com.epmet.entity.IcWorkLogEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import java.util.Map; + /** * 网格员工作日志 * @@ -12,5 +16,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcWorkLogDao extends BaseDao { - + + List listPage(Map params); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java index 6055950060..3b5895655f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java @@ -1,14 +1,22 @@ package com.epmet.service.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcWorkLogDao; +import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.IcWorkLogDTO; +import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.entity.IcWorkLogEntity; +import com.epmet.feign.EpmetUserFeignClient; import com.epmet.redis.IcWorkLogRedis; import com.epmet.service.IcWorkLogService; import org.apache.commons.lang3.StringUtils; @@ -32,12 +40,18 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); + params.put("customerId", loginUserUtil.getLoginUserCustomerId()); + IPage page = getPage(params); + List list = baseDao.listPage(params); return getPageData(page, IcWorkLogDTO.class); } @@ -66,6 +80,15 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl staffInfo = epmetUserFeignClient.getCustomerStaffInfoByUserId(customerStaffParam); + if (!staffInfo.success() || null == staffInfo.getData()) { + logger.warn(String.format("居民申请入群，给组长发送消息通知错误，调用%s服务查询申请用户名称失败,入参%s", ServiceConstant.EPMET_USER_SERVER, JSON.toJSONString(userResiInfoFormDTO))); + } else { + currentUserName = resultUserInfo.getData().getShowName(); + } IcWorkLogEntity entity = ConvertUtils.sourceToTarget(dto, IcWorkLogEntity.class); insert(entity); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml index e286087e4b..01a1e0b0f7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml @@ -24,4 +24,34 @@ + \ No newline at end of file