Merge branch 'develop' into wanghaicheng

lift-business-service/src/main/java/cn/com/ty/lift/business/BusinessApplication.java

@@ -5,12 +5,14 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.web.bind.annotation.CrossOrigin;
 
 /**
  * @Author xwy
  * @create 2019/11/4
  */
 @Slf4j
+@CrossOrigin
 @EnableFeignClients
 @MapperScan("cn.com.ty.**.mapper")
 @SpringBootApplication(scanBasePackages = {"cn.com.ty.lift", "cn.com.xwy.boot"})

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/controller/AnnualinSpectionController.java

@@ -49,7 +49,7 @@ public class AnnualInspectionController {
 
     @PostMapping("page")
     public RestResponse page(@RequestBody InspectionCondition condition){
-
+        annualInspectionService.listByCondition(condition);
 
         return null;
     }

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/service/AnnualinSpectionService.java

@@ -15,5 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface AnnualInspectionService extends IService<AnnualInspection> {
 
-    IPage<AnnualInspection> page(InspectionCondition condition);
+    IPage<AnnualInspection> listByCondition(InspectionCondition condition);
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/service/impl/AnnualInspectionServiceImpl.java

@@ -25,7 +25,7 @@ public class AnnualInspectionServiceImpl extends ServiceImpl<AnnualInspectionMap
     private AnnualInspectionMapper annualInspectionMapper;
 
     @Override
-    public IPage<AnnualInspection> page(InspectionCondition condition) {
+    public IPage<AnnualInspection> listByCondition(InspectionCondition condition) {
         IPage<AnnualInspection> page = new Page<>(condition.getPageNum(),condition.getPageSize());
         IPage<AnnualInspection> lists = annualInspectionMapper.listByCondition(page,condition);
         return lists;

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/controller/EmergencyRepairController.java

@@ -91,4 +91,26 @@ public class EmergencyRepairController {
         return RestResult.okData(pages);
     }
 
+    /**
+     * @description 急修单转派
+     * @date 2019/12/11 9:25
+     * @param
+     * @return
+     */
+    @PostMapping("transfer")
+    public RestResponse transfer(Long id,Long workerId){
+        if(null == id || null == workerId){
+            return RestResult.errParam();
+        }
+        EmergencyRepair entity = emergencyRepairService.getById(id);
+        if(null == entity){
+            return RestResult.errParam();
+        }
+        entity.setWorkerId1(workerId);
+        boolean result = emergencyRepairService.saveOrUpdate(entity);
+        if(result){
+            return RestResult.okData(result);
+        }
+        return RestResult.fail();
+    }
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/framework/conf/CustomCORSConfiguration.java

@@ -0,0 +1,35 @@
+package cn.com.ty.lift.business.framework.conf;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+/**
+ * @author huangyuan
+ * @date 2019-12-10
+ * @description
+ */
+@Configuration
+public class CustomCORSConfiguration {
+    private CorsConfiguration buildConfig(){
+        CorsConfiguration corsConfiguration = new CorsConfiguration();
+        // 允许任何的head头部
+        corsConfiguration.addAllowedHeader("*");
+        // 允许任何域名使用
+        corsConfiguration.addAllowedOrigin("*");
+        // 允许任何的请求方法
+        corsConfiguration.addAllowedMethod("*");
+        corsConfiguration.setAllowCredentials(true);
+        return corsConfiguration;
+    }
+
+    // 添加CorsFilter拦截器，对任意的请求使用
+    @Bean
+    public CorsFilter corsFilter() {
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", buildConfig());
+        return new CorsFilter(source);
+    }
+}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/EnterpriseApplication.java

@@ -5,12 +5,14 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.web.bind.annotation.CrossOrigin;
 
 /**
  * @Author xwy
  * @create 2019/11/4
  */
 @Slf4j
+@CrossOrigin
 @EnableFeignClients
 @MapperScan("cn.com.ty.**.mapper")
 @SpringBootApplication(scanBasePackages = {"cn.com.ty.lift", "cn.com.xwy.boot"})

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/common/CustomCORSConfiguration.java

@@ -0,0 +1,32 @@
+package cn.com.ty.lift.enterprise.common;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+/**
+ * @author huangyuan
+ * @date 2019-12-10
+ * @description
+ */
+@Configuration
+public class CustomCORSConfiguration {
+    private CorsConfiguration buildConfig(){
+        CorsConfiguration corsConfiguration = new CorsConfiguration();
+        corsConfiguration.addAllowedHeader("*"); // 允许任何的head头部
+        corsConfiguration.addAllowedOrigin("*"); // 允许任何域名使用
+        corsConfiguration.addAllowedMethod("*"); // 允许任何的请求方法
+        corsConfiguration.setAllowCredentials(true);
+        return corsConfiguration;
+    }
+
+    // 添加CorsFilter拦截器，对任意的请求使用
+    @Bean
+    public CorsFilter corsFilter() {
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", buildConfig());
+        return new CorsFilter(source);
+    }
+}