From 3a44a2b2da3ca11182be4a9d50a75b536d988bcb Mon Sep 17 00:00:00 2001 From: chenze <1824191732@qq.com> Date: Tue, 6 Aug 2024 10:44:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RepairDeviceController.java | 13 ++- .../RepairFailureTypeController.java | 76 +++++++++++++++ .../controller/RepairTypeController.java | 8 +- .../java/com/ics/admin/domain/Repair.java | 2 + .../ics/admin/domain/RepairFailureType.java | 27 ++++++ .../admin/mapper/RepairFailureTypeMapper.java | 64 +++++++++++++ .../service/IRepairFailureTypeService.java | 61 ++++++++++++ .../service/impl/RepairDeviceServiceImpl.java | 1 + .../impl/RepairFailureTypeServiceImpl.java | 92 +++++++++++++++++++ .../mapper/admin/RepairFailureTypeMapper.xml | 89 ++++++++++++++++++ .../resources/mapper/admin/RepairMapper.xml | 14 +-- .../mobile/member/RepairAPIController.java | 19 ++++ 12 files changed, 446 insertions(+), 20 deletions(-) create mode 100644 shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairFailureTypeController.java create mode 100644 shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairFailureType.java create mode 100644 shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairFailureTypeMapper.java create mode 100644 shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairFailureTypeService.java create mode 100644 shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairFailureTypeServiceImpl.java create mode 100644 shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairFailureTypeMapper.xml diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairDeviceController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairDeviceController.java index f026c15..e66abe5 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairDeviceController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairDeviceController.java @@ -21,7 +21,7 @@ import org.wf.jwtp.annotation.RequiresPermissions; * @date 2024-07-30 */ @RestController -@RequestMapping("device") +@RequestMapping("/repairDevice") public class RepairDeviceController extends BaseController { @Autowired @@ -38,7 +38,7 @@ public class RepairDeviceController extends BaseController { /** * 查询保修设备类型列表 */ - @RequiresPermissions("core:device:list") + @RequiresPermissions("core:repairDevice:list") @GetMapping("list") public R list(RepairDevice repairDevice) { startPage(); @@ -49,7 +49,7 @@ public class RepairDeviceController extends BaseController { /** * 新增保存保修设备类型 */ - @RequiresPermissions("core:device:add") + @RequiresPermissions("core:repairDevice:add") @PostMapping("save") public R addSave(@RequestBody RepairDevice repairDevice) { return toAjax(repairDeviceService.insertRepairDevice(repairDevice)); @@ -58,7 +58,7 @@ public class RepairDeviceController extends BaseController { /** * 修改保存保修设备类型 */ - @RequiresPermissions("core:device:edit") + @RequiresPermissions("core:repairDevice:edit") @PostMapping("update") public R editSave(@RequestBody RepairDevice repairDevice) { return toAjax(repairDeviceService.updateRepairDevice(repairDevice)); @@ -67,10 +67,13 @@ public class RepairDeviceController extends BaseController { /** * 删除保修设备类型 */ - @RequiresPermissions("core:device:remove") + @RequiresPermissions("core:repairDevice:remove") @PostMapping("remove") public R remove(String ids) { return toAjax(repairDeviceService.deleteRepairDeviceByIds(ids)); } + + + } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairFailureTypeController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairFailureTypeController.java new file mode 100644 index 0000000..204be59 --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairFailureTypeController.java @@ -0,0 +1,76 @@ +package com.ics.admin.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.ics.common.core.domain.R; +import com.ics.common.core.controller.BaseController; +import com.ics.admin.domain.RepairFailureType; +import com.ics.admin.service.IRepairFailureTypeService; +import org.wf.jwtp.annotation.RequiresPermissions; + +/** + * 故障类型 提供者 + * + * @author chen + * @date 2024-08-05 + */ +@RestController +@RequestMapping("repairFailureType") +public class RepairFailureTypeController extends BaseController { + + @Autowired + private IRepairFailureTypeService repairFailureTypeService; + + /** + * 查询故障类型 + */ + @GetMapping("get/{id}") + public RepairFailureType get(@PathVariable("id") Long id) { + return repairFailureTypeService.selectRepairFailureTypeById(id); + } + + /** + * 查询故障类型列表 + */ + @RequiresPermissions("RepairFailureType:repairType:list") + @GetMapping("list") + public R list(RepairFailureType repairFailureType) { + startPage(); + return result(repairFailureTypeService.selectRepairFailureTypeList(repairFailureType)); + } + + + /** + * 新增保存故障类型 + */ + @RequiresPermissions("RepairFailureType:repairType:add") + @PostMapping("save") + public R addSave(@RequestBody RepairFailureType repairFailureType) { + return toAjax(repairFailureTypeService.insertRepairFailureType(repairFailureType)); + } + + /** + * 修改保存故障类型 + */ + @RequiresPermissions("RepairFailureType:repairType:edit") + @PostMapping("update") + public R editSave(@RequestBody RepairFailureType repairFailureType) { + return toAjax(repairFailureTypeService.updateRepairFailureType(repairFailureType)); + } + + /** + * 删除故障类型 + */ + @RequiresPermissions("RepairFailureType:repairType:remove") + @PostMapping("remove") + public R remove(String ids) { + return toAjax(repairFailureTypeService.deleteRepairFailureTypeByIds(ids)); + } + +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairTypeController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairTypeController.java index 8453636..d5cb4a5 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairTypeController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairTypeController.java @@ -38,7 +38,7 @@ public class RepairTypeController extends BaseController { /** * 查询设备类型列表 */ - @RequiresPermissions("RepairType:type:list") + @RequiresPermissions("RepairType:repairType:list") @GetMapping("list") public R list(RepairType repairType) { startPage(); @@ -49,7 +49,7 @@ public class RepairTypeController extends BaseController { /** * 新增保存设备类型 */ - @RequiresPermissions("RepairType:type:add") + @RequiresPermissions("RepairType:repairType:add") @PostMapping("save") public R addSave(@RequestBody RepairType repairType) { return toAjax(repairTypeService.insertRepairType(repairType)); @@ -58,7 +58,7 @@ public class RepairTypeController extends BaseController { /** * 修改保存设备类型 */ - @RequiresPermissions("RepairType:type:edit") + @RequiresPermissions("RepairType:repairType:edit") @PostMapping("update") public R editSave(@RequestBody RepairType repairType) { return toAjax(repairTypeService.updateRepairType(repairType)); @@ -67,7 +67,7 @@ public class RepairTypeController extends BaseController { /** * 删除设备类型 */ - @RequiresPermissions("RepairType:type:remove") + @RequiresPermissions("RepairType:repairType:remove") @PostMapping("remove") public R remove(String ids) { return toAjax(repairTypeService.deleteRepairTypeByIds(ids)); diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/Repair.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/Repair.java index bfa48c4..e10ce69 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/Repair.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/Repair.java @@ -236,5 +236,7 @@ public class Repair extends BaseEntity { private Long parkId; + private Long failureTypeId; + } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairFailureType.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairFailureType.java new file mode 100644 index 0000000..b68734d --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairFailureType.java @@ -0,0 +1,27 @@ +package com.ics.admin.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.ics.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * 故障类型对象 ics_repair_failure_type + * + * @author chen + * @date 2024-08-05 + */ +@Data +@TableName("ics_repair_failure_type") +public class RepairFailureType extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 名称 */ + private String name; + + /** 备注 */ + private String remark; + + /** 园区ID */ + private Long parkId; + +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairFailureTypeMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairFailureTypeMapper.java new file mode 100644 index 0000000..723ec31 --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairFailureTypeMapper.java @@ -0,0 +1,64 @@ +package com.ics.admin.mapper; + +import com.ics.admin.domain.RepairFailureType; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 故障类型Mapper接口 + * + * @author chen + * @date 2024-08-05 + */ +@Mapper +public interface RepairFailureTypeMapper extends BaseMapper { + /** + * 查询故障类型 + * + * @param id 故障类型ID + * @return 故障类型 + */ + RepairFailureType selectRepairFailureTypeById(Long id); + + /** + * 查询故障类型列表 + * + * @param repairFailureType 故障类型 + * @return 故障类型集合 + */ + List selectRepairFailureTypeList(RepairFailureType repairFailureType); + + /** + * 新增故障类型 + * + * @param repairFailureType 故障类型 + * @return 结果 + */ + int insertRepairFailureType(RepairFailureType repairFailureType); + + /** + * 修改故障类型 + * + * @param repairFailureType 故障类型 + * @return 结果 + */ + int updateRepairFailureType(RepairFailureType repairFailureType); + + /** + * 删除故障类型 + * + * @param id 故障类型ID + * @return 结果 + */ + int deleteRepairFailureTypeById(Long id); + + /** + * 批量删除故障类型 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + int deleteRepairFailureTypeByIds(String[] ids); +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairFailureTypeService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairFailureTypeService.java new file mode 100644 index 0000000..1d26725 --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairFailureTypeService.java @@ -0,0 +1,61 @@ +package com.ics.admin.service; + +import com.ics.admin.domain.RepairFailureType; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * 故障类型Service接口 + * + * @author chen + * @date 2024-08-05 + */ +public interface IRepairFailureTypeService extends IService { + /** + * 查询故障类型 + * + * @param id 故障类型ID + * @return 故障类型 + */ + RepairFailureType selectRepairFailureTypeById(Long id); + + /** + * 查询故障类型列表 + * + * @param repairFailureType 故障类型 + * @return 故障类型集合 + */ + List selectRepairFailureTypeList(RepairFailureType repairFailureType); + + /** + * 新增故障类型 + * + * @param repairFailureType 故障类型 + * @return 结果 + */ + int insertRepairFailureType(RepairFailureType repairFailureType); + + /** + * 修改故障类型 + * + * @param repairFailureType 故障类型 + * @return 结果 + */ + int updateRepairFailureType(RepairFailureType repairFailureType); + + /** + * 批量删除故障类型 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + int deleteRepairFailureTypeByIds(String ids); + + /** + * 删除故障类型信息 + * + * @param id 故障类型ID + * @return 结果 + */ + int deleteRepairFailureTypeById(Long id); +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairDeviceServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairDeviceServiceImpl.java index 2393352..aa74ebe 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairDeviceServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairDeviceServiceImpl.java @@ -42,6 +42,7 @@ public class RepairDeviceServiceImpl extends ServiceImpl selectRepairDeviceList(RepairDevice repairDevice) { QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq(repairDevice.getTypeId() != null,"type_id",repairDevice.getTypeId()); return repairDeviceMapper.selectList(queryWrapper); } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairFailureTypeServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairFailureTypeServiceImpl.java new file mode 100644 index 0000000..6b0f2d4 --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairFailureTypeServiceImpl.java @@ -0,0 +1,92 @@ +package com.ics.admin.service.impl; + +import java.util.List; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ics.admin.mapper.RepairFailureTypeMapper; +import com.ics.admin.domain.RepairFailureType; +import com.ics.admin.service.IRepairFailureTypeService; + +/** + * 故障类型Service业务层处理 + * + * @author chen + * @date 2024-08-05 + */ +@Service +public class RepairFailureTypeServiceImpl extends ServiceImpl implements IRepairFailureTypeService { + @Autowired + private RepairFailureTypeMapper repairFailureTypeMapper; + + /** + * 查询故障类型 + * + * @param id 故障类型ID + * @return 故障类型 + */ + @Override + public RepairFailureType selectRepairFailureTypeById(Long id) { + return repairFailureTypeMapper.selectById(id); + } + + /** + * 查询故障类型列表 + * + * @param repairFailureType 故障类型 + * @return 故障类型 + */ + @Override + public List selectRepairFailureTypeList(RepairFailureType repairFailureType) { + QueryWrapper queryWrapper = new QueryWrapper(); + return repairFailureTypeMapper.selectList(queryWrapper); + } + + /** + * 新增故障类型 + * + * @param repairFailureType 故障类型 + * @return 结果 + */ + @Override + public int insertRepairFailureType(RepairFailureType repairFailureType) { + return repairFailureTypeMapper.insert(repairFailureType); + } + + /** + * 修改故障类型 + * + * @param repairFailureType 故障类型 + * @return 结果 + */ + @Override + public int updateRepairFailureType(RepairFailureType repairFailureType) { + return repairFailureTypeMapper.updateById(repairFailureType); + } + + /** + * 删除故障类型对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteRepairFailureTypeByIds(String ids) { + String[] idsArray = StrUtil.split(ids,","); + return repairFailureTypeMapper.deleteBatchIds(CollUtil.toList(idsArray)); + } + + /** + * 删除故障类型信息 + * + * @param id 故障类型ID + * @return 结果 + */ + @Override + public int deleteRepairFailureTypeById(Long id) { + return repairFailureTypeMapper.deleteRepairFailureTypeById(id); + } +} diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairFailureTypeMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairFailureTypeMapper.xml new file mode 100644 index 0000000..2ac2508 --- /dev/null +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairFailureTypeMapper.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + SELECT id, name, remark, delete_flag, create_by, create_time, update_by, update_time, tenant_id, park_id FROM ics_repair_failure_type + + + + + + + + INSERT INTO ics_repair_failure_type + + name, + remark, + delete_flag, + create_by, + create_time, + update_by, + update_time, + tenant_id, + park_id, + + + #{name}, + #{remark}, + #{deleteFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{tenantId}, + #{parkId}, + + + + + UPDATE ics_repair_failure_type + + name = #{name}, + remark = #{remark}, + delete_flag = #{deleteFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + tenant_id = #{tenantId}, + park_id = #{parkId}, + + WHERE id = #{id} + + + + DELETE FROM ics_repair_failure_type WHERE id = #{id} + + + + DELETE FROM ics_repair_failure_type where id in + + #{id} + + + + \ No newline at end of file diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml index f4a872c..7f14bfc 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml @@ -13,6 +13,7 @@ + @@ -79,6 +80,7 @@ r.dispatcher_id, r.type_id, r.repair_device, + r.failure_type_id, r.repair_time, r.repair_images, r.repair_fee, @@ -95,18 +97,8 @@ r.update_by, r.update_time, r.tenant_id, - r.park_id, - ic.id AS cid, - ic.name AS cname, - ip.id AS pid, - ip.name AS pname, - u.id AS userId, - u.username, - u.mobile + r.park_id FROM ics_repair AS r - LEFT JOIN ics_customer AS ic ON r.customer_id = ic.id - LEFT JOIN sys_user AS u ON r.worker_id = u.id - LEFT JOIN ics_park AS ip ON ip.id = r.park_id