From bb002c46e661955e1702144d594b5e44dbc532ef Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 13 Apr 2022 14:38:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85--=E6=8E=A5=E5=8F=A3=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOController.java | 16 ++- .../entity/BussDocumentLibraryEO.java | 40 ++++++ .../DummyInventoryInfoEOController.java | 133 +++++++++++++++--- .../dummy/entity/DummyInventoryInfoEO.java | 4 + .../service/IDummyInventoryInfoEOService.java | 20 +++ .../impl/DummyInventoryInfoEOServiceImpl.java | 36 ++++- 6 files changed, 229 insertions(+), 20 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java index 7bc3a779b..0c878ff16 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java @@ -1,9 +1,12 @@ package com.jero.modules.document.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.service.IBussDocumentLibraryEOService; import io.swagger.annotations.Api; @@ -431,7 +434,18 @@ public class BussDocumentLibraryEOController extends JeroController queryPageInfoDummy(BussDocumentLibraryEO bussDocumentLibraryEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bussDocumentLibraryEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = bussDocumentLibraryEOService.page(page, queryWrapper); + return Result.OK(pageList); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java index 85b83c9b4..cfefa526a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java @@ -35,4 +35,44 @@ public class BussDocumentLibraryEO implements Serializable { @ApiModelProperty(value = "主键") private java.lang.String id; + /**编号*/ + @Excel(name = "编号", width = 15) + @ApiModelProperty(value = "编号") + private java.lang.String serialNumber; + + /**标题*/ + @Excel(name = "标题", width = 15) + @ApiModelProperty(value = "标题") + private java.lang.String title; + + /**适用范围*/ + @Excel(name = "适用范围", width = 15) + @ApiModelProperty(value = "适用范围") + private java.lang.String shi4Yong4Fan4Wei2; + + /**状态*/ + @Excel(name = "状态", width = 15) + @ApiModelProperty(value = "状态") + private java.lang.String state; + + /**技术领域*/ + @Excel(name = "技术领域", width = 15) + @ApiModelProperty(value = "技术领域") + private java.lang.String technologyTerritory; + + /**新车型实施日期*/ + @Excel(name = "新车型实施日期", width = 15) + @ApiModelProperty(value = "新车型实施日期") + private java.lang.String xin1Che1Xing2Shi2Shi1Ri4Qi1; + + /**在产车实施日期*/ + @Excel(name = "在产车实施日期", width = 15) + @ApiModelProperty(value = "在产车实施日期") + private java.lang.String implementTime; + + /**对应标准*/ + @Excel(name = "对应标准", width = 15) + @ApiModelProperty(value = "对应标准") + private java.lang.String correspondingStandard; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java index bd09ceaa9..757746af7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java @@ -1,25 +1,33 @@ package com.jero.modules.dummy.controller; -import java.util.Arrays; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.dummy.entity.DummyInventoryInfoEO; -import com.jero.modules.dummy.service.IDummyInventoryInfoEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.dummy.entity.DummyInventoryInfoEO; +import com.jero.modules.dummy.service.IDummyInventoryInfoEOService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; /** @@ -35,7 +43,7 @@ import com.jero.common.aspect.annotation.AutoLog; public class DummyInventoryInfoEOController extends JeroController { @Autowired private IDummyInventoryInfoEOService dummyInventoryInfoEOService; - + /** * 分页列表查询 * @@ -93,7 +101,7 @@ public class DummyInventoryInfoEOController extends JeroController edit(@Validated @RequestBody DummyInventoryInfoEO dummyInventoryInfoEO) { dummyInventoryInfoEOService.editById(dummyInventoryInfoEO); return Result.OK("编辑成功!"); @@ -107,7 +115,7 @@ public class DummyInventoryInfoEOController extends JeroController delete(@RequestParam(name="id",required=true) String id) { dummyInventoryInfoEOService.deleteById(id); return Result.OK("删除成功!"); @@ -121,7 +129,7 @@ public class DummyInventoryInfoEOController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.dummyInventoryInfoEOService.deleteByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); @@ -167,4 +175,93 @@ public class DummyInventoryInfoEOController extends JeroController importData(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, DummyInventoryInfoEO.class); + } + + @ApiOperation(value = "模板下载") + @GetMapping(value = "/exportTemplate") + public void exportTemplate(@Validated @RequestBody DummyInventoryInfoEO dummyInventoryInfoEO, HttpServletResponse response, HttpServletRequest request) throws Exception { + dummyInventoryInfoEOService.exportTemplate(dummyInventoryInfoEO,response,request); + } + + /** + * 复制 + * + * @param ids + * @return + */ + @AutoLog(value = "复制") + @ApiOperation(value="复制", notes="复制") + @GetMapping(value = "/copyInfoByIds") + public Result copyInfoByIds(@RequestParam(name="id",required=true) String ids, + @RequestParam(name="id",required=true) String cut) { + try { + dummyInventoryInfoEOService.copyInfoByIds(ids); + } catch (Exception e) { + if(CutEnum.CN.getValue().equals(cut)){ + return Result.error("复制失败"); + }else{ + return Result.error("Copy the failure"); + } + } + if(CutEnum.CN.getValue().equals(cut)){ + return Result.OK("复制成功"); + }else{ + return Result.OK("Copy success"); + } + } + + + /** + * 批量设置 + * + * @param dummyInventoryInfoEOList + * @return + */ + @AutoLog(value = "虚拟清单详情表-添加") + @ApiOperation(value="虚拟清单详情表-添加", notes="虚拟清单详情表-添加") + @PostMapping(value = "/setBatch") + public Result setBatch(@Validated @RequestBody List dummyInventoryInfoEOList) { + String cut = ""; + if(dummyInventoryInfoEOList.size() != 0){ + cut = dummyInventoryInfoEOList.get(0).getCut(); + } + + try { + dummyInventoryInfoEOService.setBatch(dummyInventoryInfoEOList); + } catch (Exception e) { + if(CutEnum.CN.getValue().equals(cut)){ + return Result.error("批量设置失败！"); + }else{ + return Result.error("Batch set success"); + } + } + if(CutEnum.CN.getValue().equals(cut)){ + return Result.OK("批量设置成功"); + }else{ + return Result.OK("Batch set success"); + } + + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java index 59ac6cb4f..c156f194c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -201,4 +202,7 @@ public class DummyInventoryInfoEO implements Serializable { @ApiModelProperty(value = "验证符合性确认-责任人") private java.lang.String verifyDuty; + @TableField(exist = false) + private String cut; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java index 74d1df850..d6ca908a4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java @@ -2,6 +2,9 @@ package com.jero.modules.dummy.service; import com.jero.modules.dummy.entity.DummyInventoryInfoEO; import com.baomidou.mybatisplus.extension.service.IService; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -52,10 +55,27 @@ public interface IDummyInventoryInfoEOService extends IService queryList(); + + + /** + * 批量设置 + * @param dummyInventoryInfoEOList + */ + void setBatch(List dummyInventoryInfoEOList); + + /** + * 模板下载 + * @param dummyInventoryInfoEO + * @param response + * @param request + */ + void exportTemplate(DummyInventoryInfoEO dummyInventoryInfoEO, HttpServletResponse response, HttpServletRequest request); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 5f490162f..edbdd64d0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -8,6 +8,9 @@ import java.util.List; import java.util.Date; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * @Description: 虚拟清单详情表 * @Author: jero-boot @@ -77,7 +80,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl queryList() { return list(); } + + + /** + * 复制 + * @param ids + */ + @Override + public void copyInfoByIds(String ids) { + + } + + + /** + * 批量设置 + * @param dummyInventoryInfoEOList + */ + @Override + public void setBatch(List dummyInventoryInfoEOList) { + + } + + /** + * 模板下载 + * @param dummyInventoryInfoEO + * @param response + * @param request + */ + @Override + public void exportTemplate(DummyInventoryInfoEO dummyInventoryInfoEO, HttpServletResponse response, HttpServletRequest request) { + + } }