From 8a798d6d030df710597e765a217451f00f7b9fb7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 9 Nov 2020 11:18:19 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E5=BE=BD=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/constant/BadgeConstant.java | 12 +++++++ .../main/java/com/epmet/dao/UserBadgeDao.java | 9 ++++++ .../service/impl/UserBadgeServiceImpl.java | 31 ++++++++++++++++--- .../main/resources/mapper/UserBadgeDao.xml | 22 +++++++++++++ 4 files changed, 70 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java index f8b6dcc2e5..131e4a9203 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java @@ -30,4 +30,16 @@ public interface BadgeConstant { String OFFLINE ="offline"; + String RESI = "resi"; + + String AUTH_TITLE = "您有一条认证消息"; + + String GET_BADGE_NAME_FAILURE = "获取徽章名称失败......"; + + String MESSAGE_CONTENT = "您好，您的%s因认证失败未成功点亮，请查看"; + + String READ_FLAG = "unread"; + + String DEFAULT = "default"; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java index 65910f22cd..aae79a6ac3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java @@ -36,6 +36,15 @@ public interface UserBadgeDao { */ List selectAllBadge(@Param("customerId") String customerId); + /** + * @Description 查询单个徽章信息 + * @Param customerId + * @Param badgeId + * @author zxc + * @date 2020/11/9 11:17 上午 + */ + UserBadgeListResultDTO selectBadgeByBadgeId(@Param("customerId") String customerId,@Param("badgeId") String badgeId); + /** * @Description 查询徽章认证记录 * @Param userId diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index 2f3f51ed86..95c2810750 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -20,7 +20,6 @@ import com.epmet.service.UserBadgeService; import com.epmet.service.UserBaseInfoService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,8 +27,6 @@ import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; /** * @Author zxc @@ -47,6 +44,8 @@ public class UserBadgeServiceImpl implements UserBadgeService { private UserBaseInfoService userBaseInfoService; @Autowired private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; + @Autowired + private EpmetMessageOpenFeignClient messageFeignClient; /** * @Description 查询已经点亮的徽章 @@ -151,9 +150,32 @@ public class UserBadgeServiceImpl implements UserBadgeService { form.setCertificationImg(certificationAddFormDTO.getCertificationImg()); form.setSurname(certificationAddFormDTO.getSurname()); userBadgeDao.insertUserBadgeCertificateRecord(form); + + //TODO 站内信发送 您好，您的xxx徽章因认证失败未成功点亮，请查看 + + return new Result(); } + public void sendMessageByUser(UserBadgeCertificateRecordDTO form){ + List msgList = new ArrayList<>(); + UserMessageFormDTO formDTO = new UserMessageFormDTO(); + formDTO.setApp(BadgeConstant.RESI); + formDTO.setCustomerId(form.getCustomerId()); + formDTO.setGridId(form.getGridId()); + UserBadgeListResultDTO userBadgeListResultDTO = userBadgeDao.selectBadgeByBadgeId(form.getCustomerId(), form.getBadgeId()); + if (null == userBadgeListResultDTO){ + log.error(BadgeConstant.GET_BADGE_NAME_FAILURE); + return; + } + formDTO.setMessageContent(String.format(BadgeConstant.MESSAGE_CONTENT,userBadgeListResultDTO.getBadgeName())); + formDTO.setTitle(BadgeConstant.AUTH_TITLE); + formDTO.setReadFlag(BadgeConstant.READ_FLAG); + formDTO.setUserId(form.getUserId()); + msgList.add(formDTO); + Result result = messageFeignClient.saveUserMessageList(msgList); + } + /** * @Description 发送验证码 * @Param badgeSendCodeFormDTO @@ -205,7 +227,8 @@ public class UserBadgeServiceImpl implements UserBadgeService { public List authField(AuthFieldFormDTO authFieldFormDTO) { List authFieldResultDTOS = userBadgeDao.selectAuthField(authFieldFormDTO); if (CollectionUtils.isEmpty(authFieldResultDTOS)){ - return new ArrayList<>(); + authFieldFormDTO.setCustomerId(BadgeConstant.DEFAULT); + return userBadgeDao.selectAuthField(authFieldFormDTO); } return authFieldResultDTOS; } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml index a20a9c0e61..c62269205f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml @@ -126,6 +126,28 @@ AND cc.BADGE_ID = #{badgeId} ORDER BY cf.SORT + From c9c139dcd5a3c7a8ae2059f9084168ab86c91cc2 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 9 Nov 2020 13:25:25 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E5=BE=BD=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/UserBadgeServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index 95c2810750..6f2510ab6f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -152,7 +152,7 @@ public class UserBadgeServiceImpl implements UserBadgeService { userBadgeDao.insertUserBadgeCertificateRecord(form); //TODO 站内信发送 您好，您的xxx徽章因认证失败未成功点亮，请查看 - + this.sendMessageByUser(form); return new Result(); } @@ -227,8 +227,7 @@ public class UserBadgeServiceImpl implements UserBadgeService { public List authField(AuthFieldFormDTO authFieldFormDTO) { List authFieldResultDTOS = userBadgeDao.selectAuthField(authFieldFormDTO); if (CollectionUtils.isEmpty(authFieldResultDTOS)){ - authFieldFormDTO.setCustomerId(BadgeConstant.DEFAULT); - return userBadgeDao.selectAuthField(authFieldFormDTO); + return new ArrayList<>(); } return authFieldResultDTOS; } From 75e4427d79643d574e781d2d22f3731f33f46799 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 9 Nov 2020 13:32:44 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/UserBadgeServiceImpl.java | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index 6f2510ab6f..9fe158c415 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -254,24 +254,9 @@ public class UserBadgeServiceImpl implements UserBadgeService { @Override public void reloadCustomerBadge(String customerId){ userBadgeRedis.delCustomerBadge(customerId); - List resultUserBadge = new ArrayList<>(); List userBadgeListResultDTOS = userBadgeDao.selectAllBadge(customerId); - if (!CollectionUtils.isEmpty(userBadgeListResultDTOS)){ - Map> groupByCustomer = userBadgeListResultDTOS.stream().collect(Collectors.groupingBy(UserBadgeListResultDTO::getCustomerId)); - resultUserBadge.addAll(groupByCustomer.get(BadgeConstant.DEFAULT_CUSTOMER)); - List badgeByCustomer = groupByCustomer.get(customerId); - if (!CollectionUtils.isEmpty(badgeByCustomer)) { - resultUserBadge.forEach(r -> { - for (int i = NumConstant.ZERO; i < badgeByCustomer.size(); i++) { - if (r.getBadgeId().equals(badgeByCustomer.get(i).getBadgeId())) { - BeanUtils.copyProperties(badgeByCustomer.get(i), r); - badgeByCustomer.remove(badgeByCustomer.get(i)); - } - } - }); - resultUserBadge.addAll(badgeByCustomer); - } - userBadgeRedis.setCustomerBadge(resultUserBadge, customerId); + if (CollectionUtils.isEmpty(userBadgeListResultDTOS)){ + throw new RenException("客户徽章缓存初始化未查到数据"); } userBadgeRedis.setCustomerBadge(userBadgeListResultDTOS, customerId); } From 1f4d8927b77788244b8046a330d0486cba636a14 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 9 Nov 2020 14:13:01 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E7=BD=91=E6=A0=BCId=20=E5=8F=82=E6=95=B0,?= =?UTF-8?q?=E7=BC=BA=E5=B0=91=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/fact/FactIndexController.java | 1 + .../java/com/epmet/dto/form/BadgeFormDTO.java | 4 ++ .../src/main/java/com/epmet/dao/BadgeDao.java | 69 ++++++++++--------- .../epmet/service/impl/BadgeServiceImpl.java | 6 +- .../src/main/resources/mapper/BadgeDao.xml | 2 + 5 files changed, 48 insertions(+), 34 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/fact/FactIndexController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/fact/FactIndexController.java index 2fe90dbce7..3a2f5cfebb 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/fact/FactIndexController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/fact/FactIndexController.java @@ -63,6 +63,7 @@ public class FactIndexController { * @Description 按月查询各项指标数据 * @author sun */ + @PostMapping("index/ablitylist") public Result> ablityList(@RequestBody AblityListFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, AblityListFormDTO.AddUserInternalGroup.class); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeFormDTO.java index fdd2969fb0..5a40b86f0f 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeFormDTO.java @@ -21,4 +21,8 @@ public class BadgeFormDTO implements Serializable { * 每页显示数量 */ private Integer pageSize = 20; + /** + * 网格Id + */ + private String gridId; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java index e20fd8a523..9e669fd694 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java @@ -19,15 +19,10 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.BadgeDTO; -import com.epmet.dto.result.BadgeAuditRecordResultDTO; -import com.epmet.dto.result.BadgeAuditingResultDTO; -import com.epmet.dto.result.BadgeDetailResultDTO; -import com.epmet.dto.result.BadgeListResultDTO; -import com.epmet.dto.result.UserBadgeListResultDTO; +import com.epmet.dto.result.*; import com.epmet.entity.BadgeEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName; import java.util.List; @@ -42,114 +37,126 @@ public interface BadgeDao extends BaseDao { /** * 获取徽章列表 - * @author zhaoqifeng - * @date 2020/11/3 17:30 + * * @param customerId * @return java.util.List + * @author zhaoqifeng + * @date 2020/11/3 17:30 */ List selectList(@Param("customerId") String customerId); /** * 重名校验 - * @author zhaoqifeng - * @date 2020/11/4 10:40 + * * @param customerId * @param badgeName * @return java.util.List + * @author zhaoqifeng + * @date 2020/11/4 10:40 */ List getDuplicateName(@Param("customerId") String customerId, @Param("badgeName") String badgeName); /** * 编辑重名校验 - * @author zhaoqifeng - * @date 2020/11/4 15:09 + * * @param customerId * @param badgeId * @param badgeName * @return java.util.List + * @author zhaoqifeng + * @date 2020/11/4 15:09 */ List getDuplicateNameForEdit(@Param("customerId") String customerId, @Param("badgeId") String badgeId, - @Param("badgeName") String badgeName); + @Param("badgeName") String badgeName); /** * 获取徽章详情 - * @author zhaoqifeng - * @date 2020/11/4 14:30 + * * @param customerId * @param badgeId * @return com.epmet.dto.result.BadgeDetailResultDTO + * @author zhaoqifeng + * @date 2020/11/4 14:30 */ BadgeDetailResultDTO selectDetail(@Param("customerId") String customerId, @Param("badgeId") String badgeId); /** * 获取徽章信息 - * @author zhaoqifeng - * @date 2020/11/4 15:16 + * * @param customerId * @param badgeId * @return com.epmet.entity.BadgeEntity + * @author zhaoqifeng + * @date 2020/11/4 15:16 */ BadgeEntity selectBadgeInfo(@Param("customerId") String customerId, @Param("badgeId") String badgeId); /** * 更新徽章信息 - * @author zhaoqifeng - * @date 2020/11/4 15:38 + * * @param entity * @return void + * @author zhaoqifeng + * @date 2020/11/4 15:38 */ void updateBadge(BadgeEntity entity); /** * 删除徽章信息 - * @author zhaoqifeng - * @date 2020/11/4 15:39 + * * @param customerId * @param badgeId * @return void + * @author zhaoqifeng + * @date 2020/11/4 15:39 */ void deleteBadge(@Param("customerId") String customerId, @Param("badgeId") String badgeId); /** * 待审核列表 - * @author zhaoqifeng - * @date 2020/11/5 10:01 + * * @param customerId * @param pageNo * @param pageSize + * @param gridId * @return java.util.List + * @author zhaoqifeng + * @date 2020/11/5 10:01 */ List selectAuditingList(@Param("customerId") String customerId, @Param("pageNo") Integer pageNo, - @Param("pageSize") Integer pageSize); + @Param("pageSize") Integer pageSize, @Param("gridId") String gridId); /** * 审核历史列表 - * @author zhaoqifeng - * @date 2020/11/5 11:01 + * * @param customerId * @param pageNo * @param pageSize + * @param gridId * @return java.util.List + * @author zhaoqifeng + * @date 2020/11/5 11:01 */ List selectAuditRecord(@Param("customerId") String customerId, @Param("pageNo") Integer pageNo, - @Param("pageSize") Integer pageSize); + @Param("pageSize") Integer pageSize, @Param("gridId") String gridId); /** - * @Description 查询客户的徽章 * @param customerId * @return java.util.List + * @Description 查询客户的徽章 * @author wangc * @date 2020.11.05 15:50 - */ + */ List selectCustomerBadgePool(@Param("customerId") String customerId); /** * 插入数据 - * @author zhaoqifeng - * @date 2020/11/6 14:46 + * * @param entity * @return void + * @author zhaoqifeng + * @date 2020/11/6 14:46 */ void insertBadge(BadgeDTO dto); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java index 1f391e5aa9..b66faf5095 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java @@ -21,13 +21,13 @@ 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.Constant; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.constant.BadgeConstant; import com.epmet.constant.BadgeMessageConstant; import com.epmet.constant.UserConstant; @@ -289,7 +289,7 @@ public class BadgeServiceImpl extends BaseServiceImpl imp @Override public List auditingList(TokenDto tokenDto, BadgeFormDTO formDTO) { int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); - List list = baseDao.selectAuditingList(tokenDto.getCustomerId(), pageIndex, formDTO.getPageSize()); + List list = baseDao.selectAuditingList(tokenDto.getCustomerId(), pageIndex, formDTO.getPageSize(), formDTO.getGridId()); list.forEach(item -> item.setCreateTime(item.getCreateTime()/NumConstant.SIXTY)); return list; } @@ -306,7 +306,7 @@ public class BadgeServiceImpl extends BaseServiceImpl imp @Override public List auditRecord(TokenDto tokenDto, BadgeFormDTO formDTO) { int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); - List list = baseDao.selectAuditRecord(tokenDto.getCustomerId(), pageIndex, formDTO.getPageSize()); + List list = baseDao.selectAuditRecord(tokenDto.getCustomerId(), pageIndex, formDTO.getPageSize(), formDTO.getGridId()); list.forEach(item -> item.setCreateTime(item.getCreateTime()/NumConstant.SIXTY)); return list; } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml index 037711a570..e482f95095 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml @@ -169,6 +169,7 @@ AUDIT_STATUS = 'auditing' AND ubcr.DEL_FLAG = '0' AND ubcr.CUSTOMER_ID = #{customerId} + AND ubcr.GRID_ID = #{gridId} ORDER BY ubcr.CREATED_TIME DESC LIMIT #{pageNo}, #{pageSize} @@ -202,6 +203,7 @@ AUDIT_STATUS != 'auditing' AND ubcr.DEL_FLAG = '0' AND ubcr.CUSTOMER_ID = #{customerId} + AND ubcr.GRID_ID = #{gridId} ORDER BY ubcr.CREATED_TIME DESC LIMIT #{pageNo}, #{pageSize} From 5055d35514d4c680152082e467e5498c8441f61f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 9 Nov 2020 14:15:33 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E5=BE=BD=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/CertificationAddFormDTO.java | 2 +- .../main/java/com/epmet/service/impl/UserBadgeServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationAddFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationAddFormDTO.java index ee9a71d7fc..feef1ee323 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationAddFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationAddFormDTO.java @@ -47,7 +47,7 @@ public class CertificationAddFormDTO implements Serializable { /** * 身份证号 */ - private String idCard; + private String idcard; /** * 认证证件图片url diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index 9fe158c415..c03dc8e726 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -146,7 +146,7 @@ public class UserBadgeServiceImpl implements UserBadgeService { } userBadgeDao.updateCertificateRecordIsLast(form.getBadgeId(),form.getUserId()); form.setGridId(userBaseInfoResultDTOS.get(NumConstant.ZERO).getRegisteredGridId()); - form.setIdNum(certificationAddFormDTO.getIdCard()); + form.setIdNum(certificationAddFormDTO.getIdcard()); form.setCertificationImg(certificationAddFormDTO.getCertificationImg()); form.setSurname(certificationAddFormDTO.getSurname()); userBadgeDao.insertUserBadgeCertificateRecord(form); From d4d233d78fcc6f8eeca6708a04f357d7ec668f1d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 9 Nov 2020 15:22:43 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E5=BE=BD=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/CertificationDetailResultDTO.java | 2 +- .../java/com/epmet/service/impl/UserBadgeServiceImpl.java | 5 ++++- .../src/main/resources/mapper/UserBadgeDao.xml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java index cc17374704..95670ba7e8 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java @@ -26,7 +26,7 @@ public class CertificationDetailResultDTO implements Serializable { /** * 身份证号 */ - private String idCard; + private String idcard; /** * 是否认证 yes 认证 no 已认证 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index c03dc8e726..b071fa7339 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -205,6 +205,7 @@ public class UserBadgeServiceImpl implements UserBadgeService { /** * @Description 个人中心-获取徽章认证页面详情 + * 先判断 userId存在不，不存在从tokenDto获取【工作端和居民端合用一个接口】 * @Param tokenDto * @Param certificationDetailFormDTO * @author zxc @@ -212,7 +213,9 @@ public class UserBadgeServiceImpl implements UserBadgeService { */ @Override public CertificationDetailResultDTO certificationDetail(TokenDto tokenDto, CertificationDetailFormDTO certificationDetailFormDTO) { - certificationDetailFormDTO.setUserId(tokenDto.getUserId()); + if (StringUtils.isEmpty(certificationDetailFormDTO.getUserId())){ + certificationDetailFormDTO.setUserId(tokenDto.getUserId()); + } return userBadgeDao.selectBadgeAuthRecord(certificationDetailFormDTO.getUserId(), certificationDetailFormDTO.getBadgeId()); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml index c62269205f..d886833fac 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml @@ -89,7 +89,7 @@ SELECT SURNAME, NAME, - ID_NUM AS idCard, + ID_NUM AS idcard, ( CASE WHEN AUDIT_STATUS = 'approved' THEN 'yes' ELSE 'no' END ) AS isCertificated, MOBILE, CERTIFICATION_IMG, From 806a9b7583b3def3c9f57452aedc5ff1b5218f0f Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Mon, 9 Nov 2020 15:54:52 +0800 Subject: [PATCH 07/16] =?UTF-8?q?advice=E8=BF=90=E8=90=A5=E7=AB=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3over?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/AdviceListResultDTO.java | 50 +++++++++++++++++++ .../controller/UserAdviceController.java | 10 ++-- .../com/epmet/entity/UserAdviceEntity.java | 5 ++ .../java/com/epmet/excel/UserAdviceExcel.java | 5 +- .../com/epmet/service/UserAdviceService.java | 3 +- .../service/impl/UserAdviceServiceImpl.java | 50 ++++++++++++++++--- 6 files changed, 111 insertions(+), 12 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AdviceListResultDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AdviceListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AdviceListResultDTO.java new file mode 100644 index 0000000000..f9be8de0b8 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AdviceListResultDTO.java @@ -0,0 +1,50 @@ +package com.epmet.dto.result; + +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @description: + * @author: liushaowen + * @date: 2020/11/9 14:46 + */ +@Data +public class AdviceListResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 建议id + */ + private String id; + + /** + * 客户名 + */ + private String customerName; + + /** + * 网格名 + */ + private String gridName; + + /** + * 建议类型 + */ + private String adviceType; + + /** + * 提交的电话 + */ + private String phone; + + /** + * 建议时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date adviceTime; + + private String adviceContent; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java index b58cc793a3..f3bac40f4e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java @@ -31,6 +31,7 @@ import com.epmet.dto.UserAdviceDTO; import com.epmet.dto.form.AdviceListFormDTO; import com.epmet.dto.form.ReplyAdviceFormDTO; import com.epmet.dto.result.AdviceDetailResultDTO; +import com.epmet.dto.result.AdviceListResultDTO; import com.epmet.excel.UserAdviceExcel; import com.epmet.service.UserAdviceService; import org.apache.commons.lang3.StringUtils; @@ -116,9 +117,12 @@ public class UserAdviceController { } @PostMapping("advicelist") - public Result> adviceList(AdviceListFormDTO dto){ + public Result> adviceList(AdviceListFormDTO dto){ ValidatorUtils.validateEntity(dto); - PageData page = userAdviceService.adviceList(dto); - return new Result>().ok(page); + if (dto.getStartTime().after(dto.getEndTime())){ + throw new RenException("开始时间不能大于结束时间"); + } + PageData page = userAdviceService.adviceList(dto); + return new Result>().ok(page); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceEntity.java index 78c246fa15..51ddc1553d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceEntity.java @@ -123,4 +123,9 @@ public class UserAdviceEntity extends BaseEpmetEntity { */ private String govContent; + /** + * 建议时间 + */ + private Date adviceTime; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserAdviceExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserAdviceExcel.java index 9e93cb6bfc..f14ded9f03 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserAdviceExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserAdviceExcel.java @@ -61,6 +61,9 @@ public class UserAdviceExcel { @Excel(name = "用户注册手机号") private String regPhone; + @Excel(name = "建议时间") + private Date adviceTime; + @Excel(name = "建议描述") private String adviceContent; @@ -104,4 +107,4 @@ public class UserAdviceExcel { private Date updatedTime; -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserAdviceService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserAdviceService.java index 8e018df061..31a63b3ffa 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserAdviceService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserAdviceService.java @@ -23,6 +23,7 @@ import com.epmet.dto.UserAdviceDTO; import com.epmet.dto.form.AdviceListFormDTO; import com.epmet.dto.form.ReplyAdviceFormDTO; import com.epmet.dto.result.AdviceDetailResultDTO; +import com.epmet.dto.result.AdviceListResultDTO; import com.epmet.entity.UserAdviceEntity; import java.util.List; @@ -122,5 +123,5 @@ public interface UserAdviceService extends BaseService { * @Author liushaowen * @Date 2020/11/9 10:41 */ - PageData adviceList(AdviceListFormDTO dto); + PageData adviceList(AdviceListFormDTO dto); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java index df0ca66996..135cf802c1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java @@ -32,6 +32,7 @@ import com.epmet.dto.UserAdviceDTO; import com.epmet.dto.form.AdviceListFormDTO; import com.epmet.dto.form.ReplyAdviceFormDTO; import com.epmet.dto.result.AdviceDetailResultDTO; +import com.epmet.dto.result.AdviceListResultDTO; import com.epmet.entity.UserAdviceEntity; import com.epmet.entity.UserAdviceImgEntity; import com.epmet.redis.UserAdviceRedis; @@ -39,14 +40,11 @@ import com.epmet.service.UserAdviceImgService; import com.epmet.service.UserAdviceService; import io.jsonwebtoken.lang.Collections; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -168,7 +166,6 @@ public class UserAdviceServiceImpl extends BaseServiceImpl adviceList(AdviceListFormDTO dto) { + public PageData adviceList(AdviceListFormDTO dto) { //page分页 Page page = new Page<>(dto.getPageNo(), dto.getPageSize()); //时间降序 @@ -215,9 +212,48 @@ public class UserAdviceServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); + //客户Id + wrapper.eq(StringUtils.isNotBlank(dto.getCustomerId()), "CUSTOMER_ID", dto.getCustomerId()); + //是否回复 + if ("1".equals(dto.getIsReply())) { + wrapper.ne("REPLY_USER_ID", ""); + wrapper.ne("REPLY_CONTENT", ""); + } else if ("0".equals(dto.getIsReply())) { + wrapper.eq("REPLY_USER_ID", ""); + wrapper.eq("REPLY_CONTENT", ""); + } + // 组织id + wrapper.eq(StringUtils.isNotBlank(dto.getAgencyId()), "AGENCY_ID", dto.getAgencyId()); + //建议类型 + wrapper.like(StringUtils.isNotBlank(dto.getAdviceType()), "ADVICE_TYPE", dto.getAdviceType()); + //开始时间 + wrapper.ge(dto.getStartTime() != null, "CREATED_TIME", dto.getStartTime()); + //结束时间 + wrapper.le(dto.getEndTime() != null, "CREATED_TIME", dto.getEndTime()); + + IPage result = baseDao.selectPage(page, wrapper); + + List records = result.getRecords(); + + //拼接type + for (int i = 0; i < records.size(); i++) { + if (!"*".equals(records.get(i).getAdviceType())) { + StringBuilder type = new StringBuilder(); + if (records.get(i).getAdviceType().contains("gov")) { + type.append(UserAdviceConstant.GOV_TYPE_TEXT); + } + if (records.get(i).getAdviceType().contains("software")) { + if (type.length() != 0) { + type.append("\\n"); + } + type.append(UserAdviceConstant.SOFTWARE_TYPE_TEXT); + } + records.get(i).setAdviceType(type.toString()); + } + } + result.setRecords(records); - IPage result = baseDao.selectPage(page,wrapper); - return null; + return getPageData(result, AdviceListResultDTO.class); } } From 7fb40dc779aacfff4979e5d318cce10222fd87b9 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 9 Nov 2020 16:08:42 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/UserBadgeDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml index d886833fac..a40301a81f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml @@ -80,7 +80,7 @@ FROM resi_user_badge WHERE DEL_FLAG = '0' - AND CERTIFICATION_AUTID_STATUS = 'pass' + AND CERTIFICATION_AUTID_STATUS = 'approved' AND USER_ID = #{userId} From bfbdc178a301f180e6ccb79d40ebac312bf0c24a Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Mon, 9 Nov 2020 16:26:35 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=BB=BA=E8=AE=AE=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=A0=B8func?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/UserAdviceServiceImpl.java | 75 ++++++++++++++++++- 1 file changed, 71 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java index 135cf802c1..58686403c4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java @@ -17,15 +17,24 @@ 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.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.scan.param.ImgScanParamDTO; +import com.epmet.commons.tools.scan.param.ImgTaskDTO; +import com.epmet.commons.tools.scan.param.TextScanParamDTO; +import com.epmet.commons.tools.scan.param.TextTaskDTO; +import com.epmet.commons.tools.scan.result.SyncScanResult; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.ScanContentUtils; import com.epmet.constant.UserAdviceConstant; import com.epmet.dao.UserAdviceDao; import com.epmet.dto.UserAdviceDTO; @@ -40,15 +49,15 @@ import com.epmet.service.UserAdviceImgService; import com.epmet.service.UserAdviceService; import io.jsonwebtoken.lang.Collections; import org.apache.commons.lang3.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; /** * user_advice @@ -59,12 +68,20 @@ import java.util.Map; @Service public class UserAdviceServiceImpl extends BaseServiceImpl implements UserAdviceService { + private Logger logger = LogManager.getLogger(UserAdviceServiceImpl.class); @Autowired private UserAdviceRedis userAdviceRedis; @Autowired private UserAdviceImgService userAdviceImgService; + @Value("${openapi.scan.server.url}") + private String scanApiUrl; + @Value("${openapi.scan.method.textSyncScan}") + private String textSyncScanMethod; + @Value("${openapi.scan.method.imgSyncScan}") + private String imgSyncScanMethod; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -132,6 +149,10 @@ public class UserAdviceServiceImpl extends BaseServiceImpl textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); + logger.info("用户建议文字审核入参:"+JSON.toJSONString(textScanParamDTO)); + logger.info("用户建议文字审核返参:"+JSON.toJSONString(textSyncScanResult)); + if (!textSyncScanResult.success()) { + logger.warn("用户建议文字审核接口返回失败,返参:", JSON.toJSONString(textSyncScanResult)); + throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + } else { + if (!textSyncScanResult.getData().isAllPass()) { + logger.warn("用户建议文字审核失败,文字:",text); + throw new RenException(EpmetErrorCode.ACT_REQ_SCAN_FAILED.getCode()); + } + } + logger.info("用户建议文字审核成功"); + } + + private void auditPic(List imgList) { + if (null != imgList && imgList.size() > 0) { + //审核活动详情中的图片 + ImgScanParamDTO imgScanParamDTO = new ImgScanParamDTO(); + imgList.forEach(url -> { + ImgTaskDTO task = new ImgTaskDTO(); + task.setDataId(UUID.randomUUID().toString().replace("-", "")); + task.setUrl(url); + imgScanParamDTO.getTasks().add(task); + }); + Result imgScanResult = ScanContentUtils.imgSyncScan(scanApiUrl.concat(imgSyncScanMethod), imgScanParamDTO); + logger.info("图片审核入参:" + JSON.toJSONString(imgScanParamDTO)); + logger.info("图片审核返参:" + JSON.toJSONString(imgScanResult)); + if (!imgScanResult.success()) { + logger.warn("图片审核接口失败,返参:", JSON.toJSONString(imgScanResult)); + throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + } else { + if (!imgScanResult.getData().isAllPass()) { + throw new RenException(EpmetErrorCode.ACT_CONTENT_IMG_SCAN_FAILED.getCode()); + } + } + logger.info("图片审核成功"); + } + } } From 7119330af5b095d5d11916a3ee3f4a5ad1272e12 Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Mon, 9 Nov 2020 16:39:02 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/pom.xml | 4 ++++ .../epmet-user-server/src/main/resources/bootstrap.yml | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 61c5b17203..ee7aa35693 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -155,6 +155,7 @@ false + https://epmet-dev.elinkservice.cn/api/epmetscan/api @@ -187,6 +188,7 @@ false + https://epmet-dev.elinkservice.cn/api/epmetscan/api @@ -219,6 +221,7 @@ true + https://epmet-dev.elinkservice.cn/api/epmetscan/api @@ -248,6 +251,7 @@ true + https://epmet-open.elinkservice.cn/api/epmetscan/api diff --git a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml index 4f732d5ac9..b58644dbcc 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -131,4 +131,12 @@ ribbon: #pageHelper分页插件 pagehelper: helper-dialect: mysql - reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1 \ No newline at end of file + reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1 + +openapi: + scan: + server: + url: @openapi.scan.server.url@ + method: + imgSyncScan: /imgSyncScan + textSyncScan: /textSyncScan From a205829dfba4dbf4d7d36bf998f5d0a55745309a Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Mon, 9 Nov 2020 17:05:32 +0800 Subject: [PATCH 11/16] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/UserAdviceController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java index f3bac40f4e..39679abddb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java @@ -119,8 +119,10 @@ public class UserAdviceController { @PostMapping("advicelist") public Result> adviceList(AdviceListFormDTO dto){ ValidatorUtils.validateEntity(dto); - if (dto.getStartTime().after(dto.getEndTime())){ - throw new RenException("开始时间不能大于结束时间"); + if (dto.getStartTime()!=null && dto.getEndTime()!=null){ + if (dto.getStartTime().after(dto.getEndTime())){ + throw new RenException("开始时间不能大于结束时间"); + } } PageData page = userAdviceService.adviceList(dto); return new Result>().ok(page); From b9a448c582fb87bf1514bed93a97e2b8aeb7459a Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Mon, 9 Nov 2020 17:13:56 +0800 Subject: [PATCH 12/16] bug --- .../main/java/com/epmet/controller/UserAdviceController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java index 39679abddb..3b7763b5fb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java @@ -117,7 +117,7 @@ public class UserAdviceController { } @PostMapping("advicelist") - public Result> adviceList(AdviceListFormDTO dto){ + public Result> adviceList(@RequestBody AdviceListFormDTO dto){ ValidatorUtils.validateEntity(dto); if (dto.getStartTime()!=null && dto.getEndTime()!=null){ if (dto.getStartTime().after(dto.getEndTime())){ From f9df6920ab2a207c265478268d97e7d669b30482 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 9 Nov 2020 17:23:27 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E5=BE=BD=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/UserBadgeDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml index a40301a81f..f04f31eab8 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml @@ -32,7 +32,7 @@ LEFT JOIN badge b ON b.ID = ub.BADGE_ID WHERE ub.DEL_FLAG = '0' AND b.DEL_FLAG = 0 - AND ub.CERTIFICATION_AUTID_STATUS = 'pass' + AND ub.CERTIFICATION_AUTID_STATUS = 'approved' AND b.CUSTOMER_ID = 'default' AND b.BADGE_STATUS = 'online' AND ub.USER_ID = #{userId} From 079d9f2a26e2e4c665ec5e04bdff5b1f5accb834 Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Mon, 9 Nov 2020 17:27:11 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF-=E6=88=91?= =?UTF-8?q?=E7=9A=84=E5=BB=BA=E8=AE=AE=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/MyAdviceListResultDTO.java | 30 +++++++++++++++++++ .../controller/UserAdviceController.java | 30 +++++++++++-------- 2 files changed, 48 insertions(+), 12 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyAdviceListResultDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyAdviceListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyAdviceListResultDTO.java new file mode 100644 index 0000000000..a451b24393 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyAdviceListResultDTO.java @@ -0,0 +1,30 @@ +package com.epmet.dto.result; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * @description: + * @author: liushaowen + * @date: 2020/11/9 17:21 + */ +@Data +public class MyAdviceListResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + + private String adviceContent; + + private List imgList; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date adviceTime; + + private String replyContent; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date replyTime; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java index 3b7763b5fb..38578093ea 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java @@ -32,6 +32,7 @@ import com.epmet.dto.form.AdviceListFormDTO; import com.epmet.dto.form.ReplyAdviceFormDTO; import com.epmet.dto.result.AdviceDetailResultDTO; import com.epmet.dto.result.AdviceListResultDTO; +import com.epmet.dto.result.MyAdviceListResultDTO; import com.epmet.excel.UserAdviceExcel; import com.epmet.service.UserAdviceService; import org.apache.commons.lang3.StringUtils; @@ -60,19 +61,19 @@ public class UserAdviceController { private LoginUserUtil loginUserUtil; @GetMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { PageData page = userAdviceService.page(params); return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ + public Result get(@PathVariable("id") String id) { UserAdviceDTO data = userAdviceService.get(id); return new Result().ok(data); } @PostMapping - public Result save(@RequestBody UserAdviceDTO dto){ + public Result save(@RequestBody UserAdviceDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); userAdviceService.save(dto); @@ -80,7 +81,7 @@ public class UserAdviceController { } @PutMapping - public Result update(@RequestBody UserAdviceDTO dto){ + public Result update(@RequestBody UserAdviceDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); userAdviceService.update(dto); @@ -88,7 +89,7 @@ public class UserAdviceController { } @DeleteMapping - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); userAdviceService.delete(ids); @@ -102,29 +103,34 @@ public class UserAdviceController { } @PostMapping("replyadvice") - public Result replyAdvice(@RequestBody ReplyAdviceFormDTO dto){ + public Result replyAdvice(@RequestBody ReplyAdviceFormDTO dto) { ValidatorUtils.validateEntity(dto); - userAdviceService.replyAdvice(dto,loginUserUtil.getLoginUserId()); + userAdviceService.replyAdvice(dto, loginUserUtil.getLoginUserId()); return new Result(); } @PostMapping("advicedetail") - public Result adviceDetail(String adviceId){ - if (StringUtils.isBlank(adviceId)){ + public Result adviceDetail(String adviceId) { + if (StringUtils.isBlank(adviceId)) { throw new RenException("adviceId不能为空"); } return new Result().ok(userAdviceService.adviceDetail(adviceId)); } @PostMapping("advicelist") - public Result> adviceList(@RequestBody AdviceListFormDTO dto){ + public Result> adviceList(@RequestBody AdviceListFormDTO dto) { ValidatorUtils.validateEntity(dto); - if (dto.getStartTime()!=null && dto.getEndTime()!=null){ - if (dto.getStartTime().after(dto.getEndTime())){ + if (dto.getStartTime() != null && dto.getEndTime() != null) { + if (dto.getStartTime().after(dto.getEndTime())) { throw new RenException("开始时间不能大于结束时间"); } } PageData page = userAdviceService.adviceList(dto); return new Result>().ok(page); } + + @PostMapping("myadvicelist") + public Result> myAdviceList(String pageSize, String pageNo) { + return null; + } } From 31ea4f4f4120c5542159b42c0158bc3affbed2be Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Mon, 9 Nov 2020 18:09:51 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E5=BB=BA?= =?UTF-8?q?=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/MyAdviceListResultDTO.java | 4 ++-- .../controller/UserAdviceController.java | 13 ++++++++++-- .../java/com/epmet/dao/UserAdviceDao.java | 7 +++++++ .../com/epmet/service/UserAdviceService.java | 12 +++++++++++ .../service/impl/UserAdviceServiceImpl.java | 21 ++++++++++++++++--- .../main/resources/mapper/UserAdviceDao.xml | 21 +++++++++++++++++++ 6 files changed, 71 insertions(+), 7 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyAdviceListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyAdviceListResultDTO.java index a451b24393..77a8e2c460 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyAdviceListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyAdviceListResultDTO.java @@ -20,11 +20,11 @@ public class MyAdviceListResultDTO implements Serializable { private List imgList; - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy/MM/dd", timezone = "GMT+8") private Date adviceTime; private String replyContent; - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy/MM/dd", timezone = "GMT+8") private Date replyTime; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java index 38578093ea..1020c5d66a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java @@ -129,8 +129,17 @@ public class UserAdviceController { return new Result>().ok(page); } + /** + * @Description 居民端-我的建议列表 + * @param map ->pageSize,pageNo + * @return com.epmet.commons.tools.utils.Result> + * @Author liushaowen + * @Date 2020/11/9 17:35 + */ @PostMapping("myadvicelist") - public Result> myAdviceList(String pageSize, String pageNo) { - return null; + public Result> myAdviceList(@RequestBody Map map) { + int pageSize = map.get("pageSize"); + int pageNo = map.get("pageNo"); + return new Result>().ok(userAdviceService.myAdviceList(pageSize,pageNo,loginUserUtil.getLoginUserId())); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserAdviceDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserAdviceDao.java index e198ef4b82..087b91f225 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserAdviceDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserAdviceDao.java @@ -18,10 +18,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.MyAdviceListResultDTO; import com.epmet.entity.UserAdviceEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * user_advice * @@ -34,4 +37,8 @@ public interface UserAdviceDao extends BaseDao { @Param("replyContent") String replyContent, @Param("govContent") String govContent, @Param("replyUserId") String loginUserId); + + List myAdviceList(@Param("pageSize") int pageSize, + @Param("pageNo") int pageNo, + @Param("userId") String loginUserId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserAdviceService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserAdviceService.java index 31a63b3ffa..35a5e840ce 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserAdviceService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserAdviceService.java @@ -24,6 +24,7 @@ import com.epmet.dto.form.AdviceListFormDTO; import com.epmet.dto.form.ReplyAdviceFormDTO; import com.epmet.dto.result.AdviceDetailResultDTO; import com.epmet.dto.result.AdviceListResultDTO; +import com.epmet.dto.result.MyAdviceListResultDTO; import com.epmet.entity.UserAdviceEntity; import java.util.List; @@ -124,4 +125,15 @@ public interface UserAdviceService extends BaseService { * @Date 2020/11/9 10:41 */ PageData adviceList(AdviceListFormDTO dto); + + /** + * @Description 居民端-我的建议列表 + * @param pageSize + * @param pageNo + * @param loginUserId + * @return java.util.List + * @Author liushaowen + * @Date 2020/11/9 17:39 + */ + List myAdviceList(int pageSize, int pageNo, String loginUserId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java index 58686403c4..8973026d33 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java @@ -42,6 +42,7 @@ import com.epmet.dto.form.AdviceListFormDTO; import com.epmet.dto.form.ReplyAdviceFormDTO; import com.epmet.dto.result.AdviceDetailResultDTO; import com.epmet.dto.result.AdviceListResultDTO; +import com.epmet.dto.result.MyAdviceListResultDTO; import com.epmet.entity.UserAdviceEntity; import com.epmet.entity.UserAdviceImgEntity; import com.epmet.redis.UserAdviceRedis; @@ -278,6 +279,20 @@ public class UserAdviceServiceImpl extends BaseServiceImpl + * @Description 居民端-我的建议列表 + * @Author liushaowen + * @Date 2020/11/9 17:39 + */ + @Override + public List myAdviceList(int pageSize, int pageNo, String loginUserId) { + return baseDao.myAdviceList(pageSize, pageNo, loginUserId); + } + private void auditText(String text) { TextScanParamDTO textScanParamDTO = new TextScanParamDTO(); TextTaskDTO taskDTO = new TextTaskDTO(); @@ -285,14 +300,14 @@ public class UserAdviceServiceImpl extends BaseServiceImpl textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); - logger.info("用户建议文字审核入参:"+JSON.toJSONString(textScanParamDTO)); - logger.info("用户建议文字审核返参:"+JSON.toJSONString(textSyncScanResult)); + logger.info("用户建议文字审核入参:" + JSON.toJSONString(textScanParamDTO)); + logger.info("用户建议文字审核返参:" + JSON.toJSONString(textSyncScanResult)); if (!textSyncScanResult.success()) { logger.warn("用户建议文字审核接口返回失败,返参:", JSON.toJSONString(textSyncScanResult)); throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); } else { if (!textSyncScanResult.getData().isAllPass()) { - logger.warn("用户建议文字审核失败,文字:",text); + logger.warn("用户建议文字审核失败,文字:", text); throw new RenException(EpmetErrorCode.ACT_REQ_SCAN_FAILED.getCode()); } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml index 0f7d01cd50..d787d73850 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml @@ -43,4 +43,25 @@ where id = #{adviceId} and del_flag = 0 + + + + + + + + + + + From 86ac79a366c93db2de6e54b2675403538d7051f9 Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Mon, 9 Nov 2020 18:21:36 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF-=E6=88=91?= =?UTF-8?q?=E7=9A=84=E5=BB=BA=E8=AE=AE=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/UserAdviceController.java | 6 ++++++ .../src/main/resources/mapper/UserAdviceDao.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java index 1020c5d66a..070b0030f4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java @@ -140,6 +140,12 @@ public class UserAdviceController { public Result> myAdviceList(@RequestBody Map map) { int pageSize = map.get("pageSize"); int pageNo = map.get("pageNo"); + if (pageSize == 0){ + pageSize = 10; + } + if (pageNo == 0){ + pageNo = 1; + } return new Result>().ok(userAdviceService.myAdviceList(pageSize,pageNo,loginUserUtil.getLoginUserId())); } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml index d787d73850..42c4b57f44 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml @@ -59,7 +59,7 @@ order by created_time desc limit ${(pageNo-1)*pageSize},${pageSize}; - select img_url from user_advice_img where del_flag = 0 and advice_Id = #{id} and type = 'resi'