..

pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.RELEASE</version>
+		<version>2.0.4.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -22,7 +22,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <spring-cloud.version>Finchley.M8</spring-cloud.version>
+        <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
     </properties>
 
 	<dependencies>
@@ -46,6 +46,12 @@
 		    <artifactId>spring-boot-autoconfigure</artifactId>
 		</dependency>
 		
+		<dependency>
+		    <groupId>org.springframework.boot</groupId>
+		    <artifactId>spring-boot-devtools</artifactId>
+		    <optional>true</optional>
+		</dependency>
+
 		
 		<!--activiti新增的jar包   开始  -->
 		<dependency>
@@ -114,11 +120,16 @@
 		</dependency>
 		
 		<!--添加webservice-->
+		<dependency>
+		   <groupId>org.apache.cxf</groupId>
+		   <artifactId>cxf-spring-boot-starter-jaxws</artifactId>
+		   <version>3.2.4</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web-services</artifactId>
         </dependency>
-        <dependency>
+        <!-- <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
             <version>3.1.6</version>
@@ -127,7 +138,7 @@
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
             <version>3.1.6</version>
-        </dependency>
+        </dependency> -->
         <!--添加webservice end-->
         
 		<!-- 引入spring boot自带的pagehelper插件 -->
@@ -147,6 +158,16 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-config</artifactId>
         </dependency>
+        
+        <dependency>
+        	<groupId>org.springframework.cloud</groupId>
+        	<artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+        <!-- <dependency>
+　　        <groupId>org.springframework.cloud</groupId>
+　　      	   <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency> -->
+
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
@@ -186,11 +207,10 @@
 			<version>3.9</version>
 		</dependency>
 		
-		<!--<dependency>
+		<dependency>
 		    <groupId>org.apache.httpcomponents</groupId>
 		    <artifactId>httpclient</artifactId>
-		    <version>4.5.3</version>
-		</dependency>-->
+		</dependency>
 		
 		<dependency>  
 	       <groupId>log4j</groupId>  
@@ -238,6 +258,9 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+                    <fork>true</fork>
+                </configuration>
 			</plugin>
 			<!-- <plugin>
             	<groupId>org.apache.maven.plugins</groupId>

src/main/java/com/chinaitop/depot/DepotBusinessApplication.java

@@ -9,6 +9,7 @@ import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
@@ -23,6 +24,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @EnableDiscoveryClient
 @EnableCaching
 @EnableRedisHttpSession
