From 4d07b5787ada1e08907d88a221d184e2fc13b560 Mon Sep 17 00:00:00 2001 From: mashuai Date: Fri, 1 Nov 2024 14:26:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/base/config/ExceptionEnum.java | 1 + .../base/controller/TbTeamController.java | 11 +++++++++++ .../java/com/bonus/base/domain/TbTeam.java | 4 ---- .../com/bonus/base/mapper/TbTeamMapper.java | 7 +++++++ .../com/bonus/base/service/TbTeamService.java | 6 ++++++ .../base/service/impl/TbTeamServiceImpl.java | 19 +++++++++++++++++++ .../impl/ProjectDetailsViewServiceImpl.java | 8 ++++---- .../resources/mapper/base/TbTeamMapper.xml | 15 ++++++++++----- 8 files changed, 58 insertions(+), 13 deletions(-) diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/config/ExceptionEnum.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/config/ExceptionEnum.java index ee42abb..cce7114 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/config/ExceptionEnum.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/config/ExceptionEnum.java @@ -19,6 +19,7 @@ public enum ExceptionEnum { INVALID_LATITUDE_FORMAT(1114, "纬度格式不正确"), IMPORT_TO_DATABASE(1003, "该表单中存在相同名称的数据，请修改后重新提交"), SUCCESS(200, "操作成功"), + FAIL(400, "操作失败"), EXISTENCE_OF_TEAM(1112, "该人员还绑定相关班组，无法删除"), SAVE_TO_DATABASE(500, "新增保存失败，请联系管理员"), DELETE_TO_DATABASE(500, "删除失败，请联系管理员"), diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbTeamController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbTeamController.java index 8d1c9a5..425f58f 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbTeamController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbTeamController.java @@ -98,6 +98,17 @@ public class TbTeamController extends BaseController { return tbTeamService.bind(tbTeam); } + /** + * 通过主键删除数据 + * + * @param tbTeam 实体 + * @return 新增结果 + */ + @PostMapping("/delete") + public AjaxResult delete(@RequestBody TbTeam tbTeam) { + return tbTeamService.delete(tbTeam); + } + /** * 解绑操作 * diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbTeam.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbTeam.java index e13ef18..008d4a9 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbTeam.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbTeam.java @@ -40,12 +40,10 @@ public class TbTeam implements Serializable { */ @Excel(name = "班组名称") @Size(max = 50,message = "班组名称最大长度要小于 50") - @NotBlank(message = "班组名称不能为空") private String teamName; /** * 班组长id */ - @NotNull(message = "班组长不能为空") private Long relId; /** @@ -55,7 +53,6 @@ public class TbTeam implements Serializable { /** * 工程id */ - @NotNull(message = "所属工程不能为空") private String proId; /** * 工程名称 @@ -136,7 +133,6 @@ public class TbTeam implements Serializable { /** * 班组人员id集合 */ - @NotNull(message = "班组成员不能为空") private List idList; } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbTeamMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbTeamMapper.java index 7ebf7f6..cfafc2f 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbTeamMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbTeamMapper.java @@ -159,5 +159,12 @@ public interface TbTeamMapper { * @return */ List selectListById(Long id); + + /** + * 根据id删除班组信息 + * @param id + * @return + */ + int deleteById(Long id); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbTeamService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbTeamService.java index a1a2afd..707b7b0 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbTeamService.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbTeamService.java @@ -91,4 +91,10 @@ public interface TbTeamService { */ List getList(); + /** + * 删除班组 + * @param tbTeam + * @return + */ + AjaxResult delete(TbTeam tbTeam); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbTeamServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbTeamServiceImpl.java index 6425fb3..6d3b6f9 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbTeamServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbTeamServiceImpl.java @@ -329,4 +329,23 @@ public class TbTeamServiceImpl implements TbTeamService { }*/ return list; } + + /** + * 删除班组 + * @param tbTeam + * @return + */ + @Override + public AjaxResult delete(TbTeam tbTeam) { + //根据id查询班组，判断班组是否处于解散状态，解散状态的班组才能删除 + TbTeam team = tbTeamDao.queryById(tbTeam.getId()); + if (team != null && team.getJsTime() == null) { + return AjaxResult.error(ExceptionEnum.FAIL.getCode(), "该班组还未解散，无法进行删除"); + } + int result = tbTeamDao.deleteById(tbTeam.getId()); + if (result > 0) { + return AjaxResult.success(ExceptionEnum.SUCCESS.getMsg(), result); + } + return AjaxResult.error(ExceptionEnum.DELETE_TO_DATABASE.getCode(), ExceptionEnum.DELETE_TO_DATABASE.getMsg()); + } } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java index afda0cf..8403e87 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java @@ -42,7 +42,7 @@ public class ProjectDetailsViewServiceImpl { public AjaxResult getDevAttributeRecordByDevId(Integer devId) { List records = tbDeviceDataRecordMapper.getDevAttributeRecordByDevId(devId); if (records.isEmpty()) { - return AjaxResult.error("暂无数据"); + return AjaxResult.success("暂无数据"); } for (DevAttributeVo record : records) { // 截取时间 定义x轴 @@ -75,7 +75,7 @@ public class ProjectDetailsViewServiceImpl { public AjaxResult getPitDevAttributeRecordByDeviceId(Integer devId) { List records = tbDeviceDataRecordMapper.getPitDevAttributeRecordByDeviceId(devId); if (records.isEmpty()) { - return AjaxResult.error("暂无数据"); + return AjaxResult.success("暂无数据"); } for (DevAttributeVo record : records) { // 截取时间 定义x轴 @@ -92,7 +92,7 @@ public class ProjectDetailsViewServiceImpl { public AjaxResult getTowerDevAttributeRecordByDay(Integer proId) { List records = tbDeviceDataRecordMapper.getTowerDevAttributeRecordByDay(proId); if (records.isEmpty()) { - return AjaxResult.error("暂无数据"); + return AjaxResult.success("暂无数据"); } for (DevAttributeVo record : records) { // 截取时间 定义x轴 @@ -126,7 +126,7 @@ public class ProjectDetailsViewServiceImpl { public AjaxResult getTowerDevAttributeRecordByDeviceId(Integer devId) { List records = tbDeviceDataRecordMapper.getTowerDevAttributeRecordByDeviceId(devId); if (records.isEmpty()) { - return AjaxResult.error("暂无数据"); + return AjaxResult.success("暂无数据"); } for (DevAttributeVo record : records) { // 截取时间 定义x轴 diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml index 4c72288..bf7a6e2 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml @@ -1,6 +1,11 @@ + + update tb_team + set del_flag = '1' + where id = #{id} + @@ -319,7 +324,7 @@ update_user as updateUser, del_flag as delFlag from tb_team - where rel_id = #{id} + where del_flag = '0' and rel_id = #{id}