diff --git a/ant-design-vue-jeecg/src/views/zystylefabric/ZyStyleFabricList.vue b/ant-design-vue-jeecg/src/views/zystylefabric/ZyStyleFabricList.vue new file mode 100644 index 00000000..0f1e3e56 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zystylefabric/ZyStyleFabricList.vue @@ -0,0 +1,195 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zystylefabric/modules/ZyStyleFabricForm.vue b/ant-design-vue-jeecg/src/views/zystylefabric/modules/ZyStyleFabricForm.vue new file mode 100644 index 00000000..42acfc9f --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zystylefabric/modules/ZyStyleFabricForm.vue @@ -0,0 +1,116 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zystylefabric/modules/ZyStyleFabricModal.Style#Drawer.vue b/ant-design-vue-jeecg/src/views/zystylefabric/modules/ZyStyleFabricModal.Style#Drawer.vue new file mode 100644 index 00000000..7905146a --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zystylefabric/modules/ZyStyleFabricModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zystylefabric/modules/ZyStyleFabricModal.vue b/ant-design-vue-jeecg/src/views/zystylefabric/modules/ZyStyleFabricModal.vue new file mode 100644 index 00000000..e4a03744 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zystylefabric/modules/ZyStyleFabricModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/controller/ZyStyleFabricController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/controller/ZyStyleFabricController.java new file mode 100644 index 00000000..a67d262f --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/controller/ZyStyleFabricController.java @@ -0,0 +1,241 @@ +package org.jeecg.modules.zystylefabric.controller; + +import java.util.ArrayList; +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.demo.base.entity.ZyClothsModular; +import org.jeecg.modules.demo.base.entity.ZyClothsType; +import org.jeecg.modules.demo.fabric.entity.ZyFabric; +import org.jeecg.modules.demo.fabric.service.IZyFabricService; +import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle; +import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService; +import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric; +import org.jeecg.modules.zystylefabric.entity.ZyStyleFabric; +import org.jeecg.modules.zystylefabric.service.INewZyStyleFabricService; +import org.jeecg.modules.zystylefabric.service.IZyStyleFabricService; +import org.jeecg.modules.zystylemodule.entity.NewStyleModule; +import org.jeecg.modules.zystylemodule.entity.ZyStyleModule; +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-15 + * @Version: V1.0 + */ +@Api(tags="款式面料表") +@RestController +@RequestMapping("/zystylefabric/zyStyleFabric") +@Slf4j +public class ZyStyleFabricController extends JeecgController { + @Autowired + private IZyStyleFabricService zyStyleFabricService; + @Autowired + private INewZyStyleFabricService NewZyStyleFabricService; + @Autowired + private IZyClothsStyleService zyClothsStyleService; + @Autowired + private IZyFabricService zyFabricService; + + /** + * 分页列表查询 + * + * @param zyStyleFabric + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "款式面料表-分页列表查询") + @ApiOperation(value="款式面料表-分页列表查询", notes="款式面料表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ZyStyleFabric zyStyleFabric, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + if(zyStyleFabric.getStyleId()!=null || zyStyleFabric.getFabricId()!=null ){ + if(zyStyleFabric.getStyleId()!=null){ + queryWrapper.eq("style_id",zyStyleFabric.getStyleId()); + } + if(zyStyleFabric.getFabricId()!=null){ + queryWrapper.eq("fabric_id",zyStyleFabric.getFabricId()); + } + + } + List list = zyStyleFabricService.list(queryWrapper); + List newZyStyleFabrics = new ArrayList<>(); + for (ZyStyleFabric zyStyleF : list){ + NewZyStyleFabric newZySF = new NewZyStyleFabric(); + //编辑回显 + newZySF.setId(zyStyleF.getId()); + newZySF.setFabricId(zyStyleF.getFabricId()); + newZySF.setStyleId(zyStyleF.getStyleId()); + //款式编号和名称 + String styleId = zyStyleF.getStyleId(); + ZyClothsStyle styleById = zyClothsStyleService.getById(styleId); + newZySF.setStyleNums(styleById.getNums()); + newZySF.setStyleNames(styleById.getStyleNames()); + //模块编号和名称 + String fabricId = zyStyleF.getFabricId(); + ZyFabric fabricById = zyFabricService.getById(fabricId); + newZySF.setFabricNumber(fabricById.getFabricNumber()); + newZySF.setFabricName(fabricById.getName()); + newZyStyleFabrics.add(newZySF); + } + Page page = new Page(); + int size = newZyStyleFabrics.size(); + if (pageSize > size && size!=0) { + pageSize = size; + } + // 求出最大页数，防止currentPage越界 + int maxPage = size % pageSize == 0 ? size / pageSize : size / pageSize + 1; + if (pageNo > maxPage) { + pageNo = maxPage; + } + // 当前页第一条数据的下标 + int curIdx = pageNo > 1 ? (pageNo - 1) * pageSize : 0; + List pageList = new ArrayList(); + // 将当前页的数据放进pageList + for (int i = 0; i < pageSize && curIdx + i < size; i++) { + pageList.add(newZyStyleFabrics.get(curIdx + i)); + } + page.setCurrent(pageNo).setSize(pageSize).setTotal(newZyStyleFabrics.size()).setRecords(pageList); + return Result.OK(page); + } + + /** + * 添加 + * + * @param zyStyleFabric + * @return + */ + @AutoLog(value = "款式面料表-添加") + @ApiOperation(value="款式面料表-添加", notes="款式面料表-添加") + //@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ZyStyleFabric zyStyleFabric) { + zyStyleFabricService.save(zyStyleFabric); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param zyStyleFabric + * @return + */ + @AutoLog(value = "款式面料表-编辑") + @ApiOperation(value="款式面料表-编辑", notes="款式面料表-编辑") + //@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ZyStyleFabric zyStyleFabric) { + zyStyleFabricService.updateById(zyStyleFabric); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "款式面料表-通过id删除") + @ApiOperation(value="款式面料表-通过id删除", notes="款式面料表-通过id删除") + //@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + zyStyleFabricService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "款式面料表-批量删除") + @ApiOperation(value="款式面料表-批量删除", notes="款式面料表-批量删除") + //@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.zyStyleFabricService.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) { + ZyStyleFabric zyStyleFabric = zyStyleFabricService.getById(id); + if(zyStyleFabric==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(zyStyleFabric); + } + + /** + * 导出excel + * + * @param request + * @param zyStyleFabric + */ + //@RequiresPermissions("org.jeecg.modules.demo:zy_style_fabric:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ZyStyleFabric zyStyleFabric) { + return super.exportXls(request, zyStyleFabric, ZyStyleFabric.class, "款式面料表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + //@RequiresPermissions("zy_style_fabric:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ZyStyleFabric.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/entity/NewZyStyleFabric.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/entity/NewZyStyleFabric.java new file mode 100644 index 00000000..760c051f --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/entity/NewZyStyleFabric.java @@ -0,0 +1,47 @@ +package org.jeecg.modules.zystylefabric.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +@Data +public class NewZyStyleFabric { + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**款式id*/ + @Excel(name = "款式id", width = 15, dictTable = "zy_cloths_style", dicText = "style_names", dicCode = "id") + @ApiModelProperty(value = "款式id") + private java.lang.String styleId; + /**面料id*/ + @Excel(name = "面料id", width = 15, dictTable = "zy_fabric",dicText = "name", dicCode = "id") + @ApiModelProperty(value = "面料id") + private java.lang.String fabricId; + /**名称*/ + @Excel(name = "名称", width = 15) + @ApiModelProperty(value = "名称") + private java.lang.String fabricName; + /**材料编号*/ + @Excel(name = "材料编号", width = 15) + @ApiModelProperty(value = "材料编号") + private java.lang.String fabricNumber; + /**编号*/ + @Excel(name = "编号", width = 15) + @ApiModelProperty(value = "编号") + private String styleNums; + /**名称*/ + @Excel(name = "名称", width = 15) + @ApiModelProperty(value = "名称") + private String styleNames; + /**创建日期*/ + @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; +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/entity/ZyStyleFabric.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/entity/ZyStyleFabric.java new file mode 100644 index 00000000..d27ada90 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/entity/ZyStyleFabric.java @@ -0,0 +1,53 @@ +package org.jeecg.modules.zystylefabric.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-15 + * @Version: V1.0 + */ +@Data +@TableName("zy_style_fabric") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="zy_style_fabric对象", description="款式面料表") +public class ZyStyleFabric 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, dictTable = "zy_cloths_style", dicText = "style_names", dicCode = "id") + @Dict(dictTable = "zy_cloths_style", dicText = "style_names", dicCode = "id") + @ApiModelProperty(value = "款式id") + private java.lang.String styleId; + /**面料id*/ + @Excel(name = "面料id", width = 15, dictTable = "zy_fabric",dicText = "name", dicCode = "id") + @Dict(dictTable = "zy_fabric", dicText = "name", dicCode = "id") + @ApiModelProperty(value = "面料id") + private java.lang.String fabricId; + /**创建日期*/ + @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; +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/mapper/ZyStyleFabricMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/mapper/ZyStyleFabricMapper.java new file mode 100644 index 00000000..9811c939 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/mapper/ZyStyleFabricMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.zystylefabric.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.zystylefabric.entity.ZyStyleFabric; + +/** + * @Description: 款式面料表 + * @Author: jeecg-boot + * @Date: 2022-09-15 + * @Version: V1.0 + */ +public interface ZyStyleFabricMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/mapper/xml/ZyStyleFabricMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/mapper/xml/ZyStyleFabricMapper.xml new file mode 100644 index 00000000..8f5e4ef8 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/mapper/xml/ZyStyleFabricMapper.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/zystylefabric/service/INewZyStyleFabricService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/service/INewZyStyleFabricService.java new file mode 100644 index 00000000..2eef8106 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/service/INewZyStyleFabricService.java @@ -0,0 +1,8 @@ +package org.jeecg.modules.zystylefabric.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric; + +public interface INewZyStyleFabricService extends IService { +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/service/IZyStyleFabricService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/service/IZyStyleFabricService.java new file mode 100644 index 00000000..189c1b46 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/service/IZyStyleFabricService.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.zystylefabric.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.zystylefabric.entity.ZyStyleFabric; + +/** + * @Description: 款式面料表 + * @Author: jeecg-boot + * @Date: 2022-09-15 + * @Version: V1.0 + */ +public interface IZyStyleFabricService extends IService { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/service/impl/NewZyStyleFabricServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/service/impl/NewZyStyleFabricServiceImpl.java new file mode 100644 index 00000000..bf0b764a --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/service/impl/NewZyStyleFabricServiceImpl.java @@ -0,0 +1,59 @@ +package org.jeecg.modules.zystylefabric.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric; +import org.jeecg.modules.zystylefabric.service.INewZyStyleFabricService; +import org.jeecg.modules.zystylefabric.service.IZyStyleFabricService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.Map; +import java.util.function.Function; +@Service +public class NewZyStyleFabricServiceImpl implements INewZyStyleFabricService { + @Override + public boolean saveBatch(Collection entityList, int batchSize) { + return false; + } + + @Override + public boolean saveOrUpdateBatch(Collection entityList, int batchSize) { + return false; + } + + @Override + public boolean updateBatchById(Collection entityList, int batchSize) { + return false; + } + + @Override + public boolean saveOrUpdate(NewZyStyleFabric entity) { + return false; + } + + @Override + public NewZyStyleFabric getOne(Wrapper queryWrapper, boolean throwEx) { + return null; + } + + @Override + public Map getMap(Wrapper queryWrapper) { + return null; + } + + @Override + public V getObj(Wrapper queryWrapper, Function mapper) { + return null; + } + + @Override + public BaseMapper getBaseMapper() { + return null; + } + + @Override + public Class getEntityClass() { + return null; + } +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/service/impl/ZyStyleFabricServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/service/impl/ZyStyleFabricServiceImpl.java new file mode 100644 index 00000000..1fa9faba --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/service/impl/ZyStyleFabricServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.zystylefabric.service.impl; + +import org.jeecg.modules.zystylefabric.entity.ZyStyleFabric; +import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper; +import org.jeecg.modules.zystylefabric.service.IZyStyleFabricService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 款式面料表 + * @Author: jeecg-boot + * @Date: 2022-09-15 + * @Version: V1.0 + */ +@Service +public class ZyStyleFabricServiceImpl extends ServiceImpl implements IZyStyleFabricService { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/mapper/xml/ZyStyleModuleMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/mapper/xml/ZyStyleModuleMapper.xml index e69055c2..2fc94d4d 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/mapper/xml/ZyStyleModuleMapper.xml +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/mapper/xml/ZyStyleModuleMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file