From 016b963ba95665bb7ce82311be20f4406281813f Mon Sep 17 00:00:00 2001 From: lenovo <123> Date: Tue, 23 Aug 2022 12:21:30 +0800 Subject: [PATCH] 20220803-hou --- .../ZyProcessAccessoriesController.java | 198 ++++++++++++ .../controller/ZyProcessActionController.java | 35 ++- .../controller/ZyProcessFabricController.java | 28 +- .../ZyProcessMachineController.java | 27 +- .../demo/pro/entity/ZyProcessAccessories.java | 67 ++++ .../mapper/ZyProcessAccessoriesMapper.java | 25 ++ .../pro/mapper/ZyProcessActionMapper.java | 10 +- .../pro/mapper/ZyProcessFabricMapper.java | 9 + .../pro/mapper/ZyProcessMachineMapper.java | 9 + .../mapper/xml/ZyProcessAccessoriesMapper.xml | 5 + .../service/IZyProcessAccessoriesService.java | 19 ++ .../pro/service/IZyProcessActionService.java | 5 + .../pro/service/IZyProcessFabricService.java | 5 + .../pro/service/IZyProcessMachineService.java | 5 + .../impl/ZyProcessAccessoriesServiceImpl.java | 33 ++ .../impl/ZyProcessActionServiceImpl.java | 14 + .../impl/ZyProcessFabricServiceImpl.java | 14 + .../impl/ZyProcessMachineServiceImpl.java | 15 + .../controller/ZyOperationtoolController.java | 296 +++++++++--------- .../operationtool/entity/ZyOperationtool.java | 18 +- .../mapper/ZyOperationtoolMapper.java | 10 +- .../service/IZyOperationtoolService.java | 5 + .../impl/ZyOperationtoolServiceImpl.java | 14 + 23 files changed, 704 insertions(+), 162 deletions(-) create mode 100644 jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java create mode 100644 jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessAccessories.java create mode 100644 jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessAccessoriesMapper.java create mode 100644 jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/xml/ZyProcessAccessoriesMapper.xml create mode 100644 jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessAccessoriesService.java create mode 100644 jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessAccessoriesServiceImpl.java diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java new file mode 100644 index 00000000..2f893026 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessAccessoriesController.java @@ -0,0 +1,198 @@ +package org.jeecg.modules.demo.pro.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.pro.entity.ZyProcessAccessories; +import org.jeecg.modules.demo.pro.service.IZyProcessAccessoriesService; + +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-08-18 + * @Version: V1.0 + */ +@Api(tags="面料表") +@RestController +@RequestMapping("/pro/zyProcessAccessories") +@Slf4j +public class ZyProcessAccessoriesController extends JeecgController { + @Autowired + private IZyProcessAccessoriesService zyProcessAccessoriesService; + + /** + * 分页列表查询 + * + * @param zyProcessAccessories + * @param pageNo + * @param pageSize + * @param req + * @return + */ + /* + * 这个真正的是辅料表 + * + * */ + @AutoLog(value = "面料表-分页列表查询") + @ApiOperation(value="面料表-分页列表查询", notes="面料表-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(ZyProcessAccessories zyProcessAccessories, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + // QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyProcessAccessories, req.getParameterMap()); + String s=null,t=null; + if(zyProcessAccessories.getProcessId()!=null){ + s="%"+zyProcessAccessories.getProcessId()+"%"; + } + if(zyProcessAccessories.getAccessoriesId()!=null){ + t="%"+zyProcessAccessories.getAccessoriesId()+"%"; + } + Page page = new Page(pageNo, pageSize); + IPage pageList = zyProcessAccessoriesService.page(page, s,t); + return Result.OK(pageList); + } + @AutoLog(value = "面料表-分页列表查询") + @ApiOperation(value="面料表-分页列表查询", notes="面料表-分页列表查询") + @GetMapping(value = "/list1") + public Result queryPageList1(ZyProcessAccessories zyProcessAccessories, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + // QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyProcessAccessories, req.getParameterMap()); + String s=zyProcessAccessories.getProcessId(),t=null; + if(zyProcessAccessories.getAccessoriesId()!=null){ + t="%"+zyProcessAccessories.getAccessoriesId()+"%"; + } + Page page = new Page(pageNo, pageSize); + IPage pageList = zyProcessAccessoriesService.page1(page, s,t); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param zyProcessAccessories + * @return + */ + @AutoLog(value = "面料表-添加") + @ApiOperation(value="面料表-添加", notes="面料表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ZyProcessAccessories zyProcessAccessories) { + zyProcessAccessoriesService.save(zyProcessAccessories); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param zyProcessAccessories + * @return + */ + @AutoLog(value = "面料表-编辑") + @ApiOperation(value="面料表-编辑", notes="面料表-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody ZyProcessAccessories zyProcessAccessories) { + zyProcessAccessoriesService.updateById(zyProcessAccessories); + 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) { + zyProcessAccessoriesService.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.zyProcessAccessoriesService.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) { + ZyProcessAccessories zyProcessAccessories = zyProcessAccessoriesService.getById(id); + if(zyProcessAccessories==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(zyProcessAccessories); + } + + /** + * 导出excel + * + * @param request + * @param zyProcessAccessories + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ZyProcessAccessories zyProcessAccessories) { + return super.exportXls(request, zyProcessAccessories, ZyProcessAccessories.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, ZyProcessAccessories.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessActionController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessActionController.java index 62d4a531..c3b2e077 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessActionController.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessActionController.java @@ -66,12 +66,37 @@ public class ZyProcessActionController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(zyProcessAction, req.getParameterMap()); - QueryWrapper queryWrapper = new QueryWrapper(); - Page page = new Page(pageNo, pageSize); - IPage pageList = zyProcessActionService.page(page, queryWrapper); - return Result.OK(pageList); + System.out.println(zyProcessAction); + String s=null,t=null; + if(zyProcessAction.getProcessId()!=null){ + s="%"+zyProcessAction.getProcessId()+"%"; + } + if(zyProcessAction.getActionId()!=null){ + t="%"+zyProcessAction.getActionId()+"%"; + } + Page page = new Page(pageNo, pageSize); + IPage pageList = zyProcessActionService.page(page, s,t); + return Result.OK(pageList); + } + @AutoLog(value = "zy_process_action-分页列表查询") + @ApiOperation(value="zy_process_action-分页列表查询", notes="zy_process_action-分页列表查询") + @GetMapping(value = "/list1") + public Result queryPageList1(ZyProcessAction zyProcessAction, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + + //QueryWrapper queryWrapper1 = QueryGenerator.initQueryWrapper(zyProcessAction, req.getParameterMap()).eq("process_id",zyProcessAction.getProcessId()); + String s=zyProcessAction.getProcessId(),t=null; + if(zyProcessAction.getActionId()!=null){ + t="%"+zyProcessAction.getActionId()+"%"; + } + Page page = new Page(pageNo, pageSize); + IPage pageList = zyProcessActionService.page1(page, s,t); + return Result.OK(pageList); + + } /** * 添加 diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessFabricController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessFabricController.java index 3fd18c62..0a31328e 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessFabricController.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessFabricController.java @@ -66,11 +66,35 @@ public class ZyProcessFabricController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(zyProcessFabric, req.getParameterMap()); + //QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyProcessFabric, req.getParameterMap()); + String s=null,t=null; + if(zyProcessFabric.getProcessId()!=null){ + s="%"+zyProcessFabric.getProcessId()+"%"; + } + if(zyProcessFabric.getFabricId()!=null){ + t="%"+zyProcessFabric.getFabricId()+"%"; + } Page page = new Page(pageNo, pageSize); - IPage pageList = zyProcessFabricService.page(page, queryWrapper); + IPage pageList = zyProcessFabricService.page(page,s,t); return Result.OK(pageList); } + @AutoLog(value = "zy_process_fabric-分页列表查询") + @ApiOperation(value="zy_process_fabric-分页列表查询", notes="zy_process_fabric-分页列表查询") + @GetMapping(value = "/list1") + public Result queryPageList1(ZyProcessFabric zyProcessFabric, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + //QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyProcessFabric, req.getParameterMap()); + String s=zyProcessFabric.getProcessId(),t=null; + + if(zyProcessFabric.getFabricId()!=null){ + t="%"+zyProcessFabric.getFabricId()+"%"; + } + Page page = new Page(pageNo, pageSize); + IPage pageList = zyProcessFabricService.page1(page,s,t); + return Result.OK(pageList); + } /** * 添加 diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java index 22ea6f90..0cb60428 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessMachineController.java @@ -66,12 +66,35 @@ public class ZyProcessMachineController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(zyProcessMachine, req.getParameterMap()); + //QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyProcessMachine, req.getParameterMap()); + String s=null,t=null; + if(zyProcessMachine.getProcessId()!=null){ + s="%"+zyProcessMachine.getProcessId()+"%"; + } + if(zyProcessMachine.getMachineId()!=null){ + t="%"+zyProcessMachine.getMachineId()+"%"; + } Page page = new Page(pageNo, pageSize); - IPage pageList = zyProcessMachineService.page(page, queryWrapper); + IPage pageList = zyProcessMachineService.page(page, s,t); return Result.OK(pageList); } + @AutoLog(value = "zy_process_machine-分页列表查询") + @ApiOperation(value="zy_process_machine-分页列表查询", notes="zy_process_machine-分页列表查询") + @GetMapping(value = "/list1") + public Result queryPageList1(ZyProcessMachine zyProcessMachine, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + //QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyProcessMachine, req.getParameterMap()); + String s=zyProcessMachine.getProcessId(),t=null; + if(zyProcessMachine.getMachineId()!=null){ + t="%"+zyProcessMachine.getMachineId()+"%"; + } + Page page = new Page(pageNo, pageSize); + IPage pageList = zyProcessMachineService.page1(page, s,t); + return Result.OK(pageList); + } /** * 添加 * diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessAccessories.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessAccessories.java new file mode 100644 index 00000000..06b977ed --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessAccessories.java @@ -0,0 +1,67 @@ +package org.jeecg.modules.demo.pro.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-08-18 + * @Version: V1.0 + */ +@Data +@TableName("zy_process_accessories") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="zy_process_accessories对象", description="辅料表与面料表反了") +public class ZyProcessAccessories 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; + /**工序表id*/ + @Excel(name = "工序", width = 15, dictTable = "zy_process", dicText = "process_name", dicCode = "id") + @Dict(dictTable = "zy_process", dicText = "process_name", dicCode = "id") + @ApiModelProperty(value = "工序表id") + private String processId; + /**面料表id*/ + @Excel(name = "机器", width = 15, dictTable = "zy_devicetype", dicText = "name", dicCode = "id") + @Dict(dictTable = "zy_accessories", dicText = "contents", dicCode = "id") + @ApiModelProperty(value = "面料表id") + private String accessoriesId; +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessAccessoriesMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessAccessoriesMapper.java new file mode 100644 index 00000000..8f000abf --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessAccessoriesMapper.java @@ -0,0 +1,25 @@ +package org.jeecg.modules.demo.pro.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.jeecg.modules.demo.pro.entity.ZyProcessAccessories; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 面料表 + * @Author: jeecg-boot + * @Date: 2022-08-18 + * @Version: V1.0 + */ +@Mapper +public interface ZyProcessAccessoriesMapper extends BaseMapper { + @Select("") + IPage page(Page page, @Param("p") String s, @Param("m") String t); + @Select("") + IPage page1(Page page, @Param("p") String s, @Param("m") String t); +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java index 54b06083..20c7055d 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java @@ -2,7 +2,11 @@ package org.jeecg.modules.demo.pro.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.jeecg.modules.demo.pro.entity.ZyProcessAction; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -12,6 +16,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @Date: 2021-11-03 * @Version: V1.0 */ +@Mapper public interface ZyProcessActionMapper extends BaseMapper { - + @Select("") + IPage page(Page page, @Param("p") String s, @Param("m") String t); + @Select("") + IPage page1(Page page, @Param("p") String s, @Param("m") String t); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessFabricMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessFabricMapper.java index f54dcdfd..0cd83515 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessFabricMapper.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessFabricMapper.java @@ -2,7 +2,11 @@ package org.jeecg.modules.demo.pro.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.jeecg.modules.demo.pro.entity.ZyProcessFabric; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -12,6 +16,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @Date: 2021-11-10 * @Version: V1.0 */ +@Mapper public interface ZyProcessFabricMapper extends BaseMapper { + @Select("") + IPage page(Page page, @Param("p") String s, @Param("m") String t); + @Select("") + IPage page1(Page page, @Param("p") String s, @Param("m") String t); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessMachineMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessMachineMapper.java index 942c8c25..d043716c 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessMachineMapper.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessMachineMapper.java @@ -2,7 +2,11 @@ package org.jeecg.modules.demo.pro.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.jeecg.modules.demo.pro.entity.ZyProcessMachine; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -12,6 +16,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @Date: 2021-11-10 * @Version: V1.0 */ +@Mapper public interface ZyProcessMachineMapper extends BaseMapper { + @Select("") + IPage page(Page page, @Param("p") String processId, @Param("m") String machineId); + @Select("") + IPage page1(Page page, @Param("p") String s, @Param("m") String t); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/xml/ZyProcessAccessoriesMapper.xml b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/xml/ZyProcessAccessoriesMapper.xml new file mode 100644 index 00000000..dba83b32 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/xml/ZyProcessAccessoriesMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessAccessoriesService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessAccessoriesService.java new file mode 100644 index 00000000..b374e7b5 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessAccessoriesService.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.demo.pro.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.modules.demo.pro.entity.ZyProcessAccessories; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 面料表 + * @Author: jeecg-boot + * @Date: 2022-08-18 + * @Version: V1.0 + */ +public interface IZyProcessAccessoriesService extends IService { + + IPage page(Page page, String s, String t); + + IPage page1(Page page, String s, String t); +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessActionService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessActionService.java index aaee1cc9..fa2e1455 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessActionService.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessActionService.java @@ -1,5 +1,7 @@ package org.jeecg.modules.demo.pro.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.demo.pro.entity.ZyProcessAction; import com.baomidou.mybatisplus.extension.service.IService; @@ -14,4 +16,7 @@ import java.util.List; public interface IZyProcessActionService extends IService { + IPage page(Page page, String s, String t); + + IPage page1(Page page, String s, String t); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessFabricService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessFabricService.java index 6ad99b2d..9040d5be 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessFabricService.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessFabricService.java @@ -1,5 +1,7 @@ package org.jeecg.modules.demo.pro.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.demo.pro.entity.ZyProcessFabric; import com.baomidou.mybatisplus.extension.service.IService; @@ -11,4 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IZyProcessFabricService extends IService { + IPage page(Page page, String s, String t); + + IPage page1(Page page, String s, String t); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessMachineService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessMachineService.java index 889caf81..256431bb 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessMachineService.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/IZyProcessMachineService.java @@ -1,5 +1,7 @@ package org.jeecg.modules.demo.pro.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.demo.pro.entity.ZyProcessMachine; import com.baomidou.mybatisplus.extension.service.IService; @@ -11,4 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IZyProcessMachineService extends IService { + IPage page(Page page, String processId, String machineId); + + IPage page1(Page page, String s, String t); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessAccessoriesServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessAccessoriesServiceImpl.java new file mode 100644 index 00000000..2ce81793 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessAccessoriesServiceImpl.java @@ -0,0 +1,33 @@ +package org.jeecg.modules.demo.pro.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.modules.demo.pro.entity.ZyProcessAccessories; +import org.jeecg.modules.demo.pro.mapper.ZyProcessAccessoriesMapper; +import org.jeecg.modules.demo.pro.service.IZyProcessAccessoriesService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 面料表 + * @Author: jeecg-boot + * @Date: 2022-08-18 + * @Version: V1.0 + */ +@Service +public class ZyProcessAccessoriesServiceImpl extends ServiceImpl implements IZyProcessAccessoriesService { + + @Autowired + ZyProcessAccessoriesMapper zyProcessAccessoriesMapper; + @Override + public IPage page(Page page, String s, String t) { + return zyProcessAccessoriesMapper.page(page,s,t); + } + + @Override + public IPage page1(Page page, String s, String t) { + return zyProcessAccessoriesMapper.page1(page,s,t); + } +} diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessActionServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessActionServiceImpl.java index e9c51ffc..ddc22491 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessActionServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessActionServiceImpl.java @@ -1,8 +1,11 @@ package org.jeecg.modules.demo.pro.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.demo.pro.entity.ZyProcessAction; import org.jeecg.modules.demo.pro.mapper.ZyProcessActionMapper; import org.jeecg.modules.demo.pro.service.IZyProcessActionService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -18,5 +21,16 @@ import java.util.List; @Service public class ZyProcessActionServiceImpl extends ServiceImpl implements IZyProcessActionService { + @Autowired + ZyProcessActionMapper zyProcessActionMapper; + @Override + public IPage page(Page page, String s, String t) { + return zyProcessActionMapper.page(page,s,t); + } + + @Override + public IPage page1(Page page, String s, String t) { + return zyProcessActionMapper.page1(page,s,t); + } } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessFabricServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessFabricServiceImpl.java index 3010f952..1e1b395e 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessFabricServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessFabricServiceImpl.java @@ -1,8 +1,11 @@ package org.jeecg.modules.demo.pro.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.demo.pro.entity.ZyProcessFabric; import org.jeecg.modules.demo.pro.mapper.ZyProcessFabricMapper; import org.jeecg.modules.demo.pro.service.IZyProcessFabricService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,4 +19,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ZyProcessFabricServiceImpl extends ServiceImpl implements IZyProcessFabricService { + @Autowired + ZyProcessFabricMapper zyProcessFabricMapper; + @Override + public IPage page(Page page, String s, String t) { + return zyProcessFabricMapper.page(page,s,t); + } + + @Override + public IPage page1(Page page, String s, String t) { + return zyProcessFabricMapper.page1(page,s,t); + } } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessMachineServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessMachineServiceImpl.java index eabf40f6..3da5b056 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessMachineServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessMachineServiceImpl.java @@ -1,8 +1,11 @@ package org.jeecg.modules.demo.pro.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.demo.pro.entity.ZyProcessMachine; import org.jeecg.modules.demo.pro.mapper.ZyProcessMachineMapper; import org.jeecg.modules.demo.pro.service.IZyProcessMachineService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,4 +19,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ZyProcessMachineServiceImpl extends ServiceImpl implements IZyProcessMachineService { + @Autowired + ZyProcessMachineMapper zyProcessMachine; + + @Override + public IPage page(Page page, String processId, String machineId) { + return zyProcessMachine.page(page,processId,machineId); + } + + @Override + public IPage page1(Page page, String s, String t) { + return zyProcessMachine.page1(page,s,t); + } } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java index 3bcbdb99..4e2b5017 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/controller/ZyOperationtoolController.java @@ -1,171 +1,177 @@ package org.jeecg.modules.operationtool.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.operationtool.entity.ZyOperationtool; -import org.jeecg.modules.operationtool.service.IZyOperationtoolService; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; 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.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.modules.operationtool.entity.ZyOperationtool; +import org.jeecg.modules.operationtool.service.IZyOperationtoolService; 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: 2021-12-08 - * @Version: V1.0 - */ +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + +/** +* @Description: 工序工具 +* @Author: jeecg-boot +* @Date: 2021-12-08 +* @Version: V1.0 +*/ @Api(tags="工序工具") @RestController @RequestMapping("/operationtool/zyOperationtool") @Slf4j public class ZyOperationtoolController extends JeecgController { - @Autowired - private IZyOperationtoolService zyOperationtoolService; - - /** - * 分页列表查询 - * - * @param zyOperationtool - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "工序工具-分页列表查询") - @ApiOperation(value="工序工具-分页列表查询", notes="工序工具-分页列表查询") - @GetMapping(value = "/list") - public Result queryPageList(ZyOperationtool zyOperationtool, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyOperationtool, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = zyOperationtoolService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param zyOperationtool - * @return - */ - @AutoLog(value = "工序工具-添加") - @ApiOperation(value="工序工具-添加", notes="工序工具-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody ZyOperationtool zyOperationtool) { - zyOperationtoolService.save(zyOperationtool); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param zyOperationtool - * @return - */ - @AutoLog(value = "工序工具-编辑") - @ApiOperation(value="工序工具-编辑", notes="工序工具-编辑") - @PutMapping(value = "/edit") - public Result edit(@RequestBody ZyOperationtool zyOperationtool) { - zyOperationtoolService.updateById(zyOperationtool); - 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) { - zyOperationtoolService.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.zyOperationtoolService.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) { - ZyOperationtool zyOperationtool = zyOperationtoolService.getById(id); - if(zyOperationtool==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(zyOperationtool); - } + @Autowired + private IZyOperationtoolService zyOperationtoolService; - /** - * 导出excel + /** + * 分页列表查询 * - * @param request * @param zyOperationtool + * @param pageNo + * @param pageSize + * @param req + * @return */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, ZyOperationtool zyOperationtool) { - return super.exportXls(request, zyOperationtool, ZyOperationtool.class, "工序工具"); + @AutoLog(value = "工序工具-分页列表查询") + @ApiOperation(value="工序工具-分页列表查询", notes="工序工具-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(ZyOperationtool zyOperationtool, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + //QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyOperationtool, req.getParameterMap()); + System.out.println("asdadad*********************************************"); + String s=null,t=null; + if(zyOperationtool.getOperationid()!=null){ + s="%"+zyOperationtool.getOperationid()+"%"; + } + if(zyOperationtool.getToolid()!=null){ + t="%"+zyOperationtool.getToolid()+"%"; + } + Page page = new Page(pageNo, pageSize); + IPage pageList = zyOperationtoolService.page(page, s,t); + return Result.OK(pageList); + } + @AutoLog(value = "工序工具-分页列表查询") + @ApiOperation(value="工序工具-分页列表查询", notes="工序工具-分页列表查询") + @GetMapping(value = "/list1") + public Result queryPageList1(ZyOperationtool zyOperationtool, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + //QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyOperationtool, req.getParameterMap()); + String s=zyOperationtool.getOperationid(),t=null; + + if(zyOperationtool.getToolid()!=null){ + t="%"+zyOperationtool.getToolid()+"%"; + } + Page page = new Page(pageNo, pageSize); + IPage pageList = zyOperationtoolService.page1(page, s,t); + return Result.OK(pageList); } + /** + * 添加 + * + * @param zyOperationtool + * @return + */ + @AutoLog(value = "工序工具-添加") + @ApiOperation(value="工序工具-添加", notes="工序工具-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ZyOperationtool zyOperationtool) { + zyOperationtoolService.save(zyOperationtool); + return Result.OK("添加成功！"); + } - /** - * 通过excel导入数据 + /** + * 编辑 * - * @param request - * @param response + * @param zyOperationtool * @return */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, ZyOperationtool.class); - } + @AutoLog(value = "工序工具-编辑") + @ApiOperation(value="工序工具-编辑", notes="工序工具-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody ZyOperationtool zyOperationtool) { + zyOperationtoolService.updateById(zyOperationtool); + 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) { + zyOperationtoolService.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.zyOperationtoolService.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) { + ZyOperationtool zyOperationtool = zyOperationtoolService.getById(id); + if(zyOperationtool==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(zyOperationtool); + } + + /** + * 导出excel + * + * @param request + * @param zyOperationtool + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ZyOperationtool zyOperationtool) { + return super.exportXls(request, zyOperationtool, ZyOperationtool.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, ZyOperationtool.class); + } } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/entity/ZyOperationtool.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/entity/ZyOperationtool.java index b3c2e80e..716e3193 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/entity/ZyOperationtool.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/entity/ZyOperationtool.java @@ -60,12 +60,18 @@ public class ZyOperationtool implements Serializable { @ApiModelProperty(value = "工序") private String operationid; /**机器*/ - @Excel(name = "机器", width = 15, dictTable = "zy_devicetype", dicText = "name", dicCode = "id") - @Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id") - @ApiModelProperty(value = "机器") - private String device; +// @Excel(name = "机器", width = 15, dictTable = "zy_devicetype", dicText = "name", dicCode = "id") +// @Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id") +// @ApiModelProperty(value = "机器") +// private String device; /**工具*/ - @Excel(name = "工具", width = 15) +// @Excel(name = "工具", width = 15) +// @ApiModelProperty(value = "工具") +// private String tools; + + @Excel(name = "工具", width = 15, dictTable = "zy_tool_types", dicText = "name", dicCode = "id") + @Dict(dictTable = "zy_tool_types", dicText = "name", dicCode = "id") @ApiModelProperty(value = "工具") - private String tools; + private String toolid; + } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/mapper/ZyOperationtoolMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/mapper/ZyOperationtoolMapper.java index b3cc463c..cbb64174 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/mapper/ZyOperationtoolMapper.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/mapper/ZyOperationtoolMapper.java @@ -2,7 +2,11 @@ package org.jeecg.modules.operationtool.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.jeecg.modules.operationtool.entity.ZyOperationtool; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -12,6 +16,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @Date: 2021-12-08 * @Version: V1.0 */ +@Mapper public interface ZyOperationtoolMapper extends BaseMapper { - + @Select("") + IPage page(Page page, @Param("p") String s, @Param("m") String t); + @Select("") + IPage page1(Page page, @Param("p") String s, @Param("m") String t); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/service/IZyOperationtoolService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/service/IZyOperationtoolService.java index 4fe6fead..769f474a 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/service/IZyOperationtoolService.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/service/IZyOperationtoolService.java @@ -1,5 +1,7 @@ package org.jeecg.modules.operationtool.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.operationtool.entity.ZyOperationtool; import com.baomidou.mybatisplus.extension.service.IService; @@ -11,4 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IZyOperationtoolService extends IService { + IPage page(Page page, String s, String t); + + IPage page1(Page page, String s, String t); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/service/impl/ZyOperationtoolServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/service/impl/ZyOperationtoolServiceImpl.java index 657a3565..80f73fc9 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/service/impl/ZyOperationtoolServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/operationtool/service/impl/ZyOperationtoolServiceImpl.java @@ -1,8 +1,11 @@ package org.jeecg.modules.operationtool.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.operationtool.entity.ZyOperationtool; import org.jeecg.modules.operationtool.mapper.ZyOperationtoolMapper; import org.jeecg.modules.operationtool.service.IZyOperationtoolService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,4 +19,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ZyOperationtoolServiceImpl extends ServiceImpl implements IZyOperationtoolService { + @Autowired + ZyOperationtoolMapper zyOperationtoolMapper; + @Override + public IPage page(Page page, String s, String t) { + return zyOperationtoolMapper.page(page,s,t); + } + + @Override + public IPage page1(Page page, String s, String t) { + return zyOperationtoolMapper.page1(page,s,t); + } }