diff --git a/ant-design-vue-jeecg/src/views/zyclothsstyle/ZyClothsStyleList.vue b/ant-design-vue-jeecg/src/views/zyclothsstyle/ZyClothsStyleList.vue index 607aa159..7ad5aaa4 100644 --- a/ant-design-vue-jeecg/src/views/zyclothsstyle/ZyClothsStyleList.vue +++ b/ant-design-vue-jeecg/src/views/zyclothsstyle/ZyClothsStyleList.vue @@ -250,6 +250,14 @@ } }); }, + jumpPage3(record) { + this.$router.push({ + path: '/src/views/zystyleaccessories/ZyStyleAccessoriesList', + query: { // 路由携带参数 + 'id': record.id, + } + }); + }, //管理辅料 jumpPage4(record) { this.$router.push({ diff --git a/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue b/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue new file mode 100644 index 00000000..50477498 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue @@ -0,0 +1,252 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyStyleAccessoriesForm.vue b/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyStyleAccessoriesForm.vue new file mode 100644 index 00000000..6b426251 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyStyleAccessoriesForm.vue @@ -0,0 +1,118 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyStyleAccessoriesModal.vue b/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyStyleAccessoriesModal.vue new file mode 100644 index 00000000..0f0ba1d8 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyStyleAccessoriesModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyStyleAccessoriesModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyStyleAccessoriesModal__Style#Drawer.vue new file mode 100644 index 00000000..ffac8632 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyStyleAccessoriesModal__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/demo/zyaccessories/controller/ZyStyleAccessoriesController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/controller/ZyStyleAccessoriesController.java new file mode 100644 index 00000000..f7f37243 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/controller/ZyStyleAccessoriesController.java @@ -0,0 +1,177 @@ +package org.jeecg.modules.demo.zyaccessories.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 org.jeecg.modules.demo.zyaccessories.entity.ZyStyleAccessories; +import org.jeecg.modules.demo.zyaccessories.mapper.ZyStyleAccessoriesMapper; +import org.jeecg.modules.demo.zyaccessories.service.IZyStyleAccessoriesService; + +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.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-11-10 + * @Version: V1.0 + */ +@Api(tags="款式辅料管理") +@RestController +@RequestMapping("/zyaccessories/zyStyleAccessories") +@Slf4j +public class ZyStyleAccessoriesController extends JeecgController { + @Autowired + private IZyStyleAccessoriesService zyStyleAccessoriesService; + @Autowired + ZyStyleAccessoriesMapper zyStyleAccessoriesMapper; + + /** + * 分页列表查询 + * + * @param zyStyleAccessories + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "款式辅料管理-分页列表查询") + @ApiOperation(value="款式辅料管理-分页列表查询", notes="款式辅料管理-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(ZyStyleAccessories zyStyleAccessories, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyStyleAccessories, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = zyStyleAccessoriesService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param zyStyleAccessories + * @return + */ + @AutoLog(value = "款式辅料管理-添加") + @ApiOperation(value="款式辅料管理-添加", notes="款式辅料管理-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ZyStyleAccessories zyStyleAccessories) { + int a=zyStyleAccessoriesMapper.count(zyStyleAccessories.getAccessoriesId(),zyStyleAccessories.getStyleId()); + if(a>=1) + return Result.error("添加失败，存在该款式辅料"); + zyStyleAccessoriesService.save(zyStyleAccessories); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param zyStyleAccessories + * @return + */ + @AutoLog(value = "款式辅料管理-编辑") + @ApiOperation(value="款式辅料管理-编辑", notes="款式辅料管理-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody ZyStyleAccessories zyStyleAccessories) { + zyStyleAccessoriesService.updateById(zyStyleAccessories); + 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) { + zyStyleAccessoriesService.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.zyStyleAccessoriesService.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) { + ZyStyleAccessories zyStyleAccessories = zyStyleAccessoriesService.getById(id); + if(zyStyleAccessories==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(zyStyleAccessories); + } + + /** + * 导出excel + * + * @param request + * @param zyStyleAccessories + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ZyStyleAccessories zyStyleAccessories) { + return super.exportXls(request, zyStyleAccessories, ZyStyleAccessories.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, ZyStyleAccessories.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/entity/ZyStyleAccessories.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/entity/ZyStyleAccessories.java new file mode 100644 index 00000000..227d0b5e --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/entity/ZyStyleAccessories.java @@ -0,0 +1,67 @@ +package org.jeecg.modules.demo.zyaccessories.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-11-10 + * @Version: V1.0 + */ +@Data +@TableName("zy_style_accessories") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="zy_style_accessories对象", description="款式辅料管理") +public class ZyStyleAccessories 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") + @Dict(dictTable = "zy_cloths_style", dicText = "style_names", dicCode = "id") + private java.lang.String styleId; + /**面料id*/ + @Excel(name = "面料id", width = 15) + @ApiModelProperty(value = "面料id") + @Dict(dictTable = "zy_accessories", dicText = "contents", dicCode = "id") + private java.lang.String accessoriesId; +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/mapper/ZyStyleAccessoriesMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/mapper/ZyStyleAccessoriesMapper.java new file mode 100644 index 00000000..1d997310 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/mapper/ZyStyleAccessoriesMapper.java @@ -0,0 +1,20 @@ +package org.jeecg.modules.demo.zyaccessories.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.jeecg.modules.demo.zyaccessories.entity.ZyStyleAccessories; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 款式辅料管理 + * @Author: jeecg-boot + * @Date: 2022-11-10 + * @Version: V1.0 + */ +public interface ZyStyleAccessoriesMapper extends BaseMapper { + + @Select("select count(*) from zy_style_accessories where style_id=#{styleId} and accessories_id=#{accessoriesId}") + int count(@Param("accessoriesId") String accessoriesId, @Param("styleId") String styleId); +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/mapper/xml/ZyStyleAccessoriesMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/mapper/xml/ZyStyleAccessoriesMapper.xml new file mode 100644 index 00000000..d559e919 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/mapper/xml/ZyStyleAccessoriesMapper.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/demo/zyaccessories/service/IZyStyleAccessoriesService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/service/IZyStyleAccessoriesService.java new file mode 100644 index 00000000..e52b263a --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/service/IZyStyleAccessoriesService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.demo.zyaccessories.service; + +import org.jeecg.modules.demo.zyaccessories.entity.ZyStyleAccessories; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 款式辅料管理 + * @Author: jeecg-boot + * @Date: 2022-11-10 + * @Version: V1.0 + */ +public interface IZyStyleAccessoriesService extends IService { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/service/impl/ZyStyleAccessoriesServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/service/impl/ZyStyleAccessoriesServiceImpl.java new file mode 100644 index 00000000..b4874f7a --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/service/impl/ZyStyleAccessoriesServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.demo.zyaccessories.service.impl; + +import org.jeecg.modules.demo.zyaccessories.entity.ZyStyleAccessories; +import org.jeecg.modules.demo.zyaccessories.mapper.ZyStyleAccessoriesMapper; +import org.jeecg.modules.demo.zyaccessories.service.IZyStyleAccessoriesService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 款式辅料管理 + * @Author: jeecg-boot + * @Date: 2022-11-10 + * @Version: V1.0 + */ +@Service +public class ZyStyleAccessoriesServiceImpl extends ServiceImpl implements IZyStyleAccessoriesService { + +}