From 46b223f1f8fe9f7a55afa9d1cd3498c5b04fa5f4 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 11 Apr 2022 16:17:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90--log?= =?UTF-8?q?=E6=A8=A1=E5=9D=97,=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DummyInventoryInfoEOController.java | 170 +++++++++++++++ .../controller/DummyLogEOController.java | 170 +++++++++++++++ .../controller/DummyReadEOController.java | 8 +- .../dummy/entity/DummyInventoryInfoEO.java | 204 ++++++++++++++++++ .../jero/modules/dummy/entity/DummyLogEO.java | 74 +++++++ .../{read => dummy}/entity/DummyReadEO.java | 4 +- .../mapper/DummyInventoryInfoEOMapper.java | 17 ++ .../dummy/mapper/DummyLogEOMapper.java | 17 ++ .../mapper/DummyReadEOMapper.java | 4 +- .../mapper/xml/DummyInventoryInfoEOMapper.xml | 40 ++++ .../dummy/mapper/xml/DummyLogEOMapper.xml | 14 ++ .../mapper/xml/DummyReadEOMapper.xml | 6 +- .../service/IDummyInventoryInfoEOService.java | 61 ++++++ .../dummy/service/IDummyLogEOService.java | 61 ++++++ .../service/IDummyReadEOService.java | 4 +- .../impl/DummyInventoryBaseEOServiceImpl.java | 7 +- .../impl/DummyInventoryInfoEOServiceImpl.java | 89 ++++++++ .../service/impl/DummyLogEOServiceImpl.java | 89 ++++++++ .../service/impl/DummyReadEOServiceImpl.java | 8 +- 19 files changed, 1026 insertions(+), 21 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyLogEOController.java rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{read => dummy}/controller/DummyReadEOController.java (96%) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyLogEO.java rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{read => dummy}/entity/DummyReadEO.java (95%) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/DummyInventoryInfoEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/DummyLogEOMapper.java rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{read => dummy}/mapper/DummyReadEOMapper.java (77%) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyLogEOMapper.xml rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{read => dummy}/mapper/xml/DummyReadEOMapper.xml (76%) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyLogEOService.java rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{read => dummy}/service/IDummyReadEOService.java (90%) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyLogEOServiceImpl.java rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/{read => dummy}/service/impl/DummyReadEOServiceImpl.java (87%) 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 new file mode 100644 index 000000000..bd09ceaa9 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java @@ -0,0 +1,170 @@ +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.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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 虚拟清单详情表 + * @Author: jero-boot + * @Date: 2022-04-11 + * @Version: V1.0 + */ +@Api(tags="虚拟清单详情表") +@RestController +@RequestMapping("/dummy/dummyInventoryInfoEO") +@Slf4j +public class DummyInventoryInfoEOController extends JeroController { + @Autowired + private IDummyInventoryInfoEOService dummyInventoryInfoEOService; + + /** + * 分页列表查询 + * + * @param dummyInventoryInfoEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "虚拟清单详情表-分页列表查询") + @ApiOperation(value="虚拟清单详情表-分页列表查询", notes="虚拟清单详情表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(DummyInventoryInfoEO dummyInventoryInfoEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = dummyInventoryInfoEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "虚拟清单详情表-列表查询") + @ApiOperation(value="虚拟清单详情表-列表查询", notes="虚拟清单详情表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = dummyInventoryInfoEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param dummyInventoryInfoEO + * @return + */ + @AutoLog(value = "虚拟清单详情表-添加") + @ApiOperation(value="虚拟清单详情表-添加", notes="虚拟清单详情表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody DummyInventoryInfoEO dummyInventoryInfoEO) { + dummyInventoryInfoEOService.add(dummyInventoryInfoEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param dummyInventoryInfoEO + * @return + */ + @AutoLog(value = "虚拟清单详情表-编辑") + @ApiOperation(value="虚拟清单详情表-编辑", notes="虚拟清单详情表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody DummyInventoryInfoEO dummyInventoryInfoEO) { + dummyInventoryInfoEOService.editById(dummyInventoryInfoEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "虚拟清单详情表-通过id删除") + @ApiOperation(value="虚拟清单详情表-通过id删除", notes="虚拟清单详情表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + dummyInventoryInfoEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "虚拟清单详情表-批量删除") + @ApiOperation(value="虚拟清单详情表-批量删除", notes="虚拟清单详情表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.dummyInventoryInfoEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "虚拟清单详情表-通过id查询") + @ApiOperation(value="虚拟清单详情表-通过id查询", notes="虚拟清单详情表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + DummyInventoryInfoEO dummyInventoryInfoEO = dummyInventoryInfoEOService.queryById(id); + if(dummyInventoryInfoEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(dummyInventoryInfoEO); + } + + /** + * 导出excel + * + * @param request + * @param dummyInventoryInfoEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, DummyInventoryInfoEO dummyInventoryInfoEO) { + return super.exportXls(request, dummyInventoryInfoEO, DummyInventoryInfoEO.class, "虚拟清单详情表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, DummyInventoryInfoEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyLogEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyLogEOController.java new file mode 100644 index 000000000..4fa917a17 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyLogEOController.java @@ -0,0 +1,170 @@ +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.DummyLogEO; +import com.jero.modules.dummy.service.IDummyLogEOService; +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.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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 虚拟清单log表 + * @Author: jero-boot + * @Date: 2022-04-11 + * @Version: V1.0 + */ +@Api(tags="虚拟清单log表") +@RestController +@RequestMapping("/dummy/dummyLogEO") +@Slf4j +public class DummyLogEOController extends JeroController { + @Autowired + private IDummyLogEOService dummyLogEOService; + + /** + * 分页列表查询 + * + * @param dummyLogEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "虚拟清单log表-分页列表查询") + @ApiOperation(value="虚拟清单log表-分页列表查询", notes="虚拟清单log表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(DummyLogEO dummyLogEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(dummyLogEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = dummyLogEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "虚拟清单log表-列表查询") + @ApiOperation(value="虚拟清单log表-列表查询", notes="虚拟清单log表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = dummyLogEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param dummyLogEO + * @return + */ + @AutoLog(value = "虚拟清单log表-添加") + @ApiOperation(value="虚拟清单log表-添加", notes="虚拟清单log表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody DummyLogEO dummyLogEO) { + dummyLogEOService.add(dummyLogEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param dummyLogEO + * @return + */ + @AutoLog(value = "虚拟清单log表-编辑") + @ApiOperation(value="虚拟清单log表-编辑", notes="虚拟清单log表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody DummyLogEO dummyLogEO) { + dummyLogEOService.editById(dummyLogEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "虚拟清单log表-通过id删除") + @ApiOperation(value="虚拟清单log表-通过id删除", notes="虚拟清单log表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + dummyLogEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "虚拟清单log表-批量删除") + @ApiOperation(value="虚拟清单log表-批量删除", notes="虚拟清单log表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.dummyLogEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "虚拟清单log表-通过id查询") + @ApiOperation(value="虚拟清单log表-通过id查询", notes="虚拟清单log表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + DummyLogEO dummyLogEO = dummyLogEOService.queryById(id); + if(dummyLogEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(dummyLogEO); + } + + /** + * 导出excel + * + * @param request + * @param dummyLogEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, DummyLogEO dummyLogEO) { + return super.exportXls(request, dummyLogEO, DummyLogEO.class, "虚拟清单log表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, DummyLogEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/read/controller/DummyReadEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyReadEOController.java similarity index 96% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/read/controller/DummyReadEOController.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyReadEOController.java index 08d7422d3..82203eab6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/read/controller/DummyReadEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyReadEOController.java @@ -1,4 +1,4 @@ -package com.jero.modules.read.controller; +package com.jero.modules.dummy.controller; import java.util.Arrays; import java.util.List; @@ -6,8 +6,8 @@ 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.read.entity.DummyReadEO; -import com.jero.modules.read.service.IDummyReadEOService; +import com.jero.modules.dummy.entity.DummyReadEO; +import com.jero.modules.dummy.service.IDummyReadEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -30,7 +30,7 @@ import com.jero.common.aspect.annotation.AutoLog; */ @Api(tags="虚拟清单订阅表") @RestController -@RequestMapping("/read/dummyReadEO") +@RequestMapping("/dummy/dummyReadEO") @Slf4j public class DummyReadEOController extends JeroController { @Autowired 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 new file mode 100644 index 000000000..59ac6cb4f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java @@ -0,0 +1,204 @@ +package com.jero.modules.dummy.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 虚拟清单详情表 + * @Author: jero-boot + * @Date: 2022-04-11 + * @Version: V1.0 + */ +@Data +@TableName("dummy_inventory_info") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="dummy_inventory_info对象", description="虚拟清单详情表") +public class DummyInventoryInfoEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**法规清单基础表id*/ + @Excel(name = "法规清单基础表id", width = 15) + @ApiModelProperty(value = "法规清单基础表id") + private java.lang.String dummyInventoryBaseId; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**编号*/ + @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; + + /**WVTA ID*/ + @Excel(name = "WVTA ID", width = 15) + @ApiModelProperty(value = "WVTA ID") + private java.lang.String wvtaId; + + /**子标题*/ + @Excel(name = "子标题", width = 15) + @ApiModelProperty(value = "子标题") + private java.lang.String subtitle; + + /**实施类别*/ + @Excel(name = "实施类别", width = 15) + @ApiModelProperty(value = "实施类别") + private java.lang.String implementType; + + /**认证类型*/ + @Excel(name = "认证类型", width = 15) + @ApiModelProperty(value = "认证类型") + private java.lang.String attestationType; + + /**认证级别*/ + @Excel(name = "认证级别", width = 15) + @ApiModelProperty(value = "认证级别") + private java.lang.String attestationRank; + + /**责任领域*/ + @Excel(name = "责任领域", width = 15) + @ApiModelProperty(value = "责任领域") + private java.lang.String dutyTerritory; + + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private java.lang.String remark; + + /**设计符合性确认-交付物类型*/ + @Excel(name = "设计符合性确认-交付物类型", width = 15) + @ApiModelProperty(value = "设计符合性确认-交付物类型") + private java.lang.String designDeliverableType; + + /**设计符合性确认-交付物模板*/ + @Excel(name = "设计符合性确认-交付物模板", width = 15) + @ApiModelProperty(value = "设计符合性确认-交付物模板") + private java.lang.String designDeliverableTemplate; + + /**设计符合性确认-发起人*/ + @Excel(name = "设计符合性确认-发起人", width = 15) + @ApiModelProperty(value = "设计符合性确认-发起人") + private java.lang.String designInitiator; + + /**设计符合性确认-责任人*/ + @Excel(name = "设计符合性确认-责任人", width = 15) + @ApiModelProperty(value = "设计符合性确认-责任人") + private java.lang.String designDuty; + + /**prehomo确认-交付物类型*/ + @Excel(name = "prehomo确认-交付物类型", width = 15) + @ApiModelProperty(value = "prehomo确认-交付物类型") + private java.lang.String prehomoDeliverableType; + + /**prehomo确认-交付物模板*/ + @Excel(name = "prehomo确认-交付物模板", width = 15) + @ApiModelProperty(value = "prehomo确认-交付物模板") + private java.lang.String prehomoDeliverableTemplate; + + /**prehomo确认-发起人*/ + @Excel(name = "prehomo确认-发起人", width = 15) + @ApiModelProperty(value = "prehomo确认-发起人") + private java.lang.String prehomoInitiator; + + /**prehomo确认-责任人*/ + @Excel(name = "prehomo确认-责任人", width = 15) + @ApiModelProperty(value = "prehomo确认-责任人") + private java.lang.String prehomoDuty; + + /**验证符合性确认-交付物类型*/ + @Excel(name = "验证符合性确认-交付物类型", width = 15) + @ApiModelProperty(value = "验证符合性确认-交付物类型") + private java.lang.String verifyDeliverableType; + + /**验证符合性确认-交付物模板*/ + @Excel(name = "验证符合性确认-交付物模板", width = 15) + @ApiModelProperty(value = "验证符合性确认-交付物模板") + private java.lang.String verifyDeliverableTemplate; + + /**验证符合性确认-发起人*/ + @Excel(name = "验证符合性确认-发起人", width = 15) + @ApiModelProperty(value = "验证符合性确认-发起人") + private java.lang.String verifyInitiator; + + /**验证符合性确认-责任人*/ + @Excel(name = "验证符合性确认-责任人", width = 15) + @ApiModelProperty(value = "验证符合性确认-责任人") + private java.lang.String verifyDuty; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyLogEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyLogEO.java new file mode 100644 index 000000000..002441400 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyLogEO.java @@ -0,0 +1,74 @@ +package com.jero.modules.dummy.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 虚拟清单log表 + * @Author: jero-boot + * @Date: 2022-04-11 + * @Version: V1.0 + */ +@Data +@TableName("dummy_log") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="dummy_log对象", description="虚拟清单log表") +public class DummyLogEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**虚拟清单基础表id*/ + @Excel(name = "虚拟清单基础表id", width = 15) + @ApiModelProperty(value = "虚拟清单基础表id") + private java.lang.String dummyInventoryBaseId; + + /**log内容*/ + @Excel(name = "log内容", width = 15) + @ApiModelProperty(value = "log内容") + private java.lang.String logContent; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/read/entity/DummyReadEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyReadEO.java similarity index 95% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/read/entity/DummyReadEO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyReadEO.java index 3c32e0762..ebb9aaa91 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/read/entity/DummyReadEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyReadEO.java @@ -1,4 +1,4 @@ -package com.jero.modules.read.entity; +package com.jero.modules.dummy.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; @@ -64,6 +64,6 @@ public class DummyReadEO implements Serializable { /**虚拟清单基础表id*/ @Excel(name = "虚拟清单基础表id", width = 15) @ApiModelProperty(value = "虚拟清单基础表id") - private java.lang.String dummyInventoryId; + private java.lang.String dummyInventoryBaseId; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/DummyInventoryInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/DummyInventoryInfoEOMapper.java new file mode 100644 index 000000000..fe8851a35 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/DummyInventoryInfoEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.dummy.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.dummy.entity.DummyInventoryInfoEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 虚拟清单详情表 + * @Author: jero-boot + * @Date: 2022-04-11 + * @Version: V1.0 + */ +public interface DummyInventoryInfoEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/DummyLogEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/DummyLogEOMapper.java new file mode 100644 index 000000000..caf35502f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/DummyLogEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.dummy.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.dummy.entity.DummyLogEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 虚拟清单log表 + * @Author: jero-boot + * @Date: 2022-04-11 + * @Version: V1.0 + */ +public interface DummyLogEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/read/mapper/DummyReadEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/DummyReadEOMapper.java similarity index 77% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/read/mapper/DummyReadEOMapper.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/DummyReadEOMapper.java index 15618000e..98a527676 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/read/mapper/DummyReadEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/DummyReadEOMapper.java @@ -1,9 +1,9 @@ -package com.jero.modules.read.mapper; +package com.jero.modules.dummy.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.jero.modules.read.entity.DummyReadEO; +import com.jero.modules.dummy.entity.DummyReadEO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml new file mode 100644 index 000000000..73b604af0 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyLogEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyLogEOMapper.xml new file mode 100644 index 000000000..3933e37cb --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyLogEOMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/read/mapper/xml/DummyReadEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyReadEOMapper.xml similarity index 76% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/read/mapper/xml/DummyReadEOMapper.xml rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyReadEOMapper.xml index 7dc317d4a..3015fc327 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/read/mapper/xml/DummyReadEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyReadEOMapper.xml @@ -1,13 +1,13 @@ - - + + - + 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 new file mode 100644 index 000000000..74d1df850 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.dummy.service; + +import com.jero.modules.dummy.entity.DummyInventoryInfoEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 虚拟清单详情表 + * @Author: jero-boot + * @Date: 2022-04-11 + * @Version: V1.0 + */ +public interface IDummyInventoryInfoEOService extends IService { + + /** + * 保存 + * + * @param dummyInventoryInfoEO + * @return + */ + void add(DummyInventoryInfoEO dummyInventoryInfoEO); + + /** + * 更新 + * + * @param dummyInventoryInfoEO + * @return + */ + void editById(DummyInventoryInfoEO dummyInventoryInfoEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + DummyInventoryInfoEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyLogEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyLogEOService.java new file mode 100644 index 000000000..fe3e5a7e2 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyLogEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.dummy.service; + +import com.jero.modules.dummy.entity.DummyLogEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 虚拟清单log表 + * @Author: jero-boot + * @Date: 2022-04-11 + * @Version: V1.0 + */ +public interface IDummyLogEOService extends IService { + + /** + * 保存 + * + * @param dummyLogEO + * @return + */ + void add(DummyLogEO dummyLogEO); + + /** + * 更新 + * + * @param dummyLogEO + * @return + */ + void editById(DummyLogEO dummyLogEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + DummyLogEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/read/service/IDummyReadEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyReadEOService.java similarity index 90% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/read/service/IDummyReadEOService.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyReadEOService.java index fb852ea80..9937f66b0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/read/service/IDummyReadEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyReadEOService.java @@ -1,6 +1,6 @@ -package com.jero.modules.read.service; +package com.jero.modules.dummy.service; -import com.jero.modules.read.entity.DummyReadEO; +import com.jero.modules.dummy.entity.DummyReadEO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index f39ad1a99..bc473af37 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -6,10 +6,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.system.vo.LoginUser; import com.jero.modules.dummy.entity.DummyInventoryBaseEO; +import com.jero.modules.dummy.entity.DummyReadEO; import com.jero.modules.dummy.mapper.DummyInventoryBaseEOMapper; import com.jero.modules.dummy.service.IDummyInventoryBaseEOService; -import com.jero.modules.read.entity.DummyReadEO; -import com.jero.modules.read.service.impl.DummyReadEOServiceImpl; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import org.apache.shiro.SecurityUtils; @@ -129,7 +128,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.in(DummyReadEO::getDummyInventoryId,dummyId).in(DummyReadEO::getCreateBy,sysUser.getUsername()); + wrapper.in(DummyReadEO::getDummyInventoryBaseId,dummyId).in(DummyReadEO::getCreateBy,sysUser.getUsername()); dummyReadEOService.remove(wrapper); } } 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 new file mode 100644 index 000000000..5f490162f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.dummy.service.impl; + +import com.jero.modules.dummy.entity.DummyInventoryInfoEO; +import com.jero.modules.dummy.mapper.DummyInventoryInfoEOMapper; +import com.jero.modules.dummy.service.IDummyInventoryInfoEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 虚拟清单详情表 + * @Author: jero-boot + * @Date: 2022-04-11 + * @Version: V1.0 + */ +@Service +public class DummyInventoryInfoEOServiceImpl extends ServiceImpl implements IDummyInventoryInfoEOService { + + /** + * 保存 + * + * @param dummyInventoryInfoEO + * @return + */ + @Override + public void add(DummyInventoryInfoEO dummyInventoryInfoEO) { + Date now = new Date(); + dummyInventoryInfoEO.setCreateTime(now); + dummyInventoryInfoEO.setUpdateTime(now); + save(dummyInventoryInfoEO); + } + + /** + * 更新 + * + * @param dummyInventoryInfoEO + * @return + */ + @Override + public void editById(DummyInventoryInfoEO dummyInventoryInfoEO) { + Date now = new Date(); + dummyInventoryInfoEO.setUpdateTime(now); + saveOrUpdate(dummyInventoryInfoEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public DummyInventoryInfoEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyLogEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyLogEOServiceImpl.java new file mode 100644 index 000000000..25a573e65 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyLogEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.dummy.service.impl; + +import com.jero.modules.dummy.entity.DummyLogEO; +import com.jero.modules.dummy.mapper.DummyLogEOMapper; +import com.jero.modules.dummy.service.IDummyLogEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 虚拟清单log表 + * @Author: jero-boot + * @Date: 2022-04-11 + * @Version: V1.0 + */ +@Service +public class DummyLogEOServiceImpl extends ServiceImpl implements IDummyLogEOService { + + /** + * 保存 + * + * @param dummyLogEO + * @return + */ + @Override + public void add(DummyLogEO dummyLogEO) { + Date now = new Date(); + dummyLogEO.setCreateTime(now); + dummyLogEO.setUpdateTime(now); + save(dummyLogEO); + } + + /** + * 更新 + * + * @param dummyLogEO + * @return + */ + @Override + public void editById(DummyLogEO dummyLogEO) { + Date now = new Date(); + dummyLogEO.setUpdateTime(now); + saveOrUpdate(dummyLogEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public DummyLogEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/read/service/impl/DummyReadEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyReadEOServiceImpl.java similarity index 87% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/read/service/impl/DummyReadEOServiceImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyReadEOServiceImpl.java index 232d1369f..0a416f321 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/read/service/impl/DummyReadEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyReadEOServiceImpl.java @@ -1,8 +1,8 @@ -package com.jero.modules.read.service.impl; +package com.jero.modules.dummy.service.impl; -import com.jero.modules.read.entity.DummyReadEO; -import com.jero.modules.read.mapper.DummyReadEOMapper; -import com.jero.modules.read.service.IDummyReadEOService; +import com.jero.modules.dummy.entity.DummyReadEO; +import com.jero.modules.dummy.mapper.DummyReadEOMapper; +import com.jero.modules.dummy.service.IDummyReadEOService; import org.springframework.stereotype.Service; import java.util.List; import java.util.Date;