From 1f26db0966ad66d121142f3abced0260fa896747 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 30 Jan 2023 15:03:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8F=8D=E9=A6=88=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4=E4=B8=BA=E5=85=BC?= =?UTF-8?q?=E5=AE=B9pc=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/AdviceListFormDTO.java | 21 +++++++++-- .../controller/UserAdviceController.java | 10 ++++-- .../java/com/epmet/dao/UserAdviceDao.java | 3 ++ .../service/impl/UserAdviceServiceImpl.java | 31 +++++++++++++--- .../main/resources/mapper/UserAdviceDao.xml | 36 +++++++++++++++++++ 5 files changed, 93 insertions(+), 8 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AdviceListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AdviceListFormDTO.java index 39ca1de27d..620e1b3f5e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AdviceListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AdviceListFormDTO.java @@ -1,8 +1,11 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; /** * @description: @@ -11,16 +14,28 @@ import javax.validation.constraints.Min; */ @Data public class AdviceListFormDTO { + /** + * 工作端pc调用此接口，校验参数 + */ + public interface WorkPcGroup extends CustomerClientShowGroup { + } /** * 客户id 不填查询所有 */ + @NotBlank(message = "customerId不能为空",groups = WorkPcGroup.class) private String customerId; /** * 组织id 不填查询所有 */ + @NotBlank(message = "agencyId不能为空",groups = WorkPcGroup.class) private String agencyId; + /** + * 网格id + */ + private String gridId; + /** * 是否被回复,0未回复，1回复, 传空查询所有 */ @@ -44,12 +59,14 @@ public class AdviceListFormDTO { /** * 页码 */ + @NotNull(message = "pageNo不能为空",groups = WorkPcGroup.class) @Min(1) - private int pageNo; + private Integer pageNo; /** * 页大小 */ + @NotNull(message = "pageSize不能为空",groups = WorkPcGroup.class) @Min(1) - private int pageSize; + private Integer pageSize; } 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 8ad9e5da00..e58a7ad95b 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 @@ -17,8 +17,11 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.constant.AppClientConstant; 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.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; @@ -145,8 +148,11 @@ public class UserAdviceController { * @Date 2020/11/10 9:32 */ @PostMapping("advicelist") - public Result> adviceList(@RequestBody AdviceListFormDTO dto) { - ValidatorUtils.validateEntity(dto); + public Result> adviceList(@LoginUser TokenDto tokenDto, @RequestBody AdviceListFormDTO dto) { + if (AppClientConstant.APP_GOV.equals(tokenDto.getApp())) { + //工作端调用，校验参数 + ValidatorUtils.validateEntity(dto, AdviceListFormDTO.WorkPcGroup.class); + } //校验时间 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 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 3fd6a4f205..7497af5dbd 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 @@ -19,6 +19,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.UserAdviceDTO; +import com.epmet.dto.form.AdviceListFormDTO; import com.epmet.dto.result.MyAdviceListResultDTO; import com.epmet.entity.UserAdviceEntity; import org.apache.ibatis.annotations.Mapper; @@ -44,4 +45,6 @@ public interface UserAdviceDao extends BaseDao { @Param("userId") String loginUserId); int saveUserAdvice(UserAdviceDTO dto); + + List selectListAdvice(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 a6480dca76..6a8b259095 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 @@ -20,8 +20,6 @@ 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.constant.FieldConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -52,6 +50,8 @@ import com.epmet.feign.OperCrmOpenFeignClient; import com.epmet.service.UserAdviceImgService; import com.epmet.service.UserAdviceService; import com.epmet.service.UserResiInfoService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import io.jsonwebtoken.lang.Collections; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; @@ -242,7 +242,7 @@ public class UserAdviceServiceImpl extends BaseServiceImpl adviceList(AdviceListFormDTO dto) { - //page分页 + /*//page分页 Page page = new Page<>(dto.getPageNo(), dto.getPageSize()); //时间降序 page.addOrder(OrderItem.desc(FieldConstant.CREATED_TIME)); @@ -300,7 +300,30 @@ public class UserAdviceServiceImpl extends BaseServiceImpl list = baseDao.selectListAdvice(dto); + List records=ConvertUtils.sourceToTarget(list,AdviceListResultDTO.class); + //拼接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()); + } + } + PageInfo pageInfo = new PageInfo<>(records); + return new PageData<>(records, pageInfo.getTotal()); } /** 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 53433e05ec..6ed2dbc8ae 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 @@ -116,4 +116,40 @@ 0,0,#{userId},#{adviceTime},#{userId},#{adviceTime} ) + +