bonus
/
SafetyAlertSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修改优化

This commit is contained in:
mashuai 2024-10-09 17:22:29 +08:00
parent 118b059a19
commit f17832a208
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bonus-modules/bonus-base/src/main/java/com/bonus/base/config/ExceptionEnum.java
View File

@ -17,6 +17,7 @@ public enum ExceptionEnum {
ID_CARD_DUPLICATE(1009, "身份证号码重复，请重新输入"), ID_CARD_DUPLICATE(1009, "身份证号码重复，请重新输入"),
IMPORT_TO_DATABASE(1003, "该表单中存在相同名称的数据，请修改后重新提交"), IMPORT_TO_DATABASE(1003, "该表单中存在相同名称的数据，请修改后重新提交"),
SUCCESS(200, "操作成功"), SUCCESS(200, "操作成功"),
EXISTENCE_OF_TEAM(1112, "该人员还绑定相关班组，无法删除"),
SAVE_TO_DATABASE(500, "新增保存失败，请联系管理员"), SAVE_TO_DATABASE(500, "新增保存失败，请联系管理员"),
DELETE_TO_DATABASE(500, "删除失败，请联系管理员"), DELETE_TO_DATABASE(500, "删除失败，请联系管理员"),
DELETE_PROJECT_POWER(1111, "该项目部还关联相应工程，无法删除"), DELETE_PROJECT_POWER(1111, "该项目部还关联相应工程，无法删除"),

4
bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbTeamMapper.java
View File

@ -148,9 +148,9 @@ public interface TbTeamMapper {
/** /**
* 根据班组长id修改班组信息 * 根据班组长id修改班组信息
* @param id * @param tbPeople
* @return * @return
*/ */
int editPeople(Long id); int editPeople(TbPeople tbPeople);
} }

3
bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbBdDeviceRecordServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.bonus.base.service.impl; package com.bonus.base.service.impl;
import com.bonus.base.config.ExceptionEnum;
import com.bonus.base.vo.TbBdDeviceVo; import com.bonus.base.vo.TbBdDeviceVo;
import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.utils.StringUtils;
import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.core.utils.encryption.Sm4Utils;
@ -28,7 +29,7 @@ public class TbBdDeviceRecordServiceImpl implements TbBdDeviceRecordService{
//判断该边带设备是否被设备绑定 //判断该边带设备是否被设备绑定
int count = tbBdDeviceRecordMapper.queryByDeviceId(id); int count = tbBdDeviceRecordMapper.queryByDeviceId(id);
if (count > 0) { if (count > 0) {
return AjaxResult.error("该边带设备被设备绑定，无法删除"); return AjaxResult.error(ExceptionEnum.EXISTENCE_OF_TEAM.getCode(),"该边带设备被设备绑定，无法删除");
} }
return AjaxResult.success(tbBdDeviceRecordMapper.deleteByPrimaryKey(id)); return AjaxResult.success(tbBdDeviceRecordMapper.deleteByPrimaryKey(id));
} }

16
bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbBdRecordServiceImpl.java
View File

