From af9c62b45450bd4d3d773079ff59e3917fa1b8d9 Mon Sep 17 00:00:00 2001 From: mashuai Date: Mon, 9 Sep 2024 11:53:59 +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 --- .../controller/TbProDepartController.java | 89 +++++++ .../com/bonus/base/domain/TbProDepart.java | 73 ++++++ .../bonus/base/mapper/TbProDepartMapper.java | 89 +++++++ .../base/service/TbProDepartService.java | 57 ++++ .../service/impl/TbProDepartServiceImpl.java | 77 ++++++ .../src/main/resources/bootstrap.yml | 25 +- .../resources/mapper/TbProDepartMapper.xml | 247 ++++++++++++++++++ 7 files changed, 645 insertions(+), 12 deletions(-) create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbProDepartController.java create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbProDepart.java create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbProDepartMapper.java create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbProDepartService.java create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbProDepartServiceImpl.java create mode 100644 bonus-modules/bonus-base/src/main/resources/mapper/TbProDepartMapper.xml 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 new file mode 100644 index 0000000..2aed862 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbProDepartController.java @@ -0,0 +1,89 @@ +package com.bonus.base.controller; + +import com.bonus.base.domain.TbProDepart; +import com.bonus.base.service.TbProDepartService; +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 org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 项目部(TbProDepart)表控制层 + * + * @author makejava + * @since 2024-09-09 11:09:30 + */ +@RestController +@RequestMapping("/tbProDepart") +public class TbProDepartController extends BaseController { + /** + * 服务对象 + */ + @Resource + private TbProDepartService tbProDepartService; + + /** + * 分页查询 + * + * @param tbProDepart 筛选条件 + * @return 查询结果 + */ + @GetMapping + public TableDataInfo queryByPage(TbProDepart tbProDepart) { + startPage(); + List list = tbProDepartService.queryByPage(tbProDepart); + return getDataTable(list); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("{id}") + public AjaxResult queryById(@PathVariable("id") Long id) { + return AjaxResult.success(tbProDepartService.queryById(id)); + } + + /** + * 新增数据 + * + * @param tbProDepart 实体 + * @return 新增结果 + */ + @PostMapping + public AjaxResult add(@RequestBody TbProDepart tbProDepart) { + return AjaxResult.success(tbProDepartService.insert(tbProDepart)); + } + + /** + * 编辑数据 + * + * @param tbProDepart 实体 + * @return 编辑结果 + */ + @PutMapping + public ResponseEntity edit(TbProDepart tbProDepart) { + return ResponseEntity.ok(this.tbProDepartService.update(tbProDepart)); + } + + /** + * 删除数据 + * + * @param id 主键 + * @return 删除是否成功 + */ + @DeleteMapping + public ResponseEntity deleteById(Long id) { + return ResponseEntity.ok(this.tbProDepartService.deleteById(id)); + } + +} + diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbProDepart.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbProDepart.java new file mode 100644 index 0000000..330095a --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbProDepart.java @@ -0,0 +1,73 @@ +package com.bonus.base.domain; + +import lombok.Data; + +import java.util.Date; +import java.io.Serializable; + +/** + * 项目部(TbProDepart)实体类 + * + * @author makejava + * @since 2024-09-09 11:09:33 + */ +@Data +public class TbProDepart implements Serializable { + private static final long serialVersionUID = -99327586927571942L; + /** + * 主键 + */ + private Long id; + /** + * 项目部名称 + */ + private String departName; + /** + * 项目部类型(字典表) + */ + private String departType; + /** + * 地区(区域表 type==0) + */ + private Long areaId; + + /** + * 地区名称 + */ + private String areaName; + + /** + * 负责人 + */ + private String headUser; + /** + * 负责人联系电话(sm4)加密(查询展示脱敏) + */ + private String headUserPhone; + /** + * 备注 + */ + private String remarks; + /** + * 创建时间 + */ + private Date createTime; + /** + * 创建人 + */ + private Long createUser; + /** + * 修改时间 + */ + private Date updateTime; + /** + * 修改人 + */ + private Long updateUser; + /** + * 是否删除(0, 正常 1删除) + */ + private Integer delFlag; + +} + 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 new file mode 100644 index 0000000..4fd7fb3 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbProDepartMapper.java @@ -0,0 +1,89 @@ +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; + +/** + * 项目部(TbProDepart)表数据库访问层 + * + * @author makejava + * @since 2024-09-09 11:09:31 + */ +public interface TbProDepartMapper { + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + TbProDepart queryById(Long id); + + /** + * 查询指定行数据 + * + * @param tbProDepart 查询条件 + * @param pageable 分页对象 + * @return 对象列表 + */ + List queryAllByLimit(TbProDepart tbProDepart, @Param("pageable") Pageable pageable); + + /** + * 统计总行数 + * + * @param tbProDepart 查询条件 + * @return 总行数 + */ + long count(TbProDepart tbProDepart); + + /** + * 新增数据 + * + * @param tbProDepart 实例对象 + * @return 影响行数 + */ + 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); + + /** + * 修改数据 + * + * @param tbProDepart 实例对象 + * @return 影响行数 + */ + int update(TbProDepart tbProDepart); + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 影响行数 + */ + int deleteById(Long id); + + /** + * 分页查询 + * @param tbProDepart + * @return + */ + List queryByPage(TbProDepart tbProDepart); +} + 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 new file mode 100644 index 0000000..0f96824 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbProDepartService.java @@ -0,0 +1,57 @@ +package com.bonus.base.service; + +import com.bonus.base.domain.TbProDepart; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; + +import java.util.List; + +/** + * 项目部(TbProDepart)表服务接口 + * + * @author makejava + * @since 2024-09-09 11:09:35 + */ +public interface TbProDepartService { + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + TbProDepart queryById(Long id); + + /** + * 分页查询 + * + * @param tbProDepart 筛选条件 + * @return 查询结果 + */ + List queryByPage(TbProDepart tbProDepart); + + /** + * 新增数据 + * + * @param tbProDepart 实例对象 + * @return 实例对象 + */ + int insert(TbProDepart tbProDepart); + + /** + * 修改数据 + * + * @param tbProDepart 实例对象 + * @return 实例对象 + */ + TbProDepart update(TbProDepart tbProDepart); + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 是否成功 + */ + boolean 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 new file mode 100644 index 0000000..77d5a64 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbProDepartServiceImpl.java @@ -0,0 +1,77 @@ +package com.bonus.base.service.impl; + +import com.bonus.base.domain.TbProDepart; +import com.bonus.base.mapper.TbProDepartMapper; +import com.bonus.base.service.TbProDepartService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 项目部(TbProDepart)表服务实现类 + * + * @author makejava + * @since 2024-09-09 11:09:37 + */ +@Service("tbProDepartService") +public class TbProDepartServiceImpl implements TbProDepartService { + @Resource + private TbProDepartMapper tbProDepartDao; + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + @Override + public TbProDepart queryById(Long id) { + return tbProDepartDao.queryById(id); + } + + /** + * 分页查询 + * + * @param tbProDepart 筛选条件 + * @return 查询结果 + */ + @Override + public List queryByPage(TbProDepart tbProDepart) { + return tbProDepartDao.queryByPage(tbProDepart); + } + + /** + * 新增数据 + * + * @param tbProDepart 实例对象 + * @return 实例对象 + */ + @Override + public int insert(TbProDepart tbProDepart) { + return tbProDepartDao.insert(tbProDepart); + } + + /** + * 修改数据 + * + * @param tbProDepart 实例对象 + * @return 实例对象 + */ + @Override + public TbProDepart update(TbProDepart tbProDepart) { + this.tbProDepartDao.update(tbProDepart); + return this.queryById(tbProDepart.getId()); + } + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 是否成功 + */ + @Override + public boolean deleteById(Long id) { + return this.tbProDepartDao.deleteById(id) > 0; + } +} diff --git a/bonus-modules/bonus-base/src/main/resources/bootstrap.yml b/bonus-modules/bonus-base/src/main/resources/bootstrap.yml index b5d4fa9..8b64e85 100644 --- a/bonus-modules/bonus-base/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-base/src/main/resources/bootstrap.yml @@ -3,12 +3,15 @@ server: port: 18083 # Spring spring: - servlet: - multipart: - # 文件最大 - max-file-size: 20MB - # 设置总上传数据总大小 - max-request-size: 20MB + datasource: + dynamic: + primary: master + datasource: + master: + url: jdbc:mysql://192.168.0.56:3306/safety_warn_sys?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: Bonus@git + password: Passw0rd! + driver-class-name: com.mysql.cj.jdbc.Driver application: # 应用名称 name: bonus-base @@ -17,16 +20,14 @@ spring: active: dev cloud: nacos: - username: nacos - password: nacos discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 - namespace: 0cc70924-d088-4723-84c7-3d9a464e1bc3 + server-addr: 127.0.0.1:8848 + namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66 config: # 配置中心地址 - server-addr: 192.168.0.14:8848 - namespace: 0cc70924-d088-4723-84c7-3d9a464e1bc3 + server-addr: 127.0.0.1:8848 + namespace: 693e01a9-1dc4-4858-b1ae-439da3d35f66 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/TbProDepartMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/TbProDepartMapper.xml new file mode 100644 index 0000000..becc28d --- /dev/null +++ b/bonus-modules/bonus-base/src/main/resources/mapper/TbProDepartMapper.xml @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + INSERT INTO tb_pro_depart + + depart_name, + depart_type, + area_id, + head_user, + head_user_phone, + remarks, + create_time, + create_user, + update_time, + update_user, + del_flag + + + #{departName}, + #{departType}, + #{areaId}, + #{headUser}, + #{headUserPhone}, + #{remarks}, + NOW(), + #{createUser}, + #{updateTime}, + #{updateUser}, + 0 + + + + + + insert into tb_pro_depart(depart_name, depart_type, area_id, head_user, head_user_phone, remarks, create_time, + create_user, update_time, update_user, del_flag) + values + + (#{entity.departName}, #{entity.departType}, #{entity.areaId}, #{entity.headUser}, #{entity.headUserPhone}, + #{entity.remarks}, #{entity.createTime}, #{entity.createUser}, #{entity.updateTime}, #{entity.updateUser}, + #{entity.delFlag}) + + on duplicate key update + depart_name = values(depart_name), + depart_type = values(depart_type), + area_id = values(area_id), + head_user = values(head_user), + head_user_phone = values(head_user_phone), + remarks = values(remarks), + create_time = values(create_time), + create_user = values(create_user), + update_time = values(update_time), + update_user = values(update_user), + del_flag = values(del_flag) + + + + + update tb_pro_depart + + + depart_name = #{departName}, + + + depart_type = #{departType}, + + + area_id = #{areaId}, + + + head_user = #{headUser}, + + + head_user_phone = #{headUserPhone}, + + + remarks = #{remarks}, + + + create_time = #{createTime}, + + + create_user = #{createUser}, + + + update_time = #{updateTime}, + + + update_user = #{updateUser}, + + + del_flag = #{delFlag}, + + + where id = #{id} + + + + + delete + from tb_pro_depart + where id = #{id} + + + +