From c60853f82e23854241c26245d7f310612d58dc54 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Mon, 26 Feb 2024 10:54:21 +0800 Subject: [PATCH] =?UTF-8?q?Bug:=E3=80=90ID1000467=E3=80=91=E4=BB=AA?= =?UTF-8?q?=E5=99=A8=E7=AE=A1=E7=90=86-=E5=BA=8F=E5=88=97=E5=8F=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E3=80=90=E5=88=A0=E9=99=A4=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E6=95=B0=E6=8D=AE=E3=80=91/=E3=80=90=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=85=A8=E9=87=8F=E6=95=B0=E6=8D=AE=E3=80=91=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=B7=B2=E7=BB=91=E5=AE=9A=E7=8A=B6=E6=80=81=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E5=88=A0=E9=99=A4=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/mapper/WxInstrumentSerialMapper.java | 3 +++ .../mapper/WxInstrumentSerialMapper.xml | 8 +++++++ .../service/impl/WxInstrumentServiceImpl.java | 4 +++- .../impl/WxInstrumentSerialServiceImpl.java | 21 +++++++++++++++++++ 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentSerialMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentSerialMapper.java index 41832a7..f714297 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentSerialMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentSerialMapper.java @@ -1,6 +1,7 @@ package com.flossom.common.core.mapper; import com.flossom.common.core.domain.entity.WxInstrumentSerial; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -20,6 +21,8 @@ public interface WxInstrumentSerialMapper */ public WxInstrumentSerial selectWxInstrumentSerialById(Long id); + public List selectWxInstrumentSerialByIdList(@Param("idList") List idList); + /** * 查询仪器序列号关联列表 * diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentSerialMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentSerialMapper.xml index 7f27e46..4b35cbe 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentSerialMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentSerialMapper.xml @@ -60,6 +60,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + insert into wx_instrument_serial diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java index 59b24a7..76a09e8 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java @@ -463,10 +463,11 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { wxModeServiceInfo.setModeId(wxMode.getId()); List wxModeServiceInfoList = wxModeServiceInfoMapper.selectWxModeServiceInfoList(wxModeServiceInfo); if (wxModeServiceInfoList != null && wxModeServiceInfoList.size() > 0) { - Calendar calendar = Calendar.getInstance(); + for (WxModeServiceInfo modeServiceInfo : wxModeServiceInfoList) { if (modeServiceInfo.getServiceStartTime() != null) { Date date = wxModeServiceInfo.getServiceStartTime(); + Calendar calendar = Calendar.getInstance(); calendar.setTime(date); modeServiceInfo.setServiceStartTimeStr( DateUtils.formatMS(calendar.get(Calendar.HOUR_OF_DAY) * 60 * 60 @@ -477,6 +478,7 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { } if (modeServiceInfo.getServiceEndTime() != null) { Date date = wxModeServiceInfo.getServiceEndTime(); + Calendar calendar = Calendar.getInstance(); calendar.setTime(date); modeServiceInfo.setServiceEndTimeStr( DateUtils.formatMS(calendar.get(Calendar.HOUR_OF_DAY) * 60 * 60 diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentSerialServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentSerialServiceImpl.java index 0e18b6c..515b598 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentSerialServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentSerialServiceImpl.java @@ -1,5 +1,6 @@ package com.flossom.system.service.impl; +import java.util.Arrays; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -9,6 +10,7 @@ import com.flossom.common.core.domain.entity.WxInstrument; import com.flossom.common.core.domain.entity.WxInstrumentSerial; import com.flossom.common.core.domain.req.WxInstrumentSerialExportVm; import com.flossom.common.core.domain.req.WxInstrumentSerialImportVm; +import com.flossom.common.core.enums.BindingStatusEnums; import com.flossom.common.core.exception.ServiceException; import com.flossom.common.core.mapper.WxInstrumentMapper; import com.flossom.common.core.mapper.WxInstrumentSerialMapper; @@ -21,6 +23,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.flossom.system.service.IWxInstrumentSerialService; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; /** @@ -121,8 +124,17 @@ public class WxInstrumentSerialServiceImpl implements IWxInstrumentSerialService * @return 结果 */ @Override + @Transactional public int deleteWxInstrumentSerialByIds(Long[] ids) { + List wxInstrumentSerialList = wxInstrumentSerialMapper.selectWxInstrumentSerialByIdList(Arrays.asList(ids)); + if (wxInstrumentSerialList != null && wxInstrumentSerialList.size() > 0) { + for (WxInstrumentSerial wxInstrumentSerial : wxInstrumentSerialList) { + if (wxInstrumentSerial.getBindingStatus() == BindingStatusEnums.BINDED.getCode()) { + throw new ServiceException("删除失败，只能删除已解绑状态的数据，您选中的内容存在【已绑定状态】请重试"); + } + } + } return wxInstrumentSerialMapper.deleteWxInstrumentSerialByIds(ids); } @@ -139,7 +151,16 @@ public class WxInstrumentSerialServiceImpl implements IWxInstrumentSerialService } @Override + @Transactional public int deleteAll() { + List wxInstrumentSerialList = wxInstrumentSerialMapper.selectWxInstrumentSerialList(new WxInstrumentSerial()); + if (wxInstrumentSerialList != null && wxInstrumentSerialList.size() > 0) { + for (WxInstrumentSerial wxInstrumentSerial : wxInstrumentSerialList) { + if (wxInstrumentSerial.getBindingStatus() == BindingStatusEnums.BINDED.getCode()) { + throw new ServiceException("删除失败，只能删除已解绑状态的数据，您选中的内容存在【已绑定状态】请重试"); + } + } + } return wxInstrumentSerialMapper.deleteAll(); }