2021-07-13 lrl

src/main/java/com/steerinfo/SysManageApplication.java

@@ -8,6 +8,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.netflix.hystrix.EnableHystrix;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;

src/main/java/com/steerinfo/auth/shiro/realm/OssServiceClient.java

@@ -7,10 +7,12 @@ import org.springframework.web.bind.annotation.RequestMethod;
 
 import com.steerinfo.framework.controller.RESTfulResult;
 
-@FeignClient(value = "sysmanage-service", fallback = OssServiceHystrix.class)
+@FeignClient(value = "sysmanage-service", fallback = OssServiceHystrix.class,url = "172.16.90.238:8088")
 // @FeignClient(value = "sso-service", fallback = OssServiceHystrix.class)
 public interface OssServiceClient {
+
 	@RequestMapping(value="/v1/sysusers/{id}", method=RequestMethod.GET)
+
     public RESTfulResult getUser(@PathVariable("id") String id);
 	
 	@RequestMapping(value="/v1/sysusers/user/token/", method=RequestMethod.GET)

src/main/java/com/steerinfo/ems/trmworkproc/mapper/TRmWorkprocMapper.java

@@ -27,4 +27,11 @@ public interface TRmWorkprocMapper extends IBaseMapper<TRmWorkproc, String> {
      */
 	List<TRmWorkproc> queryWorkprocs(Map<String, Object> parmas);
 
+    /**
+     * 月计划工序列表
+     * @param parmas
+     * @return
+     */
+	List<TRmWorkproc> queryPlanMoth();
+
 }

src/main/java/com/steerinfo/ems/trmworkproc/mapper/TRmWorkprocMapper.xml

@@ -550,4 +550,12 @@
       (select workprocid from T_RM_ELECTRICITY_LOCATION where 1=1 ${workshop})
       ORDER BY NAME
   </select>
+
+  <!--获取月计划工序列表-->
+  <select id="queryPlanMoth"  resultType="com.steerinfo.ems.trmworkproc.model.TRmWorkproc">
+    SELECT ID,NAME,NODE FROM T_RM_WORKPROC
+      where ISSETTLE = 1 and ID in
+      (select workprocid from EMS_PRODPLAN_MONTH where 1=1)
+      ORDER BY NAME
+  </select>
 </mapper>

src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 spring:
   application:
-    name: ems-service
+    name: xt-ems-api
   profiles:
     active: dev
   zipkin:
@@ -8,34 +8,36 @@ spring:
   sleuth:
     sampler:
       #默认值为0.1f，现在为了测试设置100%采集
-      percentage: 1.0      
+      percentage: 1.0
   cloud:
-    config:
-      fail-fast: true
-      discovery:
-        enabled: true
-        service-id: config-server
+    #    config:
+    #      fail-fast: true
+    #      discovery:
+    #        enabled: true
+    #        service-id: config-server
     bus:
       trace:
         enabled: false
       enabled: false
 server:
-  port: ${SERVER_PORT:9002}
+  port: ${SERVER_PORT:8086}
+  tomcat:
+    basedir: ${user.home}/tomcat/tmp
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.100.133}:${EUREKA_PORT:8061}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.90.238}:${EUREKA_PORT:8086}/eureka/
     metadata-map:
       cluster: ribbon
   instance:
-    hostname: ems-service
-    status-page-url: http://${SWAGGER_INDEX:sso.steerinfo.com}/swagger-ui.html
+    hostname: xt-ems-api
+    status-page-url: http://${SWAGGER_INDEX:localhost:9003}/swagger-ui.html
     prefer-ip-address: true
-    instance-id: ${spring.cloud.client.ip-address}:${server.port} 
+    instance-id: ${spring.cloud.client.ip-address}:${server.port}
 #禁止调用eureka client获取注册列表信息
 ribbon:
   eureka:
-    enabled: true
+    enabled: false
 #新版配置，否则后面dashboard无法找到hystrix.stream
 management:
   endpoints:

src/main/resources/message.properties

@@ -1,4 +1,4 @@
 succeed=操作成功
 failed=操作失败
 unreg=帐号或手机号码未注册
-passerr=密码错
+passerr=密码错误