From fddf9f7316e7917e9cdef7f620ea9b98378e15b1 Mon Sep 17 00:00:00 2001 From: Hy Date: Tue, 22 Jun 2021 11:01:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=AE=B1=E8=BF=9E=E6=8E=A5=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/NewJobManageController.java | 388 ++++++++++++++++++ .../controller/WarningInfoController.java | 2 +- 2 files changed, 389 insertions(+), 1 deletion(-) create mode 100644 jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/controller/NewJobManageController.java diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/controller/NewJobManageController.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/controller/NewJobManageController.java new file mode 100644 index 0000000..fd29c1b --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/controller/NewJobManageController.java @@ -0,0 +1,388 @@ +package org.jeecg.modules.demo.jobmanage.controller; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.apache.poi.ss.formula.functions.T; +import org.apache.shiro.SecurityUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.demo.jobmanage.entity.JobManage; +import org.jeecg.modules.demo.jobmanage.service.IJobManageService; + +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.kitreader.NewKitReader; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.modules.demo.kitreader.Parsing; +import org.jeecg.modules.demo.kitreader.encoding.Cmd_82; +import org.jeecg.modules.demo.kitreader.inspectioninfor.InspectionInfor; +import org.jeecg.modules.demo.model.Model; +import org.jeecg.modules.demo.tooladmin.service.IToolAdminService; +import org.jeecg.modules.demo.toolbox.entity.Toolbox; +import org.jeecg.modules.demo.toolbox.rest.ToolboxRestController; +import org.jeecg.modules.demo.toolbox.service.IToolboxService; +import org.jeecg.modules.demo.typeofwork.service.ITypeOfWorkService; +import org.jeecg.modules.demo.useinfo.entity.UseInfo; +import org.jeecg.modules.demo.useinfo.service.IUseInfoService; +import org.jeecg.modules.demo.toolbox.rest.ToolboxRestController; +import org.jeecg.modules.demo.warningInfo.entity.WarningInfo; +import org.jeecg.modules.demo.warningInfo.service.IWarningInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import toolkit.KitReader; +import tools.Conversion; +import tools.Types; + +/** + * @Description: 作业管理 + * @Author: jeecg-boot + * @Date: 2021-05-24 + * @Version: V1.0 + */ +@Api(tags = "新的作业管理") +@RestController +@RequestMapping("/newjobmanage/newjobManage") +@Slf4j +public class NewJobManageController extends JeecgController { + @Autowired + private IJobManageService jobManageService; + @Autowired + private ShiroRealm shiroRealm; + @Autowired + private ToolboxRestController restController; + @Autowired + private IWarningInfoService warningInfoService; + @Autowired + private IToolboxService toolboxService; + @Autowired + private ITypeOfWorkService ofWorkService; + @Autowired + private IUseInfoService useInfoService; + @Autowired + private IToolAdminService toolAdminService; + + public static KitReader kitReader = new toolkit.KitReader(new NewKitReader()); + + //public static LoginUser loginUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); + + /** + * 分页列表查询 + * + * @param jobManage + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "作业管理-分页列表查询") + @ApiOperation(value = "作业管理-分页列表查询", notes = "作业管理-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(JobManage jobManage, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(jobManage, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = jobManageService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param jsonObject + * @return + */ + @AutoLog(value = "作业管理-添加") + @ApiOperation(value = "作业管理-添加", notes = "作业管理-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody JSONObject jsonObject) { + //开锁 + String s = kitReader.ChestDoorUnLock(Byte.parseByte(jsonObject.getString("cupboardDoor")), 3000,true); + if (!"-4".equalsIgnoreCase(s)){ + //判断作业状态 + if ("3".equalsIgnoreCase(jsonObject.getString("status"))){ + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + //判断是否在巡检 + if (ToolboxRestController.isInspectionStatus) { + kitReader.PreControlAction(); + } + //查询设备状态 + Map toolboxDoorNum = restController.getToolboxDoorNum(jsonObject.getString("cupboardDoor")); + //获取工种名称 + String typeOfWorkName = ofWorkService.getTypeOfWorkName(toolboxDoorNum.get("0" + jsonObject.getString("cupboardDoor"))); + UseInfo useInfo = new UseInfo(); + useInfo.setCreateBy(loginUser.getUsername()); + useInfo.setUseName(loginUser.getUsername()); + useInfo.setToolboxId(toolboxDoorNum.get("0" + jsonObject.getString("cupboardDoor"))); + useInfo.setCreateTime(new Date()); + if (typeOfWorkName != null && !"".equalsIgnoreCase(typeOfWorkName)){ + useInfo.setUseType(typeOfWorkName); + } + //未结束作业 + useInfo.setStatus(0); + //查询员工工号 + Model userNo = useInfoService.getUserNo(loginUser.getUsername()); + if (userNo != null){ + useInfo.setUserJobNumber(userNo.getStr()); + } + //增加使用信息 + useInfoService.save(useInfo); + JobManage jobManage = new JobManage(); + jobManage.setOperator(loginUser.getRealname()); + jobManage.setOperatorAccount(loginUser.getUsername()); + jobManage.setStatus("1"); + jobManage.setEquipmentNum(toolboxDoorNum.get("0" + jsonObject.getString("cupboardDoor"))); + jobManage.setCupboardDoor(jsonObject.getString("cupboardDoor")); + jobManageService.save(jobManage); + if (ToolboxRestController.isInspectionStatus) { + kitReader.PostControlAction(); + } + return Result.OK(jobManage); + } + return Result.OK("开锁成功！"); + } + return Result.error("开锁失败！"); + } + + + /** + * @param jsonObject 开箱用户 + * @description: 更换工具 + * @return: org.jeecg.common.api.vo.Result + * @author huangyu + * @date: 2021/6/4 11:20 + */ + @AutoLog(value = "作业管理-更换工具") + @ApiOperation(value = "作业管理-更换工具", notes = "作业管理-更换工具") + @PutMapping("replacementTool") + public Result replacementTool(@RequestBody JSONObject jsonObject) { + return jobManageService.replacementTool(jsonObject.getString("equipmentNum"), jsonObject.getString("cupboardDoor"), jsonObject.getString("userName")); + } + + @AutoLog(value = "作业管理-结束更换工具") + @ApiOperation(value = "作业管理-结束更换工具", notes = "作业管理-结束更换工具") + @PutMapping("exitReplacementTool") + public Result exitReplacementTool(@RequestBody JSONObject jsonObject) { + if (ToolboxRestController.isInspectionStatus) { + kitReader.PreControlAction(); + } + //String s = kitReader.ChestDoorUnLock(Byte.parseByte(jsonObject.getString("cupboardDoor")), 3000,true); + Result result = null; +// if (!s.equalsIgnoreCase("-4")) { +// result = jobManageService.exitReplacementTool(jsonObject.getString("equipmentNum"), jsonObject.getString("cupboardDoor"), jsonObject.getString("userName")); +// } else { +// return Result.error("开锁失败！"); +// } + result = jobManageService.exitReplacementTool(jsonObject.getString("equipmentNum"), jsonObject.getString("cupboardDoor"), jsonObject.getString("userName")); + if (ToolboxRestController.isInspectionStatus) { + kitReader.PostControlAction(); + } + return result; + } + + /** + * 编辑 + * + * @param jobManage + * @return + */ + @AutoLog(value = "作业管理-结束作业") + @ApiOperation(value = "作业管理-结束作业", notes = "作业管理-结束作业") + @PutMapping(value = "/edit") + public Result edit(@RequestBody JobManage jobManage) { + //jobManageService.updateById(jobManage); + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + byte cupboardDoor = (byte)Integer.parseInt(jobManage.getCupboardDoor()); + //开锁 + String s = kitReader.ChestDoorUnLock(cupboardDoor, 3000,true); + if (!"-4".equalsIgnoreCase(s)){ + return Result.OK("开锁成功!"); + } + return Result.error("开锁失败!"); + } + + /** + * @description: 判断箱子连接是否正常 + * @param jsonObject + * @return: boolean + * @author huangyu + * @date: 2021/6/22 9:41 + */ + @RequestMapping("judgeToolbox") + public boolean judgeToolbox(@RequestBody JSONObject jsonObject){ + //查询设备状态 + Map toolboxDoorNum = restController.getToolboxDoorNum(jsonObject.getString("cupboardDoor")); + Parsing.parsingCode(NewKitReader.kitMsg.split(",")); + if (!"1".equalsIgnoreCase(Parsing.resule)){ + return false; + } + return true; + } + + + @PostMapping("/uploadData") + public Result uploadData(@RequestBody JobManage jobManage){ + //查询设备状态 + Map toolboxDoorNum = restController.getToolboxDoorNum(jobManage.getCupboardDoor()); + Parsing.parsingCode(NewKitReader.kitMsg.split(",")); +// if (!"1".equalsIgnoreCase(Parsing.resule)){ +// return Result.error("箱子不在柜子中，或出现异常，请联系管理员！"); +// } + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (jobManage.getCupboardDoor() != null && !"".equalsIgnoreCase(jobManage.getCupboardDoor())){ + byte cupboardDoor = (byte)Integer.parseInt(jobManage.getCupboardDoor()); + + //获取工种名称 + String typeOfWorkName = ofWorkService.getTypeOfWorkName(toolboxDoorNum.get("0" + jobManage.getCupboardDoor())); + //查询员工工号 + Model userNo = useInfoService.getUserNo(loginUser.getUsername()); + //获取工具箱内容 + NewKitReader.kitReader.GetToolBoxTimeAndContent(cupboardDoor,(byte)1, Integer.parseInt(Cmd_82.closeBoxNum)-1,true); + //获取报警信息 + WarningInfo warningInfor = InspectionInfor.getWarningInfor(NewKitReader.kitMsg); + //对比标签内容 + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("toolbox_num",toolboxDoorNum.get("0" + jobManage.getCupboardDoor())); + Toolbox toolbox_num = toolboxService.getOne(wrapper); + //对比标签信息，获取丢失的工具标签 + List split1 = null; + if (toolbox_num != null && warningInfor != null){ + String newTagsInfo = ""; + String[] strings = toolbox_num.getTagsInfo().substring(0, toolbox_num.getTagsInfo().length() - 1).replace("-","").split(","); + split1 = Arrays.asList(warningInfor.getTagsContent().substring(0, warningInfor.getTagsContent().length() - 1).split(",")); + for (String tag : strings){ + if (!split1.contains(tag)){ + newTagsInfo += tag + ","; + } + } + warningInfor.setTagsContent(newTagsInfo); + } + if (split1 != null){ + //删除旧的工具箱工具信息 + QueryWrapper queryWrapper = new QueryWrapper(); + wrapper.eq("toolbox_num",toolboxDoorNum.get("0" + jobManage.getCupboardDoor())); + if(toolAdminService.remove(queryWrapper)){ + //更新工具箱工具信息 + toolAdminService.saveList(split1,toolboxDoorNum.get("0" + jobManage.getCupboardDoor()),loginUser.getUsername(),new Date()); + } + } + //报警信息上传 + if (warningInfor != null){ + if (typeOfWorkName != null && !"".equalsIgnoreCase(typeOfWorkName)) { + warningInfor.setWarningType(typeOfWorkName); + } + warningInfor.setWarningTime(new Date()); + if (userNo.getStr() != null && !"".equalsIgnoreCase(userNo.getStr())){ + warningInfor.setUserJobNumber(userNo.getStr()); + } + if (warningInfor.getTagsContent() != null && !"".equalsIgnoreCase(warningInfor.getTagsContent())){ + warningInfoService.save(warningInfor); + } + } + //更新使用信息 + useInfoService.updateUseInfo(loginUser.getUsername(), userNo.getStr(), 0, new Date(), toolboxDoorNum.get("0" + jobManage.getCupboardDoor())); + //更新作业信息 + int i = jobManageService.updateJob(jobManage.getCupboardDoor(), jobManage.getEquipmentNum()); + return Result.OK("数据上传成功！"); + } + return Result.error("必要参数不存在，数据上传失败！"); + } + + /** + * 通过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) { + jobManageService.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.jobManageService.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) { + JobManage jobManage = jobManageService.getById(id); + if (jobManage == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(jobManage); + } + + /** + * 导出excel + * + * @param request + * @param jobManage + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, JobManage jobManage) { + return super.exportXls(request, jobManage, JobManage.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, JobManage.class); + } + + + /** + * 查询作业状态 + * + * @return + */ + @GetMapping(value = "/jobManageStatus") + public Result getJobManageStatus(@RequestParam("equipmentNum") String equipmentNum, @RequestParam("cupboardDoor") String cupboardDoor) { + JobManage job = jobManageService.getJob(equipmentNum, cupboardDoor); + return Result.OK(job); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/warninginfo/controller/WarningInfoController.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/warninginfo/controller/WarningInfoController.java index 4b9a670..25a5bf3 100644 --- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/warninginfo/controller/WarningInfoController.java +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/warninginfo/controller/WarningInfoController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.warningInfo.controller; +package org.jeecg.modules.demo.warninginfo.controller; import java.util.ArrayList; import java.util.Arrays; -- Gitee From 28d5822d58c8d20ad2fb3674a8dead5e697703e5 Mon Sep 17 00:00:00 2001 From: Hy Date: Tue, 22 Jun 2021 14:34:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/JobManageController.java | 26 ++++++++++++------- .../controller/NewJobManageController.java | 4 +-- .../tooladmin/mapper/ToolAdminMapper.java | 4 +++ .../tooladmin/service/IToolAdminService.java | 2 ++ .../service/impl/ToolAdminServiceImpl.java | 13 ++++++++++ 5 files changed, 37 insertions(+), 12 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/controller/JobManageController.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/controller/JobManageController.java index 2b201e7..449ab33 100644 --- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/controller/JobManageController.java +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/controller/JobManageController.java @@ -238,24 +238,30 @@ public class JobManageController extends JeecgController split1 = null; - if (toolbox_num != null && warningInfor != null){ - String newTagsInfo = ""; - String[] strings = toolbox_num.getTagsInfo().substring(0, toolbox_num.getTagsInfo().length() - 1).replace("-","").split(","); + if (warningInfor != null){ split1 = Arrays.asList(warningInfor.getTagsContent().substring(0, warningInfor.getTagsContent().length() - 1).split(",")); - for (String tag : strings){ - if (!split1.contains(tag)){ - newTagsInfo += tag + ","; + String newTagsInfo = ""; + if (toolbox_num != null){ + String[] strings = toolbox_num.getTagsInfo().substring(0, toolbox_num.getTagsInfo().length() - 1).replace("-","").split(","); + for (String tag : strings){ + if (!split1.contains(tag)){ + newTagsInfo += tag + ","; + } } } warningInfor.setTagsContent(newTagsInfo); } + //删除旧的工具箱工具信息 if (split1 != null){ - //删除旧的工具箱工具信息 - QueryWrapper queryWrapper = new QueryWrapper(); - wrapper.eq("toolbox_num",toolboxDoorNum.get("0" + jobManage.getCupboardDoor())); - if(toolAdminService.remove(queryWrapper)){ + //List tags = Arrays.asList(Cmd_82.tagsInfo.substring(0,Cmd_82.tagsInfo.length()-1).split(",")); +// QueryWrapper queryWrapper = new QueryWrapper(); +// wrapper.eq("toolbox_num",toolboxDoorNum.get("0" + jobManage.getCupboardDoor())); + Integer integer = toolAdminService.removeToolboxNum(toolboxDoorNum.get("0" + jobManage.getCupboardDoor())); + if(integer>0){ //更新工具箱工具信息 toolAdminService.saveList(split1,toolboxDoorNum.get("0" + jobManage.getCupboardDoor()),loginUser.getUsername(),new Date()); + }else if (integer != null){ + toolAdminService.saveList(split1,toolboxDoorNum.get("0" + jobManage.getCupboardDoor()),loginUser.getUsername(),new Date()); } } //报警信息上传 diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/controller/NewJobManageController.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/controller/NewJobManageController.java index fd29c1b..6bd3251 100644 --- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/controller/NewJobManageController.java +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/controller/NewJobManageController.java @@ -37,8 +37,8 @@ import org.jeecg.modules.demo.typeofwork.service.ITypeOfWorkService; import org.jeecg.modules.demo.useinfo.entity.UseInfo; import org.jeecg.modules.demo.useinfo.service.IUseInfoService; import org.jeecg.modules.demo.toolbox.rest.ToolboxRestController; -import org.jeecg.modules.demo.warningInfo.entity.WarningInfo; -import org.jeecg.modules.demo.warningInfo.service.IWarningInfoService; +import org.jeecg.modules.demo.warninginfo.entity.WarningInfo; +import org.jeecg.modules.demo.warninginfo.service.IWarningInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/mapper/ToolAdminMapper.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/mapper/ToolAdminMapper.java index a006663..8446def 100644 --- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/mapper/ToolAdminMapper.java +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/mapper/ToolAdminMapper.java @@ -3,6 +3,7 @@ package org.jeecg.modules.demo.tooladmin.mapper; import java.util.Date; import java.util.List; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -42,4 +43,7 @@ public interface ToolAdminMapper extends BaseMapper { @Select("select * from tool_admin") List listAll(); + + @Delete("delete from tool_admin where toolbox_num = #{toolboxNum}") + Integer removeToolboxNum(@Param("toolboxNum") String toolboxNum); } diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/IToolAdminService.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/IToolAdminService.java index 671193a..58a08cc 100644 --- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/IToolAdminService.java +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/IToolAdminService.java @@ -35,4 +35,6 @@ public interface IToolAdminService extends IService { Integer saveList(List list, String toolboxNum, String username, Date createDate); List listAll(); + + Integer removeToolboxNum(String toolboxNum); } diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/impl/ToolAdminServiceImpl.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/impl/ToolAdminServiceImpl.java index 630bf78..59a5970 100644 --- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/impl/ToolAdminServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/tooladmin/service/impl/ToolAdminServiceImpl.java @@ -105,4 +105,17 @@ public class ToolAdminServiceImpl extends ServiceImpl