From c6ef0025b12582ca7b0367798d3c7c9174c0ea4a Mon Sep 17 00:00:00 2001 From: chen <1216142052@qq.com> Date: Wed, 7 Sep 2022 16:36:57 +0800 Subject: [PATCH] =?UTF-8?q?2022-09-07=201.1.2=20=E6=AC=BE=E5=BC=8F?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E5=88=9D=E7=89=88=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/zyclothsstyle/ZyClothsStyleList.vue | 268 ++++++++++++++++++ .../modules/ZyClothsStyleForm.vue | 214 ++++++++++++++ .../modules/ZyClothsStyleModal.vue | 60 ++++ .../ZyClothsStyleModal__Style#Drawer.vue | 84 ++++++ .../controller/ZyClothsStyleController.java | 171 +++++++++++ .../zyclothsstyle/entity/ZyClothsStyle.java | 122 ++++++++ .../mapper/ZyClothsStyleMapper.java | 18 ++ .../mapper/xml/ZyClothsStyleMapper.xml | 5 + .../service/IZyClothsStyleService.java | 15 + .../impl/ZyClothsStyleServiceImpl.java | 20 ++ 10 files changed, 977 insertions(+) create mode 100644 ant-design-vue-jeecg/src/views/zyclothsstyle/ZyClothsStyleList.vue create mode 100644 ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue create mode 100644 ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleModal.vue create mode 100644 ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleModal__Style#Drawer.vue create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/controller/ZyClothsStyleController.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/entity/ZyClothsStyle.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/mapper/ZyClothsStyleMapper.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/mapper/xml/ZyClothsStyleMapper.xml create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/IZyClothsStyleService.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java diff --git a/ant-design-vue-jeecg/src/views/zyclothsstyle/ZyClothsStyleList.vue b/ant-design-vue-jeecg/src/views/zyclothsstyle/ZyClothsStyleList.vue new file mode 100644 index 00000000..336ffb4d --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zyclothsstyle/ZyClothsStyleList.vue @@ -0,0 +1,268 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue b/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue new file mode 100644 index 00000000..8c06b85a --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue @@ -0,0 +1,214 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleModal.vue b/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleModal.vue new file mode 100644 index 00000000..d2db9ded --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleModal__Style#Drawer.vue new file mode 100644 index 00000000..0e30892a --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleModal__Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/controller/ZyClothsStyleController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/controller/ZyClothsStyleController.java new file mode 100644 index 00000000..49463a3a --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/controller/ZyClothsStyleController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.zyclothsstyle.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; + +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 org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle; +import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService; +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 服装款式表 + * @Author: jeecg-boot + * @Date: 2022-09-04 + * @Version: V1.0 + */ +@Api(tags="服装款式表") +@RestController +@RequestMapping("/zyclothsstyle/zyClothsStyle") +@Slf4j +public class ZyClothsStyleController extends JeecgController { + @Autowired + private IZyClothsStyleService zyClothsStyleService; + + /** + * 分页列表查询 + * + * @param zyClothsStyle + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "服装款式表-分页列表查询") + @ApiOperation(value="服装款式表-分页列表查询", notes="服装款式表-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(ZyClothsStyle zyClothsStyle, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyClothsStyle, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = zyClothsStyleService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param zyClothsStyle + * @return + */ + @AutoLog(value = "服装款式表-添加") + @ApiOperation(value="服装款式表-添加", notes="服装款式表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ZyClothsStyle zyClothsStyle) { + zyClothsStyleService.save(zyClothsStyle); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param zyClothsStyle + * @return + */ + @AutoLog(value = "服装款式表-编辑") + @ApiOperation(value="服装款式表-编辑", notes="服装款式表-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody ZyClothsStyle zyClothsStyle) { + zyClothsStyleService.updateById(zyClothsStyle); + 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) { + zyClothsStyleService.removeById(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.zyClothsStyleService.removeByIds(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) { + ZyClothsStyle zyClothsStyle = zyClothsStyleService.getById(id); + if(zyClothsStyle==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(zyClothsStyle); + } + + /** + * 导出excel + * + * @param request + * @param zyClothsStyle + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ZyClothsStyle zyClothsStyle) { + return super.exportXls(request, zyClothsStyle, ZyClothsStyle.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, ZyClothsStyle.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/entity/ZyClothsStyle.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/entity/ZyClothsStyle.java new file mode 100644 index 00000000..71fc03da --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/entity/ZyClothsStyle.java @@ -0,0 +1,122 @@ +package org.jeecg.modules.zyclothsstyle.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +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 org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 服装款式表 + * @Author: jeecg-boot + * @Date: 2022-09-04 + * @Version: V1.0 + */ +@Data +@TableName("zy_cloths_style") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="zy_cloths_style对象", description="服装款式表") +public class ZyClothsStyle implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + /**类型id*/ + @Excel(name = "类型id", width = 15) + @ApiModelProperty(value = "类型id") + private String typeId; + /**形式*/ + @Excel(name = "形式", width = 15) + @Dict(dicCode = "style_shape") + @ApiModelProperty(value = "形式") + private String shape; + /**编号*/ + @Excel(name = "编号", width = 15) + @ApiModelProperty(value = "编号") + private String nums; + /**名称*/ + @Excel(name = "名称", width = 15) + @ApiModelProperty(value = "名称") + private String styleNames; + /**规格*/ + @Excel(name = "规格", width = 15) + @ApiModelProperty(value = "规格") + private String specification; + /**销售地区*/ + @Excel(name = "销售地区", width = 15) + @ApiModelProperty(value = "销售地区") + private String salesTerritory; + /**产品概述*/ + @Excel(name = "产品概述", width = 15) + @ApiModelProperty(value = "产品概述") + private String productOverview; + /**结构*/ + @Excel(name = "结构", width = 15) + @ApiModelProperty(value = "结构") + private String structure; + /**特征*/ + @Excel(name = "特征", width = 15) + @ApiModelProperty(value = "特征") + private String characteristic; + /**效果*/ + @Excel(name = "效果", width = 15) + @ApiModelProperty(value = "效果") + private String designSketch; + /**主图*/ + @Excel(name = "主图", width = 15) + @ApiModelProperty(value = "主图") + private String mainMap; + /**测量方法*/ + @Excel(name = "测量方法", width = 15) + @ApiModelProperty(value = "测量方法") + private String measuringMethod; + /**误差*/ + @Excel(name = "误差", width = 15) + @ApiModelProperty(value = "误差") + private String error; + /**定额用料*/ + @Excel(name = "定额用料", width = 15) + @ApiModelProperty(value = "定额用料") + private String quotaMaterials; + /**折叠搭配及包装*/ + @Excel(name = "折叠搭配及包装", width = 15) + @ApiModelProperty(value = "折叠搭配及包装") + private String foldingPackaging; + /**配件及标志*/ + @Excel(name = "配件及标志", width = 15) + @ApiModelProperty(value = "配件及标志") + private String accLogos; + /**缝纫形式*/ + @Excel(name = "缝纫形式", width = 15) + @ApiModelProperty(value = "缝纫形式") + private String sewingForm; + /**企业id*/ + @Excel(name = "企业id", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") + @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") + @ApiModelProperty(value = "企业id") + private String enterpriseId; + /**创建时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "创建时间") + private Date createTime; + /**更新时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "更新时间") + private Date updateTime; +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/mapper/ZyClothsStyleMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/mapper/ZyClothsStyleMapper.java new file mode 100644 index 00000000..4dfe0d64 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/mapper/ZyClothsStyleMapper.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.zyclothsstyle.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle; + +/** + * @Description: 服装款式表 + * @Author: jeecg-boot + * @Date: 2022-09-04 + * @Version: V1.0 + */ +public interface ZyClothsStyleMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/mapper/xml/ZyClothsStyleMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/mapper/xml/ZyClothsStyleMapper.xml new file mode 100644 index 00000000..ade30c40 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/mapper/xml/ZyClothsStyleMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/IZyClothsStyleService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/IZyClothsStyleService.java new file mode 100644 index 00000000..6637876f --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/IZyClothsStyleService.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.zyclothsstyle.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle; + +/** + * @Description: 服装款式表 + * @Author: jeecg-boot + * @Date: 2022-09-04 + * @Version: V1.0 + */ +public interface IZyClothsStyleService extends IService { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java new file mode 100644 index 00000000..35531bdd --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java @@ -0,0 +1,20 @@ +package org.jeecg.modules.zyclothsstyle.service.impl; + + +import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle; +import org.jeecg.modules.zyclothsstyle.mapper.ZyClothsStyleMapper; +import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 服装款式表 + * @Author: jeecg-boot + * @Date: 2022-09-04 + * @Version: V1.0 + */ +@Service +public class ZyClothsStyleServiceImpl extends ServiceImpl implements IZyClothsStyleService { + +}