From c43543c1851d9ff70fe4052f65d4a584f59a4240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Mon, 20 Jan 2025 10:48:03 +0800 Subject: [PATCH] ere --- nflg-mobilebroken-admin/pom.xml | 4 ++ .../controller/DeviceComponentController.java | 32 ++++++++++++++++ .../pojo/query/DeviceComponentQuery.java | 11 ++++++ .../common/pojo/query/PageBaseQuery.java | 8 ++++ .../mapper/DeviceComponentMapper.java | 10 +++++ .../service/IDeviceComponentService.java | 20 ++++++++++ .../impl/DeviceComponentServiceImpl.java | 38 +++++++++++++++++++ .../mapper/DeviceComponentMapper.xml | 12 ++++++ .../starter/annotation/MethodInfoMark.java | 12 ++++++ 9 files changed, 147 insertions(+) create mode 100644 nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java create mode 100644 nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceComponentQuery.java create mode 100644 nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/query/PageBaseQuery.java create mode 100644 nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/annotation/MethodInfoMark.java diff --git a/nflg-mobilebroken-admin/pom.xml b/nflg-mobilebroken-admin/pom.xml index fe1e92ba..e8b61a29 100644 --- a/nflg-mobilebroken-admin/pom.xml +++ b/nflg-mobilebroken-admin/pom.xml @@ -54,6 +54,10 @@ jakarta.validation jakarta.validation-api + + com.nflg + nflg-mobilebroken-starter + diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java new file mode 100644 index 00000000..3fdd2b1d --- /dev/null +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java @@ -0,0 +1,32 @@ +package com.nflg.mobilebroken.admin.controller; + + +import cn.hutool.core.convert.Convert; +import cn.hutool.db.Page; +import com.nflg.mobilebroken.admin.pojo.query.DeviceComponentQuery; +import com.nflg.mobilebroken.common.pojo.ApiResult; +import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery; +import com.nflg.mobilebroken.common.pojo.vo.AreaSimpleVO; +import com.nflg.mobilebroken.common.pojo.vo.AreaVO; +import com.nflg.mobilebroken.repository.service.IDeviceComponentService; +import com.nflg.mobilebroken.starter.annotation.MethodInfoMark; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +@RequestMapping("/deviceComponent") +public class DeviceComponentController { + + @Resource + IDeviceComponentService deviceComponentService; + + @PostMapping("getList") + @MethodInfoMark("获取部件列表") + public ApiResult> getSimpleAreas(@RequestBody DeviceComponentQuery query){ + deviceComponentService.selectListByPage(query); + + return ApiResult.success(vos); + } +} diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceComponentQuery.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceComponentQuery.java new file mode 100644 index 00000000..f4f6d2f6 --- /dev/null +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceComponentQuery.java @@ -0,0 +1,11 @@ +package com.nflg.mobilebroken.admin.pojo.query; + +import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery; +import lombok.Data; + +@Data +public class DeviceComponentQuery extends PageBaseQuery { + private String modelNo; + + private String component; +} diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/query/PageBaseQuery.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/query/PageBaseQuery.java new file mode 100644 index 00000000..28affaff --- /dev/null +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/query/PageBaseQuery.java @@ -0,0 +1,8 @@ +package com.nflg.mobilebroken.common.pojo.query; + +public class PageBaseQuery { + + private Integer page=1; + + private Integer pageSize=20; +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceComponentMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceComponentMapper.java index 4238be85..70795835 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceComponentMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceComponentMapper.java @@ -1,7 +1,10 @@ package com.nflg.mobilebroken.repository.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery; import com.nflg.mobilebroken.repository.entity.DeviceComponent; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -13,4 +16,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface DeviceComponentMapper extends BaseMapper { + /** + * 分页查询 + * @param page + * @param query + * @return + */ + Page selectListByPage(@Param("page") Page page, @Param("query") PageBaseQuery query); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceComponentService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceComponentService.java index 797172b3..63e0ddc7 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceComponentService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceComponentService.java @@ -1,7 +1,13 @@ package com.nflg.mobilebroken.repository.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery; import com.nflg.mobilebroken.repository.entity.DeviceComponent; import com.baomidou.mybatisplus.extension.service.IService; +import org.apache.ibatis.annotations.Param; +import org.springframework.data.repository.query.Param; + +import java.util.List; /** *

@@ -13,4 +19,18 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IDeviceComponentService extends IService { + /** + * 分页查询 + * @param page + * @param query + * @return + */ + List selectListByPage( @Param("query") PageBaseQuery query); + + DeviceComponent saveComponent(DeviceComponent component); + + + void delComponent(Integer component); + + Boolean saveOrUpdateBatchComponent(List data); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceComponentServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceComponentServiceImpl.java index d7371340..82454ae5 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceComponentServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceComponentServiceImpl.java @@ -1,11 +1,16 @@ package com.nflg.mobilebroken.repository.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery; import com.nflg.mobilebroken.repository.entity.DeviceComponent; import com.nflg.mobilebroken.repository.mapper.DeviceComponentMapper; import com.nflg.mobilebroken.repository.service.IDeviceComponentService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 机型部件 服务实现类 @@ -17,4 +22,37 @@ import org.springframework.stereotype.Service; @Service public class DeviceComponentServiceImpl extends ServiceImpl implements IDeviceComponentService { + + /** + * 分页查询 + * @param page + * @param query + * @return + */ + public Page selectListByPage(@Param("page") Page page, @Param("query") PageBaseQuery query){ + return this.getBaseMapper().selectListByPage(page,query); + } + + /** + * 保存 + * @param component + * @return + */ + public DeviceComponent saveComponent(DeviceComponent component){ + this.saveOrUpdate(component); + return component; + } + + public void delComponent(Integer id){ + this.getBaseMapper().deleteById(id); + } + + + public Boolean saveOrUpdateBatchComponent(List data){ + return this.saveOrUpdateBatch(data); + } + + + + } diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceComponentMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceComponentMapper.xml index 49c0a68a..fa11ff73 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceComponentMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceComponentMapper.xml @@ -2,4 +2,16 @@ + + + and model_no=#{query.modelNo} + + + and component like concat('%',#{query.component} ,"%") + + + diff --git a/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/annotation/MethodInfoMark.java b/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/annotation/MethodInfoMark.java new file mode 100644 index 00000000..4c29d7c4 --- /dev/null +++ b/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/annotation/MethodInfoMark.java @@ -0,0 +1,12 @@ +package com.nflg.mobilebroken.starter.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +public @interface MethodInfoMark { + String value() default ""; +}