From e5f41d2909b40c7f3c223bd0955325f2868d0495 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 13 Oct 2021 17:09:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E7=A8=8B=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TripReportController.java | 50 +++++++++++++++++++ .../modules/epidemic/dao/TripReportDao.java | 14 +++++- .../epidemic/service/TripReportService.java | 39 +++++++++++++++ .../service/impl/TripReportServiceImpl.java | 40 +++++++++++++++ .../mapper/epidemic/TripReportDao.xml | 11 ++++ 5 files changed, 153 insertions(+), 1 deletion(-) diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/TripReportController.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/TripReportController.java index 81ba1c1..d61ebce 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/TripReportController.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/TripReportController.java @@ -25,6 +25,8 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.dto.GetTripInfoFormDTO; +import com.elink.esua.epdc.dto.SaveTripInfoFormDTO; import com.elink.esua.epdc.dto.TripReportDTO; import com.elink.esua.epdc.modules.epidemic.excel.TripReportExcel; import com.elink.esua.epdc.modules.epidemic.service.TripReportService; @@ -91,4 +93,52 @@ public class TripReportController { ExcelUtils.exportExcelToTarget(response, null, list, TripReportExcel.class); } + /** + * @describe: 行程上报 + * @author wangtong + * @date 2021/10/13 10:50 + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("saveTripInfo") + public Result saveTripInfo( @RequestBody SaveTripInfoFormDTO formDto) { + return tripReportService.saveTripInfo(formDto); + } + + /** + * @describe: 我的上报列表 + * @author wangtong + * @date 2021/10/13 13:37 + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getTripInfoList") + public Result getTripInfoList(@RequestBody GetTripInfoFormDTO formDto) { + return tripReportService.getTripInfoList(formDto); + } + + /** + * @describe: 上报详情 + * @author wangtong + * @date 2021/10/13 13:37 + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getTripInfoDetail") + public Result getTripInfoDetail(@RequestBody GetTripInfoFormDTO formDto) { + return tripReportService.getTripInfoDetail(formDto); + } + + /** + * @describe: 删除上报信息 + * @author wangtong + * @date 2021/10/13 14:17 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @DeleteMapping("deleteTripById") + public Result deleteTripById(@RequestBody GetTripInfoFormDTO formDto) { + return tripReportService.deleteTripById(formDto); + } + } \ No newline at end of file diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/TripReportDao.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/TripReportDao.java index 0dbe177..4624bd1 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/TripReportDao.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/TripReportDao.java @@ -18,9 +18,13 @@ package com.elink.esua.epdc.modules.epidemic.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.GetTripInfoFormDTO; +import com.elink.esua.epdc.dto.TripListDTO; import com.elink.esua.epdc.modules.epidemic.entity.TripReportEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 行程上报信息 * @@ -29,5 +33,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface TripReportDao extends BaseDao { - + + /** + * @describe: 我的上报列表 + * @author wangtong + * @date 2021/10/13 16:58 + * @params [formDto] + * @return java.util.List + */ + List getTripInfoList(GetTripInfoFormDTO formDto); } \ No newline at end of file diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/TripReportService.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/TripReportService.java index e2fe3c5..ccb3ad6 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/TripReportService.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/TripReportService.java @@ -19,6 +19,9 @@ package com.elink.esua.epdc.modules.epidemic.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.GetTripInfoFormDTO; +import com.elink.esua.epdc.dto.SaveTripInfoFormDTO; import com.elink.esua.epdc.dto.TripReportDTO; import com.elink.esua.epdc.modules.epidemic.entity.TripReportEntity; @@ -92,4 +95,40 @@ public interface TripReportService extends BaseService { * @date 2021-10-13 */ void delete(String[] ids); + + /** + * @describe: 行程上报 + * @author wangtong + * @date 2021/10/13 10:50 + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result saveTripInfo(SaveTripInfoFormDTO formDto); + + /** + * @describe: 我的上报列表 + * @author wangtong + * @date 2021/10/13 13:37 + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getTripInfoList(GetTripInfoFormDTO formDto); + + /** + * @describe: 上报详情 + * @author wangtong + * @date 2021/10/13 13:37 + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getTripInfoDetail(GetTripInfoFormDTO formDto); + + /** + * @describe: 删除上报信息 + * @author wangtong + * @date 2021/10/13 14:17 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result deleteTripById(GetTripInfoFormDTO formDto); } \ No newline at end of file diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java index fc82b2f..ba57674 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java @@ -21,13 +21,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.GetTripInfoFormDTO; +import com.elink.esua.epdc.dto.SaveTripInfoFormDTO; +import com.elink.esua.epdc.dto.TripListDTO; import com.elink.esua.epdc.dto.TripReportDTO; import com.elink.esua.epdc.modules.epidemic.dao.TripReportDao; import com.elink.esua.epdc.modules.epidemic.entity.TripReportEntity; import com.elink.esua.epdc.modules.epidemic.redis.TripReportRedis; import com.elink.esua.epdc.modules.epidemic.service.TripReportService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -43,6 +49,7 @@ import java.util.Map; * @author qu qu@elink-cn.com * @since v1.0.0 2021-10-13 */ +@Slf4j @Service public class TripReportServiceImpl extends BaseServiceImpl implements TripReportService { @@ -101,4 +108,37 @@ public class TripReportServiceImpl extends BaseServiceImpl result = baseDao.getTripInfoList(formDto); + return new Result().ok(result); + } + + @Override + public Result getTripInfoDetail(GetTripInfoFormDTO formDto) { + TripReportEntity entity = selectById(formDto.getId()); + return new Result().ok(entity); + } + + @Override + public Result deleteTripById(GetTripInfoFormDTO formDto) { + Boolean result = deleteById(formDto.getId()); + if(result){ + return new Result().ok("操作成功！"); + }else{ + log.info("formDto"+formDto); + return new Result().ok("操作失败，请联系管理员"); + } + + } + } \ No newline at end of file diff --git a/epdc-cloud-custom/src/main/resources/mapper/epidemic/TripReportDao.xml b/epdc-cloud-custom/src/main/resources/mapper/epidemic/TripReportDao.xml index 8ed10b3..d127f58 100644 --- a/epdc-cloud-custom/src/main/resources/mapper/epidemic/TripReportDao.xml +++ b/epdc-cloud-custom/src/main/resources/mapper/epidemic/TripReportDao.xml @@ -33,6 +33,17 @@ + \ No newline at end of file