From 37fe78bb0153508910b31f84f01942d2473958d0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 19 二月 2025 15:55:18 +0800
Subject: [PATCH] #新增 1. 新增物料分组tree接口 2. 新增通过物料获取物料接口 3. 新增knife4j接口UI显示 访问链接：http://localhost:8080/rsf-server/doc.html#/home
---
rsf-server/pom.xml | 6 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java | 13 +++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrGroupServiceImpl.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/common/config/WebMvcConfig.java | 15 +++
rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageResult.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrGroupService.java | 1
rsf-server/src/main/resources/mapper/manager/MatnrGroupMapper.xml | 3
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java | 25 ++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java | 16 +++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/MatnrGroupMapper.java | 4 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java | 12 ++-
rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java | 5
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ShipperController.java | 3
rsf-server/src/main/java/com/vincent/rsf/server/common/config/SwaggerConfig.java | 91 ++++++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Shipper.java | 1
rsf-server/src/main/resources/application.yml | 24 +++++
rsf-server/src/main/resources/application-dev.yml | 2
18 files changed, 211 insertions(+), 16 deletions(-)
diff --git a/rsf-server/pom.xml b/rsf-server/pom.xml
index 583c2ce..f8479b8 100644
--- a/rsf-server/pom.xml
+++ b/rsf-server/pom.xml
@@ -93,7 +93,11 @@
<artifactId>springfox-boot-starter</artifactId>
<version>3.0.0</version>
</dependency>
-
+ <dependency>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>knife4j-spring-boot-starter</artifactId>
+ <version>3.0.2</version>
+ </dependency>
<!-- jjwt -->
<dependency>
<groupId>io.jsonwebtoken</groupId>
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/config/SwaggerConfig.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/config/SwaggerConfig.java
new file mode 100644
index 0000000..65dedf4
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/config/SwaggerConfig.java
@@ -0,0 +1,91 @@
+package com.vincent.rsf.server.common.config;
+
+import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
+import io.swagger.annotations.Api;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.util.ReflectionUtils;
+import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.oas.annotations.EnableOpenApi;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.spring.web.plugins.WebFluxRequestHandlerProvider;
+import springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider;
+
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+@Configuration
+@EnableKnife4j
+@EnableOpenApi
+public class SwaggerConfig {
+
+ @Value("${spring.profiles.active}")
+ private String active;
+
+ @Bean
+ public Docket docket() {
+ Docket docket = new Docket(DocumentationType.OAS_30)
+ .apiInfo(apiInfo())
+ .groupName("娴嬭瘯鍒嗙粍")
+ .enable(true)
+ .select()
+ //apis锛� 娣诲姞swagger鎺ュ彛鎻愬彇鑼冨洿
+ .apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
+ .paths(PathSelectors.any())
+ .build();
+
+ return docket;
+ }
+
+ private ApiInfo apiInfo() {
+ return new ApiInfoBuilder()
+ .title("WMS鏍囩増1.0鐗堟湰鎺ュ彛鏂囨。")
+ .description("WMS鏍囩増1.0鐗堟湰鎺ュ彛鏂囨。,鎶�鏈爤涓昏鍖呮嫭锛歋pringBoot銆丷eact.js銆丮ySQL5.7")
+ .version("v1.0")
+ .build();
+ }
+
+ @Bean
+ public static BeanPostProcessor springfoxHandlerProviderBeanPostProcessor() {
+ return new BeanPostProcessor() {
+
+ @Override
+ public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
+ if (bean instanceof WebMvcRequestHandlerProvider || bean instanceof WebFluxRequestHandlerProvider) {
+ customizeSpringfoxHandlerMappings(getHandlerMappings(bean));
+ }
+ return bean;
+ }
+
+ private <T extends RequestMappingInfoHandlerMapping> void customizeSpringfoxHandlerMappings(List<T> mappings) {
+ List<T> copy = mappings.stream()
+ .filter(mapping -> mapping.getPatternParser() == null)
+ .collect(Collectors.toList());
+ mappings.clear();
+ mappings.addAll(copy);
+ }
+
+ @SuppressWarnings("unchecked")
+ private List<RequestMappingInfoHandlerMapping> getHandlerMappings(Object bean) {
+ try {
+ Field field = ReflectionUtils.findField(bean.getClass(), "handlerMappings");
+ field.setAccessible(true);
+ return (List<RequestMappingInfoHandlerMapping>) field.get(bean);
+ } catch (IllegalArgumentException | IllegalAccessException e) {
+ throw new IllegalStateException(e);
+ }
+ }
+ };
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/config/WebMvcConfig.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/config/WebMvcConfig.java
index a1536db..c79c7d6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/config/WebMvcConfig.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/config/WebMvcConfig.java
@@ -7,6 +7,7 @@
import org.springframework.web.servlet.AsyncHandlerInterceptor;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import javax.servlet.http.HttpServletRequest;
@@ -25,7 +26,7 @@
public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(getAsyncHandlerInterceptor())
.addPathPatterns("/**")
- ;
+ .excludePathPatterns("/swagger-resources/**", "/webjars/**", "/v2/**","/v3/**","/doc.html/**", "/swagger-ui.html/**");
}
@Bean
@@ -40,6 +41,18 @@
}
@Override
+ public void addResourceHandlers(ResourceHandlerRegistry registry) {
+ registry.addResourceHandler("/**").addResourceLocations("classpath:/static/");
+ registry.addResourceHandler("swagger-ui.html")
+ .addResourceLocations("classpath:/META-INF/resources/");
+ registry.addResourceHandler("doc.html")
+ .addResourceLocations("classpath:/META-INF/resources/");
+ registry.addResourceHandler("/webjars/**")
+ .addResourceLocations("classpath:/META-INF/resources/webjars/");
+ }
+
+
+ @Override
public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/**")
.allowedOriginPatterns("*")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageResult.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageResult.java
index 0573c89..608271f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageResult.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageResult.java
@@ -1,6 +1,7 @@
package com.vincent.rsf.server.common.domain;
import lombok.Data;
+import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.List;
@@ -10,6 +11,7 @@
* @since 2017-06-10 10:10:02
*/
@Data
+@Accessors(chain = true)
public class PageResult<T> implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java
index 7c31298..53ad888 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java
@@ -42,11 +42,12 @@
"/login",
"/register",
"/druid/**",
+ "/doc.html",
"/swagger-ui.html",
"/swagger-resources/**",
"/webjars/**",
- "/v2/api-docs",
- "/v3/api-docs",
+ "/v2/api-docs/**",
+ "/v3/api-docs/**",
"/swagger-ui/**",
"/ws/**"
};
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
index 32b9061..4aecd2a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.common.domain.PageResult;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
@@ -12,13 +14,14 @@
import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+@Api(tags = "鐗╂枡琛ㄦ帴鍙�")
@RestController
public class MatnrController extends BaseController {
@@ -101,6 +104,26 @@
return R.ok().add(vos);
}
+
+ @PreAuthorize("hasAuthority('manager:matnr:list')")
+ @PostMapping("/matnr/group")
+ public R getGroupMatnrs(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Matnr, BaseParam> pageParam = new PageParam<>(baseParam, Matnr.class);
+ LambdaQueryWrapper<Matnr> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(map.get("condition"))) {
+ wrapper.like(Matnr::getName, map.get("condition"));
+ }
+ if (Cools.isEmpty(map.get("groupId"))) {
+ throw new CoolException("鍒嗙被ID涓嶈兘涓虹┖锛侊紒");
+ }
+ wrapper.eq(Matnr::getGroupId, map.get("groupId"));
+ Page<Matnr> matnrPage = matnrService.page(new Page<>(1, 30), wrapper);
+ return R.ok(new PageResult().setRecords(matnrPage.getRecords()).setTotal(matnrPage.getTotal()));
+ }
+
+
+
@PreAuthorize("hasAuthority('manager:matnr:list')")
@PostMapping("/matnr/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
index 85db6ef..a1ba42a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.vincent.rsf.common.utils.Utils;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.common.domain.PageResult;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
@@ -12,6 +14,7 @@
import com.vincent.rsf.server.manager.entity.MatnrGroup;
import com.vincent.rsf.server.manager.service.MatnrGroupService;
import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -19,6 +22,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+@Api(tags = "鐗╂枡鍒嗙粍")
@RestController
public class MatnrGroupController extends BaseController {
@@ -102,6 +106,15 @@
}
@PreAuthorize("hasAuthority('manager:matnrGroup:list')")
+ @GetMapping("/matnrGroup/tree")
+ public R tree() {
+ List<MatnrGroup> matnrs = matnrGroupService.list(new LambdaQueryWrapper<>());
+ List<MatnrGroup> treeData = Utils.toTreeData(matnrs, 0L, MatnrGroup::getParentId, MatnrGroup::getId, MatnrGroup::setChildren);
+ return R.ok().add(treeData);
+ }
+
+
+ @PreAuthorize("hasAuthority('manager:matnrGroup:list')")
@PostMapping("/matnrGroup/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
ExcelUtil.build(ExcelUtil.create(matnrGroupService.list(), MatnrGroup.class), response);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ShipperController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ShipperController.java
index 1e140e1..f20b179 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ShipperController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ShipperController.java
@@ -12,6 +12,8 @@
import com.vincent.rsf.server.manager.entity.Shipper;
import com.vincent.rsf.server.manager.service.ShipperService;
import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -19,6 +21,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+@Api(tags = "璐т富")
@RestController
public class ShipperController extends BaseController {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
index c4a638a..ae1e46c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
@@ -12,6 +12,7 @@
import com.vincent.rsf.server.manager.entity.Warehouse;
import com.vincent.rsf.server.manager.service.WarehouseService;
import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -19,6 +20,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+@Api(tags = "浠撳簱")
@RestController
public class WarehouseController extends BaseController {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
index 943da6d..2792c1d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
@@ -1,6 +1,7 @@
package com.vincent.rsf.server.manager.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -11,10 +12,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,9 +22,11 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
@Data
@TableName("man_matnr")
+@ApiModel(value = "Matnr", description = "鐗╂枡鎵�鏈夊熀纭�灞炴��")
public class Matnr implements Serializable {
private static final long serialVersionUID = 1L;
@@ -179,6 +179,7 @@
/**
* 鏉″舰鐮�
*/
+ @ApiModelProperty(value = "鏉″舰鐮�")
private String barcode;
/**
@@ -244,6 +245,13 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "鍒嗙被鍒楄〃")
+ @TableField(exist = false)
+ private List<Matnr> children;
+
public Matnr() {}
public Matnr(String name,String code,Long shipperId,Long groupId,Long batchRegularId,String erpCode,String spec,String model,Double weight,String color,String size,String describle,Integer nromNum,String unit,String purchaseUnit,String stockUnit,Short stockLeval,Short flagLabelMange,Double safetyQty,Double minQty,Double maxQty,Integer stagnate,Integer validity,Integer validityWarn,Short flagCheck,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java
index b97c928..87deb71 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java
@@ -1,16 +1,14 @@
package com.vincent.rsf.server.manager.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -20,8 +18,10 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
@Data
+@ApiModel(value = "鐗╂枡绫�")
@TableName("man_matnr_group")
public class MatnrGroup implements Serializable {
@@ -103,6 +103,10 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value = "瀛愮被")
+ @TableField(exist = false)
+ private List<MatnrGroup> children;
+
public MatnrGroup() {}
public MatnrGroup(String name,String code,Long parentId,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Shipper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Shipper.java
index 0dd968e..5720fdd 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Shipper.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Shipper.java
@@ -22,6 +22,7 @@
import java.util.Date;
@Data
+@ApiModel(value = "璐т富鍩虹灞炴��")
@TableName("man_shipper")
public class Shipper implements Serializable {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/MatnrGroupMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/MatnrGroupMapper.java
index 36325b2..286a96d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/MatnrGroupMapper.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/MatnrGroupMapper.java
@@ -1,5 +1,8 @@
package com.vincent.rsf.server.manager.mapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.MatnrGroup;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@@ -9,4 +12,5 @@
@Repository
public interface MatnrGroupMapper extends BaseMapper<MatnrGroup> {
+ IPage<Matnr> selectGroupMatnrs(PageParam request);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrGroupService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrGroupService.java
index f399b9e..8344c66 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrGroupService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrGroupService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.vincent.rsf.server.manager.entity.MatnrGroup;
+
public interface MatnrGroupService extends IService<MatnrGroup> {
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrGroupServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrGroupServiceImpl.java
index fb2b943..46e8c59 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrGroupServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrGroupServiceImpl.java
@@ -1,5 +1,6 @@
package com.vincent.rsf.server.manager.service.impl;
+
import com.vincent.rsf.server.manager.mapper.MatnrGroupMapper;
import com.vincent.rsf.server.manager.entity.MatnrGroup;
import com.vincent.rsf.server.manager.service.MatnrGroupService;
@@ -8,5 +9,4 @@
@Service("matnrGroupService")
public class MatnrGroupServiceImpl extends ServiceImpl<MatnrGroupMapper, MatnrGroup> implements MatnrGroupService {
-
}
diff --git a/rsf-server/src/main/resources/application-dev.yml b/rsf-server/src/main/resources/application-dev.yml
index bc61f8f..f63202c 100644
--- a/rsf-server/src/main/resources/application-dev.yml
+++ b/rsf-server/src/main/resources/application-dev.yml
@@ -8,6 +8,8 @@
name: @pom.artifactId@
mvc:
static-path-pattern: /**
+ path match:
+ matching-strategy: ANT_PATH_MATCHER
datasource:
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://192.168.4.24:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
diff --git a/rsf-server/src/main/resources/application.yml b/rsf-server/src/main/resources/application.yml
index 035aada..635cfd6 100644
--- a/rsf-server/src/main/resources/application.yml
+++ b/rsf-server/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: prod
+ active: dev
config:
system-name: @pom.artifactId@
@@ -35,4 +35,24 @@
logging:
file:
- path: logs/@pom.artifactId@
\ No newline at end of file
+ path: logs/@pom.artifactId@
+
+#knife4j:
+# enable: true
+# openapi:
+# title: Knife4j瀹樻柟鏂囨。
+# description: "`鎴戞槸娴嬭瘯`,**浣犵煡閬撳悧**
+# # aaa"
+# email: xiaoymin@foxmail.com
+# concat: 鍏竴鑿滃垁
+# url: https://docs.xiaominfo.com
+# version: v4.0
+# license: Apache 2.0
+# license-url: https://stackoverflow.com/
+# terms-of-service-url: https://stackoverflow.com/
+# group:
+# test1:
+# group-name: 鍒嗙粍鍚嶇О
+# api-rule: package
+# api-rule-resources:
+# - com.knife4j.demo.new3
\ No newline at end of file
diff --git a/rsf-server/src/main/resources/mapper/manager/MatnrGroupMapper.xml b/rsf-server/src/main/resources/mapper/manager/MatnrGroupMapper.xml
index ea5ae7a..16beba3 100644
--- a/rsf-server/src/main/resources/mapper/manager/MatnrGroupMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/MatnrGroupMapper.xml
@@ -2,4 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.vincent.rsf.server.manager.mapper.MatnrGroupMapper">
+ <select id="selectGroupMatnrs" resultType="com.vincent.rsf.server.manager.entity.Matnr">
+
+ </select>
</mapper>
--
Gitblit v1.9.1