From 6eda06a4aa05de19ceaa37821810e3b2e2ea9897 Mon Sep 17 00:00:00 2001 From: wl <173@qq.com> Date: 星期二, 29 十一月 2022 14:03:14 +0800 Subject: [PATCH] fix: 导出不要传参 --- ycl-common/src/main/java/com/ycl/service/user/IAdminLoginLogService.java | 4 ++ ycl-platform/src/main/java/com/ycl/mapper/equipment/EquipmentBayonetMapper.java | 4 ++ ycl-platform/src/main/java/com/ycl/service/equipment/impl/EquipmentBayonetServiceImpl.java | 6 +++ ycl-platform/src/main/resources/application-dev.yml | 7 --- ycl-common/src/main/java/com/ycl/service/user/impl/AdminLoginLogServiceImpl.java | 5 ++ ycl-platform/src/main/java/com/ycl/service/equipment/IEquipmentBayonetService.java | 2 + ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminLoginLogMapper.java | 4 ++ ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java | 2 + ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java | 1 ycl-platform/src/main/java/com/ycl/controller/cockpit/teamConstruction/TeamConstructionController.java | 16 +++----- ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java | 7 --- ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 5 ++ ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java | 2 + 13 files changed, 42 insertions(+), 23 deletions(-) diff --git a/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminLoginLogMapper.java b/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminLoginLogMapper.java index 40457eb..5d91def 100644 --- a/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminLoginLogMapper.java +++ b/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminLoginLogMapper.java @@ -6,6 +6,8 @@ import com.ycl.entity.user.UmsAdminLoginLog; import com.ycl.entity.user.vo.UmsAdminLogVO; +import java.util.List; + /** * <p> * 鍚庡彴鐢ㄦ埛鐧诲綍鏃ュ織琛� Mapper 鎺ュ彛 @@ -13,4 +15,6 @@ */ public interface UmsAdminLoginLogMapper extends BaseMapper<UmsAdminLoginLog> { Page<UmsAdminLogVO> selectByCondition(Page<UmsAdminLogVO> umsAdminLogVOPage, LogQueryParams logQueryParams); + + List<UmsAdminLogVO> selectByCondition(LogQueryParams logQueryParams); } diff --git a/ycl-common/src/main/java/com/ycl/service/user/IAdminLoginLogService.java b/ycl-common/src/main/java/com/ycl/service/user/IAdminLoginLogService.java index 2e3df25..9b18fb4 100644 --- a/ycl-common/src/main/java/com/ycl/service/user/IAdminLoginLogService.java +++ b/ycl-common/src/main/java/com/ycl/service/user/IAdminLoginLogService.java @@ -6,6 +6,8 @@ import com.ycl.entity.user.UmsAdminLoginLog; import com.ycl.entity.user.vo.UmsAdminLogVO; +import java.util.List; + /** * <p> * 鍚庡彴鐢ㄦ埛鐧诲綍鏃ュ織琛� 鏈嶅姟绫� @@ -17,4 +19,6 @@ public interface IAdminLoginLogService extends IService<UmsAdminLoginLog> { Page<UmsAdminLogVO> pageList(LogQueryParams logQueryParams); + + List<UmsAdminLogVO> List(LogQueryParams logQueryParams); } diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/AdminLoginLogServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/AdminLoginLogServiceImpl.java index 7300d92..0d713c5 100644 --- a/ycl-common/src/main/java/com/ycl/service/user/impl/AdminLoginLogServiceImpl.java +++ b/ycl-common/src/main/java/com/ycl/service/user/impl/AdminLoginLogServiceImpl.java @@ -31,4 +31,9 @@ Page<UmsAdminLogVO> umsAdminLogVOPage = new Page<UmsAdminLogVO>().setCurrent(logQueryParams.getCurrent()).setSize(logQueryParams.getSize()); return umsAdminLoginLogMapper.selectByCondition(umsAdminLogVOPage,logQueryParams); } + + @Override + public List<UmsAdminLogVO> List(LogQueryParams logQueryParams) { + return umsAdminLoginLogMapper.selectByCondition(logQueryParams); + } } diff --git a/ycl-platform/src/main/java/com/ycl/controller/cockpit/teamConstruction/TeamConstructionController.java b/ycl-platform/src/main/java/com/ycl/controller/cockpit/teamConstruction/TeamConstructionController.java index 855ea64..9867d6a 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/cockpit/teamConstruction/TeamConstructionController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/cockpit/teamConstruction/TeamConstructionController.java @@ -92,25 +92,21 @@ @LogSave(operationType = "闃熶紞寤鸿绠$悊", contain = "瀵煎嚭") @ApiImplicitParams( { - @ApiImplicitParam(name = "size", required = true, value = "椤甸潰鏁伴噺"), - @ApiImplicitParam(name = "current", required = true, value = "椤电爜"), @ApiImplicitParam(name = "departName", value = "閮ㄩ棬鍚嶇О"), @ApiImplicitParam(name = "status", value = "鐘舵��")} ) @SneakyThrows - public void export(@RequestParam() Integer size, - @RequestParam() Integer current, - @RequestParam(name = "departName", required = false) String departName, - @RequestParam(name = "status", required = false) Integer status, - HttpServletResponse response) { + public void export( + @RequestParam(name = "departName", required = false) String departName, + @RequestParam(name = "status", required = false) Integer status, + HttpServletResponse response) { Integer isDelete = 0; String sheetName = "鏁版嵁"; EasyExcelUtils.export(response, sheetName, TeamConstruction.class, iTeamConstructionService - .page(new Page<TeamConstruction>().setSize(size).setCurrent(current), new LambdaQueryWrapper<TeamConstruction>() + .list(new LambdaQueryWrapper<TeamConstruction>() .like(StringUtils.isNotBlank(departName), TeamConstruction::getName, departName) .eq(status != null, TeamConstruction::getStatus, status) - .eq(TeamConstruction::getIsDelete, isDelete)) - .getRecords()); + .eq(TeamConstruction::getIsDelete, isDelete))); } diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java index a411ee5..59cbc6f 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java @@ -78,12 +78,7 @@ @SneakyThrows @LogSave(operationType = "鍗″彛绠$悊", contain = "瀵煎嚭鍗″彛") public void export(HttpServletResponse response, - @RequestParam(required = false) Integer size, - @RequestParam(required = false) Integer current, @RequestParam(required = false) String bayonetName) { - Page<EquipmentBayonet> equipmentBayonetPage = new Page<>(); - equipmentBayonetPage.setCurrent(current); - equipmentBayonetPage.setSize(size); - EasyExcelUtils.export(response, "鏁版嵁", EquipmentBayonetVO.class, iEquipmentBayonetService.selectEquipmentPage(equipmentBayonetPage, bayonetName).getRecords()); + EasyExcelUtils.export(response, "鏁版嵁", EquipmentBayonetVO.class, iEquipmentBayonetService.selectEquipmentList(bayonetName)); } } \ No newline at end of file diff --git a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java index fa01fdc..fc15abe 100644 --- a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java +++ b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java @@ -34,5 +34,7 @@ Page<QueryForViolationVO> selectViolationPage(Page<QueryForViolationVO> setCurrent, QueryForViolationParam queryForViolationParam); + List<QueryForViolationVO> selectViolationPage(QueryForViolationParam queryForViolationParam); + Page<BaseCaseVO> selectVideoInspection(Page<Object> objectPage); } diff --git a/ycl-platform/src/main/java/com/ycl/mapper/equipment/EquipmentBayonetMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/equipment/EquipmentBayonetMapper.java index a42c080..c6d2676 100644 --- a/ycl-platform/src/main/java/com/ycl/mapper/equipment/EquipmentBayonetMapper.java +++ b/ycl-platform/src/main/java/com/ycl/mapper/equipment/EquipmentBayonetMapper.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.vo.equipment.EquipmentBayonetVO; +import java.util.List; + /** * <p> * 鍗″彛绠$悊 Mapper 鎺ュ彛 @@ -16,4 +18,6 @@ public interface EquipmentBayonetMapper extends BaseMapper<EquipmentBayonet> { Page<EquipmentBayonetVO> selectEquipmentPage(Page<EquipmentBayonet> equipmentBayonetPage, String bayonetName); + + List<EquipmentBayonetVO> selectEquipmentPage(String bayonetName); } diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java index fec2a47..7bf0b1d 100644 --- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java +++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java @@ -60,6 +60,8 @@ Page<QueryForViolationVO> selectViolation(QueryForViolationParam queryForViolationParam); + List<QueryForViolationVO> selectViolationList(QueryForViolationParam queryForViolationParam); + Page<BaseCaseVO> selectVideoInspection(Integer current); Map<String,Object> selectCount(); diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java index 0d6ed6f..f9b019a 100644 --- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java @@ -389,6 +389,11 @@ } @Override + public List<QueryForViolationVO> selectViolationList(QueryForViolationParam queryForViolationParam) { + return baseCaseMapper.selectViolationPage(queryForViolationParam); + } + + @Override public Page<BaseCaseVO> selectVideoInspection(Integer current) { return baseCaseMapper.selectVideoInspection(new Page<>(current, 1)); } diff --git a/ycl-platform/src/main/java/com/ycl/service/equipment/IEquipmentBayonetService.java b/ycl-platform/src/main/java/com/ycl/service/equipment/IEquipmentBayonetService.java index 6bc1cd3..9d23a66 100644 --- a/ycl-platform/src/main/java/com/ycl/service/equipment/IEquipmentBayonetService.java +++ b/ycl-platform/src/main/java/com/ycl/service/equipment/IEquipmentBayonetService.java @@ -17,4 +17,6 @@ */ public interface IEquipmentBayonetService extends IService<EquipmentBayonet> { Page<EquipmentBayonetVO> selectEquipmentPage(Page<EquipmentBayonet> equipmentBayonetPage, String bayonetName); + + List<EquipmentBayonetVO> selectEquipmentList(String bayonetName); } diff --git a/ycl-platform/src/main/java/com/ycl/service/equipment/impl/EquipmentBayonetServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/equipment/impl/EquipmentBayonetServiceImpl.java index 03cd60a..7256360 100644 --- a/ycl-platform/src/main/java/com/ycl/service/equipment/impl/EquipmentBayonetServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/equipment/impl/EquipmentBayonetServiceImpl.java @@ -9,6 +9,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * <p> @@ -28,4 +29,9 @@ public Page<EquipmentBayonetVO> selectEquipmentPage(Page<EquipmentBayonet> equipmentBayonetPage, String bayonetName) { return equipmentBayonetMapper.selectEquipmentPage(equipmentBayonetPage, bayonetName); } + + @Override + public List<EquipmentBayonetVO> selectEquipmentList(String bayonetName) { + return equipmentBayonetMapper.selectEquipmentPage(bayonetName); + } } diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java index 7208238..639a7d0 100644 --- a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java @@ -80,6 +80,7 @@ @Override @Transactional(rollbackFor = Exception.class) public String sendMessage(Message message) { + Message savedMessage = messageMapper.selectOne(new LambdaQueryWrapper<Message>() .eq(Message::getTargetTo, message.getTargetTo()) .eq(Message::getTargetFrom, message.getTargetFrom()) diff --git a/ycl-platform/src/main/resources/application-dev.yml b/ycl-platform/src/main/resources/application-dev.yml index cef9a78..d0b7834 100644 --- a/ycl-platform/src/main/resources/application-dev.yml +++ b/ycl-platform/src/main/resources/application-dev.yml @@ -64,10 +64,3 @@ apId: 1 sign: sign url: http://localhost:8082/sccg/text/sms_res - -point: - severIpAddress: http://localhost:8082/sccg/text/point - username: text - password: 123456 - sendIp: 192.168.3.137 - os: WinPc \ No newline at end of file -- Gitblit v1.8.0