From a658f8291568357f7d4ade7ff6809bd0670dec07 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Wed, 28 Feb 2024 13:52:12 +0800 Subject: [PATCH] =?UTF-8?q?rfid=E7=BB=91=E5=AE=9A=E5=92=8C=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E9=85=8D=E7=BD=AE=E9=BB=98=E8=AE=A4=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/auth/service/SysLoginService.java | 20 +++++++++++ .../controller/LeaseOutDetailsController.java | 35 +++++++++++++++---- .../app/service/LeaseOutDetailsService.java | 2 ++ .../impl/LeaseOutDetailsServiceImpl.java | 14 ++++++++ .../sgzb/base/mapper/MaMachineMapper.java | 1 + .../resources/mapper/base/MaMachineMapper.xml | 3 ++ .../controller/BackApplyController.java | 4 +-- .../PurchaseMacodeInfoController.java | 3 +- .../service/impl/BackApplyServiceImpl.java | 7 ++-- .../impl/PurchaseMacodeInfoServiceImpl.java | 2 -- .../system/controller/SysUserController.java | 2 +- .../service/impl/SysUserServiceImpl.java | 2 +- 12 files changed, 79 insertions(+), 16 deletions(-) diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java index bb6dc779..ee169057 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java @@ -22,7 +22,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -231,6 +233,14 @@ public class SysLoginService { sysUser.setNickName(username); sysUser.setPassword(SecurityUtils.encryptPassword(password)); sysUser.setPhonenumber(phone); + sysUser.setDeptId(100L); + List list = new ArrayList<>(); + list.add(105L); + Long[] longArray = new Long[list.size()]; + for (int i = 0; i < list.size(); i++) { + longArray[i] = list.get(i); + } + sysUser.setRoleIds(longArray); R registerResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER); if (R.FAIL == registerResult.getCode()) { @@ -258,4 +268,14 @@ public class SysLoginService { return hashMap; } } + + + public static long[] convertToLongArray(int num) { + String numStr = Integer.toString(num); + long[] longArray = new long[numStr.length()]; + for (int i = 0; i < numStr.length(); i++) { + longArray[i] = Long.parseLong(String.valueOf(numStr.charAt(i))); + } + return longArray; + } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java index c4125f14..7ed9f392 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java @@ -1,13 +1,16 @@ package com.bonus.sgzb.app.controller; import com.bonus.sgzb.app.domain.LeaseApplyDetails; +import com.bonus.sgzb.app.domain.LeaseApplyInfo; import com.bonus.sgzb.app.service.LeaseOutDetailsService; import com.bonus.sgzb.base.api.domain.LeaseOutDetails; +import com.bonus.sgzb.base.api.domain.MaMachine; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -29,13 +32,29 @@ public class LeaseOutDetailsController extends BaseController { @Log(title = "获取领料出库详情表", businessType = BusinessType.QUERY) @GetMapping("/getLeaseList") - public TableDataInfo getLeaseList(@RequestParam(value ="taskId", required = false, defaultValue = "") String taskId){ + public TableDataInfo getLeaseList(@RequestParam(value = "taskId", required = false, defaultValue = "") String taskId) { return getDataTable(leaseOutDetailsService.selectListByParentId(taskId)); } + /** + * Rfid绑定 + */ + @ApiOperation(value = "根据Rfid绑定设备-app") + @PostMapping("bindMachineByRfid") + public AjaxResult bindMachineByRfid(@RequestBody MaMachine maMachine) { + int i = leaseOutDetailsService.bindMachineByRfid(maMachine); + if (i == 0) { + return AjaxResult.success("绑定成功"); + } else { + return AjaxResult.error("绑定失败"); + } + + } + /** * 根据code编码查询设备信息 + * * @param maCode 机具编码 * @return 设备信息 */ @@ -47,6 +66,7 @@ public class LeaseOutDetailsController extends BaseController { /** * 根据QrCode编码查询设备信息 + * * @param qrCode 二维码编码 * @return 设备信息 */ @@ -58,6 +78,7 @@ public class LeaseOutDetailsController extends BaseController { /** * 根据RFID编码查询设备信息 + * * @param rfidCode RFID编码 * @return 设备信息 */ @@ -69,22 +90,22 @@ public class LeaseOutDetailsController extends BaseController { /** * 领料出库，对库存处理 + * * @param record 出库内容 */ @Log(title = "领料出库", businessType = BusinessType.UPDATE) @PostMapping("/submitOut") - public AjaxResult submitOut(@RequestBody LeaseOutDetails record){ + public AjaxResult submitOut(@RequestBody LeaseOutDetails record) { return leaseOutDetailsService.submitOut(record); } /** - * * @param recordList * @return */ @Log(title = "领料出库", businessType = BusinessType.UPDATE) @PostMapping("/submitOutRfid") - public AjaxResult submitOutRfid(@RequestBody List recordList){ + public AjaxResult submitOutRfid(@RequestBody List recordList) { return leaseOutDetailsService.submitOutRfid(recordList); } @@ -92,11 +113,12 @@ public class LeaseOutDetailsController extends BaseController { /** * 综合查询--领用记录查询 + * * @param bean */ @Log(title = "综合查询--领用记录查询", businessType = BusinessType.UPDATE) @PostMapping("/leaseOutRecord") - public AjaxResult leaseOutRecord(@RequestBody LeaseApplyDetails bean){ + public AjaxResult leaseOutRecord(@RequestBody LeaseApplyDetails bean) { try { List list = leaseOutDetailsService.leaseOutRecord(bean); return success(list); @@ -107,11 +129,12 @@ public class LeaseOutDetailsController extends BaseController { /** * 综合查询--工程在用查询 + * * @param bean */ @Log(title = "综合查询--工程在用查询", businessType = BusinessType.UPDATE) @PostMapping("/proUseRecord") - public AjaxResult proUseRecord(@RequestBody LeaseApplyDetails bean){ + public AjaxResult proUseRecord(@RequestBody LeaseApplyDetails bean) { try { List list = leaseOutDetailsService.proUseRecord(bean); return success(list); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java index 4cbd4873..0661f17f 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java @@ -24,6 +24,8 @@ public interface LeaseOutDetailsService { */ List selectListByParentId(String parentId); + int bindMachineByRfid(MaMachine maMachine); + /** * 领料出库，对库存处理 * @param record 出库内容 diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index 96e5efab..0459ad88 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.app.service.impl; +import cn.hutool.core.collection.CollUtil; import com.bonus.sgzb.app.domain.LeaseApplyDetails; import com.bonus.sgzb.app.domain.LeaseApplyInfo; import com.bonus.sgzb.app.mapper.LeaseApplyDetailsMapper; @@ -48,6 +49,19 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { return leaseOutDetailsMapper.selectListByParentId(parentId); } + @Override + public int bindMachineByRfid(MaMachine maMachine) { + List maMachineByMaIdAndMaCode = maMachineMapper.getMaMachineByMaIdAndMaCode(maMachine); + if (CollUtil.isNotEmpty(maMachineByMaIdAndMaCode)){ + for (MaMachine machine : maMachineByMaIdAndMaCode) { + machine.setRfidCode(maMachine.getRfidCode()); + maMachineMapper.updateMaMachine(machine); + } + return 0; + } + return 1; + } + @Override @Transactional public AjaxResult submitOutRfid(List recordList) { diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java index 270d9891..873cbac8 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java @@ -10,6 +10,7 @@ public interface MaMachineMapper { public List getMaMachine(MaMachine maMachine); public List getMaMachineByCode(String maCode); + public List getMaMachineByMaIdAndMaCode(MaMachine maMachine); public List getMaMachineByQrCode(String qrCode); diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml index 1a0d169a..06ee7ff2 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml @@ -296,4 +296,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join ma_label_bind mmb on m.ma_id = mmb.ma_id and m.type_id = mmb.type_id where m.rfid_code = #{rfidCode} + \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java index d29f4679..b751706c 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java @@ -212,8 +212,8 @@ public class BackApplyController extends BaseController { return backApplyService.audit(record); } - @ApiOperation("退料审核-驳回") - @Log(title = "退料审核列表-驳回", businessType = BusinessType.UPDATE) + @ApiOperation("退料审核-驳回(web)") + @Log(title = "退料审核列表-驳回(web)", businessType = BusinessType.UPDATE) @PostMapping("/refuse") public AjaxResult refuse(@RequestBody BackApplyInfo record) { return backApplyService.refuse(record); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java index 84673054..3b2dd01d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java @@ -3,9 +3,11 @@ package com.bonus.sgzb.material.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.bonus.sgzb.material.domain.LeaseApplyInfo; import com.bonus.sgzb.material.domain.MaInputRecord; import com.bonus.sgzb.material.service.IPurchaseMacodeInfoService; import com.bonus.sgzb.material.domain.PurchaseMacodeInfo; +import com.bonus.sgzb.material.service.LeaseRecordService; import com.bonus.sgzb.material.vo.EquipmentNumberVO; import com.bonus.sgzb.material.vo.MaInputVO; import io.swagger.annotations.Api; @@ -96,7 +98,6 @@ public class PurchaseMacodeInfoController extends BaseController return purchaseMacodeInfoService.insertPurchaseMacodeInfo(purchaseMacodeInfoList); } - /** * 修改新购验收编号管理 */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java index e6296f8e..6465b3d8 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java @@ -181,7 +181,7 @@ public class BackApplyServiceImpl implements BackApplyService { if (roles.contains("tsfgs") || roles.contains("admin")) { bean.setCompanyId(companyId.toString()); bean.setCreateBy(username); - bean.setStatus("2"); + bean.setStatus("3"); int re = backApplyMapper.audit(bean); if (re < 1) { return AjaxResult.error("审核失败"); @@ -210,6 +210,7 @@ public class BackApplyServiceImpl implements BackApplyService { public AjaxResult refuse(BackApplyInfo bean) { Set roles = SecurityUtils.getLoginUser().getRoles(); String username = SecurityUtils.getLoginUser().getUsername(); + Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); int num = 0; if (!StringUtils.isEmpty(bean.getIds())) { String[] ids = bean.getIds().split(","); @@ -217,7 +218,7 @@ public class BackApplyServiceImpl implements BackApplyService { String id = ids[i]; bean.setId(Long.valueOf(id)); if (roles.contains("jjfgs") || roles.contains("admin")) { - bean.setCompanyId("101"); + bean.setCompanyId(companyId.toString()); bean.setCreateBy(username); bean.setStatus("2"); int re = backApplyMapper.refuse(bean); @@ -226,7 +227,7 @@ public class BackApplyServiceImpl implements BackApplyService { } } if (roles.contains("tsfgs") || roles.contains("admin")) { - bean.setCompanyId("102"); + bean.setCompanyId(companyId.toString()); bean.setCreateBy(username); bean.setStatus("4"); int re = backApplyMapper.refuse(bean); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java index e09605f7..9fed2e34 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java @@ -95,7 +95,6 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService TmTask task = taskMapper.selectTmTaskByTaskId(taskId); Long typeId = purchaseMacodeInfo.getTypeId(); String maCode = purchaseMacodeInfo.getMaCode(); - String rfidCode = purchaseMacodeInfo.getRfidCode(); purchaseCheckDetails.setTypeId(typeId); purchaseCheckDetails.setTaskId(purchaseMacodeInfo.getTaskId()); @@ -118,7 +117,6 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService maMachine.setAssetsCode(purchaseMacodeInfo.getAssetsCode()); } maMachine.setMaCode(maCode); - maMachine.setRfidCode(rfidCode); maMachine.setCreateTime(new Date()); maMachine.setCreateBy(SecurityUtils.getUsername()); purchaseMacodeInfoMapper.maMachineAdd(maMachine); diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java index 20a03488..b38d4e7a 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java @@ -209,7 +209,7 @@ public class SysUserController extends BaseController { } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) { return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); } - user.setCreateBy(SecurityUtils.getUsername()); + user.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getUserName()); user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); return toAjax(userService.insertUser(user)); } diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java index 22bb36d4..376ae8c0 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java @@ -278,7 +278,7 @@ public class SysUserServiceImpl implements ISysUserService { */ @Override public boolean registerUser(SysUser user) { - return userMapper.insertUser(user) > 0; + return this.insertUser(user) > 0; } /**