From 9b7791718c7192ada3a6d722fdaf130bc1a28f33 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Fri, 13 Oct 2023 14:58:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=95=85=E9=9A=9C=E7=B1=BB=E5=9E=8BV1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EquFaultTypeController.java | 2 +- .../device/service/IEquFaultTypeService.java | 2 +- .../service/impl/EquCheckItemServiceImpl.java | 22 +++++++++++++-- .../service/impl/EquFaultTypeServiceImpl.java | 28 +++++++++++++++++-- .../mapper/device/EquFaultTypeMapper.xml | 4 +-- 5 files changed, 49 insertions(+), 9 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultTypeController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultTypeController.java index 5c0ffa5ee..ff621ea97 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultTypeController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultTypeController.java @@ -83,7 +83,7 @@ public class EquFaultTypeController extends BaseController { @Log(title = "故障类型维护", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody EquFaultType equFaultType) { - return toAjax(equFaultTypeService.updateEquFaultType(equFaultType)); + return equFaultTypeService.updateEquFaultType(equFaultType); } /** diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultTypeService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultTypeService.java index 01c55cb04..fef90657a 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultTypeService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultTypeService.java @@ -42,7 +42,7 @@ public interface IEquFaultTypeService { * @param equFaultType 故障类型维护 * @return 结果 */ - public int updateEquFaultType(EquFaultType equFaultType); + public AjaxResult updateEquFaultType(EquFaultType equFaultType); /** * 批量删除故障类型维护 diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java index 86afb64e2..4ddaab8e0 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java @@ -104,10 +104,14 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService { @Transactional public AjaxResult insertEquCheckItem(EquCheckItemDTO equCheckItemDTO) { // 检验重复 - EquCheckItem checkItem = equCheckItemMapper.selectEquCheckItemByItemName(equCheckItemDTO.getItemName()); - if (checkItem != null) { - return error("检查项已存在！新增失败！"); + EquCheckItem checkItem = new EquCheckItem(); + checkItem.setItemType(equCheckItemDTO.getItemType()); + checkItem.setItemName(equCheckItemDTO.getItemName()); + List check = equCheckItemMapper.selectEquCheckItemList(checkItem); + if (check.size() > 0) { + return error(500,"检查项已存在！新增失败！"); } + // 创建检查项对象 EquCheckItem equCheckItem = new EquCheckItem(); BeanUtils.copyProperties(equCheckItemDTO, equCheckItem); @@ -195,6 +199,18 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService { @DS("#header.poolName") @Transactional public AjaxResult updateEquCheckItem(EquCheckItemDTO equCheckItemDTO) { + + // 检验 + EquCheckItem checkQuery = new EquCheckItem(); + checkQuery.setItemType(equCheckItemDTO.getItemType()); + checkQuery.setItemName(equCheckItemDTO.getItemName()); + List check = equCheckItemMapper.selectEquCheckItemList(checkQuery); + if (check.size()>0) { + if (!check.get(0).getItemCode().equals(equCheckItemDTO.getItemCode())) { + return error(500,"检查项已存在！不可修改！"); + } + } + EquCheckItem equCheckItem = new EquCheckItem(); BeanUtils.copyProperties(equCheckItemDTO, equCheckItem); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultTypeServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultTypeServiceImpl.java index f476ed68d..71a71ebcd 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultTypeServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultTypeServiceImpl.java @@ -65,6 +65,15 @@ public class EquFaultTypeServiceImpl implements IEquFaultTypeService { @DS("#header.poolName") public AjaxResult insertEquFaultType(EquFaultType equFaultType) { + // 检验 + EquFaultType checkQuery = new EquFaultType(); + checkQuery.setFaultType(equFaultType.getFaultType()); + checkQuery.setFaultSubclass(equFaultType.getFaultSubclass()); + List check = equFaultTypeMapper.selectEquFaultTypeList(checkQuery); + if (check.size() > 0) { + return error(500,"故障子类已存在！不可添加！"); + } + //获取当前所选工厂 HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String key = "#header.poolName"; @@ -98,9 +107,24 @@ public class EquFaultTypeServiceImpl implements IEquFaultTypeService { */ @Override @DS("#header.poolName") - public int updateEquFaultType(EquFaultType equFaultType) { + public AjaxResult updateEquFaultType(EquFaultType equFaultType) { + + // 检验 + EquFaultType checkQuery = new EquFaultType(); + checkQuery.setFaultType(equFaultType.getFaultType()); + checkQuery.setFaultSubclass(equFaultType.getFaultSubclass()); + List check = equFaultTypeMapper.selectEquFaultTypeList(checkQuery); + if (check.size() > 0) { + if (!check.get(0).equals(equFaultType.getFaultCode())) { + return error(500,"故障子类已存在！修改失败！"); + } + } + equFaultType.setUpdateBy(SecurityContextHolder.getUserName()); equFaultType.setUpdateTime(DateUtils.getNowDate()); - return equFaultTypeMapper.updateEquFaultType(equFaultType); + // 插入数据库 + equFaultTypeMapper.updateEquFaultType(equFaultType); + + return success("修改成功"); } /** diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml index eac4783d0..415cda84d 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml @@ -113,11 +113,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from equ_fault_type where fault_id = #{faultId} + delete equ_fault_type set del_flag = '1' where fault_id = #{faultId} - delete from equ_fault_type where fault_id in + update equ_fault_type set del_flag = '1' where fault_id in #{faultId} From 571f3b154be5af001273bae989ddb2cdb0185022 Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Fri, 13 Oct 2023 14:59:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Constants=E6=96=87=E4=BB=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/op/common/core/constant/Constants.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/op-common/op-common-core/src/main/java/com/op/common/core/constant/Constants.java b/op-common/op-common-core/src/main/java/com/op/common/core/constant/Constants.java index 8313b4331..a22d102ba 100644 --- a/op-common/op-common-core/src/main/java/com/op/common/core/constant/Constants.java +++ b/op-common/op-common-core/src/main/java/com/op/common/core/constant/Constants.java @@ -135,4 +135,6 @@ public class Constants { public static final String OPTION="OPTION"; public static final String LOW="LOW"; + + public static final String HIGH="HIGH"; } From 2de0b1d2df2cbf6e3cfbc4169c9bf8b15b5d3ba0 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Fri, 13 Oct 2023 15:10:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=95=85=E9=9A=9C=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4(=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/device/domain/EquFaultType.java | 69 +++++++++++++++++++ .../service/impl/EquFaultTypeServiceImpl.java | 17 +++++ .../mapper/device/EquFaultTypeMapper.xml | 11 +-- 3 files changed, 93 insertions(+), 4 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java index 064a7dfb3..1aff0c837 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java @@ -5,6 +5,9 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.op.common.core.annotation.Excel; import com.op.common.core.web.domain.BaseEntity; +import java.util.Date; +import java.util.List; + /** * 故障类型维护对象 equ_fault_type * @@ -53,6 +56,72 @@ public class EquFaultType extends BaseEntity { @Excel(name = "删除标志") private String delFlag; + // 创建日期范围list + private List createTimeArray; + + // 更新日期范围list + private List updateTimeArray; + + // 更新日期开始 + private String updateTimeStart; + + // 更新日期结束 + private String updateTimeEnd; + + // 创建日期开始 + private String createTimeStart; + + // 创建日期结束 + private String createTimeEnd; + + public List getCreateTimeArray() { + return createTimeArray; + } + + public void setCreateTimeArray(List createTimeArray) { + this.createTimeArray = createTimeArray; + } + + public List getUpdateTimeArray() { + return updateTimeArray; + } + + public void setUpdateTimeArray(List updateTimeArray) { + this.updateTimeArray = updateTimeArray; + } + + public String getUpdateTimeStart() { + return updateTimeStart; + } + + public void setUpdateTimeStart(String updateTimeStart) { + this.updateTimeStart = updateTimeStart; + } + + public String getUpdateTimeEnd() { + return updateTimeEnd; + } + + public void setUpdateTimeEnd(String updateTimeEnd) { + this.updateTimeEnd = updateTimeEnd; + } + + public String getCreateTimeStart() { + return createTimeStart; + } + + public void setCreateTimeStart(String createTimeStart) { + this.createTimeStart = createTimeStart; + } + + public String getCreateTimeEnd() { + return createTimeEnd; + } + + public void setCreateTimeEnd(String createTimeEnd) { + this.createTimeEnd = createTimeEnd; + } + public void setFaultId(String faultId) { this.faultId = faultId; } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultTypeServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultTypeServiceImpl.java index 71a71ebcd..e375ca969 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultTypeServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultTypeServiceImpl.java @@ -1,5 +1,6 @@ package com.op.device.service.impl; +import java.text.SimpleDateFormat; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; @@ -52,6 +53,22 @@ public class EquFaultTypeServiceImpl implements IEquFaultTypeService { @Override @DS("#header.poolName") public List selectEquFaultTypeList(EquFaultType equFaultType) { + if (equFaultType.getCreateTimeArray() != null) { + // 设置创建日期开始和结束值 + if (equFaultType.getCreateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equFaultType.setCreateTimeStart(formatter.format(equFaultType.getCreateTimeArray().get(0))); + equFaultType.setCreateTimeEnd(formatter.format(equFaultType.getCreateTimeArray().get(1))); + } + } + if (equFaultType.getUpdateTimeArray() != null) { + // 设置更新日期开始和结束 + if (equFaultType.getUpdateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equFaultType.setUpdateTimeStart(formatter.format(equFaultType.getUpdateTimeArray().get(0))); + equFaultType.setUpdateTimeEnd(formatter.format(equFaultType.getUpdateTimeArray().get(1))); + } + } return equFaultTypeMapper.selectEquFaultTypeList(equFaultType); } diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml index 415cda84d..4945af13d 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml @@ -37,12 +37,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and attr2 = #{attr2} and attr3 = #{attr3} and del_flag = #{delFlag} - and create_by = #{createBy} - and create_time = #{createTime} - and update_by = #{updateBy} - and update_time = #{updateTime} + and CONVERT(date,create_time) >= #{createTimeStart} + and #{createTimeEnd} >= CONVERT(date,create_time) + and create_by like concat('%', #{createBy}, '%') + and CONVERT(date,update_time) >= #{updateTimeStart} + and #{updateTimeEnd} >= CONVERT(date,update_time) + and update_by like concat('%', #{updateBy}, '%') and del_flag = '0' + ORDER BY create_time DESC