Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/java/com/steerinfo/dil/controller/BackgroundProcessingController.java

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.controller;
 
 
+import com.steerinfo.dil.aspect.LogAspect;
 import com.steerinfo.dil.feign.SSOFeign;
 import com.steerinfo.dil.mapper.BackgroundProcessingMapper;
 import com.steerinfo.dil.mapper.OmstruckOrderMapper;
@@ -10,6 +11,7 @@ import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiOperation;
+import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -17,10 +19,7 @@ import com.steerinfo.dil.util.SSOUtil;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /*
  * 后台处理程序
@@ -37,6 +36,8 @@ public class BackgroundProcessingController extends BaseRESTfulController {
     @Resource
     SSOUtil ssoUtil;
 
+    static final Logger log = Logger.getLogger(BackgroundProcessingController.class);
+
     @ApiOperation("登录接口")
     @PostMapping("bpLogin")
     public Map<String,Object> bpLogin(@RequestParam String loginName, @RequestParam String password,  @RequestParam String app_code) {

src/main/java/com/steerinfo/dil/controller/EMSController.java

@@ -175,4 +175,20 @@ public class EMSController extends BaseRESTfulController {
         return emsFeign.faildMsg();
     }
 
+
+    @ApiOperation(value = "展示年月工资绩效")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getemssalarydetailsMonthyear")
+    Map<String, Object> getemssalarydetailsMonthyear(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize
+    ) {
+        return emsFeign.getemssalarydetailsMonthyear(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
 }

src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -739,4 +739,11 @@ public class TMSController extends BaseRESTfulController {
     public RESTfulResult updateWeight(@RequestBody  Map<String,Object> map) {
         return tmsFeign.updateWeight(map);
     }
+
+    @ApiOperation("checkWeightResult")
+    @PostMapping("/checkWeightResult")
+    @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"计量实绩"})
+    public Map<String,Object> checkWeightResult(@RequestBody  Map<String,Object> map) {
+        return tmsFeign.checkWeightResult(map);
+    }
 }

src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -239,4 +239,11 @@ public class UniversalController extends BaseRESTfulController {
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, material);
         return success(pageList);
     }
+
+    @ApiOperation("根据车型获取剩余车辆")
+    @PostMapping("/getcountCar")
+    public RESTfulResult getcountCar(@RequestBody Map<String,Object> map) {
+        List<Map<String, Object>> material = universalMapper.getcountCar(map);
+        return success(material);
+    }
 }

src/main/java/com/steerinfo/dil/feign/EmsFeign.java

@@ -62,6 +62,14 @@ public interface EmsFeign {
 
     @PostMapping("api/v1/ems/emsdetailsorders/faildMsg")
     Map<String, Object> faildMsg();
+
+
+    @PostMapping("api/v1/ems/emssalarydetailss/getemssalarydetailsMonthyear")
+    Map<String, Object> getemssalarydetailsMonthyear(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize
+    );
 }
 
 

src/main/java/com/steerinfo/dil/feign/TmsFeign.java

@@ -260,6 +260,9 @@ public interface TmsFeign {
 
     @PostMapping("api/v1/tms/omstransorders/batchDispatchSc")
     Map<String, Object> batchDispatchSc(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/tmsweightresults/checkWeightResult")
+    Map<String, Object> checkWeightResult(@RequestBody(required = false) Map<String, Object> map);
 }
 
 

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -76,4 +76,7 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getMaterial(Map<String, Object> map);
 
+
+    //获取车型剩余的空闲车辆和已经派车的数量
+    List<Map<String, Object>> getcountCar(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/util/FtpFileUtil.java

@@ -32,7 +32,7 @@ public class FtpFileUtil {
      */
 
     // String FTP_ADDRESS;
-    private String FTP_ADDRESS = "172.16.90.238";
+    private String FTP_ADDRESS = "172.16.90.202";
 
     /**
      * 端口号
@@ -44,12 +44,12 @@ public class FtpFileUtil {
      * 用户名
      */
 
-    private String FTP_USERNAME = "ftptest";
+    private String FTP_USERNAME = "ftpuser";
     /**
      * 密码
      */
 
-    private String FTP_PASSWORD = "at286315";
+    private String FTP_PASSWORD = "123456";
 
     private FTPClient ftpClient = new FTPClient();
     private static final String SPOT = ".";

src/main/resources/application-dev.yml

@@ -10,28 +10,13 @@ spring:
   mvc:
     async:
       request-timeout: 15000
-#  redis:
-#    # Redis本地服务器地址，注意要开启redis服务，即那个redis-server.exe
-#    host: 127.0.0.1
-#    # Redis服务器端口,默认为6379.若有改动按改动后的来
-#    port: 6379
-#    #Redis服务器连接密码，默认为空，若有设置按设置的来
-#    password:
-#    jedis:
-#      pool:
-#        # 连接池最大连接数，若为负数则表示没有任何限制
-#        max-active: 8
-#        # 连接池最大阻塞等待时间，若为负数则表示没有任何限制
-#        max-wait: -1
-#        # 连接池中的最大空闲连接
-#        max-idle: 8
-
 
 server:
   port: 9080
   tomcat:
     max-threads: 1000
     accept-count: 800
+    basedir: /tomcat/baseDir
 eureka:
   client:
     registerWithEureka: false
@@ -41,29 +26,29 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.214:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:172.16.90.214:8079}
   BmsFeign:
     url: ${BMSFEIGN_URL:172.16.90.214:8078}
   TmsFeign:
-    url: ${TMSFEIGN_URL:localhost:8086}
+    url: ${TMSFEIGN_URL:172.16.90.214:8086}
   WMSFeign:
