From 4a9aea54c862b3350f23d06412cb7fa19bc25bd0 Mon Sep 17 00:00:00 2001 From: mashuai Date: Mon, 9 Sep 2024 12:09:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/base/config/ExceptionEnum.java | 37 +++++ .../controller/TbProDepartController.java | 29 ++-- .../bonus/base/mapper/TbProDepartMapper.java | 36 ----- .../base/service/TbProDepartService.java | 7 +- .../service/impl/TbProDepartServiceImpl.java | 29 +++- .../resources/mapper/TbProDepartMapper.xml | 136 +----------------- 6 files changed, 88 insertions(+), 186 deletions(-) create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/config/ExceptionEnum.java 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 new file mode 100644 index 0000000..c3d1caa --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/config/ExceptionEnum.java @@ -0,0 +1,37 @@ +package com.bonus.base.config; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 返回异常枚举类 + * @Author ma_sh + */ +@Getter +@AllArgsConstructor +public enum ExceptionEnum { + + PARAM_NULL(1001, "参数为空"), + IOT_CODE_DUPLICATE(1002, "设备编号重复"), + IOT_TO_DELETE(1003, "该iot设备绑定相关类型设备，无法删除"), + SUCCESS(200, "操作成功"), + SAVE_TO_DATABASE(500, "新增保存失败，请联系管理员！！！"), + DELETE_TO_DATABASE(500, "删除失败，请联系管理员！！！"), + BIND_TO_DATABASE(500, "绑定失败，请联系管理员！！！"), + UN_BIND_TO_DATABASE(500, "解绑失败，请联系管理员！！！"), + UPDATE_TO_DATABASE(500, "修改失败，请联系管理员！！！"), + + RETURN_DATA_IS_EMPTY(501, "返回数据为空！！"), + IOT_ENCODING_ERROR(502, "输入的IOT编码有误，请输入正确的编码！！！"); + private Integer code; + + private String msg; + + public Integer getCode() { + return code; + } + + public String getMsg() { + return msg; + } +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbProDepartController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbProDepartController.java index 2aed862..439c6a6 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbProDepartController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbProDepartController.java @@ -2,15 +2,15 @@ package com.bonus.base.controller; import com.bonus.base.domain.TbProDepart; import com.bonus.base.service.TbProDepartService; +import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.http.ResponseEntity; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -60,7 +60,7 @@ public class TbProDepartController extends BaseController { */ @PostMapping public AjaxResult add(@RequestBody TbProDepart tbProDepart) { - return AjaxResult.success(tbProDepartService.insert(tbProDepart)); + return tbProDepartService.insert(tbProDepart); } /** @@ -70,8 +70,8 @@ public class TbProDepartController extends BaseController { * @return 编辑结果 */ @PutMapping - public ResponseEntity edit(TbProDepart tbProDepart) { - return ResponseEntity.ok(this.tbProDepartService.update(tbProDepart)); + public AjaxResult edit(@RequestBody TbProDepart tbProDepart) { + return tbProDepartService.update(tbProDepart); } /** @@ -80,9 +80,20 @@ public class TbProDepartController extends BaseController { * @param id 主键 * @return 删除是否成功 */ - @DeleteMapping - public ResponseEntity deleteById(Long id) { - return ResponseEntity.ok(this.tbProDepartService.deleteById(id)); + @DeleteMapping("/{id}") + public AjaxResult deleteById(@PathVariable("id") Long id) { + return tbProDepartService.deleteById(id); + } + + /** + * 项目部管理导出 + */ + @ApiOperation("项目部管理导出") + @PostMapping("/export") + public void export(HttpServletResponse response, TbProDepart tbProDepart) { + List list = tbProDepartService.queryByPage(tbProDepart); + ExcelUtil util = new ExcelUtil<>(TbProDepart.class); + util.exportExcel(response, list, "项目部管理数据"); } } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbProDepartMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbProDepartMapper.java index 4fd7fb3..f9ac63b 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbProDepartMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbProDepartMapper.java @@ -1,8 +1,6 @@ package com.bonus.base.mapper; import com.bonus.base.domain.TbProDepart; -import org.apache.ibatis.annotations.Param; -import org.springframework.data.domain.Pageable; import java.util.List; /** @@ -21,23 +19,6 @@ public interface TbProDepartMapper { */ TbProDepart queryById(Long id); - /** - * 查询指定行数据 - * - * @param tbProDepart 查询条件 - * @param pageable 分页对象 - * @return 对象列表 - */ - List queryAllByLimit(TbProDepart tbProDepart, @Param("pageable") Pageable pageable); - - /** - * 统计总行数 - * - * @param tbProDepart 查询条件 - * @return 总行数 - */ - long count(TbProDepart tbProDepart); - /** * 新增数据 * @@ -46,23 +27,6 @@ public interface TbProDepartMapper { */ int insert(TbProDepart tbProDepart); - /** - * 批量新增数据（MyBatis原生foreach方法） - * - * @param entities List 实例对象列表 - * @return 影响行数 - */ - int insertBatch(@Param("entities") List entities); - - /** - * 批量新增或按主键更新数据（MyBatis原生foreach方法） - * - * @param entities List 实例对象列表 - * @return 影响行数 - * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常，请自行校验入参 - */ - int insertOrUpdateBatch(@Param("entities") List entities); - /** * 修改数据 * diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbProDepartService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbProDepartService.java index 0f96824..f2c04ce 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbProDepartService.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbProDepartService.java @@ -1,6 +1,7 @@ package com.bonus.base.service; import com.bonus.base.domain.TbProDepart; +import com.bonus.common.core.web.domain.AjaxResult; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -36,7 +37,7 @@ public interface TbProDepartService { * @param tbProDepart 实例对象 * @return 实例对象 */ - int insert(TbProDepart tbProDepart); + AjaxResult insert(TbProDepart tbProDepart); /** * 修改数据 @@ -44,7 +45,7 @@ public interface TbProDepartService { * @param tbProDepart 实例对象 * @return 实例对象 */ - TbProDepart update(TbProDepart tbProDepart); + AjaxResult update(TbProDepart tbProDepart); /** * 通过主键删除数据 @@ -52,6 +53,6 @@ public interface TbProDepartService { * @param id 主键 * @return 是否成功 */ - boolean deleteById(Long id); + AjaxResult deleteById(Long id); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbProDepartServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbProDepartServiceImpl.java index 77d5a64..32b8df6 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbProDepartServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbProDepartServiceImpl.java @@ -1,8 +1,10 @@ package com.bonus.base.service.impl; +import com.bonus.base.config.ExceptionEnum; import com.bonus.base.domain.TbProDepart; import com.bonus.base.mapper.TbProDepartMapper; import com.bonus.base.service.TbProDepartService; +import com.bonus.common.core.web.domain.AjaxResult; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -48,8 +50,12 @@ public class TbProDepartServiceImpl implements TbProDepartService { * @return 实例对象 */ @Override - public int insert(TbProDepart tbProDepart) { - return tbProDepartDao.insert(tbProDepart); + public AjaxResult insert(TbProDepart tbProDepart) { + int result = tbProDepartDao.insert(tbProDepart); + if (result > 0) { + return AjaxResult.success(ExceptionEnum.SUCCESS.getMsg(), result); + } + return AjaxResult.error(ExceptionEnum.SAVE_TO_DATABASE.getCode(), ExceptionEnum.SAVE_TO_DATABASE.getMsg()); } /** @@ -59,9 +65,13 @@ public class TbProDepartServiceImpl implements TbProDepartService { * @return 实例对象 */ @Override - public TbProDepart update(TbProDepart tbProDepart) { - this.tbProDepartDao.update(tbProDepart); - return this.queryById(tbProDepart.getId()); + public AjaxResult update(TbProDepart tbProDepart) { + int result = tbProDepartDao.update(tbProDepart); + if (result > 0) { + return AjaxResult.success(ExceptionEnum.SUCCESS.getMsg(), result); + } else { + return AjaxResult.error(ExceptionEnum.UPDATE_TO_DATABASE.getCode(), ExceptionEnum.UPDATE_TO_DATABASE.getMsg()); + } } /** @@ -71,7 +81,12 @@ public class TbProDepartServiceImpl implements TbProDepartService { * @return 是否成功 */ @Override - public boolean deleteById(Long id) { - return this.tbProDepartDao.deleteById(id) > 0; + public AjaxResult deleteById(Long id) { + int result = tbProDepartDao.deleteById(id); + if (result > 0) { + return AjaxResult.success(ExceptionEnum.SUCCESS.getMsg(), result); + } else { + return AjaxResult.error(ExceptionEnum.DELETE_TO_DATABASE.getCode(), ExceptionEnum.DELETE_TO_DATABASE.getMsg()); + } } } diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/TbProDepartMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/TbProDepartMapper.xml index becc28d..35012e5 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/TbProDepartMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/TbProDepartMapper.xml @@ -1,97 +1,10 @@ - - - - - - + + update tb_pro_depart set del_flag = 1 + where id = #{id} +