1517874642 4 år sedan
förälder
incheckning
7aa76e5268
7 ändrade filer med 55 tillägg och 15 borttagningar
  1. +0
    -0
      user-client/src/main/java/com/hp/user/client/entity/CustomerServiceProviderEnterpriseVO.java
  2. +0
    -0
      user-client/src/main/java/com/hp/user/client/entity/StationVO.java
  3. +0
    -1
      user-service/src/main/java/com/hp/user/generactor/GeneratorCodeTest.java
  4. +4
    -3
      user-service/src/main/java/com/hp/user/service/UserServiceApplaction.java
  5. +34
    -9
      user-service/src/main/java/com/hp/user/service/config/SwaggerConfig.java
  6. +7
    -1
      user-service/src/main/java/com/hp/user/service/controller/AreaController.java
  7. +10
    -1
      user-service/src/main/java/com/hp/user/service/controller/CompanyController.java

user-client/src/main/java/com/hp/user/client/entity/CustomerServiceProviderEnterprise.java → user-client/src/main/java/com/hp/user/client/entity/CustomerServiceProviderEnterpriseVO.java Visa fil


user-client/src/main/java/com/hp/user/client/entity/Station.java → user-client/src/main/java/com/hp/user/client/entity/StationVO.java Visa fil


+ 0
- 1
user-service/src/main/java/com/hp/user/generactor/GeneratorCodeTest.java Visa fil

@@ -4,7 +4,6 @@ import java.util.Scanner;


import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.ConfigurableApplicationContext;


import com.alibaba.nacos.spring.context.annotation.config.NacosPropertySource; import com.alibaba.nacos.spring.context.annotation.config.NacosPropertySource;
import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;


+ 4
- 3
user-service/src/main/java/com/hp/user/service/UserServiceApplaction.java Visa fil

@@ -1,10 +1,12 @@
package com.hp.user.service; package com.hp.user.service;


import cn.nyhlw.doc2swagger.springswagger2.EnableSwagger2;
import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;


import com.alibaba.nacos.spring.context.annotation.config.NacosPropertySource; import com.alibaba.nacos.spring.context.annotation.config.NacosPropertySource;
import org.springframework.context.annotation.ComponentScan;


/** /**
* 用户服务启动类 * 用户服务启动类
@@ -12,14 +14,13 @@ import com.alibaba.nacos.spring.context.annotation.config.NacosPropertySource;
* @since 2020/11/18 * @since 2020/11/18
* *
*/ */
@EnableSwagger2
@MapperScan("com.hp.user.service.dao") //扫描的mapper @MapperScan("com.hp.user.service.dao") //扫描的mapper
@SpringBootApplication @SpringBootApplication
@NacosPropertySource(dataId = "userdatasource", autoRefreshed = true) @NacosPropertySource(dataId = "userdatasource", autoRefreshed = true)
@ComponentScan("com.hp.user.service.config")
public class UserServiceApplaction { public class UserServiceApplaction {

public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(UserServiceApplaction.class, args); SpringApplication.run(UserServiceApplaction.class, args);
} }
} }

+ 34
- 9
user-service/src/main/java/com/hp/user/service/config/SwaggerConfig.java Visa fil

@@ -2,23 +2,48 @@ package com.hp.user.service.config;


import java.util.Arrays; import java.util.Arrays;


import cn.nyhlw.doc2swagger.springswagger2.EnableSwagger2;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;


import cn.nyhlw.doc2swagger.core.config.RestDocConfig; import cn.nyhlw.doc2swagger.core.config.RestDocConfig;
import cn.nyhlw.doc2swagger.springswagger2.EnableSwagger2;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;


@Configuration @Configuration
@EnableSwagger2 @EnableSwagger2
public class SwaggerConfig { public class SwaggerConfig {
public static final String VERSION = "1.0.0";
public static final String SWAGGER_SCAN_BASE_PACKAGE = "com.hp.user.service.controller";
@Bean @Bean
RestDocConfig _swaggerConfig()
{
return RestDocConfig.builder()
.apiTitle("rest doc user")
.apiDescription("用户信息系统")
.apiVersion("1.0.0")
.packages(Arrays.asList("com.hp.user.service.controller"))
.build();
public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo())
.select()
.apis(RequestHandlerSelectors.basePackage(SWAGGER_SCAN_BASE_PACKAGE))
.paths(PathSelectors.any())
.build();
}

private ApiInfo apiInfo() {
return new ApiInfoBuilder()
.title("rest doc user")
.description("用户信息系统")
// .termsOfServiceUrl("http://www.cnblogs.com/congc/")
.version(VERSION)
.build();
} }
// RestDocConfig _swaggerConfig()
// {
// return RestDocConfig.builder()
// .apiTitle("rest doc user")
// .apiDescription("用户信息系统")
// .apiVersion("1.0.0")
// .packages(Arrays.asList("com.hp.user.service.controller"))
// .build();
// }
} }

+ 7
- 1
user-service/src/main/java/com/hp/user/service/controller/AreaController.java Visa fil

@@ -4,12 +4,17 @@ import com.hp.user.client.entity.AreaVO;
import com.hp.user.client.service.AreaService; import com.hp.user.client.service.AreaService;
import com.hp.user.service.dao.AreaMapper; import com.hp.user.service.dao.AreaMapper;
import com.hp.user.service.entity.Area; import com.hp.user.service.entity.Area;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;


import java.util.List; import java.util.List;


@Api(tags = "地区API接口")
@RestController @RestController
@RequestMapping("/area") @RequestMapping("/area")
public class AreaController { public class AreaController {
@@ -20,7 +25,8 @@ public class AreaController {
/** /**
* 查询所有地区 * 查询所有地区
*/ */
@RequestMapping("/queryAllArea")
@GetMapping("/queryAllArea")
@ApiOperation(value = "获取所有地区信息", notes = "获取所有地区信息", httpMethod = "GET")
public List<AreaVO> queryAllArea(){ public List<AreaVO> queryAllArea(){
return areaService.getAllArea(); return areaService.getAllArea();
} }


+ 10
- 1
user-service/src/main/java/com/hp/user/service/controller/CompanyController.java Visa fil

@@ -1,16 +1,25 @@
package com.hp.user.service.controller; package com.hp.user.service.controller;


import com.hp.user.client.service.CustomerCompanyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;


@Api(description = "公司API接口")
@RestController @RestController
@RequestMapping("/company") @RequestMapping("/company")
public class CompanyController { public class CompanyController {
@Autowired
private CustomerCompanyService customerCompanyService;
/** /**
* 添加企业 * 添加企业
* 需要企业信息 * 需要企业信息
*/ */
@RequestMapping("/addCompany")
@ApiOperation(value="新增企业")
@PostMapping("/addCompany")
public void addCompany(){ public void addCompany(){


} }


Laddar…
Avbryt
Spara