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

src/main/java/com/steerinfo/dil/aspect/LogAspect.java

@@ -67,7 +67,11 @@ public class LogAspect {
         }
         if(map==null || map.get("userId")==null ||map.get("userName") ==null){
             log.error("缺乏日志必要参数"+map);
-            return new RESTfulResult("500","缺乏日志必要参数"+map,"缺乏日志必要参数"+map);
+//            Map<String,Object> resultMap = new HashMap<>();
+//            resultMap.put("code","500");
+//            resultMap.put("message","缺乏日志必要参数");
+//            resultMap.put("data","缺乏日志必要参数"+map);
+//            return resultMap;
         }
         //获取切点处的注解及其参数
         LogAround logAround = method.getAnnotation(LogAround.class);

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.config;
 
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.steerinfo.dil.aspect.LogAspect;
 import lombok.extern.slf4j.Slf4j;
@@ -93,14 +94,18 @@ public class RequestFilter implements Filter {
                params.put("dilCompanyList",dilCompanyListObject);
                params.put("rootCompanyMap",rootCompanyMapObject);
                params.put("accessToken",accessToken);
+               log.info("url:"+url);
+               log.info("params:"+params.toJSONString());
                //将新的RequestBody写入新的请求对象保存
                ServletRequest requestWrapper = new RequestWrapper(httpRequest, params.toJSONString());
                chain.doFilter(requestWrapper, response);
            } else {
-
+               log.info("无请求体，使用原生请求处理!");
                chain.doFilter(request, response);
            }
        } catch (Exception e) {
+           log.info("过滤失败，使用原生请求处理！");
+           log.info(e.getMessage());
            e.printStackTrace();
            chain.doFilter(request, response);
        }

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.controller;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.steerinfo.dil.annotaion.LogAround;
 import com.steerinfo.dil.feign.AmsFeign;
