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

# Conflicts:
#	src/main/java/com/steerinfo/dil/controller/TMSController.java
#	src/main/java/com/steerinfo/dil/feign/TmsFeign.java

src/main/java/com/steerinfo/dil/config/RequestFilter.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.steerinfo.dil.aspect.LogAspect;
 import com.steerinfo.dil.mapper.BackgroundProcessingMapper;
+import com.steerinfo.dil.util.DisposeRoleData;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +19,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URLDecoder;
+import java.util.List;
 import java.util.Map;
 
 @Component
@@ -31,6 +33,9 @@ public class RequestFilter implements Filter {
     @Resource
     private BackgroundProcessingMapper backgroundProcessingMapper;
 
+    @Resource
+    private DisposeRoleData disposeRoleData;
+
     @Override
     public void doFilter(ServletRequest request, ServletResponse response,FilterChain chain) throws IOException, ServletException {
        try{
@@ -102,9 +107,9 @@ public class RequestFilter implements Filter {
            if (strBuilder != null && !"".equals(strBuilder.toString())) {
                //有请求体则写入userId和userName，保存
                JSONObject params = JSONObject.parseObject(strBuilder.toString());
-               params.put("userId", userId);
-               params.put("userName", userName);
-               params.put("orgCode", orgCode);
+               params.put("userId", userId == null ? "无" : userId);
+               params.put("userName", userName == null ? "无" : userName);
+               params.put("orgCode", orgCode == null ? "无" : orgCode);
                params.put("roleCodes",roleCodesObject);
                params.put("dilCompanyList",dilCompanyListObject);
                params.put("rootCompanyMap",rootCompanyMapObject);

src/main/java/com/steerinfo/dil/config/SessionInterceptor.java

@@ -72,7 +72,7 @@ public class SessionInterceptor extends HandlerInterceptorAdapter {
                     redisUtil.put( methodName+userId, count);
                 }else{
                     //超出访问次数
-                    log.info("访问"+methodName+"方法过快，用户  ===> " + userId + " 且在   " + seconds + " 秒内超过最大限制  ===> " + maxCount + " 次数达到    ====> " + count);
+                    //log.info("访问"+methodName+"方法过快，用户  ===> " + userId + " 且在   " + seconds + " 秒内超过最大限制  ===> " + maxCount + " 次数达到    ====> " + count);
                     response.setCharacterEncoding("UTF-8");
                     response.setContentType("application/json; charset=utf-8");
                     RESTfulResult result =new RESTfulResult("500", "访问过快，请稍后再试", "访问过快，请稍后再试");

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

@@ -14,8 +14,10 @@ import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiOperation;
+import oracle.jdbc.proxy.annotation.Post;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import com.steerinfo.dil.util.SSOUtil;
@@ -51,9 +53,10 @@ public class BackgroundProcessingController extends BaseRESTfulController {
         if("succeed".equals(resMap.get("status"))) {
             Map<String, Object> dataMap = (Map<String, Object>) resMap.get("data");
             Map<String, Object> userInfo = (Map<String, Object>) dataMap.get("user");
+            String userId = userInfo.get("userId").toString();
+            List<Map<String,Object>> mapList = (List<Map<String, Object>>) userInfo.get("sysRoles");
             // 根据用户名去查询该用户绑定的公司及下属公司;7.2改为只查本单位因前端会报错
             List<Map<String, Object>> companyList = backgroundProcessingMapper.getCurrentCompanyList(loginName);
-            //List<Map<String, Object>> companyList = backgroundProcessingMapper.getCompanyList(loginName);
             if(companyList != null && companyList.size() > 0) {
                 Map<String, Object> stringMap = new HashMap<>();
                 stringMap.put("companyId",-1);
@@ -65,7 +68,21 @@ public class BackgroundProcessingController extends BaseRESTfulController {
                 //resMap.put("code","500");
                 //return resMap;
             }
+            //遍历角色,查看是否有业务单位权限
+            for(Map<String,Object> map : mapList) {
+                //如果角色包含业务单位
+                if("businessCompany".equals(map.get("roleCode"))) {
+                    List<Map<String,Object>> businessCompanyList =  backgroundProcessingMapper.getCompanyList(userId);
+                    if(businessCompanyList != null) {
+                        companyList.addAll(businessCompanyList);
+                    }
+                    break;
+                }else{
+                    continue;
+                }
+            }
             Map<String,Object> rootCompanyMap = backgroundProcessingMapper.getCompanyRootMap(loginName);
+            //根据companyList查询名字相同的
             userInfo.put("dilCompanyList", companyList);
             if (rootCompanyMap != null && rootCompanyMap.get("isListed") != null) {
                 userInfo.put("rootCompanyMap",rootCompanyMap);
@@ -145,4 +162,11 @@ public class BackgroundProcessingController extends BaseRESTfulController {
             return  failed(map,e.getMessage());
         }
     }
+
+    @ApiOperation("修改运输订单状态")
+    @PostMapping("/submitOrderStatus")
+    public RESTfulResult submitOrderStatus(@RequestBody Map<String,Object> map) {
+        int i = backgroundProcessingMapper.submitOrderStatus(map);
+        return success();
+    }
 }

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

@@ -158,4 +158,13 @@ public class ReportController {
     Map<String, Object> updateOperateDaily() {
         return reportFeign.updateOperateDaily();
     }
+
+    @ApiOperation("查询日报数据")
+    @PostMapping("getOperateDaily")
+    Map<String,Object> getOperateDaily(@RequestBody(required=false) Map<String,Object> mapValue,
+                                       Integer apiId,
+                                       Integer pageNum,
+                                       Integer pageSize) {
+        return reportFeign.getOperateDaily(mapValue, apiId, pageNum, pageSize);
+    }
 }

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

@@ -762,7 +762,9 @@ public class TMSController extends BaseRESTfulController {
 //                throw new Exception("同一个Excel只允许一批车辆，请检查卸车日期！");
 //            }
             //车牌号去重
-            capacitySet.add(item.get("车号").toString());
+            System.out.println(item.get("车号").toString());
+            Boolean b = capacitySet.add(item.get("车号").toString());
+            System.out.println(b);
         }
         String[] capacities = capacitySet.toArray(new String[0]);//车牌号
         if (capacities.length != list.size()) {
@@ -1148,6 +1150,33 @@ public class TMSController extends BaseRESTfulController {
     @PostMapping("/getgenerateOperateDaily")
     public Map<String,Object> generateOperateDaily(@RequestBody Map<String,Object> map) {
         return tmsFeign.getgenerateOperateDaily(map);
+    } @ApiOperation(value = "保存WMS传递的内转出库数据", notes = "保存WMS传递的内转出库数据")
+    @PostMapping(value = "/preserveMoveListIn")
+    public RESTfulResult preserveMoveListIn(@RequestBody Map<String, Object> mapList) {
+        return tmsFeign.preserveMoveListIn(mapList);
+    }
+
+    @ApiOperation(value = "保存WMS传递的内转入库数据", notes = "保存WMS传递的内转入库数据")
+    @PostMapping(value = "/preserveMoveListOut")
+    public RESTfulResult preserveMoveListOut(@RequestBody Map<String, Object> mapList) {
+        return tmsFeign.preserveMoveListOut(mapList);
+    }
+
+    @ApiOperation(value = "保存WMS传递的内转撤销入库数据", notes = "保存WMS传递的内转撤销入库数据")
+    @PostMapping(value = "/preserveMoveListRevokeOut")
+    public RESTfulResult preserveMoveListRevokeOut(@RequestBody Map<String, Object> mapList) {
+        return tmsFeign.preserveMoveListRevokeOut(mapList);
+    }
+
+    @ApiOperation(value = "保存WMS传递的内转撤销出库数据", notes = "保存WMS传递的内撤销转出库数据")
+    @PostMapping(value = "/preserveMoveListRevokeIn")
+    public RESTfulResult preserveMoveListRevokeIn(@RequestBody Map<String, Object> mapList) {
+        return tmsFeign.preserveMoveListRevokeIn(mapList);
     }
 
+    @ApiOperation(value = "保存WMS传递的内转撤销出库数据", notes = "保存WMS传递的内撤销转出库数据")
+    @PostMapping(value = "/modifyChange")
+    public RESTfulResult modifyChange(@RequestBody Map<String, Object> params) {
+        return tmsFeign.modifyChange(params);
+    }
 }

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

@@ -361,5 +361,16 @@ public class WMSController extends BaseRESTfulController {
         pageList.setTotal((int)data.get("total"));
         return success(pageList);
     }
+
+    @ApiOperation(value = "增加装车记录", notes = "根据List<Map>信息来增加装车记录")
+    public String addList(@RequestBody List<Map<String, Object>> ListMap) {
+        return wmsFeign.addList(ListMap);
+    }
+
+    @ApiOperation(value = "删除装车记录", notes = "根据派车单号信息来删除装车记录")
+    @PutMapping(value = "/deleteSlmDlivDirListByDlivDirnoSeq")
+    public String deleteSlmDlivDirListByDlivDirnoSeq(@RequestParam String dlivDirnoSeq) {
+        return wmsFeign.deleteSlmDlivDirListByDlivDirnoSeq(dlivDirnoSeq);
+    }
 }
 

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

@@ -16,6 +16,4 @@ import java.io.IOException;
 public class systemOaController extends BaseRESTfulController {
 
 
-
-
 }

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

@@ -83,4 +83,10 @@ public interface ReportFeign {
 
     @PostMapping(value = "api/v1/report/reportDaily/updateOperateDaily")
     Map<String, Object> updateOperateDaily();
+
+    @PostMapping(value = "/api/v1/report/reportDaily/getOperateDaily")
+    Map<String, Object> getOperateDaily(@RequestBody(required = false) Map<String, Object> map,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam  Integer pageNum,
+                                        @RequestParam  Integer pageSize);
 }

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

@@ -404,9 +404,20 @@ public interface TmsFeign {
     Map<String, Object> disposeHandling(@RequestBody Map<String, Object> map);
 
     @PostMapping("/api/v1/tms/omstransorders/getgenerateOperateDaily")
-    Map<String, Object> getgenerateOperateDaily(@RequestBody Map<String, Object> map);
+    Map<String, Object> getgenerateOperateDaily(@RequestBody Map<String, Object> map);   @PostMapping("/api/v1/tms/tmsloadresults/preserveMoveListIn")
+    RESTfulResult preserveMoveListIn(@RequestBody Map<String, Object> map);
 
-}
+    @PostMapping("/api/v1/tms/tmsunloadresults/preserveMoveListOut")
+    RESTfulResult preserveMoveListOut(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/tms/tmsunloadresults/preserveMoveListRevokeOut")
+    RESTfulResult preserveMoveListRevokeOut(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/tms/tmsloadresults/preserveMoveListRevokeIn")
+    RESTfulResult preserveMoveListRevokeIn(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/tms/omstransorders/modifyChange")
+    RESTfulResult modifyChange(@RequestBody Map<String, Object> map);}
 
 
 

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

@@ -107,4 +107,10 @@ public interface WMSFeign {
 
     @PostMapping("api/v1/wms/wmsoutboundresults/updateOutbound")
     Map<String, Object> updateOutbound(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/wms/wmstransportdetails/addList")
+    String addList(@RequestBody List<Map<String, Object>> ListMap);
+
+    @PutMapping("api/v1/wms/wmstransportdetails/deleteSlmDlivDirListByDlivDirnoSeq")
+    String deleteSlmDlivDirListByDlivDirnoSeq(@RequestParam String dlivDirnoSeq);
 }

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

@@ -27,4 +27,7 @@ public interface BackgroundProcessingMapper {
     Map<String,Object> getCapacityMap(String loginName);
 
     Map<String, Object> getPersonnelMap(String loginName);
+
+    int submitOrderStatus(Map<String, Object> map);
+
 }

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

@@ -0,0 +1,30 @@
+package com.steerinfo.dil.util;
+
+
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class DisposeRoleData {
+
+    private  static List<String> list = Arrays.asList("businessCompany","approveBusinessCompany","admin","siji","chengYunShang");
+
+
+    public List<String> disposeRoleData(Object roleCodes,Object companyList) {
+        //转数组
+        List<String> roleCodeList = (List<String>) roleCodes;
+        //
+        List<String> roleFinalList = new ArrayList<>();
+        //遍历数组
+        for(String roleCode : roleCodeList) {
+            if(list.contains(roleCode)) {
+                roleFinalList.add(roleCode);
+            }
+        }
+        return roleFinalList;
+    }
+}

src/main/resources/application-prod.yml

@@ -26,15 +26,14 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.202:80}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.202:80}
+    url: ${AMSFEIGN_URL:172.16.90.202:8079}
 #    url: ${AMSFEIGN_URL:localhost:8079}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.202:80}
-#    url: ${TMSFEIGN_URL:localhost:8086}
+    url: ${TMSFEIGN_URL:172.16.90.202:8086}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.202:80}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.202:80}
+    url: ${RMSFEIGN_URL:172.16.90.202:8060}
 #    url: ${RMSFEIGN_URL:localhost:8060}
   EmsFeign:
     url: ${EMSFEIGN_URL:172.16.90.202:80}
@@ -43,10 +42,10 @@ openfeign:
   WebSocketFeign:
     url: ${WEBSOCKETFEIGN_URL:172.16.90.202:80}
   REPORTFeign:
-    url: ${REPORTFEIGN_URL:172.16.90.202:80}
+    url: ${REPORTFEIGN_URL:172.16.90.202:8055}
 #    url: ${REPORTFEIGN_URL:localhost:8055}
   DzFeign:
-    url: ${DZFEIGN_URL:172.16.90.202:80}
+    url: ${DZFEIGN_URL:172.16.90.202:8056}
 #    url: ${DZFEIGN_URL:localhost:8056}
 
 

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.BackgroundProcessingMapper">
-
     <select id="getUserInfo" resultType="java.util.Map">
         SELECT RP.PERSONNEL_ID "personnelId",
                RP.IDENTITY_CARD "idCard",
@@ -20,25 +19,32 @@
         AND RC.COMPANY_TYPE = #{roleName}
     </select>
     <select id="getCompanyList" resultType="java.util.Map">
-        select "companyId" from (
-        SELECT DISTINCT
-        rc.company_id "companyId",
-        level	"level"
-        FROM
-        RMS_COMPANY RC START WITH RC.COMPANY_ID IN (
-            SELECT RPC.COMPANY_ID
-            FROM RMS_PERSONNEL RP
-                     LEFT JOIN RMS_PERSONNEL_COMPANY RPC ON RP.PERSONNEL_ID = RPC.PERSONNEL_ID
-            WHERE RPC.DELETED = 0
-              AND RP.SSO_ID = #{userId}
-              AND nvl(RP.PERSONNEL_POST,'无') != '司机'
-        )
-        CONNECT BY PRIOR RC.COMPANY_ID = rc.PARENT_COMPANY_ID
+        SELECT rc.company_id "companyId"
+        FROM RMS_COMPANY rc
+        WHERE rc.COMPANY_NAME IN (
+            SELECT "companyName"
+            FROM (
+                     SELECT DISTINCT rc.COMPANY_NAME "companyName",
+                                     LEVEL           "level"
+                     FROM RMS_COMPANY RC
+                     START WITH RC.COMPANY_ID IN (
+                         SELECT RPC.COMPANY_ID
+                         FROM RMS_PERSONNEL RP
+                                  LEFT JOIN RMS_PERSONNEL_COMPANY RPC ON RP.PERSONNEL_ID = RPC.PERSONNEL_ID
+                         WHERE RPC.DELETED = 0
+                           AND RP.SSO_ID = #{userId}
+                           AND nvl(RP.PERSONNEL_POST, '无') != '司机'
+                     )
+                     CONNECT BY PRIOR RC.COMPANY_ID = rc.PARENT_COMPANY_ID
+                 )
         )
-        order by "level"
     </select>
     <select id="getCurrentCompanyList" resultType="java.util.Map">
-        SELECT distinct rc.company_id "companyId"
+        SELECT
+        RC.COMPANY_ID "companyId"
+        FROM RMS_COMPANY RC
+        WHERE RC.COMPANY_NAME IN (
+        SELECT distinct rc.COMPANY_NAME
         FROM RMS_PERSONNEL RP
         LEFT JOIN RMS_PERSONNEL_COMPANY RPC
         on RP.PERSONNEL_ID = RPC.PERSONNEL_ID
@@ -47,7 +53,7 @@
         WHERE
         RPC.DELETED = 0
         AND
-        RP.PERSONNEL_JOB_NUMBER = #{userName}
+        RP.PERSONNEL_JOB_NUMBER = #{userName})
     </select>
     <select id="getCompanyRootMap" resultType="java.util.Map">
         SELECT DISTINCT
@@ -95,4 +101,13 @@
           AND RP.PERSONNEL_JOB_NUMBER = #{loginName}
         FETCH NEXT 1 ROWS ONLY
     </select>
+    <update id="submitOrderStatus">
+        UPDATE OMS_TRANS_ORDER
+        SET DELETED = #{orderStatus},
+            INSERT_UPDATE_REMARK = #{remark}
+        WHERE 1 != 1
+        <if test="transOrderNumber != null">
+            OR SERIAL_NUMBER = #{transOrderNumber}
+        </if>
+    </update>
 </mapper>

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

@@ -225,7 +225,15 @@
         </if>
     </select>
     <select id="getMaterialTypeByLike" resultType="java.util.Map">
-        select * from(
+        select distinct "operationsNameId",
+        "operationsName",
+        "id",
+        "value",
+        "label",
+        "text",
+        "remark",
+        "prop"
+        from(
         select * from(
         select
         t.MATERIAL_TYPE_ID "operationsNameId",
@@ -885,7 +893,20 @@
         FETCH NEXT 10 ROWS ONLY
     </select>
     <select id="getTransRangeByLike" resultType="java.util.Map">
-        select * from(
+        select distinct
+        "transrangeId",
+        "transrangeName",
+        "operationRangeId",
+        "operationRangeName",
+        "id",
+        "value",
+        "label",
+        "text",
+        "shippingPointId",
+        "receivingPointId",
+        "lineId",
+        "prop"
+        from(
         select
         RC.TRANS_RANGE_ID "transrangeId",
         RC.TRANS_RANGE_NAME "transrangeName",
@@ -1117,8 +1138,9 @@
         </if>
     </select>
     <select id="getMaterialByLike" resultType="java.util.Map">
-        select * from(
+        select distinct * from(
         select
+        distinct
         RC.MATERIAL_ID "materialId",
         RC.MATERIAL_NAME ||
         (CASE
@@ -2148,4 +2170,5 @@
              )
         WHERE "count" > 0
     </select>
+
 </mapper>