+@EnableFeignClients
 @EnableSwagger2
 @SpringBootApplication(
 		//exclude = {DataSourceAutoConfiguration.class}	// 禁止自动配置数据源，多数据源需采用手动配置
@@ -40,7 +42,7 @@ public class DepotBusinessApplication {
 	/**
 	 * 注册一个dispatcherServlet,解决增加ws之后https接口访问不了问题
 	 */
-	@Bean
+	/*@Bean
 	public ServletRegistrationBean restServlet(){
 		//注解扫描上下文
 		AnnotationConfigWebApplicationContext applicationContext = new AnnotationConfigWebApplicationContext();
@@ -57,11 +59,11 @@ public class DepotBusinessApplication {
 		registrationBean.setName("rest");
 		return registrationBean;
 	}
-
-	@Bean
+*/
+	/*@Bean
 	public ThreadPoolTaskScheduler threadPoolTaskScheduler() {
 		return new ThreadPoolTaskScheduler();
-	}
+	}*/
 	
 
 }

src/main/java/com/chinaitop/depot/act/controller/ActTemplateController.java

@@ -2,12 +2,10 @@ package com.chinaitop.depot.act.controller;
 
 import java.io.UnsupportedEncodingException;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.xml.stream.XMLStreamException;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -21,15 +19,15 @@ public class ActTemplateController {
 	@Autowired
 	private ActTemplateService actTemplateService;
 	
-	@RequestMapping(value = "/deploy", method=RequestMethod.POST)
-	public String deploy( MultipartFile file, RedirectAttributes redirectAttributes, HttpServletRequest request) {
+	@RequestMapping(value = "/actDeploy",method=RequestMethod.POST)
+	public String deploy(MultipartFile file,RedirectAttributes redirectAttributes, Integer orgId) {
 
 		String fileName = file.getOriginalFilename();
 		
 		if (StringUtils.isBlank(fileName)){
 			redirectAttributes.addFlashAttribute("message", "请选择要部署的流程文件");
 		}else{
-			String message = actTemplateService.deploy(file,request);
+			String message = actTemplateService.deploy(file,orgId);
 			return message;
 		}
 		return null;

src/main/java/com/chinaitop/depot/act/service/ActTemplateService.java

@@ -38,7 +38,7 @@ public class ActTemplateService {
 	 * @return
 	 */
 	@Transactional(readOnly = false)
-	public String deploy(MultipartFile file, HttpServletRequest request) {
+	public String deploy(MultipartFile file,Integer orgId) {
 
 		String message = "";
 		
@@ -64,13 +64,11 @@ public class ActTemplateService {
 			
 			List<ProcessDefinition> list = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).list();
 			
-			Integer depotId =(Integer) request.getSession().getAttribute("depotId");
-			
 				// 设置流程分类
 			for (ProcessDefinition processDefinition : list) {
 	//				ActUtils.exportDiagramToFile(repositoryService, processDefinition, exportDir);
-				repositoryService.setProcessDefinitionCategory(processDefinition.getId(), depotId.toString());
-				message += "部署成功，流程ID=" + processDefinition.getId() + "<br/>";
+				repositoryService.setProcessDefinitionCategory(processDefinition.getId(), orgId.toString());
+				message += "部署成功，流程ID=" + processDefinition.getId();
 			}
 			if (list.size() == 0){
 				message = "部署失败，没有流程。";

src/main/java/com/chinaitop/depot/business/controller/RoleInfoController.java

@@ -0,0 +1,47 @@
+package com.chinaitop.depot.business.controller;
+
+import com.chinaitop.depot.business.model.RoleInfo;
+import com.chinaitop.depot.business.model.RoleInfoExample;
+import com.chinaitop.depot.business.model.RoleInfoExample.Criteria;
+import com.chinaitop.depot.business.service.RoleInfoService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import java.util.List;
+
+@RestController
+@RequestMapping(value="/roleInfo")
+public class RoleInfoController {
+	
+	@Resource
+	private RoleInfoService roleInfoService;
+	
+	
+	/**
+	 * 查找角色信息
+	 * @param pageNum	页码
+	 * @param pageSize	每页条数
+	 * @return
+	 */
+	@RequestMapping(value="/getRole")
+	public PageInfo<RoleInfo> getRoleInfo(HttpServletRequest request) {
+		RoleInfoExample example = new RoleInfoExample();
+		Criteria criteria = example.createCriteria();
+		Integer orgId = (Integer)request.getSession().getAttribute("orgId");
+		if (orgId != null) {
+			criteria.andOrgIdEqualTo(orgId);
+		}
+		List<RoleInfo> list = roleInfoService.queryByExample(example);	
+		PageInfo<RoleInfo> pageInfo = new PageInfo<RoleInfo>(list);
+		return pageInfo;
+	}
+
+	
+
+}

src/main/java/com/chinaitop/depot/business/controller/UserInfoController.java

@@ -77,86 +77,17 @@ public class UserInfoController {
 	 */
 	@RequestMapping(value="/getUser", method = RequestMethod.GET)
 	@ApiOperation(value="查询用户信息", notes = "查询用户信息列表，支持分页")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
-			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
-			@ApiImplicitParam(name = "username", value = "用户名", paramType = "query"),
-			@ApiImplicitParam(name = "realName", value = "用户真实姓名", paramType = "query")
-	})
-	public PageInfo<UserInfo> getUserInfo(HttpServletRequest request, Integer pageNum, Integer pageSize,
-                                          String username, String realName, Integer roleId, String orgIds) {
-		
-		if (pageNum!=null && pageSize!=null) {
-			PageHelper.startPage(pageNum, pageSize);
-		}
-		
+	public PageInfo<UserInfo> getUserInfo(HttpServletRequest request) {
+                                          
 		HashMap<Object, Object> map = new HashMap<Object, Object>();
-		map.put("username", username);
-		map.put("realName", realName);
-		map.put("roleId", roleId);
+		Integer orgId = (Integer)request.getSession().getAttribute("orgId");
+		map.put("orgIds", orgId);
 		List<UserInfo> listAll=userInfoService.queryAll(map);
 		PageInfo<UserInfo> pageInfo = new PageInfo<UserInfo>(listAll);
 		return pageInfo;
 	}
 
-	/**
-	 * 用户登录
-	 * @param request
-	 * @param username	用户名
-	 * @param password	密码
-	 * @return
-	 */
-	@RequestMapping(value="/login", method = RequestMethod.POST)
-	@ApiOperation(value="用户登录", notes = "用户登录")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "username", value = "用户名", paramType = "form"),
-			@ApiImplicitParam(name = "password", value = "密码", paramType = "form"),
-			@ApiImplicitParam(name = "yzm", value = "验证码", paramType = "form"),
-			@ApiImplicitParam(name = "from", value = "来源，app代表来自于移动端", paramType = "form")
-	})
-	public Map<String, Object> Login(HttpServletRequest request, String username, String password, String yzm, String from) {
-		Map<String, Object> map = new HashMap<String, Object>();
-		if (StringUtils.isBlank(from) || from.compareTo("app")!=0) {
-			String yzm_code = (String) request.getSession().getAttribute("Service_Code");
-			if (!yzm_code.equals(yzm)) {
-				map.put("status", false);
-				map.put("success", "验证码输入错误！");
-				return map;
-			}
-		}
-		UserInfo userInfo = userInfoService.valid(username, password);
-		if (userInfo != null) {
-			//把对象转变成一个json
-			ObjectMapper mapper = new ObjectMapper();
-			try {
-				String userInfoObject = mapper.writeValueAsString(userInfo);
-				// 当前登录用户
-				request.getSession().setAttribute("userInfo", userInfoObject);
-				// 当前登录用户id
-				request.getSession().setAttribute("userId", userInfo.getUserId());
-				// 当前组织信息
-				OrgInfo orgInfo = orgInfoService.findById(userInfo.getOrgId());
-				String orgInfoObject = mapper.writeValueAsString(orgInfo);
-				request.getSession().setAttribute("orgInfo", orgInfoObject);
-				// 当前用户所属的库信息及库编号
-				OrgInfo depotInfo = orgInfoService.getDepotInfo(orgInfo);
-				if(depotInfo!=null){
-					String depotInfoObject = mapper.writeValueAsString(depotInfo);
-					request.getSession().setAttribute("depotInfo", depotInfoObject);
-					request.getSession().setAttribute("depotId", depotInfo.getOrgId());
-				}
-			} catch (JsonProcessingException e) {
-				e.printStackTrace();
-			}
-			map.put("status", true);
-			map.put("userInfo", userInfo);
-		} else {
-			map.put("status", false);
-			map.put("success", "用户名或密码错误，登录失败！");
-		}
-		return map;
-	}
-
+	
 	/**
 	 * 获取用户登录信息,包括当前用户、当前组织、当前库、当前库编号
 	 * @param request

src/main/java/com/chinaitop/depot/business/model/BusinessScedule.java

@@ -1,15 +1,15 @@
 /**
  * 
- *//*
+ */
 package com.chinaitop.depot.business.model;
 
-*//**
+/**
  * 粮食业务管理，进度查询.
  * <p>Title: BusinessScedule</p>
  * <p>Description: </p>
  * @author yaoyabin
  * @date 2017年11月1日 下午8:04:31
- *//*
+ */
 
 public class BusinessScedule {
     // 可研报告号 对应 粮食业务管理中的计划id
@@ -25,79 +25,78 @@ public class BusinessScedule {
     private String sumRksl;
     // 出库数量.
     private String sumCksl;
-    *//**
+    /**
      * @return the jhId
-     *//*
+     */
     public String getJhId() {
         return jhId;
     }
-    *//**
+    /**
      * @param jhId the jhId to set
-     *//*
+     */
     public void setJhId(String jhId) {
         this.jhId = jhId;
     }
-    *//**
+    /**
      * @return the htId
-     *//*
+     */
     public String getHtId() {
         return htId;
     }
-    *//**
+    /**
      * @param htId the htId to set
-     *//*
+     */
     public void setHtId(String htId) {
         this.htId = htId;
     }
-    *//**
+    /**
      * @return the tzdId
-     *//*
+     */
     public String getTzdId() {
         return tzdId;
     }
-    *//**
+    /**
      * @param tzdId the tzdId to set
-     *//*
+     */
     public void setTzdId(String tzdId) {
         this.tzdId = tzdId;
     }
-    *//**
+    /**
      * @return the sumRksl
-     *//*
+     */
     public String getSumRksl() {
         return sumRksl;
     }
-    *//**
+    /**
      * @param sumRksl the sumRksl to set
-     *//*
+     */
     public void setSumRksl(String sumRksl) {
         this.sumRksl = sumRksl;
     }
-    *//**
+    /**
      * @return the sumCksl
-     *//*
+     */
     public String getSumCksl() {
         return sumCksl;
     }
-    *//**
+    /**
      * @param sumCksl the sumCksl to set
-     *//*
+     */
     public void setSumCksl(String sumCksl) {
         this.sumCksl = sumCksl;
     }
-    *//**
+    /**
      * @return the crkLx
-     *//*
+     */
     public String getCrkLx() {
         return crkLx;
     }
-    *//**
+    /**
      * @param crkLx the crkLx to set
-     *//*
+     */
     public void setCrkLx(String crkLx) {
         this.crkLx = crkLx;
     }
     
     
 }
-*/

src/main/java/com/chinaitop/depot/business/service/BusinessSceduleService.java

@@ -1,4 +1,4 @@
-/*package com.chinaitop.depot.business.service;
+package com.chinaitop.depot.business.service;
 
 import java.util.List;
 import java.util.Map;
@@ -7,34 +7,33 @@ import com.chinaitop.depot.business.model.BusinessScedule;
 
 public interface BusinessSceduleService {
 
-    *//**
+    /**
      * 通过多个计划id,获取这多个计划的出入库类型，出库总数量，入库总数量.
      * @param planIds
      * @return
-     *//*
+     */
     List<BusinessScedule> getPlanSceduleInPlanId(String planIds);
     
-    *//**
+    /**
      * 通过多个合同id,获取这多个合同的出入库类型，出库总数量，入库总数量.
      * @param planIds
      * @return
-     *//*
+     */
     List<BusinessScedule> getContractSceduleInContractId(String contractIds);
     
-    *//**
+    /**
      * 通过多个通知单id,获取这多个通知单的出入库类型，出库总数量，入库总数量.
      * @param planIds
      * @return
-     *//*
+     */
     List<BusinessScedule> getNoticeSceduleInNoticeId(String noticeIds);
 
-    *//**
+    /**
      * 根据粮库业务管理中出入库通知单id,修改出入库系统中，通知单状态. 
      * 修改出入库表  data_crkyw_tzdxx_default中tzdh等于 这边的 通知单id获取到DataID 
      * 通过DataID 链接 fl_bill_relation 修改字段FLOWSTATUS
      * @param paramMap 通知单id. 通知单状态.
-     *//*
+     */
     void updateNoticeStatus(Map<String, Object> paramMap);
 
 }
-*/

src/main/java/com/chinaitop/depot/business/service/impl/BusinessContractServiceImpl.java

@@ -17,8 +17,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.act.service.ActTaskService;
-import com.chinaitop.depot.agile.model.BusinessScedule;
 import com.chinaitop.depot.agile.service.BusinessSceduleService;
+import com.chinaitop.depot.agile.model.BusinessScedule;
 import com.chinaitop.depot.business.mapper.BusinessContractMapper;
 import com.chinaitop.depot.business.model.BusinessApproval;
 import com.chinaitop.depot.business.model.BusinessContract;
@@ -61,6 +61,8 @@ public class BusinessContractServiceImpl implements BusinessContractService {
     private BusinessStoreWareDetailService businessStoreWareDetailService;
     @Resource
     private BusinessContractService contractService;
+    /*@Resource
+    private ServerApi serverApi;*/
     @Resource
     private BusinessSceduleService businessSceduleService;
     @Resource
@@ -842,6 +844,7 @@ public class BusinessContractServiceImpl implements BusinessContractService {
                 paramMap.put("FLOWSTATUS", CrkNoticeStatus.ZHIXINGZHONG.getCrkNoticeCode());
                 // 修改出入库系统的 通知单状态.
                 businessSceduleService.updateNoticeStatus(paramMap);
+                //serverApi.updateNoticeStatus(paramMap);
             }
         }
         return returnMap;
@@ -882,6 +885,7 @@ public class BusinessContractServiceImpl implements BusinessContractService {
                 paramMap.put("FLOWSTATUS", CrkNoticeStatus.ZANTING.getCrkNoticeCode());
                 // 修改出入库系统的 通知单状态.
                 businessSceduleService.updateNoticeStatus(paramMap);
+                //serverApi.updateNoticeStatus(paramMap);
             }
         }
     }
@@ -921,6 +925,7 @@ public class BusinessContractServiceImpl implements BusinessContractService {
                 paramMap.put("FLOWSTATUS", CrkNoticeStatus.ZHONGZHI.getCrkNoticeCode());
                 // 修改出入库系统的 通知单状态.
                 businessSceduleService.updateNoticeStatus(paramMap);
+               // serverApi.updateNoticeStatus(paramMap);
             }
         }
     }
@@ -991,13 +996,16 @@ public class BusinessContractServiceImpl implements BusinessContractService {
             fyzz.append(")");
             dzzz.append(")");
             List<BusinessScedule> businessSceduleList = businessSceduleService.getContractSceduleInContractId(sb.toString()); //合同
+            //List<BusinessScedule> businessSceduleList = serverApi.getContractSceduleInContractId(sb.toString());
             List<BusinessScedule> dzContractSceduleList = null ;
             List<BusinessScedule> fyContractSceduleList = null;
             if(dzzz.indexOf(",")!=-1){
             	 dzContractSceduleList = businessSceduleService.getDzContractSceduleInContractId(dzzz.toString()); //到站中转的合同
+            	//dzContractSceduleList = serverApi.getDzContractSceduleInContractId(dzzz.toString());
             }
             if(fyzz.indexOf(",")!=-1){
             	 fyContractSceduleList = businessSceduleService.getFyContractSceduleInContractId(fyzz.toString()); //发运中转的合同
+            	 //fyContractSceduleList = serverApi.getFyContractSceduleInContractId(fyzz.toString()); //发运中转的合同
             }
             if(dzContractSceduleList!=null && dzContractSceduleList.size()>0){
             	for (BusinessScedule dzScedule : dzContractSceduleList) {

src/main/java/com/chinaitop/depot/business/service/impl/BusinessDeliveryStorageNoticeServiceImpl.java

@@ -16,8 +16,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.act.service.ActTaskService;
-import com.chinaitop.depot.agile.model.BusinessScedule;
 import com.chinaitop.depot.agile.service.BusinessSceduleService;
+import com.chinaitop.depot.agile.model.BusinessScedule;
 import com.chinaitop.depot.business.mapper.BusinessDeliveryStorageNoticeMapper;
 import com.chinaitop.depot.business.model.BusinessApproval;
 import com.chinaitop.depot.business.model.BusinessContract;
@@ -57,6 +57,8 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
     private BusinessPlanService planService;
     @Resource
     private BusinessContractService contractService;
+    /*@Resource
+    private ServerApi serverApi;*/
     @Resource
     private BusinessSceduleService businessSceduleService;
     @Resource
@@ -657,6 +659,7 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
         paramMap.put("FLOWSTATUS", CrkNoticeStatus.ZHIXINGZHONG.getCrkNoticeCode());
         // 修改出入库系统的 通知单状态.
         businessSceduleService.updateNoticeStatus(paramMap);
+         //serverApi.updateNoticeStatus(paramMap);
         return returnMap;
     }
 
@@ -690,6 +693,7 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
         paramMap.put("FLOWSTATUS", CrkNoticeStatus.ZANTING.getCrkNoticeCode());
         // 修改出入库系统的 通知单状态.
         businessSceduleService.updateNoticeStatus(paramMap);
+        //serverApi.updateNoticeStatus(paramMap);
     }
     
     /**
@@ -723,6 +727,7 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
         paramMap.put("FLOWSTATUS", CrkNoticeStatus.ZHONGZHI.getCrkNoticeCode());
         // 修改出入库系统的 通知单状态.
         businessSceduleService.updateNoticeStatus(paramMap);
+        //serverApi.updateNoticeStatus(paramMap);
     }
 
     /**
@@ -775,6 +780,7 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
             sb = new StringBuffer(substring);
             sb.append(")");
             List<BusinessScedule> businessSceduleList = businessSceduleService.getNoticeSceduleInNoticeId(sb.toString());
+            //List<BusinessScedule> businessSceduleList = serverApi.getNoticeSceduleInNoticeId(sb.toString());
             // 通过通知单id,去出入库查询.
             if (businessSceduleList != null && businessSceduleList.size() > 0) {
                 // 循环通知单list.

src/main/java/com/chinaitop/depot/business/service/impl/BusinessPlanServiceImpl.java

@@ -17,8 +17,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.act.service.ActTaskService;
-import com.chinaitop.depot.agile.model.BusinessScedule;
 import com.chinaitop.depot.agile.service.BusinessSceduleService;
+import com.chinaitop.depot.agile.model.BusinessScedule;
 import com.chinaitop.depot.business.mapper.BusinessPlanMapper;
 import com.chinaitop.depot.business.model.BusinessApproval;
 import com.chinaitop.depot.business.model.BusinessContract;
@@ -69,6 +69,8 @@ public class BusinessPlanServiceImpl implements BusinessPlanService {
     private ActTaskService actTaskService;
     @Resource
     private BusinessApprovalService businessApprovalService;
+    /*@Resource
+    private ServerApi serverApi;*/
     @Resource
     private BusinessSceduleService businessSceduleService;
     @Resource
@@ -497,6 +499,7 @@ public class BusinessPlanServiceImpl implements BusinessPlanService {
                 paramMap.put("FLOWSTATUS", CrkNoticeStatus.ZHIXINGZHONG.getCrkNoticeCode());
                 // 修改出入库系统的 通知单状态.
                 businessSceduleService.updateNoticeStatus(paramMap);
+                //serverApi.updateNoticeStatus(paramMap);
             }
         }
     }