-    url: ${WMSFEIGN_URL:localhost:8093}
+    url: ${WMSFEIGN_URL:172.16.90.214:8093}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.90.214:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:localhost:8060}
+    url: ${RMSFEIGN_URL:172.16.90.214:8060}
   IntegrationFeign:
-    url: ${INTEGRATIONFEIGN_URL:localhost:8066}
+    url: ${INTEGRATIONFEIGN_URL:172.16.90.214:8066}
   OTMSFeign:
-    url: ${OTMSFEIGN_URL:localhost:8038}
+    url: ${OTMSFEIGN_URL:172.16.90.214:8038}
   EmsFeign:
-    url: ${TMSFEIGN_URL:localhost:8096}
-  WebSocketFeign:
-    url: ${WEBSOCKETFEIGN_URL:localhost:8000}
+    url: ${TMSFEIGN_URL:172.16.90.214:8096}
   SSOFeign:
     url: ${SSOFEIGN_URL:172.16.90.214:9001}
+  WebSocketFeign:
+    url: ${WEBSOCKETFEIGN_URL:172.16.90.214:8000}
   REPORTFeign:
-    url: ${REPORTFEIGN_URL:localhost:8055}
+    url: ${REPORTFEIGN_URL:172.16.90.214:8055}
 
 
 #远程调用
@@ -74,7 +59,7 @@ feign:
     config:
       default:  #默认配置,连接时间要短，读取时间要长
         connectTimeout: 1000 #单位毫秒
-        readTimeout: 150000 #单位毫秒
+        readTimeout: 30000 #单位毫秒
 #熔断器
 hystrix:
   command:

src/main/resources/application-prod.yml

@@ -1,7 +1,7 @@
 #正式环境配置文件
 spring:
   datasource:
-    url: jdbc:oracle:thin:@172.16.90.214:1521/gxmes
+    url: jdbc:oracle:thin:@172.16.90.197:1521/ATTMS
     password: gxmestest
     username: gxmestest
     driver-class-name: oracle.jdbc.OracleDriver
@@ -24,31 +24,31 @@ eureka:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.90.214:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.90.202:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.214:8079}
+    url: ${AMSFEIGN_URL:172.16.90.202:8079}
   BmsFeign:
-    url: ${BMSFEIGN_URL:172.16.90.214:8078}
+    url: ${BMSFEIGN_URL:172.16.90.202:8078}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.214:8086}
+    url: ${TMSFEIGN_URL:172.16.90.202:8086}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.90.214:8093}
+    url: ${WMSFEIGN_URL:172.16.90.202:8093}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.90.214:8095}
+    url: ${OMSFEIGN_URL:172.16.90.202:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.214:8060}
+    url: ${RMSFEIGN_URL:172.16.90.202:8060}
   IntegrationFeign:
-    url: ${INTEGRATIONFEIGN_URL:172.16.90.214:8066}
+    url: ${INTEGRATIONFEIGN_URL:172.16.90.202:8066}
   OTMSFeign:
-    url: ${OTMSFEIGN_URL:172.16.90.214:8038}
+    url: ${OTMSFEIGN_URL:172.16.90.202:8038}
   EmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.214:8096}
+    url: ${TMSFEIGN_URL:172.16.90.202:8096}
   SSOFeign:
-    url: ${SSOFEIGN_URL:172.16.90.214:9001}
+    url: ${SSOFEIGN_URL:172.16.90.202:9001}
   WebSocketFeign:
-    url: ${WEBSOCKETFEIGN_URL:172.16.90.214:8000}
+    url: ${WEBSOCKETFEIGN_URL:172.16.90.202:8000}
   REPORTFeign:
-    url: ${REPORTFEIGN_URL:172.16.90.214:8055}
+    url: ${REPORTFEIGN_URL:172.16.90.202:8055}
 
 
 #远程调用

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -323,6 +323,7 @@
         PERSONNEL_NAME "personnelName",
         PERSONNEL_POST "personnelPost",
         PERSONNEL_PHONE "personnelPhone",
+        INNNER_CODE "innerCode",
         to_char(SSO_ID) "ssoId",
         PERSONNEL_ID "id",
         PERSONNEL_ID "value",
@@ -1077,4 +1078,36 @@
             AND APC.TRANS_PLAN_ID =#{transPlanId}
         </where>
     </select>
+
+    <select id="getcountCar" resultType = "java.util.Map">
+        SELECT
+            RCAOLD.a "oldcar",(RCA.b-RCAOLD.a)"nowcar"
+        FROM
+            (
+                SELECT
+                    COUNT( RCA.CAPACITY_NUMBER ) a
+                FROM
+                    RMS_CAPACITY RCA
+                        LEFT JOIN OMS_TRANS_ORDER OTO ON RCA.CAPACITY_ID = OTO.CAPACITY_ID
+
+                WHERE
+                    OTO.TRANS_ORDER_ID IS NOT NULL
+                  AND OTO.DELETED = 5
+                  <if test="capacityTypeId != null and capacityTypeId != ''" >
+                  AND RCA.CAPACITY_TYPE_ID = #{capacityTypeId}
+                  </if>
+                  AND RCA.DELETED !=  1
+            ) RCAOLD,
+            ( SELECT
+                  COUNT( RCA.CAPACITY_NUMBER) b
+              FROM
+                  RMS_CAPACITY RCA
+              WHERE
+             <if test="capacityTypeId != null and capacityTypeId != ''" >
+            RCA.CAPACITY_TYPE_ID = #{capacityTypeId}
+             AND
+            </if>
+                RCA.DELETED !=  1
+            ) RCA
+    </select>
 </mapper>