> 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 "";
+}