@@ -534,6 +537,7 @@ public class BusinessPlanServiceImpl implements BusinessPlanService {
                 paramMap.put("FLOWSTATUS", CrkNoticeStatus.ZANTING.getCrkNoticeCode());
                 // 修改出入库系统的 通知单状态.
                 businessSceduleService.updateNoticeStatus(paramMap);
+                //serverApi.updateNoticeStatus(paramMap);
             }
         }
     }
@@ -570,6 +574,7 @@ public class BusinessPlanServiceImpl implements BusinessPlanService {
                 paramMap.put("FLOWSTATUS", CrkNoticeStatus.ZHONGZHI.getCrkNoticeCode());
                 // 修改出入库系统的 通知单状态.
                 businessSceduleService.updateNoticeStatus(paramMap);
+                //serverApi.updateNoticeStatus(paramMap);
             }
         }
     }
@@ -616,6 +621,7 @@ public class BusinessPlanServiceImpl implements BusinessPlanService {
             sb = new StringBuffer(substring);
             sb.append(")");
             List<BusinessScedule> businessSceduleList = businessSceduleService.getPlanSceduleInPlanId(sb.toString());
+            //List<BusinessScedule> businessSceduleList = serverApi.getPlanSceduleInPlanId(sb.toString());
             // 通过计划id,去出入库查询.
             if (businessSceduleList != null && businessSceduleList.size() > 0) {
                 // 循环计划list.

src/main/java/com/chinaitop/depot/config/DataSourceConfig.java

@@ -1,4 +1,4 @@
-package com.chinaitop.depot.config;
+/*package com.chinaitop.depot.config;
 
 import javax.sql.DataSource;
 
@@ -8,11 +8,11 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 
-/**
+*//**
  * 配置多数据源
  * @author XUEENXI
  *
- */
+ *//*
 @Configuration
 public class DataSourceConfig {
 
@@ -30,3 +30,4 @@ public class DataSourceConfig {
     }
 
 }
+*/

src/main/java/com/chinaitop/depot/config/MybatisAgileDBConfig.java

@@ -1,4 +1,4 @@
-package com.chinaitop.depot.config;
+/*package com.chinaitop.depot.config;
 
 import javax.sql.DataSource;
 
@@ -38,3 +38,4 @@ public class MybatisAgileDBConfig {
         return template;
     }
 }
+*/

src/main/java/com/chinaitop/depot/config/MybatisDepotDBConfig.java

@@ -1,4 +1,4 @@
-package com.chinaitop.depot.config;
+/*package com.chinaitop.depot.config;
 
 import javax.sql.DataSource;
 
@@ -44,3 +44,4 @@ public class MybatisDepotDBConfig {
         return template;
     }
 }
+*/

src/main/java/com/chinaitop/depot/unissoft/serviceconfig/CxfConfig.java

@@ -7,8 +7,6 @@ import com.chinaitop.depot.unissoft.webservice.NoticePassServiceImpl;
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBus;
 import org.apache.cxf.jaxws.EndpointImpl;
-import org.apache.cxf.transport.servlet.CXFServlet;
-import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -16,10 +14,10 @@ import javax.xml.ws.Endpoint;
 
 @Configuration
 public class CxfConfig {
-    @Bean
+    /*@Bean
     public ServletRegistrationBean dispatcherServlet() {
         return new ServletRegistrationBean(new CXFServlet(),"/business/*");
-    }
+    }*/
     @Bean(name = Bus.DEFAULT_BUS_ID)
     public SpringBus springBus() {
         return new SpringBus();

src/main/resources/bootstrap.yml

@@ -50,7 +50,8 @@ spring:
   
 web:
   upload-path: /home/depot/depot-web/apache-tomcat-8.0.53/webapps/ROOT/WEB-INF/classes/static
-
+cxf:
+  path: /business