From 07e4b1114feadc19478847a9bcda869b5d6a5bf7 Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期五, 02 九月 2022 14:23:10 +0800 Subject: [PATCH] 项目目录结构调整 --- equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java | 81 ++++++++++++++++++++++++++++++++-------- 1 files changed, 64 insertions(+), 17 deletions(-) diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java index b3b561c..54629c8 100644 --- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java +++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java @@ -2,24 +2,35 @@ import com.alibaba.fastjson.JSONObject; -import com.gkhy.safePlatform.equipment.entity.*; -import com.gkhy.safePlatform.equipment.model.dto.resp.KeypointEquipmentInfoDto; -import com.gkhy.safePlatform.equipment.service.KeypointEquipmentInfoService; -import com.google.common.collect.Lists; -import org.springframework.web.bind.annotation.*; +import com.gkhy.safePlatform.commons.enums.ResultCodes; import com.gkhy.safePlatform.commons.query.PageQuery; +import com.gkhy.safePlatform.commons.utils.BeanCopyUtils; import com.gkhy.safePlatform.commons.utils.PageUtils; import com.gkhy.safePlatform.commons.vo.ResultVO; -import com.gkhy.safePlatform.commons.enums.ResultCodes; +import com.gkhy.safePlatform.equipment.entity.*; +import com.gkhy.safePlatform.equipment.model.dto.req.KeypointEquipmentInfoImportExcel; import com.gkhy.safePlatform.equipment.model.dto.req.KeypointEquipmentInfoQueryCriteria; +import com.gkhy.safePlatform.equipment.model.dto.resp.KeypointEquipmentInfoDto; +import com.gkhy.safePlatform.equipment.model.dto.resp.KeypointEquipmentInfoExcel; +import com.gkhy.safePlatform.equipment.service.KeypointEquipmentInfoService; +import com.gkhy.safePlatform.equipment.utils.DateUtils; +import com.gkhy.safePlatform.equipment.utils.poihelper.ExcelLogs; +import com.gkhy.safePlatform.equipment.utils.poihelper.ExcelUtil; +import com.google.common.collect.Lists; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.stream.Collectors; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.io.Serializable; -import java.util.List; +import java.net.URLEncoder; +import java.sql.Timestamp; +import java.util.*; +import java.util.stream.Collectors; /** * 重点监管装置/设备 详细信息(KeypointEquipmentInfo)表控制层 @@ -36,6 +47,11 @@ @Resource private KeypointEquipmentInfoService keypointEquipmentInfoService; + + @Autowired + public HttpServletRequest request; + + /** * 分页查询所有数据 * @@ -44,7 +60,7 @@ */ @PostMapping(value = "/page/list") public ResultVO selectAll(@RequestBody PageQuery<KeypointEquipmentInfoQueryCriteria> pageQuery){ - PageUtils.checkCheck(pageQuery.getPageIndex(), pageQuery.getPageSize()); + PageUtils.checkCheck(pageQuery); return this.keypointEquipmentInfoService.queryAll(pageQuery); } @@ -82,15 +98,46 @@ * @param ids 主键结合 * @return 删除结果 */ - @GetMapping(value = "/delete") - public ResultVO delete(String ids) { - List<String> idList = Arrays.stream(ids.split(",")) - .collect(Collectors.toList()); - this.keypointEquipmentInfoService.removeByIds(idList); + @RequestMapping(value = "/delete",method = RequestMethod.POST) + public ResultVO delete(@RequestBody Long[] ids) { + this.keypointEquipmentInfoService.delete(ids); return new ResultVO<>(ResultCodes.OK); } + /** + * 下载模板 + * + */ + @GetMapping(value = "/exportTemplate") + public void exportTemplate() throws IOException { + keypointEquipmentInfoService.exportTemplate(); + } + + + /** + * 导入数据 + * + */ + @RequestMapping(value = "/importData") + public ResultVO importData(MultipartFile file) throws IOException { + keypointEquipmentInfoService.importData(file); + return new ResultVO<>(ResultCodes.OK); + } + + + + + /** + * 导出一览数据 + * + */ + @GetMapping(value = "/exportData") + public void exportData(KeypointEquipmentInfoQueryCriteria queryCriteria) throws IOException { + keypointEquipmentInfoService.exportData(queryCriteria); + } + + public static void main(String[] args) { KeypointEquipmentInfoDto infoDto = new KeypointEquipmentInfoDto(); -- Gitblit v1.9.2