@ -59,7 +59,7 @@ public class TbBdRecordServiceImpl implements TbBdRecordService{
//根据项目部和工程判断，同项目部和工程只可接入一次申请 //根据项目部和工程判断，同项目部和工程只可接入一次申请
TbBdRecord tbBdRecord = tbBdRecordMapper.selectByName(record); TbBdRecord tbBdRecord = tbBdRecordMapper.selectByName(record);
if (tbBdRecord != null){ if (tbBdRecord != null){
return AjaxResult.error("该项目部和工程已申请，请勿重复申请"); return AjaxResult.error(1113,"该项目部和工程已申请，请勿重复申请");
} }
int result = 0; int result = 0;
//返回主键id //返回主键id
@ -83,7 +83,7 @@ public class TbBdRecordServiceImpl implements TbBdRecordService{
//根据设备名称或编码唯一校验 //根据设备名称或编码唯一校验
List<TbBdDeviceRecord> tbBdDeviceRecord = tbBdDeviceRecordMapper.selectByName(deviceRecord); List<TbBdDeviceRecord> tbBdDeviceRecord = tbBdDeviceRecordMapper.selectByName(deviceRecord);
if (CollectionUtils.isNotEmpty(tbBdDeviceRecord)) { if (CollectionUtils.isNotEmpty(tbBdDeviceRecord)) {
return AjaxResult.error("设备名称或编码与库中重复，请勿重复添加"); return AjaxResult.error(1113,"设备名称或编码与库中重复，请勿重复添加");
} }
result += tbBdDeviceRecordMapper.insertSelective(deviceRecord); result += tbBdDeviceRecordMapper.insertSelective(deviceRecord);
} }
@ -110,28 +110,28 @@ public class TbBdRecordServiceImpl implements TbBdRecordService{
//根据项目部和工程判断，同项目部和工程只可接入一次申请 //根据项目部和工程判断，同项目部和工程只可接入一次申请
TbBdRecord tbBdRecord = tbBdRecordMapper.selectByName(record); TbBdRecord tbBdRecord = tbBdRecordMapper.selectByName(record);
if(tbBdRecord != null && !tbBdRecord.getId().equals(record.getId())){ if(tbBdRecord != null && !tbBdRecord.getId().equals(record.getId())){
return AjaxResult.error("该项目部和工程已申请，请勿重复申请"); return AjaxResult.error(1113,"该项目部和工程已申请，请勿重复申请");
} }
//校验内层设备名称或编码重复性 //校验内层设备名称或编码重复性
if (record.getRecordList() != null && record.getRecordList().size() > 0) { if (record.getRecordList() != null && record.getRecordList().size() > 0) {
// 检查设备名称是否重复 // 检查设备名称是否重复
long distinctNames = record.getRecordList().stream().map(TbBdDeviceRecord::getDevName).distinct().count(); long distinctNames = record.getRecordList().stream().map(TbBdDeviceRecord::getDevName).distinct().count();
if (distinctNames < record.getRecordList().size()) { if (distinctNames < record.getRecordList().size()) {
return AjaxResult.error("提交的数据中设备名称存在重复，请勿重复添加"); return AjaxResult.error(1114,"提交的数据中设备名称存在重复，请勿重复添加");
} }
// 检查设备编码是否重复 // 检查设备编码是否重复
long distinctCodes = record.getRecordList().stream().map(TbBdDeviceRecord::getDevCode).distinct().count(); long distinctCodes = record.getRecordList().stream().map(TbBdDeviceRecord::getDevCode).distinct().count();
if (distinctCodes < record.getRecordList().size()) { if (distinctCodes < record.getRecordList().size()) {
return AjaxResult.error("提交的数据中设备编码存在重复，请勿重复添加"); return AjaxResult.error(1114,"提交的数据中设备编码存在重复，请勿重复添加");
} }
for (TbBdDeviceRecord deviceRecord : record.getRecordList()) { for (TbBdDeviceRecord deviceRecord : record.getRecordList()) {
List<TbBdDeviceRecord> tbBdDeviceRecord = tbBdDeviceRecordMapper.selectByName(deviceRecord); List<TbBdDeviceRecord> tbBdDeviceRecord = tbBdDeviceRecordMapper.selectByName(deviceRecord);
if (CollectionUtils.isNotEmpty(tbBdDeviceRecord)) { if (CollectionUtils.isNotEmpty(tbBdDeviceRecord)) {
if (tbBdDeviceRecord.size() > 1) { if (tbBdDeviceRecord.size() > 1) {
return AjaxResult.error("设备名称或编码与库中重复，请勿重复添加"); return AjaxResult.error(1114,"设备名称或编码与库中重复，请勿重复添加");
} }
if (tbBdDeviceRecord.size() == 1 && !deviceRecord.getId().equals(tbBdDeviceRecord.get(0).getId())) { if (tbBdDeviceRecord.size() == 1 && !deviceRecord.getId().equals(tbBdDeviceRecord.get(0).getId())) {
return AjaxResult.error("提交的数据中设备名称或编码与库中重复，请勿重复添加"); return AjaxResult.error(1115,"提交的数据中设备名称或编码与库中重复，请勿重复添加");
} }
} }
} }
@ -191,7 +191,7 @@ public class TbBdRecordServiceImpl implements TbBdRecordService{
if (result > 0) { if (result > 0) {
return AjaxResult.success(ExceptionEnum.SUCCESS.getMsg(), result); return AjaxResult.success(ExceptionEnum.SUCCESS.getMsg(), result);
} }
return AjaxResult.error("审核失败，请联系管理员"); return AjaxResult.error(1116,"审核失败，请联系管理员");
} }
/** /**

4
bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbPeopleServiceImpl.java
View File

@ -172,7 +172,7 @@ public class TbPeopleServiceImpl implements TbPeopleService {
//根据人员id去班组表中修改人员信息，先根据人员id去班组表中查询 //根据人员id去班组表中修改人员信息，先根据人员id去班组表中查询
TbTeam tbTeam = tbTeamDao.selectById(tbPeople.getId()); TbTeam tbTeam = tbTeamDao.selectById(tbPeople.getId());
if (tbTeam != null) { if (tbTeam != null) {
result += tbTeamDao.editPeople(tbPeople.getId()); result += tbTeamDao.editPeople(tbPeople);
} }
if (result > 0) { if (result > 0) {
return AjaxResult.success(ExceptionEnum.SUCCESS.getMsg(), result); return AjaxResult.success(ExceptionEnum.SUCCESS.getMsg(), result);
@ -191,7 +191,7 @@ public class TbPeopleServiceImpl implements TbPeopleService {
//通过id查询人员是否绑定班组，绑定则不能删除 //通过id查询人员是否绑定班组，绑定则不能删除
TbPeople tbPeople = tbPeopleDao.queryById(id); TbPeople tbPeople = tbPeopleDao.queryById(id);
if (tbPeople.getTeamId() != null) { if (tbPeople.getTeamId() != null) {
return AjaxResult.error("该人员还绑定相关班组，无法删除"); return AjaxResult.error(ExceptionEnum.EXISTENCE_OF_TEAM.getCode(), ExceptionEnum.EXISTENCE_OF_TEAM.getMsg());
} }
int result = tbPeopleDao.deleteById(id); int result = tbPeopleDao.deleteById(id);
if (result > 0) { if (result > 0) {