diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index af654f8..b52742a 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -190,7 +190,6 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { return AjaxResult.error("已领数量大于预领数量或该机具未在库"); } } catch (Exception e) { - e.printStackTrace(); return AjaxResult.error("出库失败"); } return AjaxResult.success("出库成功"); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java index 01e8704..ce5da41 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java @@ -125,7 +125,7 @@ public class BmProjectInfoController extends BaseController{ util.exportExcel(response, list, "往来单位"); } - @Log(title = "项目管理导入", businessType = BusinessType.IMPORT) +/* @Log(title = "项目管理导入", businessType = BusinessType.IMPORT) @RequiresPermissions("system:user:import") @PostMapping("/importData") public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception @@ -134,6 +134,5 @@ public class BmProjectInfoController extends BaseController{ List bmProjectInfoList = util.importExcel(file.getInputStream()); String message = bmProjectInfoService.importBmProjectInfo(bmProjectInfoList, updateSupport); return success(message); - } - + }*/ } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java index b7339ce..fedb140 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java @@ -90,7 +90,7 @@ public class BmProjectLotController extends BaseController { return bmProjectLotService.updateBmProjectLot(bmProjectLot); } - @Log(title = "项目管理导入", businessType = BusinessType.IMPORT) +/* @Log(title = "项目管理导入", businessType = BusinessType.IMPORT) @RequiresPermissions("system:user:import") @PostMapping("/importData") public AjaxResult importData(MultipartFile file) throws Exception @@ -99,6 +99,6 @@ public class BmProjectLotController extends BaseController { List bmProjectLotList = util.importExcel(file.getInputStream()); String message = bmProjectLotService.importBmProjectLot(bmProjectLotList); return success(message); - } + }*/ } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java index e79a71a..e7d2c9d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java @@ -162,7 +162,7 @@ public class BmUnitInfoController extends BaseController{ ExcelUtil util = new ExcelUtil(BmUnitInfo.class); util.exportExcel(response, list, "往来单位"); } - @ApiOperation(value = "往来单位导入") +/* @ApiOperation(value = "往来单位导入") @Log(title = "往来单位导入", businessType = BusinessType.IMPORT) @RequiresPermissions("system:user:import") @PostMapping("/importData") @@ -173,6 +173,6 @@ public class BmUnitInfoController extends BaseController{ Long userId = SecurityUtils.getLoginUser().getUserid(); String message = bmUnitInfoService.importUser(bmUnitInfoList, updateSupport, userId); return success(message); - } + }*/ } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/exception/ExceptionDict.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/exception/ExceptionDict.java index 9167128..e12a462 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/exception/ExceptionDict.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/exception/ExceptionDict.java @@ -36,9 +36,9 @@ public class ExceptionDict { public static final String ERROR_OCCURRED_DURING_SCRAP_TASK_REVIEW_MSG = "报废任务审核失败!"; - public static void main(String[] args) { + /* public static void main(String[] args) { System.out.println(String.format(ExceptionDict.PARAM_IS_NULL_ERROR_MSG,"name")); - } + }*/ } 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 8a20bb5..82c52b4 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 @@ -223,11 +223,8 @@ public class BackApplyServiceImpl implements BackApplyService { roles = SecurityUtils.getLoginUser().getRoles(); userid = SecurityUtils.getLoginUser().getUserid(); companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); - } catch (NullPointerException e) { - e.printStackTrace(); - return AjaxResult.error("获取用户信息失败:{}", e); } catch (Exception e) { - e.printStackTrace(); + return AjaxResult.error("获取用户信息失败:{}", e); } int num = 0; if (!StringUtils.isEmpty(bean.getIds())) { @@ -425,6 +422,7 @@ public class BackApplyServiceImpl implements BackApplyService { /** * 退料批量审核-审核(web) + * * @param dto * @return */ @@ -437,11 +435,8 @@ public class BackApplyServiceImpl implements BackApplyService { roles = SecurityUtils.getLoginUser().getRoles(); userid = SecurityUtils.getLoginUser().getUserid(); companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); - } catch (NullPointerException e) { - e.printStackTrace(); - return AjaxResult.error("获取用户信息失败:{}", e); } catch (Exception e) { - e.printStackTrace(); + return AjaxResult.error("获取用户信息失败:{}", e); } if (CollectionUtils.isNotEmpty(dto.getBackApplyList())) { for (BackApplyListDto backApplyListDto : dto.getBackApplyList()) { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java index bf30c2d..f1ade54 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java @@ -159,7 +159,6 @@ public class MaWholeSetServiceImpl implements MaWholeSetService { throw new RuntimeException("配套名称已重复，请重新输入"); }*/ } catch (Exception e) { - e.printStackTrace(); return AjaxResult.error(ExceptionEnum.UPDATE_TO_DATABASE.getCode(), ExceptionEnum.UPDATE_TO_DATABASE.getMsg()); } return AjaxResult.success("修改成功", res); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java index 379471c..9ce8dba 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java @@ -13,6 +13,7 @@ import com.bonus.sgzb.material.service.*; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -356,7 +357,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { } } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage()); } return res; } @@ -381,7 +382,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { throw new RuntimeException("createBackApplyInfoAndDetails异常"); } } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage()); } return res; @@ -508,7 +509,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { } } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage()); } return res; @@ -561,7 +562,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { } } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage()); } return res; } @@ -586,7 +587,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { taskId = Integer.valueOf(task.getId()); } } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage()); } return taskId; @@ -599,7 +600,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { DirectApplyInfo directApplyInfos = getDirectApplyInfoById(directApplyInfoDetails.getId()); directApplyInfos.setStatus("1"); directApplyInfos.setAuditor(SecurityUtils.getLoginUser().getUsername()); - directApplyInfos.setAuditTime(DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")); + directApplyInfos.setAuditTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")); res = refuseDirectApplyInfo(directApplyInfos); } else { return res; diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_local.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_local.yml index 2c378f0..d0474fe 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_local.yml +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_local.yml @@ -16,11 +16,11 @@ spring: discovery: # 服务注册地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_nwjj + namespace: sgzb_cloud_dev_nw config: # 配置中心地址 server-addr: 127.0.0.1:8848 - namespace: sgzb_nwjj + namespace: sgzb_cloud_dev_nw # 配置文件格式 file-extension: yml # 共享配置