From c7f51537e8c83a1fce3022002c23ee10dafde9f5 Mon Sep 17 00:00:00 2001 From: luyan Date: Thu, 24 Aug 2023 13:35:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=93=81?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=85=B6=E4=BB=96bug=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/CanteenDishesServiceImpl.java | 1 + .../com/epmet/service/impl/CanteenMenusServiceImpl.java | 6 ++++++ .../epmet/service/impl/CommunityCanteenServiceImpl.java | 9 +++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CanteenDishesServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CanteenDishesServiceImpl.java index b5dd6ed0b3..947652debb 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CanteenDishesServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CanteenDishesServiceImpl.java @@ -71,6 +71,7 @@ public class CanteenDishesServiceImpl extends BaseServiceImpl 0) { - entity.setBusinessHours(StringUtils.join(dto.getBusinessHours())); + entity.setBusinessHours(StringUtils.join(dto.getBusinessHours(), ",")); } if (null != dto.getThreeMeals() && dto.getThreeMeals().length > 0) { - entity.setThreeMeals(StringUtils.join(dto.getThreeMeals())); + entity.setThreeMeals(StringUtils.join(dto.getThreeMeals(), ",")); + } + if (StringUtils.isNotEmpty(dto.getAgencyId())) { + AgencyInfoCache info = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId()); + entity.setAgencyId(PidUtils.convertPid2OrgIdPath(dto.getAgencyId(), info.getPids())); + entity.setCustomerId(info.getCustomerId()); } updateById(entity); } From 74a5e4dde2e6556111b58dae313c10aca3e0c5af Mon Sep 17 00:00:00 2001 From: luyan Date: Mon, 28 Aug 2023 09:14:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=95=E8=AF=89?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=9B=E5=A2=9E=E5=8A=A0=E7=A4=BE=E5=8C=BA?= =?UTF-8?q?=E9=A3=9F=E5=A0=82=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/CanteenMenusDTO.java | 9 + .../controller/CanteenMenusController.java | 14 ++ .../CommunityCanteenController.java | 13 ++ .../java/com/epmet/dao/CanteenMenusDao.java | 1 + .../epmet/service/CanteenMenusService.java | 9 + .../service/CommunityCanteenService.java | 8 + .../service/impl/CanteenMenusServiceImpl.java | 48 +++- .../impl/CommunityCanteenServiceImpl.java | 70 +++++- .../java/com/epmet/dto/IcComplaintsDTO.java | 63 ++++++ .../com/epmet/dto/IcComplaintsReplyDTO.java | 54 +++++ .../controller/IcComplaintsController.java | 112 +++++++++ .../IcComplaintsReplyController.java | 72 ++++++ .../java/com/epmet/dao/IcComplaintsDao.java | 16 ++ .../com/epmet/dao/IcComplaintsReplyDao.java | 16 ++ .../com/epmet/entity/IcComplaintsEntity.java | 61 +++++ .../epmet/entity/IcComplaintsReplyEntity.java | 41 ++++ .../com/epmet/excel/IcComplaintsExcel.java | 54 +++++ .../epmet/excel/IcComplaintsReplyExcel.java | 51 +++++ .../service/IcComplaintsReplyService.java | 78 +++++++ .../epmet/service/IcComplaintsService.java | 92 ++++++++ .../impl/IcComplaintsReplyServiceImpl.java | 82 +++++++ .../service/impl/IcComplaintsServiceImpl.java | 213 ++++++++++++++++++ .../main/resources/mapper/IcComplaintsDao.xml | 22 ++ .../resources/mapper/IcComplaintsReplyDao.xml | 21 ++ 24 files changed, 1215 insertions(+), 5 deletions(-) create mode 100755 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcComplaintsDTO.java create mode 100755 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcComplaintsReplyDTO.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcComplaintsController.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcComplaintsReplyController.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcComplaintsDao.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcComplaintsReplyDao.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcComplaintsEntity.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcComplaintsReplyEntity.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcComplaintsExcel.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcComplaintsReplyExcel.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcComplaintsReplyService.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcComplaintsService.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcComplaintsReplyServiceImpl.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcComplaintsServiceImpl.java create mode 100755 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcComplaintsDao.xml create mode 100755 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcComplaintsReplyDao.xml diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/CanteenMenusDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/CanteenMenusDTO.java index 5f9f6781db..644b64089d 100755 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/CanteenMenusDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/CanteenMenusDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto; import lombok.Data; import java.io.Serializable; +import java.util.List; /** @@ -51,5 +52,13 @@ public class CanteenMenusDTO implements Serializable { */ private Integer def; + /** + * 菜单名 + */ private String dishesName; + + /** + * 菜品 + */ + private List dishes; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/CanteenMenusController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/CanteenMenusController.java index c48c9c680c..eb5cd42075 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/CanteenMenusController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/CanteenMenusController.java @@ -1,7 +1,9 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -89,4 +91,16 @@ public class CanteenMenusController { return new Result(); } + /** + * 根据食堂ID获取菜单 + * @param tokenDto + * @param params + * @return + */ + @NoRepeatSubmit + @RequestMapping("getCanteenMenusById") + public Result> getCanteenMenusById(@LoginUser TokenDto tokenDto, @RequestBody Map params){ + return new Result>().ok(canteenMenusService.getCanteenMenusById(tokenDto.getUserId(),params)); + } + } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/CommunityCanteenController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/CommunityCanteenController.java index 3df06a3f6c..e690aa34e3 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/CommunityCanteenController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/CommunityCanteenController.java @@ -1,7 +1,9 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -67,4 +69,15 @@ public class CommunityCanteenController { return new Result(); } + /** + * 居民端获取食堂列表 + * + * @param tokenDto + * @return + */ + @NoRepeatSubmit + @RequestMapping("getCanteenList") + public Result> getCanteenList(@LoginUser TokenDto tokenDto, @RequestBody Map params) { + return new Result>().ok(communityCanteenService.getCanteenList(tokenDto.getUserId(), params)); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/CanteenMenusDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/CanteenMenusDao.java index c38a990c8a..07e5ecb65d 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/CanteenMenusDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/CanteenMenusDao.java @@ -1,6 +1,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.CanteenMenusDTO; import com.epmet.entity.CanteenMenusEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/CanteenMenusService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/CanteenMenusService.java index dc61ddb619..53f4c28678 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/CanteenMenusService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/CanteenMenusService.java @@ -88,4 +88,13 @@ public interface CanteenMenusService extends BaseService { * @param dto */ void saveOrUpdateDto(CanteenMenusDTO dto); + + + /** + * 根据食堂ID获取菜单 + * @param userId + * @param params + * @return + */ + List getCanteenMenusById(String userId, Map params); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/CommunityCanteenService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/CommunityCanteenService.java index 5859afd1eb..54fef35e3d 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/CommunityCanteenService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/CommunityCanteenService.java @@ -78,8 +78,16 @@ public interface CommunityCanteenService extends BaseService getCanteenList(String userId, Map params); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CanteenMenusServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CanteenMenusServiceImpl.java index 4d25ce067e..5dba0703ee 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CanteenMenusServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CanteenMenusServiceImpl.java @@ -7,17 +7,21 @@ 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.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.PidUtils; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.CanteenMenusDao; import com.epmet.dto.CanteenDishesDTO; import com.epmet.dto.CanteenMenusDTO; import com.epmet.dto.CanteenMenusListDTO; import com.epmet.dto.result.LoginUserDetailsResultDTO; import com.epmet.entity.CanteenMenusEntity; +import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.remote.EpmetUserRemoteService; import com.epmet.service.CanteenDishesService; import com.epmet.service.CanteenMenusService; @@ -50,6 +54,9 @@ public class CanteenMenusServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -148,8 +155,8 @@ public class CanteenMenusServiceImpl extends BaseServiceImpl getCanteenMenusById(String userId, Map params) { + // 判断是否注册居民 + Result isResiFlag = userOpenFeignClient.getIsResiFlag(userId); + if (!isResiFlag.success()) { + throw new EpmetException("查询是否注册居民失败..."); + } + if (!isResiFlag.getData()) { + throw new EpmetException(EpmetErrorCode.NOT_REGEIST_RESI.getCode()); + } + String canteenId = (String) params.get("canteenId"); + String startTime = (String) params.get("startTime"); + String endTime = (String) params.get("endTime"); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotEmpty(canteenId), "CANTEEN_ID", canteenId); + if (StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime)) { + wrapper.between("START_TIME", startTime, endTime); + } + //获取菜单 + List menusDTOList = baseDao.selectList(wrapper); + if (!CollectionUtils.isEmpty(menusDTOList)) { + List dtoList = ConvertUtils.sourceToTarget(menusDTOList, CanteenMenusDTO.class); + menusDTOList.forEach(entity -> { + dtoList.forEach(dto -> { + if (entity.getId().equals(dto.getId())) { + buildDate(dto, entity); + List dishes = canteenDishesService.selectByIds(Arrays.asList(entity.getDishesMenus().split(","))); + dto.setDishes(dishes); + String names = dishes.stream().map(CanteenDishesDTO::getName).collect(Collectors.joining("、")); + dto.setDishesName(names); + } + }); + }); + } + return null; + } + private List getDateList(String startDate, String endDate) { if (StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)) { return DateUtil.rangeToList(DateUtil.parseDate(startDate), DateUtil.parseDate(endDate), DateField.DAY_OF_YEAR); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CommunityCanteenServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CommunityCanteenServiceImpl.java index 92bbe741b5..57e5c4a73e 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CommunityCanteenServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/CommunityCanteenServiceImpl.java @@ -1,18 +1,23 @@ package com.epmet.service.impl; +import com.alibaba.fastjson.support.geo.Point; 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.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.PidUtils; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.CommunityCanteenDao; import com.epmet.dto.CommunityCanteenDTO; import com.epmet.dto.result.LoginUserDetailsResultDTO; import com.epmet.entity.CommunityCanteenEntity; +import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.remote.EpmetUserRemoteService; import com.epmet.service.CommunityCanteenService; import org.apache.commons.lang3.StringUtils; @@ -21,9 +26,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 日照：社区食堂 @@ -37,6 +40,9 @@ public class CommunityCanteenServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -167,4 +173,62 @@ public class CommunityCanteenServiceImpl extends BaseServiceImpl getCanteenList(String userId, Map params) { + // 判断是否注册居民 + Result isResiFlag = userOpenFeignClient.getIsResiFlag(userId); + if (!isResiFlag.success()) { + throw new EpmetException("查询是否注册居民失败..."); + } + if (!isResiFlag.getData()) { + throw new EpmetException(EpmetErrorCode.NOT_REGEIST_RESI.getCode()); + } + QueryWrapper wrapper = new QueryWrapper<>(); + String name = (String) params.get("name"); + String lon = (String) params.get("longitude"); + String lat = (String) params.get("latitude"); + Point coordinate = new Point(); + coordinate.setLongitude(Double.valueOf(lon)); + coordinate.setLatitude(Double.valueOf(lat)); + wrapper.like(StringUtils.isNotBlank(name), FieldConstant.NAME, name); + IPage page = baseDao.selectPage(getPage(new HashMap<>()), wrapper); + PageData pageData = getPageData(page, CommunityCanteenDTO.class); + Map canteentMap = new HashMap<>(); + //坐标计算容器 + Set points = new HashSet<>(); + page.getRecords().forEach(entity -> { + pageData.getList().forEach(dto -> { + if (entity.getId().equals(dto.getId())) { + //获取所有食堂的坐标系 + Point point = new Point(); + point.setLongitude(Double.valueOf(dto.getLongitude())); + point.setLatitude(Double.valueOf(dto.getLatitude())); + canteentMap.put(point, dto.getId()); + points.add(point); + dto.setThreeMeals(entity.getThreeMeals().split(",")); + dto.setBusinessHours(entity.getBusinessHours().split(",")); + dto.setAgencyId(entity.getAgencyId().substring(entity.getAgencyId().lastIndexOf(":") + 1)); + dto.setAgencyName(CustomerOrgRedis.getAgencyInfo(dto.getAgencyId()).getOrganizationName()); + } + }); + }); + if (!CollectionUtils.isEmpty(points)) { + Point result = Collections.min(points, new Comparator() { + @Override + public int compare(Point o1, Point o2) { + double tempLon = 0.0; + double tempLan = 0.0; + if (o1.getLongitude() - coordinate.getLongitude() < 0) { + tempLon = o1.getLongitude(); + } + if (o2.getLongitude() - coordinate.getLongitude() < 0) { + + } + return 0; + } + }); + } + return pageData; + } + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcComplaintsDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcComplaintsDTO.java new file mode 100755 index 0000000000..254c4b142c --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcComplaintsDTO.java @@ -0,0 +1,63 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 日照：投诉建议 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-08-25 + */ +@Data +public class IcComplaintsDTO implements Serializable { + + private static final long serialVersionUID = -3506231337265221127L; + + /** + * 主键ID + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 投诉人ID + */ + private String resiUserId; + + /** + * 投诉人姓名 + */ + private String userName; + + /** + * 投诉人电话 + */ + private String mobile; + + /** + * 投诉内容 + */ + private String content; + + /** + * 处理状态 0、待处理 1、处理中 2、已完成 + */ + private Integer state; + + /** + * 投诉类型 + */ + private Integer type; + + /** + * 照片附件 + */ + private String[] imgs; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcComplaintsReplyDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcComplaintsReplyDTO.java new file mode 100755 index 0000000000..4d1d42fbf2 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcComplaintsReplyDTO.java @@ -0,0 +1,54 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 日照：投诉建议处理表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-08-25 + */ +@Data +public class IcComplaintsReplyDTO implements Serializable { + + + private static final long serialVersionUID = 5978243906188087190L; + /** + * 主键ID + */ + private Integer id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 投诉建议主键ID + */ + private String complantsId; + + /** + * 处理状态 0、待处理 1、处理中 2、已完成 + */ + private Integer state; + + /** + * 处理情况 + */ + private String content; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcComplaintsController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcComplaintsController.java new file mode 100755 index 0000000000..f2917e2017 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcComplaintsController.java @@ -0,0 +1,112 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.IcComplaintsDTO; +import com.epmet.service.IcComplaintsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + + +/** + * 日照：投诉建议 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-08-25 + */ +@RestController +@RequestMapping("icComplaints") +public class IcComplaintsController { + + @Autowired + private IcComplaintsService icComplaintsService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params) { + PageData page = icComplaintsService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { + IcComplaintsDTO data = icComplaintsService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcComplaintsDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icComplaintsService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcComplaintsDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icComplaintsService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids) { + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icComplaintsService.delete(ids); + return new Result(); + } + + /** + * 小程序居民端上报投诉 + */ + @NoRepeatSubmit + @PostMapping("addComplaints") + public Result addComplaints(@LoginUser TokenDto tokenDto, @RequestBody IcComplaintsDTO dto) { + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + dto.setCustomerId(tokenDto.getCustomerId()); + dto.setResiUserId(tokenDto.getUserId()); + icComplaintsService.addComplaints(dto); + return new Result(); + } + + /** + * 投诉详情 + */ + @NoRepeatSubmit + @PostMapping("getComplaintsById") + public Result getComplaintsById(@LoginUser TokenDto tokenDto, @RequestParam Map params) { + if (null != tokenDto) { + return new Result().ok(icComplaintsService.get(params.get("id"))); + } else { + throw new EpmetException("请登陆后查询！"); + } + } + + /** + * 居民投诉列表 + * + * @param tokenDto + * @return + */ + @NoRepeatSubmit + @PostMapping("myComplanintsList") + public Result> myComplanintsList(@LoginUser TokenDto tokenDto, @RequestParam Map params) { + List result = icComplaintsService.myComplanintsList(tokenDto.getUserId(), params); + return new Result>().ok(result); + } +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcComplaintsReplyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcComplaintsReplyController.java new file mode 100755 index 0000000000..ea445f8aa6 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcComplaintsReplyController.java @@ -0,0 +1,72 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.IcComplaintsReplyDTO; +import com.epmet.service.IcComplaintsReplyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +/** + * 日照：投诉建议处理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-08-25 + */ +@RestController +@RequestMapping("icComplaintsReply") +public class IcComplaintsReplyController { + + @Autowired + private IcComplaintsReplyService icComplaintsReplyService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icComplaintsReplyService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcComplaintsReplyDTO data = icComplaintsReplyService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcComplaintsReplyDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icComplaintsReplyService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcComplaintsReplyDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icComplaintsReplyService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icComplaintsReplyService.delete(ids); + return new Result(); + } + + + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcComplaintsDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcComplaintsDao.java new file mode 100755 index 0000000000..d88291dd8a --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcComplaintsDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcComplaintsEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 日照：投诉建议 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-08-25 + */ +@Mapper +public interface IcComplaintsDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcComplaintsReplyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcComplaintsReplyDao.java new file mode 100755 index 0000000000..6e0bcc68d1 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcComplaintsReplyDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcComplaintsReplyEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 日照：投诉建议处理表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-08-25 + */ +@Mapper +public interface IcComplaintsReplyDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcComplaintsEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcComplaintsEntity.java new file mode 100755 index 0000000000..f79d740663 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcComplaintsEntity.java @@ -0,0 +1,61 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 日照：投诉建议 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ic_complaints") +public class IcComplaintsEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = -3726190218061182367L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 投诉人ID + */ + private String resiUserId; + + /** + * 投诉人姓名 + */ + private String userName; + + /** + * 投诉人电话 + */ + private String mobile; + + /** + * 投诉内容 + */ + private String content; + + /** + * 处理状态 0、待处理 1、处理中 2、已完成 + */ + private Integer state; + + /** + * 投诉类型 + */ + private Integer type; + + /** + * 投诉附件 + */ + private String imgs; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcComplaintsReplyEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcComplaintsReplyEntity.java new file mode 100755 index 0000000000..07d4475eab --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcComplaintsReplyEntity.java @@ -0,0 +1,41 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 日照：投诉建议处理表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-08-25 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_complaints_reply") +public class IcComplaintsReplyEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 3939092291283125627L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 投诉建议主键ID + */ + private String complantsId; + + /** + * 处理状态 0、待处理 1、处理中 2、已完成 + */ + private Integer state; + + /** + * 处理情况 + */ + private String content; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcComplaintsExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcComplaintsExcel.java new file mode 100755 index 0000000000..8432b0e4d6 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcComplaintsExcel.java @@ -0,0 +1,54 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 日照：投诉建议 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-08-25 + */ +@Data +public class IcComplaintsExcel { + + @Excel(name = "主键ID") + private String id; + + @Excel(name = "客户ID") + private String customerId; + + @Excel(name = "投诉人ID") + private String resiUserId; + + @Excel(name = "投诉内容") + private String content; + + @Excel(name = "处理状态 0、待处理 1、处理中 2、已完成") + private Integer state; + + @Excel(name = "投诉类型") + private Integer type; + + @Excel(name = "删除标识 0未删除、1已删除") + private String delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcComplaintsReplyExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcComplaintsReplyExcel.java new file mode 100755 index 0000000000..178196b11e --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcComplaintsReplyExcel.java @@ -0,0 +1,51 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 日照：投诉建议处理表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-08-25 + */ +@Data +public class IcComplaintsReplyExcel { + + @Excel(name = "主键ID") + private Integer id; + + @Excel(name = "客户ID") + private String customerId; + + @Excel(name = "投诉建议主键ID") + private String complantsId; + + @Excel(name = "处理状态 0、待处理 1、处理中 2、已完成") + private Integer state; + + @Excel(name = "处理情况") + private String content; + + @Excel(name = "删除标识 0未删除、1已删除") + private String delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcComplaintsReplyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcComplaintsReplyService.java new file mode 100755 index 0000000000..bb12522727 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcComplaintsReplyService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcComplaintsReplyDTO; +import com.epmet.entity.IcComplaintsReplyEntity; + +import java.util.List; +import java.util.Map; + +/** + * 日照：投诉建议处理表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-08-25 + */ +public interface IcComplaintsReplyService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2023-08-25 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2023-08-25 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcComplaintsReplyDTO + * @author generator + * @date 2023-08-25 + */ + IcComplaintsReplyDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2023-08-25 + */ + void save(IcComplaintsReplyDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2023-08-25 + */ + void update(IcComplaintsReplyDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2023-08-25 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcComplaintsService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcComplaintsService.java new file mode 100755 index 0000000000..539e28a815 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcComplaintsService.java @@ -0,0 +1,92 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcComplaintsDTO; +import com.epmet.entity.IcComplaintsEntity; + +import java.util.List; +import java.util.Map; + +/** + * 日照：投诉建议 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-08-25 + */ +public interface IcComplaintsService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2023-08-25 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2023-08-25 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcComplaintsDTO + * @author generator + * @date 2023-08-25 + */ + IcComplaintsDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2023-08-25 + */ + void save(IcComplaintsDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2023-08-25 + */ + void update(IcComplaintsDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2023-08-25 + */ + void delete(String[] ids); + + /** + * 居民端上报投诉 + */ + void addComplaints(IcComplaintsDTO dto); + + /** + * 居民投诉列表 + * + * @param userId + * @return + */ + List myComplanintsList(String userId,Map params); + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcComplaintsReplyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcComplaintsReplyServiceImpl.java new file mode 100755 index 0000000000..78885c467a --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcComplaintsReplyServiceImpl.java @@ -0,0 +1,82 @@ +package com.epmet.service.impl; + +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.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dao.IcComplaintsReplyDao; +import com.epmet.dto.IcComplaintsReplyDTO; +import com.epmet.entity.IcComplaintsReplyEntity; +import com.epmet.service.IcComplaintsReplyService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 日照：投诉建议处理表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-08-25 + */ +@Service +public class IcComplaintsReplyServiceImpl extends BaseServiceImpl implements IcComplaintsReplyService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcComplaintsReplyDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcComplaintsReplyDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IcComplaintsReplyDTO get(String id) { + IcComplaintsReplyEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcComplaintsReplyDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcComplaintsReplyDTO dto) { + IcComplaintsReplyEntity entity = ConvertUtils.sourceToTarget(dto, IcComplaintsReplyEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcComplaintsReplyDTO dto) { + IcComplaintsReplyEntity entity = ConvertUtils.sourceToTarget(dto, IcComplaintsReplyEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcComplaintsServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcComplaintsServiceImpl.java new file mode 100755 index 0000000000..6d1df812a9 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcComplaintsServiceImpl.java @@ -0,0 +1,213 @@ +package com.epmet.service.impl; + +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.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.page.PageData; +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.utils.Result; +import com.epmet.commons.tools.utils.ScanContentUtils; +import com.epmet.dao.IcComplaintsDao; +import com.epmet.dto.IcComplaintsDTO; +import com.epmet.dto.form.CommonUserIdFormDTO; +import com.epmet.dto.result.ExtUserInfoResultDTO; +import com.epmet.dto.result.LoginUserDetailsResultDTO; +import com.epmet.entity.IcComplaintsEntity; +import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.remote.EpmetUserRemoteService; +import com.epmet.service.IcComplaintsService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import javax.annotation.Resource; +import java.util.*; + +/** + * 日照：投诉建议 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-08-25 + */ +@Service +public class IcComplaintsServiceImpl extends BaseServiceImpl implements IcComplaintsService { + + @Value("${openapi.scan.server.url}") + private String scanApiUrl; + + @Value("${openapi.scan.method.textSyncScan}") + private String textSyncScanMethod; + + @Resource + private EpmetUserRemoteService remoteService; + + @Resource + private EpmetUserOpenFeignClient openFeignClient; + + @Resource + private EpmetUserOpenFeignClient userOpenFeignClient; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcComplaintsDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + return ConvertUtils.sourceToTarget(entityList, IcComplaintsDTO.class); + } + + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + String userName = (String) params.get("userName"); + String state = (String) params.get("state"); + String type = (String) params.get("type"); + String content = (String) params.get("content"); + String startTime = (String) params.get("startTime"); + String endTime = (String) params.get("endTime"); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.like(StringUtils.isNotEmpty(userName), "USER_NAME", userName); + wrapper.eq(StringUtils.isNotEmpty(state), FieldConstant.STATE_HUMP, state); + wrapper.eq(StringUtils.isNotEmpty(type), "TYPE", type); + wrapper.like(StringUtils.isNotEmpty(content), "CONTENT", content); + wrapper.between(StringUtils.isNotEmpty(startTime), "CREATED_TIME", startTime, endTime); + return wrapper; + } + + @Override + public IcComplaintsDTO get(String id) { + IcComplaintsEntity entity = baseDao.selectById(id); + IcComplaintsDTO result = ConvertUtils.sourceToTarget(entity, IcComplaintsDTO.class); + if (StringUtils.isNotEmpty(entity.getImgs())) { + result.setImgs(entity.getImgs().split(",")); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcComplaintsDTO dto) { + IcComplaintsEntity entity = ConvertUtils.sourceToTarget(dto, IcComplaintsEntity.class); + if (StringUtils.isNotEmpty(dto.getResiUserId())) { + CommonUserIdFormDTO param = new CommonUserIdFormDTO(); + param.setUserId(dto.getResiUserId()); + ExtUserInfoResultDTO userInfo = openFeignClient.extUserInfo(param).getData(); + if (null != userInfo) { + dto.setUserName(userInfo.getRealName()); + dto.setMobile(userInfo.getMobile()); + } else { + throw new EpmetException("未查询到当前用户信息，请联系管理员！"); + } + } else { + throw new EpmetException("未能获取到当前用户，请联系管理员！"); + } + LoginUserDetailsResultDTO userDetails = remoteService.getLoginUserDetails(); + entity.setCustomerId(userDetails.getCustomerId()); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcComplaintsDTO dto) { + IcComplaintsEntity entity = ConvertUtils.sourceToTarget(dto, IcComplaintsEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public void addComplaints(IcComplaintsDTO dto) { + // 判断是否注册居民 + Result isResiFlag = userOpenFeignClient.getIsResiFlag(dto.getResiUserId()); + if (!isResiFlag.success()) { + throw new EpmetException("查询是否注册居民失败..."); + } + if (!isResiFlag.getData()) { + throw new EpmetException(EpmetErrorCode.NOT_REGEIST_RESI.getCode()); + } + //审查用户提交内容 + scanContent(dto.getContent()); + IcComplaintsEntity entity = ConvertUtils.sourceToTarget(dto, IcComplaintsEntity.class); + if (StringUtils.isNotEmpty(dto.getResiUserId())) { + CommonUserIdFormDTO param = new CommonUserIdFormDTO(); + param.setUserId(dto.getResiUserId()); + ExtUserInfoResultDTO userInfo = openFeignClient.extUserInfo(param).getData(); + if (null != userInfo) { + entity.setUserName(userInfo.getRealName()); + entity.setMobile(userInfo.getMobile()); + entity.setState(0); + } else { + throw new EpmetException("查询用户信息失败" + dto.getResiUserId()); + } + } + if (!CollectionUtils.isEmpty(Arrays.asList(dto.getImgs()))) { + entity.setImgs(StringUtils.join(dto.getImgs(), ",")); + } + insert(entity); + } + + @Override + public List myComplanintsList(String userId, Map params) { + QueryWrapper wrapper = new QueryWrapper<>(); + String state = (String) params.get("state"); + wrapper.eq(StringUtils.isNotBlank(userId), "RESI_USER_ID", userId); + wrapper.eq(StringUtils.isNotBlank(state), "STATE", state); + List entityList = baseDao.selectList(wrapper); + List result; + if (!CollectionUtils.isEmpty(entityList)) { + result = ConvertUtils.sourceToTarget(entityList, IcComplaintsDTO.class); + entityList.forEach(entity -> { + result.forEach(dto -> { + if (entity.getId().equals(dto.getId())) { + dto.setImgs(entity.getImgs().split(",")); + } + }); + }); + return result; + } + return new ArrayList<>(); + } + + /** + * 检查上报内容是否合规 + * + * @param eventContent + */ + private void scanContent(String eventContent) { + //事件内容 + if (StringUtils.isNotBlank(eventContent)) { + TextScanParamDTO textScanParamDTO = new TextScanParamDTO(); + TextTaskDTO taskDTO = new TextTaskDTO(); + taskDTO.setContent(eventContent); + taskDTO.setDataId(UUID.randomUUID().toString().replace("-", "")); + textScanParamDTO.getTasks().add(taskDTO); + Result textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); + if (!textSyncScanResult.success()) { + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode()); + } else { + if (!textSyncScanResult.getData().isAllPass()) { + throw new EpmetException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode(), EpmetErrorCode.TEXT_SCAN_FAILED.getMsg()); + } + } + } + } +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcComplaintsDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcComplaintsDao.xml new file mode 100755 index 0000000000..85f68c4ec6 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcComplaintsDao.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcComplaintsReplyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcComplaintsReplyDao.xml new file mode 100755 index 0000000000..526874f17a --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcComplaintsReplyDao.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file