From 2085a3ac4da92343003a15511409174ef348304e Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 24 Apr 2023 13:53:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B8=85=E5=8D=95=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E6=9B=B4=E6=96=B0log=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...arketListVersionUpdateLogEOController.java | 170 ++++++++++++++++++ .../entity/MarketListVersionUpdateLogEO.java | 81 +++++++++ .../jero/modules/log/enums/ListTypeEnum.java | 33 ++++ .../MarketListVersionUpdateLogEOMapper.java | 17 ++ .../MarketListVersionUpdateLogEOMapper.xml | 16 ++ .../IMarketListVersionUpdateLogEOService.java | 61 +++++++ ...rketListVersionUpdateLogEOServiceImpl.java | 89 +++++++++ 7 files changed, 467 insertions(+) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/controller/MarketListVersionUpdateLogEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/entity/MarketListVersionUpdateLogEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/enums/ListTypeEnum.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/mapper/MarketListVersionUpdateLogEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/mapper/xml/MarketListVersionUpdateLogEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/service/IMarketListVersionUpdateLogEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/service/impl/MarketListVersionUpdateLogEOServiceImpl.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/controller/MarketListVersionUpdateLogEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/controller/MarketListVersionUpdateLogEOController.java new file mode 100644 index 000000000..5b309a684 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/controller/MarketListVersionUpdateLogEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.log.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.log.entity.MarketListVersionUpdateLogEO; +import com.jero.modules.log.service.IMarketListVersionUpdateLogEOService; +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: 2023-04-24 + * @Version: V1.0 + */ +@Api(tags="市场清单版本更新log表") +@RestController +@RequestMapping("/log/marketListVersionUpdateLogEO") +@Slf4j +public class MarketListVersionUpdateLogEOController extends JeroController { + @Autowired + private IMarketListVersionUpdateLogEOService marketListVersionUpdateLogEOService; + + /** + * 分页列表查询 + * + * @param marketListVersionUpdateLogEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "市场清单版本更新log表-分页列表查询") + @ApiOperation(value="市场清单版本更新log表-分页列表查询", notes="市场清单版本更新log表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(MarketListVersionUpdateLogEO marketListVersionUpdateLogEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(marketListVersionUpdateLogEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = marketListVersionUpdateLogEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "市场清单版本更新log表-列表查询") + @ApiOperation(value="市场清单版本更新log表-列表查询", notes="市场清单版本更新log表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = marketListVersionUpdateLogEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param marketListVersionUpdateLogEO + * @return + */ + @AutoLog(value = "市场清单版本更新log表-添加") + @ApiOperation(value="市场清单版本更新log表-添加", notes="市场清单版本更新log表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody MarketListVersionUpdateLogEO marketListVersionUpdateLogEO) { + marketListVersionUpdateLogEOService.add(marketListVersionUpdateLogEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param marketListVersionUpdateLogEO + * @return + */ + @AutoLog(value = "市场清单版本更新log表-编辑") + @ApiOperation(value="市场清单版本更新log表-编辑", notes="市场清单版本更新log表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody MarketListVersionUpdateLogEO marketListVersionUpdateLogEO) { + marketListVersionUpdateLogEOService.editById(marketListVersionUpdateLogEO); + 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) { + marketListVersionUpdateLogEOService.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.marketListVersionUpdateLogEOService.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) { + MarketListVersionUpdateLogEO marketListVersionUpdateLogEO = marketListVersionUpdateLogEOService.queryById(id); + if(marketListVersionUpdateLogEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(marketListVersionUpdateLogEO); + } + + /** + * 导出excel + * + * @param request + * @param marketListVersionUpdateLogEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, MarketListVersionUpdateLogEO marketListVersionUpdateLogEO) { + return super.exportXls(request, marketListVersionUpdateLogEO, MarketListVersionUpdateLogEO.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, MarketListVersionUpdateLogEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/entity/MarketListVersionUpdateLogEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/entity/MarketListVersionUpdateLogEO.java new file mode 100644 index 000000000..421932ae8 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/entity/MarketListVersionUpdateLogEO.java @@ -0,0 +1,81 @@ +package com.jero.modules.log.entity; + +import java.io.Serializable; +import java.util.Date; + +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 市场清单版本更新log表 + * @Author: jero-boot + * @Date: 2023-04-24 + * @Version: V1.0 + */ +@Data +@TableName("market_list_version_update_log") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="market_list_version_update_log对象", description="市场清单版本更新log表") +public class MarketListVersionUpdateLogEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**版本号*/ + @Excel(name = "版本号", width = 15) + @ApiModelProperty(value = "版本号") + private String versionNum; + + /**升版说明*/ + @Excel(name = "升版说明", width = 15) + @ApiModelProperty(value = "升版说明") + private String upgradeExplanation; + + /**清单类型*/ + @Excel(name = "清单类型", width = 15) + @ApiModelProperty(value = "清单类型") + private String listType; + + /**清单id*/ + @Excel(name = "清单id", width = 15) + @ApiModelProperty(value = "清单id") + private String listId; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/enums/ListTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/enums/ListTypeEnum.java new file mode 100644 index 000000000..bcfd884a2 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/enums/ListTypeEnum.java @@ -0,0 +1,33 @@ +package com.jero.modules.log.enums; + +/** + * 清单类型枚举类 + */ +public enum ListTypeEnum { + MARKET_REGULATION_LIST("市场法规清单","Market Regulation List"), + MARKET_CERTIFICATION_LIST("市场认证清单","Market Certification List"); + + String name; + String value; + + private ListTypeEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/mapper/MarketListVersionUpdateLogEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/mapper/MarketListVersionUpdateLogEOMapper.java new file mode 100644 index 000000000..c3ec07429 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/mapper/MarketListVersionUpdateLogEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.log.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.log.entity.MarketListVersionUpdateLogEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 市场清单版本更新log表 + * @Author: jero-boot + * @Date: 2023-04-24 + * @Version: V1.0 + */ +public interface MarketListVersionUpdateLogEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/mapper/xml/MarketListVersionUpdateLogEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/mapper/xml/MarketListVersionUpdateLogEOMapper.xml new file mode 100644 index 000000000..63d029a07 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/mapper/xml/MarketListVersionUpdateLogEOMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/service/IMarketListVersionUpdateLogEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/service/IMarketListVersionUpdateLogEOService.java new file mode 100644 index 000000000..cd43030f5 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/service/IMarketListVersionUpdateLogEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.log.service; + +import com.jero.modules.log.entity.MarketListVersionUpdateLogEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 市场清单版本更新log表 + * @Author: jero-boot + * @Date: 2023-04-24 + * @Version: V1.0 + */ +public interface IMarketListVersionUpdateLogEOService extends IService { + + /** + * 保存 + * + * @param marketListVersionUpdateLogEO + * @return + */ + void add(MarketListVersionUpdateLogEO marketListVersionUpdateLogEO); + + /** + * 更新 + * + * @param marketListVersionUpdateLogEO + * @return + */ + void editById(MarketListVersionUpdateLogEO marketListVersionUpdateLogEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + MarketListVersionUpdateLogEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/service/impl/MarketListVersionUpdateLogEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/service/impl/MarketListVersionUpdateLogEOServiceImpl.java new file mode 100644 index 000000000..d11b33a94 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/log/service/impl/MarketListVersionUpdateLogEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.log.service.impl; + +import com.jero.modules.log.entity.MarketListVersionUpdateLogEO; +import com.jero.modules.log.mapper.MarketListVersionUpdateLogEOMapper; +import com.jero.modules.log.service.IMarketListVersionUpdateLogEOService; +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: 2023-04-24 + * @Version: V1.0 + */ +@Service +public class MarketListVersionUpdateLogEOServiceImpl extends ServiceImpl implements IMarketListVersionUpdateLogEOService { + + /** + * 保存 + * + * @param marketListVersionUpdateLogEO + * @return + */ + @Override + public void add(MarketListVersionUpdateLogEO marketListVersionUpdateLogEO) { + Date now = new Date(); + marketListVersionUpdateLogEO.setCreateTime(now); + marketListVersionUpdateLogEO.setUpdateTime(now); + save(marketListVersionUpdateLogEO); + } + + /** + * 更新 + * + * @param marketListVersionUpdateLogEO + * @return + */ + @Override + public void editById(MarketListVersionUpdateLogEO marketListVersionUpdateLogEO) { + Date now = new Date(); + marketListVersionUpdateLogEO.setUpdateTime(now); + saveOrUpdate(marketListVersionUpdateLogEO); + } + + /** + * 通过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 MarketListVersionUpdateLogEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +}