From 2baec0dceb15bb789b9dcd2f4feaa79d40e5a3a1 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 11 Nov 2025 13:54:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../water/DeviceTypeController.java | 10 ++-- .../controller/water/OwnerController.java | 53 ++++++++++++++++++ .../controller/water/ProTypeController.java | 15 ++--- .../bonus/waterdesign/domain/OwnerDto.java | 17 ++++++ .../bonus/waterdesign/mapper/OwnerMapper.java | 17 ++++++ .../waterdesign/service/OwnerService.java | 17 ++++++ .../service/impl/OwnerServiceImpl.java | 56 +++++++++++++++++++ .../src/main/resources/mapper/OwnerMapper.xml | 46 +++++++++++++++ .../main/resources/mapper/ProjectMapper.xml | 23 ++++---- 9 files changed, 230 insertions(+), 24 deletions(-) create mode 100644 water-design-const/src/main/java/com/bonus/waterdesign/controller/water/OwnerController.java create mode 100644 water-design-const/src/main/java/com/bonus/waterdesign/domain/OwnerDto.java create mode 100644 water-design-const/src/main/java/com/bonus/waterdesign/mapper/OwnerMapper.java create mode 100644 water-design-const/src/main/java/com/bonus/waterdesign/service/OwnerService.java create mode 100644 water-design-const/src/main/java/com/bonus/waterdesign/service/impl/OwnerServiceImpl.java create mode 100644 water-design-const/src/main/resources/mapper/OwnerMapper.xml diff --git a/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/DeviceTypeController.java b/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/DeviceTypeController.java index 2aae47b..b291d2f 100644 --- a/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/DeviceTypeController.java +++ b/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/DeviceTypeController.java @@ -35,17 +35,17 @@ public class DeviceTypeController extends BaseController { } @PreAuthorize("@ss.hasPermi('device:type:add')") @PostMapping("/add") - public AjaxResult add(DeviceTypeDto dto) { + public AjaxResult add(@RequestBody DeviceTypeDto dto) { return deviceTypeService.add(dto); } @PreAuthorize("@ss.hasPermi('device:type:update')") - @GetMapping("/update") - public AjaxResult update(DeviceTypeDto dto) { + @PostMapping("/update") + public AjaxResult update(@RequestBody DeviceTypeDto dto) { return deviceTypeService.update(dto); } @PreAuthorize("@ss.hasPermi('device:type:del')") - @GetMapping("/del") - public AjaxResult del(DeviceTypeDto dto) { + @PostMapping("/del") + public AjaxResult del(@RequestBody DeviceTypeDto dto) { return deviceTypeService.delete(dto); } diff --git a/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/OwnerController.java b/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/OwnerController.java new file mode 100644 index 0000000..090d5d5 --- /dev/null +++ b/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/OwnerController.java @@ -0,0 +1,53 @@ +package com.bonus.waterdesign.controller.water; + +import com.bonus.common.core.controller.BaseController; +import com.bonus.common.core.domain.AjaxResult; +import com.bonus.common.core.page.TableDataInfo; +import com.bonus.waterdesign.domain.OwnerDto; +import com.bonus.waterdesign.service.OwnerService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @Author：liang.chao + * @Date：2025/11/11 - 9:50 + */ +@RestController +@RequestMapping("/owner") +public class OwnerController extends BaseController { + @Autowired + private OwnerService ownerService; + @PreAuthorize("@ss.hasPermi('owner:list')") + @GetMapping("/list") + public TableDataInfo list(OwnerDto dto) { + startPage(); + List list = ownerService.list(dto); + return getDataTable(list); + } + @GetMapping("/listSelect") + public AjaxResult listSelect(OwnerDto dto) { + List list = ownerService.list(dto); + return AjaxResult.success(list); + } + @PreAuthorize("@ss.hasPermi('owner:add')") + @PostMapping("/add") + public AjaxResult add(OwnerDto dto) { + return ownerService.add(dto); + } + @PreAuthorize("@ss.hasPermi('owner:update')") + @GetMapping("/update") + public AjaxResult update(OwnerDto dto) { + return ownerService.update(dto); + } + @PreAuthorize("@ss.hasPermi('owner:del')") + @GetMapping("/del") + public AjaxResult del(OwnerDto dto) { + return ownerService.delete(dto); + } +} diff --git a/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/ProTypeController.java b/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/ProTypeController.java index 9e89b40..dd5ccc9 100644 --- a/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/ProTypeController.java +++ b/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/ProTypeController.java @@ -9,10 +9,7 @@ import com.bonus.waterdesign.service.DeviceTypeService; import com.bonus.waterdesign.service.ProTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -35,17 +32,17 @@ public class ProTypeController extends BaseController { } @PreAuthorize("@ss.hasPermi('pro:type:add')") @PostMapping("/add") - public AjaxResult add(ProTypeDto dto) { + public AjaxResult add(@RequestBody ProTypeDto dto) { return proTypeService.add(dto); } @PreAuthorize("@ss.hasPermi('pro:type:update')") - @GetMapping("/update") - public AjaxResult update(ProTypeDto dto) { + @PostMapping("/update") + public AjaxResult update(@RequestBody ProTypeDto dto) { return proTypeService.update(dto); } @PreAuthorize("@ss.hasPermi('pro:type:del')") - @GetMapping("/del") - public AjaxResult del(ProTypeDto dto) { + @PostMapping("/del") + public AjaxResult del(@RequestBody ProTypeDto dto) { return proTypeService.delete(dto); } } diff --git a/water-design-const/src/main/java/com/bonus/waterdesign/domain/OwnerDto.java b/water-design-const/src/main/java/com/bonus/waterdesign/domain/OwnerDto.java new file mode 100644 index 0000000..6ed97a6 --- /dev/null +++ b/water-design-const/src/main/java/com/bonus/waterdesign/domain/OwnerDto.java @@ -0,0 +1,17 @@ +package com.bonus.waterdesign.domain; + +import lombok.Data; + +/** + * @Author：liang.chao + * @Date：2025/11/11 - 9:57 + */ +@Data +public class OwnerDto { + private Integer id; + private String unitName; + private String unitMan; + private String phone; + private String address; + private String remark; +} diff --git a/water-design-const/src/main/java/com/bonus/waterdesign/mapper/OwnerMapper.java b/water-design-const/src/main/java/com/bonus/waterdesign/mapper/OwnerMapper.java new file mode 100644 index 0000000..cc92363 --- /dev/null +++ b/water-design-const/src/main/java/com/bonus/waterdesign/mapper/OwnerMapper.java @@ -0,0 +1,17 @@ +package com.bonus.waterdesign.mapper; + +import com.bonus.waterdesign.domain.OwnerDto; + +import java.util.List; + +/** + * @Author：liang.chao + * @Date：2025/11/11 - 10:00 + */ +public interface OwnerMapper { + List list(OwnerDto model); + int add(OwnerDto model); + int deleteById(OwnerDto model); + int update(OwnerDto model); + +} diff --git a/water-design-const/src/main/java/com/bonus/waterdesign/service/OwnerService.java b/water-design-const/src/main/java/com/bonus/waterdesign/service/OwnerService.java new file mode 100644 index 0000000..72a8059 --- /dev/null +++ b/water-design-const/src/main/java/com/bonus/waterdesign/service/OwnerService.java @@ -0,0 +1,17 @@ +package com.bonus.waterdesign.service; + +import com.bonus.common.core.domain.AjaxResult; +import com.bonus.waterdesign.domain.OwnerDto; + +import java.util.List; + +/** + * @Author：liang.chao + * @Date：2025/11/10 - 10:34 + */ +public interface OwnerService { + List list(OwnerDto model); + AjaxResult add(OwnerDto model); + AjaxResult delete(OwnerDto dto); + AjaxResult update(OwnerDto model); +} diff --git a/water-design-const/src/main/java/com/bonus/waterdesign/service/impl/OwnerServiceImpl.java b/water-design-const/src/main/java/com/bonus/waterdesign/service/impl/OwnerServiceImpl.java new file mode 100644 index 0000000..752299c --- /dev/null +++ b/water-design-const/src/main/java/com/bonus/waterdesign/service/impl/OwnerServiceImpl.java @@ -0,0 +1,56 @@ +package com.bonus.waterdesign.service.impl; + +import com.bonus.common.core.domain.AjaxResult; +import com.bonus.waterdesign.domain.OwnerDto; +import com.bonus.waterdesign.mapper.OwnerMapper; +import com.bonus.waterdesign.service.OwnerService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author：liang.chao + * @Date：2025/11/11 - 9:59 + */ +@Service +public class OwnerServiceImpl implements OwnerService { + + @Resource + private OwnerMapper ownerMapper; + + @Override + public List list(OwnerDto model) { + return ownerMapper.list(model); + } + + @Override + public AjaxResult add(OwnerDto model) { + int add = ownerMapper.add(model); + if (add > 0) { + return AjaxResult.success("新增成功"); + } else { + return AjaxResult.error("新增失败"); + } + } + + @Override + public AjaxResult delete(OwnerDto dto) { + int i = ownerMapper.deleteById(dto); + if (i > 0) { + return AjaxResult.success("删除成功"); + } else { + return AjaxResult.error("删除失败"); + } + } + + @Override + public AjaxResult update(OwnerDto model) { + int update = ownerMapper.update(model); + if (update > 0) { + return AjaxResult.success("修改成功"); + } else { + return AjaxResult.error("修改失败"); + } + } +} diff --git a/water-design-const/src/main/resources/mapper/OwnerMapper.xml b/water-design-const/src/main/resources/mapper/OwnerMapper.xml new file mode 100644 index 0000000..8a60ea3 --- /dev/null +++ b/water-design-const/src/main/resources/mapper/OwnerMapper.xml @@ -0,0 +1,46 @@ + + + + + insert into tb_owner(unit_name,unit_man,phone,address,remark) values(#{unitName},#{unitMan},#{phone},#{address},#{remark}) + + + + UPDATE tb_owner + + + unit_name = #{unitName}, + + + unit_man = #{unitMan}, + + + phone = #{phone}, + + + address = #{address}, + + + remark = #{remark}, + + + WHERE id = #{id} + + + + delete + from tb_owner + where id = #{id} + + + + diff --git a/water-design-const/src/main/resources/mapper/ProjectMapper.xml b/water-design-const/src/main/resources/mapper/ProjectMapper.xml index 7603e8b..abac1df 100644 --- a/water-design-const/src/main/resources/mapper/ProjectMapper.xml +++ b/water-design-const/src/main/resources/mapper/ProjectMapper.xml @@ -26,8 +26,8 @@ SELECT tp.id, tp.pro_name, - sdd.dict_label as pro_type, - tp.unit_name, + sdd.type_name as pro_type, + oo.unit_name, tp.user_name, tp.pro_location, tp.lon, @@ -38,7 +38,8 @@ FROM tb_project tp LEFT JOIN sys_level_config sc ON sc.config_id = tp.LEVEL - left join sys_dict_data sdd ON sdd.dict_value = tp.pro_type and sdd.dict_type = 'pro_type' + LEFT JOIN tb_pro_type sdd ON sdd.id = tp.pro_type + LEFT JOIN tb_owner oo on oo.id = tp.unit_id WHERE del_flag = '0' @@ -52,7 +53,7 @@ AND pro_name like concat('%', #{proName}, '%') - AND unit_name = #{unit} + AND unit_id = #{unit} AND user_name like concat('%', #{chargePerson}, '%') @@ -61,13 +62,15 @@ @@ -122,7 +125,7 @@ pro_name = #{proName}, pro_type = #{proType}, - unit_name = #{unit}, + unit_id = #{unit}, user_name = #{chargePerson}, pro_location = #{location}, lon = #{longitude}, @@ -139,7 +142,7 @@ id, pro_name, pro_type, - unit_name, + unit_id, user_name, pro_location, lon,