diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppMenuController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppMenuController.java index 8506be04..0da15364 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppMenuController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppMenuController.java @@ -45,7 +45,7 @@ public class AppMenuController extends BaseController { @PostMapping("/addMenuById") public AjaxResult addMenuById(@RequestBody AppMenu bean) { - Long userId = SecurityUtils.getUserId(); + Long userId = SecurityUtils.getLoginUser().getUserid(); return toAjax(service.addMenuById(bean.getMenuId(), userId)); } @@ -54,7 +54,7 @@ public class AppMenuController extends BaseController { @DeleteMapping("/delMenuById") public AjaxResult delMenuById(@RequestBody AppMenu bean) { - Long userId = SecurityUtils.getUserId(); + Long userId = SecurityUtils.getLoginUser().getUserid(); return toAjax(service.delMenuById(bean.getMenuId(),userId)); } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseUserBookController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseUserBookController.java index 42935c50..08acccb6 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseUserBookController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseUserBookController.java @@ -22,7 +22,7 @@ public class LeaseUserBookController extends BaseController { @GetMapping public AjaxResult getLeaseUserBook(){ - Long userId = SecurityUtils.getUserId(); + Long userId = SecurityUtils.getLoginUser().getUserid(); return AjaxResult.success(service.getLeaseUserBook(userId)); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseUserBookServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseUserBookServiceImpl.java index 347a75fd..f022e147 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseUserBookServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseUserBookServiceImpl.java @@ -25,7 +25,7 @@ public class LeaseUserBookServiceImpl implements LeaseUserBookService { @Override public int add(LeaseUserBook bean) { - Long userId = SecurityUtils.getUserId(); + Long userId = SecurityUtils.getLoginUser().getUserid(); bean.setUserId(userId); return mapper.add(bean); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java index 300d9137..8c00843f 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java @@ -93,7 +93,7 @@ public class PurchaseInputServiceImpl implements PurchaseInputService { TmTask task = new TmTask(); task.setTaskId(taskId); task.setTaskStatus(28); - task.setUpdateBy(String.valueOf(SecurityUtils.getUserId())); + task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); task.setUpdateTime(DateUtils.getNowDate()); purchaseInputMapper.updateTmTask(task); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java index b6dc4a74..15254ca3 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java @@ -159,7 +159,7 @@ public class BmUnitInfoController extends BaseController{ { ExcelUtil util = new ExcelUtil(BmUnitInfo.class); List bmUnitInfoList = util.importExcel(file.getInputStream()); - Long userId = SecurityUtils.getUserId(); + Long userId = SecurityUtils.getLoginUser().getUserid(); String message = bmUnitInfoService.importUser(bmUnitInfoList, updateSupport, userId); return success(message); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java index dedbffcb..3ddf9a28 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java @@ -232,7 +232,7 @@ public class MaPropInfoServiceImpl implements IMaPropInfoService { beans.setTypeIds(typeId); beans.setPropId(bean.getPropId()); beans.setCompanyId(bean.getCompanyId()); - beans.setCreateBy(String.valueOf(SecurityUtils.getUserId())); + beans.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); list.add(beans); } } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseAccessoryServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseAccessoryServiceImpl.java index 2bb310fa..097dabfc 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseAccessoryServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseAccessoryServiceImpl.java @@ -52,21 +52,21 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService task.setCode(purchaseCodeRule()); task.setCreateTime(DateUtils.getNowDate()); task.setCompanyId(purchasePartInfo.getCompanyId()); - task.setCreateBy(String.valueOf(SecurityUtils.getUserId())); + task.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); // 创建任务信息 res = taskMapper.insertTmTask(task); if (res == 0) { throw new RuntimeException("新增失败，创建任务未成功"); } purchasePartInfo.setTaskId(task.getTaskId()); - purchasePartInfo.setCreateBy(String.valueOf(SecurityUtils.getUserId())); + purchasePartInfo.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); purchasePartInfo.setCreateTime(DateUtils.getNowDate()); // 批量新增新购任务详情信息 List partDetailsList = purchasePartInfo.getPartDetailsList(); if (partDetailsList != null) { for (PurchasePartDetails purchasePartDetails : partDetailsList) { purchasePartDetails.setTaskId(task.getTaskId()); - purchasePartDetails.setCreateBy(String.valueOf(SecurityUtils.getUserId())); + purchasePartDetails.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); purchasePartDetails.setCreateTime(DateUtils.getNowDate()); } res = purchaseAccessoryMapper.insertPurchasePartDetailsList(partDetailsList); @@ -127,7 +127,7 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService } for (PurchasePartDetails purchasePartDetails : partDetailsList) { purchasePartDetails.setTaskId(taskId); - purchasePartDetails.setUpdateBy(String.valueOf(SecurityUtils.getUserId())); + purchasePartDetails.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); purchasePartDetails.setUpdateTime(DateUtils.getNowDate()); } // 添加任务详情信息 @@ -136,7 +136,7 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService throw new RuntimeException("修改失败,添加详情信息未成功"); } } - purchasePartInfo.setUpdateBy(String.valueOf(SecurityUtils.getUserId())); + purchasePartInfo.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); purchasePartInfo.setUpdateTime(DateUtils.getNowDate()); res = purchaseAccessoryMapper.updatePurchasePartInfo(purchasePartInfo); if (res == 0) { @@ -203,7 +203,7 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService TmTask task = new TmTask(); task.setTaskId(taskId); task.setTaskStatus(69); - task.setUpdateBy(String.valueOf(SecurityUtils.getUserId())); + task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); task.setUpdateTime(DateUtils.getNowDate()); res = taskMapper.updateTmTask(task); if (res == 0) { @@ -240,7 +240,7 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService partDetails.setInputNum(partDetails.getCheckNum()); partDetails.setInputTime(String.valueOf(DateUtils.getNowDate())); - partDetails.setUpdateBy(String.valueOf(SecurityUtils.getUserId())); + partDetails.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); partDetails.setUpdateTime(DateUtils.getNowDate()); //查询该任务是否已审核 res = purchaseAccessoryMapper.setlectStatusById(partDetails.getId()); @@ -268,7 +268,7 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService TmTask task = new TmTask(); task.setTaskId(taskId); task.setTaskStatus(70); - task.setUpdateBy(String.valueOf(SecurityUtils.getUserId())); + task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); task.setUpdateTime(DateUtils.getNowDate()); res = taskMapper.updateTmTask(task); if (res == 0) { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java index 409d2478..763e85c2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java @@ -102,7 +102,7 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer TmTask task = new TmTask(); task.setTaskId(taskId); task.setTaskStatus(26); - task.setUpdateBy(String.valueOf(SecurityUtils.getUserId())); + task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); task.setUpdateTime(DateUtils.getNowDate()); taskMapper.updateTmTask(task); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java index a1127b96..4857a256 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java @@ -121,7 +121,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService task.setCode(purchaseCodeRule()); task.setCreateTime(DateUtils.getNowDate()); task.setCompanyId(purchaseCheckInfo.getCompanyId()); - task.setCreateBy(String.valueOf(SecurityUtils.getUserId())); + task.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); // 创建任务信息 taskMapper.insertTmTask(task); purchaseCheckInfo.setTaskId(task.getTaskId()); 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 37fe11bd..643a0072 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 @@ -136,7 +136,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService maLabelBind.setTypeId(typeId); maLabelBind.setBindTime(new Date()); maLabelBind.setLabelType(9); - maLabelBind.setBinder(SecurityUtils.getUserId().toString()); + maLabelBind.setBinder(SecurityUtils.getLoginUser().getUserid().toString()); purchaseMacodeInfoMapper.insertMaLabelBind(maLabelBind); } @@ -328,7 +328,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService TmTask task = new TmTask(); task.setTaskId(taskId); task.setTaskStatus(28); - task.setUpdateBy(String.valueOf(SecurityUtils.getUserId())); + task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); task.setUpdateTime(DateUtils.getNowDate()); taskMapper.updateTmTask(task); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java index 6ca80ddd..5548ab96 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java @@ -221,7 +221,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService repairInputDetails.setTypeId(inputDetails.getTypeId()); repairInputDetails.setMaId(inputDetails.getMaId()); repairInputDetails.setStatus("0"); - repairInputDetails.setCreateBy(String.valueOf(SecurityUtils.getUserId())); + repairInputDetails.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); repairInputDetails.setCreateTime(new Date()); repairTestInputMapper.insertRepairInputDetails(repairInputDetails); } @@ -250,7 +250,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService scrapApplyDetails.setScrapSource("2"); scrapApplyDetails.setStatus("0"); scrapApplyDetails.setParentId(scrapDetails.getId()); - scrapApplyDetails.setCreateBy(String.valueOf(SecurityUtils.getUserId())); + scrapApplyDetails.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); scrapApplyDetails.setCreateTime(new Date()); scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails); } @@ -270,7 +270,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService task1.setTaskStatus(47); } task1.setUpdateTime(new Date()); - task1.setUpdateBy(String.valueOf(SecurityUtils.getUserId())); + task1.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); taskMapper.updateTmTask(task1); } else { status = "2"; @@ -299,7 +299,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService int i = repairNum.intValue(); // 直接转换 repairTaskDetails.setRepairNum(i); repairTaskDetails.setStatus("0"); - repairTaskDetails.setCreateBy(SecurityUtils.getUserId()); + repairTaskDetails.setCreateBy(SecurityUtils.getLoginUser().getUserid()); repairTaskDetails.setCompanyId((long) companyId); repairTaskDetails.setBackId(backId); repairAuditDetailsMapper.insertRepairDetails(repairTaskDetails); @@ -314,20 +314,20 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService tmTask.setTaskStatus(48); } tmTask.setUpdateTime(new Date()); - tmTask.setUpdateBy(String.valueOf(SecurityUtils.getUserId())); + tmTask.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); taskMapper.updateTmTask(tmTask); } if (scrapAudit.getAuditDetailList() != null && scrapAudit.getAuditDetailList().size() > 0){ if (auditDetailList != null) { for (RepairAuditDetails bean : auditDetailList){ - bean.setAuditBy(SecurityUtils.getUserId()); + bean.setAuditBy(SecurityUtils.getLoginUser().getUserid()); bean.setStatus(status); repairAuditDetailsMapper.updateStatus(bean); } } }else { for (RepairAuditDetails bean : auditAllList){ - bean.setAuditBy(SecurityUtils.getUserId()); + bean.setAuditBy(SecurityUtils.getLoginUser().getUserid()); bean.setStatus(status); repairAuditDetailsMapper.updateStatus(bean); } @@ -343,7 +343,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService task.setTaskType(taskType); task.setCompanyId(companyId); task.setCreateTime(new Date()); - task.setCreateBy(String.valueOf(SecurityUtils.getUserId())); + task.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); taskMapper.insertTmTask(task); // 添加协议信息表 TmTaskAgreement taskAgreement = new TmTaskAgreement(); @@ -354,7 +354,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService }else { taskAgreement.setAgreementId(tmTaskAgreement.getAgreementId()); } - taskAgreement.setCreateBy(String.valueOf(SecurityUtils.getUserId())); + taskAgreement.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); agreementMapper.insertTmTaskAgreement(taskAgreement); return taskId; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java index 41c44ab7..ac470ea4 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java @@ -164,7 +164,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService task.setRemark(scrapAudit.getRemark()); } task.setUpdateTime(new Date()); - task.setUpdateBy(String.valueOf(SecurityUtils.getUserId())); + task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); taskMapper.updateTmTask(task); } return 1; diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysFileServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysFileServiceImpl.java index d280ddc5..68f4f20e 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysFileServiceImpl.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysFileServiceImpl.java @@ -49,7 +49,7 @@ public class SysFileServiceImpl implements SysFileService { StandardMultipartHttpServletRequest req = (StandardMultipartHttpServletRequest) request; String photoType = req.getParameter("fileType"); // String userId = req.getParameter("userId"); - Long userId = SecurityUtils.getUserId(); + Long userId = SecurityUtils.getLoginUser().getUserid(); HashMap map = getFile(req); List items = (List) map.get("filePath"); MultipartFile item = items.get(0); @@ -66,7 +66,7 @@ public class SysFileServiceImpl implements SysFileService { file.setType(type); file.setSize(size + "M"); file.setWords(words); - file.setCreateBy(SecurityUtils.getUserId().toString()); + file.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString()); file.setCreateTime(new Date()); dao.insertFileInfo(file); } @@ -85,7 +85,7 @@ public class SysFileServiceImpl implements SysFileService { @Override public FileInfo uploadHeadPic(MultipartFile item,String fileType) { FileInfo file = new FileInfo(); - Long userId = SecurityUtils.getUserId(); + Long userId = SecurityUtils.getLoginUser().getUserid(); try { String url = saveFilePic(item, fileType); if (url != null) { @@ -99,7 +99,7 @@ public class SysFileServiceImpl implements SysFileService { file.setType(type); file.setSize(size + "M"); file.setWords(words); - file.setCreateBy(SecurityUtils.getUserId().toString()); + file.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString()); file.setCreateTime(new Date()); dao.insertFileInfo(file); }