+import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -28,7 +29,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("${api.version}/ams")
-public class AMScontroller {
+public class AMScontroller  extends BaseRESTfulController {
     @Autowired
     AmsFeign amsFeign;
 
@@ -167,6 +168,33 @@ public class AMScontroller {
     }
 
 
+    @ApiOperation(value = "生产需求批量修改接口", notes = "生产需求批量修改接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @LogAround(foreignKeys = {"transRequirementId"}, foreignKeyTypes = {"生产需求"})
+    @PostMapping(value = "/productionRequirementBatchUpdate")
+    public Map<String, Object> productionRequirementBatchUpdate(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
+        map.put("insertUsername", map.get("userName").toString());
+        if (map.containsKey("requirementStartTime")){
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Date requirementStartTime = simpleDateFormat.parse(map.get("requirementStartTime").toString());
+            map.put("requirementStartTime", requirementStartTime);
+        }
+
+        if (map.containsKey("requirementEndTime")){
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Date requirementEndTime = simpleDateFormat.parse(map.get("requirementEndTime").toString());
+            map.put("requirementEndTime", requirementEndTime);
+        }
+        if (map.containsKey("dueTime")){
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Date dueTime = simpleDateFormat.parse(map.get("dueTime").toString());
+            map.put("dueTime", dueTime);
+        }
+        return amsFeign.productionRequirementBatchUpdate(map);
+    }
+
     @ApiOperation(value = "生产需求状态修改接口", notes = "生产需求状态修改接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
@@ -708,13 +736,13 @@ public class AMScontroller {
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
-    @PostMapping(value = "/getamsproductionordersyncs")
-    RESTfulResult getamsproductionordersyncs(@RequestBody(required = false) Map<String, Object> map,
+    @PostMapping(value = "/getProductOrderList")
+    Map<String, Object> getProductOrderList(@RequestBody(required = false) Map<String, Object> map,
                                  Integer apiId,
                                  Integer pageNum,
                                  Integer pageSize
     ) {
-        return amsFeign.getamsproductionordersyncs(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+        return amsFeign.getProductOrderList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
 
     }
 

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/RMScontroller.java

@@ -287,6 +287,41 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.importMaterial(map);
     }
 
+    //====================物资
+    @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"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getMaterialYieldList")
+    public Map<String, Object> getMaterialYieldList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize
+    ) {
+        return rmsFeign.getMaterialYieldList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @PostMapping("/insertMaterialYield")
+    public Map<String, Object> insertMaterialYield(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.insertMaterialYield(mapValue);
+    }
+
+    @PostMapping("/updateMaterialYield")
+    public Map<String, Object> updateMaterialYield(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.updateMaterialYield(mapValue);
+    }
+
+    @PostMapping("/deleteMaterialYield")
+    public Map<String, Object> deleteMaterialYield(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.deleteMaterialYield(mapValue);
+    }
+
+
+
     //====================作业点
     @ApiOperation(value = "获取作业点列表")
     @ApiImplicitParams({
@@ -380,6 +415,13 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.syncOperationPoint(map);
     }
 
+
+    @ApiOperation(value = "作业点一览", notes = "树形结构")
+    @PostMapping(value = "/getOperationPointTree")
+    public Map<String, Object> getOperationPointTree(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.getOperationPointTree(map);
+    }
+
     //============人员信息
     @ApiOperation(value = "获取人员信息列表")
     @ApiImplicitParams({
@@ -1462,4 +1504,9 @@ public class RMScontroller extends BaseRESTfulController {
     public Map<String, Object> delOilPrice(@RequestBody(required = false) Map<String, Object> mapValue) {
         return rmsFeign.delOilPrice(mapValue);
     }
+
+    @PostMapping("/updateInnerCode")
+    public Map<String, Object> updateInnerCode(@RequestBody Map<String, Object> mapValue) {
+        return rmsFeign.updateInnerCode(mapValue);
+    }
 }

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

@@ -237,19 +237,19 @@ public class SystemFileController extends BaseRESTfulController {
 
     @PostMapping("/previewfile2")
     public RESTfulResult previewfile2(@RequestBody HashMap parmas) {
-
+        try {
         SystemFile value = systemFileMapper.selectByPrimaryKey(parmas.get("id").toString());
-
+        if (value==null){
+            return failed(1,"该文件不存在！请查验文件是否被清除或已损坏！");
+        }
         String fileName = value.getFilename();
         String filepath = value.getFilepath();
         if (fileName == null || fileName.isEmpty()) {
-            return failed("该图片不存在！");
+            return failed(1,"该文件不存在！");
         }
         if (filepath == null || filepath.isEmpty()) {
-            return failed("该图片地址不存在！");
+            return failed(1,"该文件地址不存在！");
         }
-
-        try {
             String result = ftpFileUtil.downloadFile(fileName, filepath);
             return success(result);
         } catch (IOException e) {

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

@@ -89,11 +89,10 @@ public class TMSController extends BaseRESTfulController {
 
     @ApiOperation(value = "修改车辆实绩")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
-    @PutMapping(value = "/comprehensiveresultsupadete/{id}")
+    @PostMapping(value = "/comprehensiveresultsupadete")
     @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"计算公式"})
-    public Map<String, Object> comprehensiveresultsUpdate(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map) {
-        map.put("updateUsername", map.get("userName").toString());
-        return tmsFeign.updateAmsSalaryContrac(id, map);
+    public Map<String, Object> comprehensiveresultsUpdate(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsFeign.updateAmsSalaryContrac(map);
     }
 
     @ApiOperation(value = "派发运输订单")
@@ -107,11 +106,21 @@ public class TMSController extends BaseRESTfulController {
     @ApiOperation(value = "批量派发运输订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/batchDispatch")
+    @RequestLimit(seconds = 100)
     @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"运输订单"})
     public Map<String, Object> batchDispatch(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.batchDispatch(map);
     }
 
+    @ApiOperation(value = "批量派发运输订单")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/batchDispatchSc")
+    @RequestLimit(seconds = 100)
+    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"运输订单"})
+    public Map<String, Object> batchDispatchSc(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsFeign.batchDispatchSc(map);
+    }
+
     @ApiOperation(value = "修改运输订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/updateTransOrder")
@@ -535,6 +544,10 @@ public class TMSController extends BaseRESTfulController {
                     if(!weightTime.equals(item.get("计量日期").toString())){
                         throw new Exception("同一个Excel只允许一批车辆，请检查计量日期！");
                     }
+                    //更新重量
+                    BigDecimal weight = DataChange.dataToBigDecimal(map.get("weight"));
+                    weight = weight.add(DataChange.dataToBigDecimal(item.get("净重")));
+                    map.put("weight", weight);
                 } else {
                     throw new Exception("同一个Excel文件中只允许有一个通知单号！");
                 }
@@ -542,6 +555,7 @@ public class TMSController extends BaseRESTfulController {
                 //不存在，新增
                 map.put("requirementNumber", requirementNumber);
                 map.put("weightTime",item.get("计量日期").toString());
+                map.put("weight",DataChange.dataToBigDecimal(item.get("净重")));
             }
             //车牌号去重
             capacitySet.add(item.get("车号").toString());
@@ -557,8 +571,14 @@ public class TMSController extends BaseRESTfulController {
         List<Map<String,Object>> orderList = universalMapper.findTrainWeight(map);
         if (orderList.size() <= 0) {
             throw new Exception("未查询到装车信息，请先上传装车作业！");
+        } else if(orderList.size() != universalMapper.countTransOrder(orderList.get(0))){
+            throw new Exception("计量信息与装车信息数量不一致，请重新上传！");
+        } else if(orderList.get(0).get("unloadResultId")!=null){
+            throw new Exception("车皮已卸车，不允许再上传计量！");
         }
         map.put("orderList",orderList);
+        map.put("transPlanId",orderList.get(0).get("transPlanId"));
+        map.put("materialId",orderList.get(0).get("materialId"));
         //新增TMS
         return tmsFeign.purchaseTrainWeight(map);
     }
@@ -627,8 +647,21 @@ public class TMSController extends BaseRESTfulController {
         List<Map<String,Object>> orderList = universalMapper.findTrainUnload(map);
         if (orderList.size() <= 0) {
             throw new Exception("未查询到装车信息，请先上传装车作业！");
+        } else if(orderList.size() != universalMapper.countTransOrder(orderList.get(0))){
+            throw new Exception("卸货信息与装车信息数量不一致，请重新上传！");
+        }
+        //获取原本重量之和
+        BigDecimal weightOld = BigDecimal.ZERO;
+        for(Map<String,Object> item : orderList){
+            weightOld = weightOld.add(DataChange.dataToBigDecimal(item.get("unloadWeightOld")));
         }
+        map.put("weightOld",weightOld);
+        map.put("diff",DataChange.dataToBigDecimal(map.get("weight").toString()).subtract(weightOld));
         map.put("orderList",orderList);
+        map.put("requirementSerialNumber",orderList.get(0).get("requirementSerialNumber"));
+        map.put("transPlanId",orderList.get(0).get("transPlanId"));
+        map.put("materialId",orderList.get(0).get("materialId"));
+        map.put("unloadPointId",orderList.get(0).get("unloadPointId"));
         //新增TMS
         return tmsFeign.purchaseTrainUnload(map);
     }
@@ -714,4 +747,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

@@ -51,6 +51,7 @@ public class UniversalController extends BaseRESTfulController {
     @Autowired
     private ImageFileUtils imageFileUtils;
 
+
     @ApiModelProperty(value = "边输边查物资大类")
     @PostMapping("/getMaterialTypeByLike")
     public RESTfulResult getMaterialTypeByLike(@RequestBody(required = false) Map<String,Object> map) {
@@ -238,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/controller/WMSController.java

@@ -173,6 +173,16 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.getGridMaterialList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
+
+
+    @ApiOperation(value = "修改库存")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"gridMaterialId"}, foreignKeyTypes = {"入库实绩"})
+    @PostMapping("/updateGridMaterial")
+    public Map<String, Object> updateGridMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return wmsFeign.updateGridMaterial(map);
+    }
+
     @ApiOperation(value = "查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),
@@ -211,6 +221,14 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.inbound(map);
     }
 
+    @ApiOperation(value = "修改入库")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"inboundResultId"}, foreignKeyTypes = {"入库实绩"})
+    @PostMapping("/updateInbound")
+    public Map<String, Object> updateInbound(@RequestBody(required = false) Map<String, Object> map){
+        return wmsFeign.updateInbound(map);
+    }
+
     @ApiOperation(value = "查询出库实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),
@@ -233,6 +251,14 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.outbound(map);
     }
 
+    @ApiOperation(value = "修改出库")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"outboundResultId"}, foreignKeyTypes = {"出库实绩"})
+    @PostMapping("/updateOutbound")
+    public Map<String, Object> updateOutbound(@RequestBody(required = false) Map<String, Object> map){
+        return wmsFeign.updateOutbound(map);
+    }
+
     @PostMapping("/selectkcmx")
     public RESTfulResult selectkcmx(@RequestBody HashMap map,
                              Integer apiId,

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

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -26,6 +27,11 @@ public class WebSocketController {
         return webSocketFeign.readWebsocket(sendId);
     }
 
+    @PostMapping("/readingWebsockets")
+    public RESTfulResult readingWebsockets(@RequestBody HashMap<String,Object> map){
+        return webSocketFeign.readingWebsockets((List<HashMap<String, Object>>) map.get("list"));
+    }
+
     @PostMapping("/sendWebsocket/{id}")
     public RESTfulResult sendWebsocket(@PathVariable("id") String webSocketId, @RequestBody HashMap<String,Object> map, HttpServletRequest request){
         return webSocketFeign.sendWebsocket(webSocketId,map);

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

@@ -57,6 +57,10 @@ public interface AmsFeign {
                                                    @RequestParam  Integer pageSize);
     @PostMapping(value = "api/v1/ams/amstransrequirements/productionStatusUpdate")
     Map<String, Object> productionStatusUpdate(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/productionRequirementBatchUpdate")
+    Map<String, Object> productionRequirementBatchUpdate(Map<String, Object> map);
+
     @PostMapping(value = "api/v1/ams/amstransrequirements/productionRequirementChange")
     Map<String, Object> productionRequirementChange(Map<String, Object> map);
 
@@ -259,8 +263,8 @@ public interface AmsFeign {
                                  @RequestParam Integer pageSize);
 
 
-    @PostMapping(value = "api/v1/ams/amsproductionordersyncs/getamsproductionordersyncs")
-    RESTfulResult getamsproductionordersyncs(@RequestBody Map<String, Object> objectMap,
+    @PostMapping(value = "api/v1/ams/amsorders/getProductOrderList")
+    Map<String, Object> getProductOrderList(@RequestBody Map<String, Object> objectMap,
                                  @RequestParam Integer apiId,
                                  @RequestParam Integer pageNum,
                                  @RequestParam Integer pageSize);

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/RmsFeign.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -113,6 +114,15 @@ public interface RmsFeign {
                                         @RequestParam("apiId") Integer apiId,
                                         @RequestParam("pageNum") Integer pageNum,
                                         @RequestParam("pageSize") Integer pageSize);
+    //查询物料产量
+    @PostMapping(value = "api/v1/rms/rmsmaterialyields/getMaterialYieldList")
+    Map<String, Object> getMaterialYieldList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize);
+    //新增物料产量
+    @PostMapping(value = "api/v1/rms/rmsmaterialyields/insertMaterialYield")
+    Map<String, Object> insertMaterialYield(@RequestBody(required = false) Map<String,Object> model);
 
     //新增物资
     @PostMapping(value = "api/v1/rms/rmsmaterial/insertMaterial")
@@ -163,6 +173,9 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmsoperationpoint/syncOperationPoint")
     Map<String, Object> syncOperationPoint(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/rms/rmsoperationpoint/getOperationPointTree")
+    Map<String, Object> getOperationPointTree(@RequestBody(required = false) Map<String, Object> map);
+
     //查询作业点ID
     @PostMapping(value = "api/v1/rms/rmsoperationpoint/getOperationPointById/{id}")
     Map<String, Object> getOperationPointById(@PathVariable("id") BigDecimal id);
@@ -723,6 +736,12 @@ public interface RmsFeign {
 
     @PostMapping(value = "api/v1/rms/rmsmapvertexs/navigation")
     Map<String, Object> navigation(@RequestBody(required = false) Map<String, Object> map);
+    //修改物料产量
+    @PostMapping(value = "api/v1/rms/rmsmaterialyields/updateMaterialYield")
+    Map<String, Object> updateMaterialYield(@RequestBody(required = false) Map<String,Object> model);
+
+    @PostMapping(value = "api/v1/rms/rmsmaterialyields/deleteMaterialYield")
+    Map<String, Object> deleteMaterialYield(@RequestBody(required = false) Map<String,Object> model);
 
     @PostMapping(value = "api/v1/rms/rmsstandardinfos/getPublicCode")
     Map<String, Object> getPublicCode(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -760,6 +779,9 @@ public interface RmsFeign {
 
     @PostMapping(value = "api/v1/rms/rmsoilprice/delOilPrice")
     Map<String, Object> delOilPrice(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/rms/rmspersonnel/updateInnerCode")
+    Map<String, Object> updateInnerCode(@RequestBody Map<String, Object> mapValue);
 }
 
 

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

@@ -32,8 +32,8 @@ public interface TmsFeign {
     @PostMapping("api/v1/tms/tmscomprehensiveresults/add")
     Map<String, Object> insertAmsSalaryContrac(@RequestBody(required = false) Map<String, Object> map);
 
-    @PutMapping("api/v1/tms/tmscomprehensiveresults/{id}")
-    Map<String, Object> updateAmsSalaryContrac(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map);
+    @PostMapping("api/v1/tms/tmscomprehensiveresults/tmscomprehensiveresultsupdate")
+    Map<String, Object> updateAmsSalaryContrac(@RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/tms/tmscomprehensiveresults/logicdelete")
     Map<String, Object> logicdeleteAmsSaalryContrac(@RequestBody(required = false) Map<String, Object> map);
@@ -260,6 +260,12 @@ public interface TmsFeign {
 
     @PostMapping(value = "/api/v1/tms/tmsrouteresults/uploadLocation")
     RESTfulResult uploadLocation(@RequestBody Map<String, Object> map);
+
+    @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/feign/WMSFeign.java

@@ -75,6 +75,9 @@ public interface WMSFeign {
                              @RequestParam Integer pageNum,
                              @RequestParam Integer pageSize);
 
+    @PostMapping("api/v1/wms/wmsgridmaterials/updateGridMaterial")
+    Map<String, Object> updateGridMaterial(@RequestBody(required = false) Map<String, Object> map);
+
 
     @PostMapping("api/v1/wms/wmsgridmaterials/getGridMaterialDailyReport")
     Map<String, Object> getGridMaterialDailyReport(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
@@ -89,6 +92,9 @@ public interface WMSFeign {
     @PostMapping("api/v1/wms/wmsinboundresults/inbound")
     Map<String, Object> inbound(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping("api/v1/wms/wmsinboundresults/updateInbound")
+    Map<String, Object> updateInbound(@RequestBody(required = false) Map<String, Object> map);
+
     @PostMapping("api/v1/wms/wmsoutboundresults/getOutboundList")
     Map<String, Object> getOutboundList(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
                                        @RequestParam Integer pageNum,
@@ -96,4 +102,8 @@ public interface WMSFeign {
 
     @PostMapping("api/v1/wms/wmsoutboundresults/outbound")
     Map<String, Object>outbound(@RequestBody(required = false) Map<String, Object> map);
+
+
+    @PostMapping("api/v1/wms/wmsoutboundresults/updateOutbound")
+    Map<String, Object> updateOutbound(@RequestBody(required = false) Map<String, Object> map);
 }

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

@@ -7,6 +7,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
+import java.util.List;
+
 /**
  * @ClassName WebSocketFeign
  * @Description TODO
@@ -18,6 +20,8 @@ import java.util.HashMap;
 public interface WebSocketFeign {
     @PostMapping("api/v1/websocket/basewebsocketsends/readWebsocket/{id}")
     RESTfulResult readWebsocket(@PathVariable("id") String sendId);
+    @PostMapping("api/v1/websocket/basewebsocketsends/readingWebsockets")
+    RESTfulResult readingWebsockets(@RequestBody() List<HashMap<String,Object>> list);
     @PostMapping("api/v1/websocket/basewebsocketsends/sendWebsocket/{id}")
     RESTfulResult sendWebsocket(@PathVariable("id") String webSocketId, @RequestBody HashMap<String,Object> map);
     @GetMapping("api/v1/websocket/basewebsocketsends/")

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

@@ -61,6 +61,9 @@ public interface UniversalMapper {
     //查询采购火运对应运单及卸货实绩
     List<Map<String, Object>>  findTrainUnload(Map<String, Object> map);
 
+    //查询火运计划下的运单数量
+    int countTransOrder(Map<String, Object> map);
+
     List<Map<String, Object>> getBusinessTypeLike(Map<String, Object> map);
 
     List<Map<String, Object>> getFuelTypeByLike(Map<String, Object> map);
@@ -73,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: 8080
   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:
@@ -82,4 +67,7 @@ hystrix:
       execution:
         isolation:
           thread:
-            timeoutInMilliseconds: 15000 #设置熔断时间,单位毫秒
+            timeoutInMilliseconds: 15000 #设置熔断时间,单位毫秒
+          strategy: SEMAPHORE
+          semaphore:
+            maxConcurrentRequests: 1

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}
 
 
 #远程调用
@@ -67,4 +67,7 @@ hystrix:
       execution:
         isolation:
           thread:
-            timeoutInMilliseconds: 15000 #设置熔断时间,单位毫秒
+            timeoutInMilliseconds: 15000 #设置熔断时间,单位毫秒
+          strategy: SEMAPHORE
+          semaphore:
+            maxConcurrentRequests: 1

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

@@ -47,7 +47,7 @@
     </sql>
     <sql id="filterCompanyData">
         <if test="roleCodes != null and roleCodes.size > 0  and dilCompanyList != null and dilCompanyList.size > 0" >
-        AND
+            AND
             <foreach collection="roleCodes" index="index" item="item" separator="or" close=")" open="(">
                 <choose>
                     <when test="item == 'chengYunShang'">
@@ -78,8 +78,18 @@
                             #{item.companyId}
                         </foreach>
                     </when>
+                    <when test="item == 'approveBusinessCompany'">
+                        "approveBusinessCompanyId"
+                        in
+                        <foreach collection="dilCompanyList" open="(" close=")" separator="," item="item" index="index">
+                            #{item.companyId}
+                        </foreach>
+                    </when>
+                    <when test="item.contains('admin')">
+                        1 = 1
+                    </when>
                     <otherwise>
-                         1 = 1
+                        1 != 1
                     </otherwise>
                 </choose>
             </foreach>

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

@@ -98,6 +98,7 @@
         </if>
         RC.COMPANY_NAME "label",
         RC.COMPANY_NAME "text",
+        RC.COMPANY_NAME "companyName",
         T2 ."rootCompanyId",
         T2 ."rootCompanyName",
         'label' "prop"
@@ -170,6 +171,7 @@
             </if>
             RC.COMPANY_NAME "label",
             RC.COMPANY_NAME "text",
+            RC.COMPANY_NAME "companyName",
             T2 ."rootCompanyId",
             T2 ."rootCompanyName",
             'label' "prop"
@@ -321,6 +323,8 @@
         PERSONNEL_NAME "personnelName",
         PERSONNEL_POST "personnelPost",
         PERSONNEL_PHONE "personnelPhone",
+        INNNER_CODE "innerCode",
+        to_char(SSO_ID) "ssoId",
         PERSONNEL_ID "id",
         PERSONNEL_ID "value",
         PERSONNEL_NAME "label",
@@ -374,6 +378,7 @@
         PERSONNEL_NAME "personnelName",
         PERSONNEL_POST "personnelPost",
         PERSONNEL_PHONE "personnelPhone",
+        to_char(SSO_ID) "ssoId",
         PERSONNEL_ID "id",
         PERSONNEL_ID "value",
         PERSONNEL_NAME "label",
@@ -862,7 +867,10 @@
         <foreach collection="list" item="item"  separator=" UNION " >
             SELECT OTO .TRANS_ORDER_ID "transOrderId",
             OOC .ORDER_CHILD_ID "transOrderChildId",
+            APC .TRANS_PLAN_ID "transPlanId",
+            APC .MATERIAL_ID "materialId",
             TWR .RESULT_ID "resultId",
+            TUR .RESULT_ID "unloadResultId",
             #{item.车号} "capacityId",
             #{item.净重} "netWeight",
             #{item.皮重} "tareWeight",
@@ -871,7 +879,7 @@
             LEFT JOIN OMS_ORDER_CHILD OOC ON OOC .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
             LEFT JOIN TMS_WEIGHT_RESULT TWR
                 ON TWR .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID AND TWR.NET_WEIGHT_TIME = to_date(#{weightTime}, 'yyyymmdd')
-            LEFT JOIN OMS_ORDER_CHILD OOC ON OOC .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
+            LEFT JOIN TMS_UNLOAD_RESULT TUR ON TUR .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
             LEFT JOIN  AMS_PLAN_CHILD APC ON APC.PLAN_CHILD_ID = OOC.PLAN_CHILD_ID
             LEFT JOIN AMS_REQUIREMENT_CHILD ARC ON ARC.REQUIREMENT_CHILD_ID = APC.REQUIREMENT_CHILD_ID
             LEFT JOIN AMS_TRANS_REQUIREMENT ATR ON ATR.TRANS_REQUIREMENT_ID = ARC.TRANS_REQUIREMENT_ID
@@ -887,6 +895,9 @@
             SELECT OTO .TRANS_ORDER_ID "transOrderId",
             OOC .ORDER_CHILD_ID "transOrderChildId",
             TUR .RESULT_ID "resultId",
+            TUR .ACTUAL_TONNAGE "unloadWeightOld",
+            ATR .SERIAL_NUMBER  "requirementSerialNumber",
+            APC .TRANS_PLAN_ID "transPlanId",
             ARC .RECEIVING_POINT_ID "unloadPointId",
             APC .MATERIAL_ID "materialId",
             #{item.车号} "capacityId",
@@ -895,7 +906,6 @@
             LEFT JOIN OMS_ORDER_CHILD OOC ON OOC .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
             LEFT JOIN TMS_UNLOAD_RESULT TUR
             ON TUR .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID AND TUR.UNLOAD_START_TIME = to_date(#{unloadTime}, 'yyyymmdd')
-            LEFT JOIN OMS_ORDER_CHILD OOC ON OOC .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
             LEFT JOIN  AMS_PLAN_CHILD APC ON APC.PLAN_CHILD_ID = OOC.PLAN_CHILD_ID
             LEFT JOIN AMS_REQUIREMENT_CHILD ARC ON ARC.REQUIREMENT_CHILD_ID = APC.REQUIREMENT_CHILD_ID
             LEFT JOIN AMS_TRANS_REQUIREMENT ATR ON ATR.TRANS_REQUIREMENT_ID = ARC.TRANS_REQUIREMENT_ID
@@ -1056,4 +1066,48 @@
             </if>
         </where>
     </select>
+    <select id="countTransOrder" resultType="java.lang.Integer">
+        SELECT COUNT(OTO .TRANS_ORDER_ID)
+        FROM OMS_TRANS_ORDER OTO
+        LEFT JOIN OMS_ORDER_CHILD OOC ON OOC .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
+        LEFT JOIN  AMS_PLAN_CHILD APC ON APC.PLAN_CHILD_ID = OOC.PLAN_CHILD_ID
+        LEFT JOIN AMS_REQUIREMENT_CHILD ARC ON ARC.REQUIREMENT_CHILD_ID = APC.REQUIREMENT_CHILD_ID
+        LEFT JOIN AMS_TRANS_REQUIREMENT ATR ON ATR.TRANS_REQUIREMENT_ID = ARC.TRANS_REQUIREMENT_ID
+        <where>
+            OTO.DELETED != 1
+            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>