From 7cc2b1410cd22e49a388deedf9314e20d62167ee Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Fri, 27 Dec 2024 15:38:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/service/impl/BmMessageServiceImpl.java | 7 ++++--- .../device/controller/MaDevQcController.java | 13 +++++++++++-- .../bonus/material/device/mapper/MaDevQcMapper.java | 2 ++ .../material/device/service/MaDevQcService.java | 2 ++ .../device/service/impl/MaDevQcServiceImpl.java | 5 +++++ .../lease/service/impl/MaLeaseInfoServiceImpl.java | 2 +- .../mapper/material/device/MaDevQcMapper.xml | 3 +++ 7 files changed, 28 insertions(+), 6 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java index 6ed49ae..45d4bf6 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java @@ -95,9 +95,9 @@ public class BmMessageServiceImpl implements IBmMessageService { public List selectBmMessageListFromCacheOne(BmMessage bmMessage) { Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); - Long fromCompany = bmMessage.getFromCompany(); - Collection keys1 = SpringUtils.getBean(RedisService.class).keys(MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE + fromCompany + ":" + companyId); - Collection keys2 = SpringUtils.getBean(RedisService.class).keys(MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE + companyId + ":" + fromCompany); + Long toCompany = bmMessage.getToCompany(); + Collection keys1 = SpringUtils.getBean(RedisService.class).keys(MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE + toCompany + ":" + companyId); + Collection keys2 = SpringUtils.getBean(RedisService.class).keys(MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE + companyId + ":" + toCompany); List keys = new ArrayList<>(); keys.addAll(keys1); keys.addAll(keys2); @@ -134,6 +134,7 @@ public class BmMessageServiceImpl implements IBmMessageService { } List list = arrayCache.toList(BmMessage.class); list.add(bmMessage); + (SpringUtils.getBean(RedisService.class)).deleteObject(msgKey); (SpringUtils.getBean(RedisService.class)).setCacheObject(msgKey, list, MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE_HOURS, TimeUnit.HOURS); return bmMessageMapper.insertBmMessage(bmMessage); } catch (Exception e) { diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/MaDevQcController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/MaDevQcController.java index 9ec9577..bd1fc49 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/MaDevQcController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/MaDevQcController.java @@ -21,7 +21,7 @@ import java.util.List; */ @RestController @RequestMapping("/ma_qc") -@Api(value = "装备质检管理",tags = "装备质检") +@Api(value = "装备质检管理", tags = "装备质检") public class MaDevQcController extends BaseController { @Resource @@ -29,6 +29,7 @@ public class MaDevQcController extends BaseController { /** * 装备质检列表 + * * @param maDevQc * @return */ @@ -39,8 +40,10 @@ public class MaDevQcController extends BaseController { List list = maDevQcService.selectDevQcList(maDevQc); return AjaxResult.success(getDataTable(list)); } + /** * 装备质检列表 + * * @param maDevQc * @return */ @@ -54,6 +57,7 @@ public class MaDevQcController extends BaseController { /** * 新增装备质检--含附件上传 + * * @param maDevQc * @return */ @@ -65,15 +69,20 @@ public class MaDevQcController extends BaseController { /** * 删除装备质检 + * * @param maDevQc * @return */ @ApiOperation(value = "删除装备质检") @PostMapping("/deleteById") public AjaxResult deleteById(@RequestBody MaDevQc maDevQc) { - if (maDevQc == null || maDevQc.getFileId() == null) { + if (maDevQc == null || maDevQc.getFileId() == null || maDevQc.getMaId() == null) { return AjaxResult.error(HttpCodeEnum.TO_PARAM_NULL.getCode(), HttpCodeEnum.TO_PARAM_NULL.getMsg()); } + Integer count = maDevQcService.selectDevQcListByMaId(maDevQc.getMaId()); + if (count <= 1) { + return AjaxResult.error("请保持质检数据至少有一条"); + } Integer i = maDevQcService.deleteById(maDevQc); return i > 0 ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败"); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java index 781d492..46ca184 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java @@ -54,4 +54,6 @@ public interface MaDevQcMapper { List checkQcTime(); Integer updateFileId(@Param("id") Integer id, @Param("fileId") Integer fileId); + + Integer selectDevQcListByMaId(Integer maId); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/MaDevQcService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/MaDevQcService.java index 03c9842..a092508 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/MaDevQcService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/MaDevQcService.java @@ -34,4 +34,6 @@ public interface MaDevQcService { Integer deleteById(MaDevQc maDevQc); List selectQcList(MaDevQc maDevQc); + + Integer selectDevQcListByMaId(Integer maId); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/MaDevQcServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/MaDevQcServiceImpl.java index e875669..c2421d6 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/MaDevQcServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/MaDevQcServiceImpl.java @@ -154,4 +154,9 @@ public class MaDevQcServiceImpl implements MaDevQcService { public List selectQcList(MaDevQc maDevQc) { return maDevQcMapper.selectQcList(maDevQc); } + + @Override + public Integer selectDevQcListByMaId(Integer maId) { + return maDevQcMapper.selectDevQcListByMaId(maId); + } } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java index 93f0887..e276037 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java @@ -386,7 +386,7 @@ public class MaLeaseInfoServiceImpl implements MaLeaseInfoService { try { BmMessage bmMessage = new BmMessage(); bmMessage.setCreateTime(DateUtils.getNowDate()); - bmMessage.setMessageContent("您好，您的需求已被" + leaseInfo.getOrderCompanyName() + "公司接单，请及时查看"); + bmMessage.setMessageContent("您好，您的需求已被" + leaseInfo.getOrderCompanyName() + "接单，请及时查看"); bmMessage.setUuid(String.valueOf(UUID.randomUUID())); bmMessage.setFromCompany(0L); bmMessage.setFromUser(0L); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml index 4ebd06a..1916ef5 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml @@ -171,5 +171,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_dept sd on mdc.qc_com = sd.dept_id where mdc.next_check_time < now() +