From 7a5e63243f3ae3de3fa3dcb56090992970d7924e Mon Sep 17 00:00:00 2001 From: xiongml Date: Fri, 4 Jun 2021 18:01:42 +0800 Subject: [PATCH 1/2] 'a' --- .../jobmanage/controller/JobManageController.java | 8 ++++++++ .../demo/jobmanage/service/IJobManageService.java | 2 ++ .../jobmanage/service/impl/JobManageServiceImpl.java | 11 +++++++++++ .../demo/toolbox/rest/ToolboxRestController.java | 5 ++++- 4 files changed, 25 insertions(+), 1 deletion(-) 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 2e3b677..231d6ed 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 @@ -106,6 +106,14 @@ public class JobManageController extends JeecgController exitReplacementTool(@RequestBody JSONObject jsonObject) { + + return jobManageService.exitReplacementTool(jsonObject.getString("equipmentNum"), jsonObject.getString("cupboardDoor"), jsonObject.getString("userName")); + } + /** * 编辑 * diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/service/IJobManageService.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/service/IJobManageService.java index d305563..84e001e 100644 --- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/service/IJobManageService.java +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/service/IJobManageService.java @@ -33,4 +33,6 @@ public interface IJobManageService extends IService { * @date: 2021/6/4 11:22 */ Result replacementTool(String equipmentNum, String cupboardDoor, String userName); + + Result exitReplacementTool(String equipmentNum,String cupboardDoor,String userName); } diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/service/impl/JobManageServiceImpl.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/service/impl/JobManageServiceImpl.java index 9485125..12679c4 100644 --- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/service/impl/JobManageServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/service/impl/JobManageServiceImpl.java @@ -95,4 +95,15 @@ public class JobManageServiceImpl extends ServiceImpl exitReplacementTool(String equipmentNum, String cupboardDoor, String userName) { + JobManage jobManage = jobManageMapper.replacementTool(equipmentNum, cupboardDoor, userName); + if (jobManage != null){ + jobManage.setStatus("0"); + jobManageMapper.updateById(jobManage); + return Result.OK(jobManage); + } + return Result.error("结束更换工具只能本人操作！"); + } } diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/toolbox/rest/ToolboxRestController.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/toolbox/rest/ToolboxRestController.java index af9ef20..1953eef 100644 --- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/toolbox/rest/ToolboxRestController.java +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/toolbox/rest/ToolboxRestController.java @@ -48,7 +48,7 @@ public class ToolboxRestController { for (CabinetManage cabinetManage : allList){ String s = kitReader.ChestDoorUnLock(Byte.parseByte(cabinetManage.getCabinetCode()), 300); if (s.equalsIgnoreCase("-4")){ - stringBuffer.append(cabinetManage.getCabinetName()); + stringBuffer.append(cabinetManage.getCabinetName()+','); }else { String toolboxNum = toolboxService.getToolboxNum(cabinetManage.getCabinetCode()); if (loginUser != null){ @@ -64,6 +64,9 @@ public class ToolboxRestController { } } } + if(loginUser!=null){ + stringBuffer.append(loginUser.getRealname()); + } return Result.OK("开锁成功",stringBuffer); }catch (Exception e){ e.getMessage(); -- Gitee From 21aa98bbf530fd348183bf67661284609bd63fd2 Mon Sep 17 00:00:00 2001 From: xiongml Date: Mon, 7 Jun 2021 12:02:54 +0800 Subject: [PATCH 2/2] 'toolbox' --- .../controller/JobManageController.java | 1 - .../service/impl/JobManageServiceImpl.java | 3 ++- .../toolbox/rest/ToolboxRestController.java | 22 ++++++++++++++++--- 3 files changed, 21 insertions(+), 5 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 231d6ed..a35778f 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 @@ -110,7 +110,6 @@ public class JobManageController extends JeecgController exitReplacementTool(@RequestBody JSONObject jsonObject) { - return jobManageService.exitReplacementTool(jsonObject.getString("equipmentNum"), jsonObject.getString("cupboardDoor"), jsonObject.getString("userName")); } diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/service/impl/JobManageServiceImpl.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/service/impl/JobManageServiceImpl.java index 12679c4..95f0007 100644 --- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/service/impl/JobManageServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/jobmanage/service/impl/JobManageServiceImpl.java @@ -78,6 +78,7 @@ public class JobManageServiceImpl extends ServiceImpl replacementTool(String equipmentNum, String cupboardDoor, String userName) { try { + System.out.println(equipmentNum+','+cupboardDoor+','+userName); JobManage jobManage = jobManageMapper.replacementTool(equipmentNum, cupboardDoor, userName); if (jobManage != null){ KitReader kitReader = new KitReader(new NewKitReader()); @@ -100,7 +101,7 @@ public class JobManageServiceImpl extends ServiceImpl exitReplacementTool(String equipmentNum, String cupboardDoor, String userName) { JobManage jobManage = jobManageMapper.replacementTool(equipmentNum, cupboardDoor, userName); if (jobManage != null){ - jobManage.setStatus("0"); + jobManage.setStatus("1"); jobManageMapper.updateById(jobManage); return Result.OK(jobManage); } diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/toolbox/rest/ToolboxRestController.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/toolbox/rest/ToolboxRestController.java index 1953eef..2a17fc5 100644 --- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/toolbox/rest/ToolboxRestController.java +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/toolbox/rest/ToolboxRestController.java @@ -1,5 +1,7 @@ package org.jeecg.modules.demo.toolbox.rest; +import com.alibaba.fastjson.JSONObject; +import com.google.gson.JsonObject; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.vo.LoginUser; @@ -10,10 +12,13 @@ import org.jeecg.modules.demo.jobmanage.service.IJobManageService; import org.jeecg.modules.demo.kitreader.NewKitReader; import org.jeecg.modules.demo.toolbox.service.IToolboxService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import toolkit.KitReader; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -36,15 +41,26 @@ public class ToolboxRestController { * @date: 2021/6/1 15:51 */ @RequestMapping("unlock") - public Result unlock(){ + public Result unlock(@RequestBody(required = false) JSONObject jsonObject){ KitReader kitReader = null; List allList =null; StringBuffer stringBuffer = new StringBuffer(); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); try { - + String cabinetCode = jsonObject.getString("cabinetCode"); + if(cabinetCode!=""||cabinetCode==null){ + String sub = cabinetCode.substring(0,cabinetCode.length()-1); + String[] codes = sub.split(","); + allList = new ArrayList<>(); + for (String code : codes) { + CabinetManage cabinetManage = new CabinetManage(); + cabinetManage.setCabinetCode(code); + allList.add(cabinetManage); + } + }else{ + allList = cabinetManageMapper.getAllList(); + } kitReader = new KitReader(new NewKitReader()); - allList = cabinetManageMapper.getAllList(); for (CabinetManage cabinetManage : allList){ String s = kitReader.ChestDoorUnLock(Byte.parseByte(cabinetManage.getCabinetCode()), 300); if (s.equalsIgnoreCase("-4")){ -- Gitee