1

pom.xml

@@ -110,7 +110,55 @@
             <artifactId>mybatis</artifactId>
             <version>3.5.6</version>
         </dependency>
+        <!--文件上传-->
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+            <version>3.6</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.3.2</version>
+        </dependency>
 
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-scratchpad</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml-schemas</artifactId>
+            <version>3.17</version>
+        </dependency>
+
+        <dependency>
+            <groupId>fr.opensagres.xdocreport</groupId>
+            <artifactId>xdocreport</artifactId>
+            <version>2.0.1</version>
+        </dependency>
+        <!-- pdf -->
+        <dependency>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>itextpdf</artifactId>
+            <version>5.5.11</version>
+        </dependency>
 
     </dependencies>
     <build>
@@ -127,7 +175,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>LOG_RESULT</param>
+                        <param>SYSTEM_FILE</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -108,7 +108,7 @@ public class LogAspect {
                 //记录正常日志
                 log.info("方法返回：" + JSON.toJSONString(result));
                 log.info("执行时间（ms）："+exeCost);
-                log.info("执行===" + methodName + "===结束");
+                log.info("执行===" + methodName + "===成功");
                 //记录到数据库
                 List<LogResult> logResults=new ArrayList<>();
                 for(int i=0 ; i<foreignKeys.length ; i++){
@@ -129,9 +129,9 @@ public class LogAspect {
                 logResultMapper.batchInsert(logResults);
             }else{
                 //记录失败日志
-                log.error("方法返回：" + JSON.toJSONString(result));
-                log.error("执行时间（ms）："+exeCost);
-                log.error("执行===" + methodName + "===结束");
+                log.info("方法返回：" + JSON.toJSONString(result));
+                log.info("执行时间（ms）："+exeCost);
+                log.info("执行===" + methodName + "===失败");
             }
         }catch (Exception e){
             //记录错误日志

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

@@ -13,8 +13,6 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URLDecoder;
-import java.util.HashMap;
-import java.util.Map;
 
 @Component
 public class RequestFilter implements Filter {
@@ -26,47 +24,56 @@ public class RequestFilter implements Filter {
     @Override
     public void doFilter(ServletRequest request, ServletResponse response,FilterChain chain) throws IOException, ServletException {
        try{
-            HttpServletRequest httpRequest = (HttpServletRequest)request;
-            //获取参数，并校验
-            Cookie[] cookies = httpRequest.getCookies();
-            String userId = null;
-            String userName = null;
-            //获取cookie用户数据
-            for (Cookie cookie : cookies) {
-                if (userId==null && cookie.getName().equals("userId")) {
-                    userId = cookie.getValue();
-                }else if(userName==null && cookie.getName().equals("userName")){
-                    userName = URLDecoder.decode(cookie.getValue(),"utf-8");
-                }else if(userId!=null && userName!=null){
-                    //都查到了，退出
-                    break;
-                }
-            }
-            httpRequest.setAttribute("userId",userId);
-            httpRequest.setAttribute("userName", userName);
-            //获取RequestBody数据
-            BufferedReader streamReader = new BufferedReader( new InputStreamReader(request.getInputStream(), "UTF-8"));
-            StringBuilder strBuilder = new StringBuilder();
-            String inputStr;
-            while ((inputStr = streamReader.readLine()) != null) {
-                strBuilder.append(inputStr);
-            }
-            if(strBuilder!=null && !"".equals(strBuilder.toString())){
-                //有请求体则写入userId和userName，保存
-                JSONObject params = JSONObject.parseObject(strBuilder.toString());
-                params.put("userId",userId);
-                params.put("userName",userName);
-                //将新的RequestBody写入新的请求对象保存
-                ServletRequest requestWrapper = new RequestWrapper(httpRequest, params.toJSONString());
-                chain.doFilter(requestWrapper, response);
-            }else{
-                chain.doFilter(request, response);
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            log.error(e.getStackTrace());
-            chain.doFilter(request, response);
-        }
+           HttpServletRequest httpRequest = (HttpServletRequest) request;
+           //获取参数，并校验
+           Cookie[] cookies = httpRequest.getCookies();
+           String userId = httpRequest.getHeader("userid");
+           String userName = httpRequest.getHeader("username");
+           String orgCode = httpRequest.getHeader("orgCode");
+           //获取cookie用户数据
+           if (cookies != null && cookies.length > 0) {
+               for (Cookie cookie : cookies) {
+                   if (cookie.getName().equals("userId") && userId == null) {
+                       userId = cookie.getValue();
+                   } else if (cookie.getName().equals("userName") && userName == null) {
+                       userName = URLDecoder.decode(cookie.getValue(), "utf-8");
+                   } else if (cookie.getName().equals("orgCode") && orgCode == null) {
+                       orgCode = URLDecoder.decode(cookie.getValue(), "utf-8");
+                   } else if (userId != null && userName != null && orgCode != null) {
+                       //都查到了，退出
+                       break;
+                   }
+               }
+           }
+           userName = URLDecoder.decode(userName, "utf-8");
+           orgCode = URLDecoder.decode(orgCode, "utf-8");
+           httpRequest.setAttribute("userId", userId);
+           httpRequest.setAttribute("userName", userName);
+           httpRequest.setAttribute("orgCode", orgCode);
+           //获取RequestBody数据
+           BufferedReader streamReader = new BufferedReader(new InputStreamReader(request.getInputStream(), "UTF-8"));
+           StringBuilder strBuilder = new StringBuilder();
+           String inputStr;
+           while ((inputStr = streamReader.readLine()) != null) {
+               strBuilder.append(inputStr);
+           }
+           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);
+               //将新的RequestBody写入新的请求对象保存
+               ServletRequest requestWrapper = new RequestWrapper(httpRequest, params.toJSONString());
+               chain.doFilter(requestWrapper, response);
+           } else {
+               chain.doFilter(request, response);
+           }
+       } catch (Exception e) {
+           e.printStackTrace();
+           log.error(e.getStackTrace());
+           chain.doFilter(request, response);
+       }
     }
     @Override
     public void init(FilterConfig arg0) throws ServletException {}

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

@@ -28,11 +28,11 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("${api.version}/ams")
-public class AMScontroller{
+public class AMScontroller {
     @Autowired
     AmsFeign amsFeign;
 
-    @ApiOperation(value="展示采购订单详情")
+    @ApiOperation(value = "展示采购订单详情")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -40,42 +40,42 @@ public class AMScontroller{
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping(value = "/getPurchaseOrderList")
-    Map<String, Object> getPurchaseOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                     Integer apiId,
-                                     Integer pageNum,
-                                     Integer pageSize
-    ){
-        return amsFeign.getPurchaseOrderList(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize
+    ) {
+        return amsFeign.getPurchaseOrderList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
-    @ApiOperation(value="同步采购订单")
+    @ApiOperation(value = "同步采购订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/purchaseOrderSync")
-    @LogAround(foreignKeys = {"orderId"},foreignKeyTypes = {"采购订单"})
-    public Map<String, Object> purchaseOrderSync(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"orderId"}, foreignKeyTypes = {"采购订单"})
+    public Map<String, Object> purchaseOrderSync(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchaseOrderSync(map);
     }
 
-    @ApiOperation(value="新增采购订单")
+    @ApiOperation(value = "新增采购订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/purchaseOrderAdd")
-    @LogAround(foreignKeys = {"orderId"},foreignKeyTypes = {"采购订单"})
-    public Map<String, Object> purchaseOrderAdd(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"orderId"}, foreignKeyTypes = {"采购订单"})
+    public Map<String, Object> purchaseOrderAdd(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchaseOrderAdd(map);
     }
 
-    @ApiOperation(value="修改采购订单")
+    @ApiOperation(value = "修改采购订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/purchaseOrderUpdate")
-    @LogAround(foreignKeys = {"orderId"},foreignKeyTypes = {"采购订单"})
-    public Map<String, Object> purchaseOrderUpdate(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"orderId"}, foreignKeyTypes = {"采购订单"})
+    public Map<String, Object> purchaseOrderUpdate(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchaseOrderUpdate(map);
     }
 
-    @ApiOperation(value="删除采购订单")
+    @ApiOperation(value = "删除采购订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/purchaseOrderDelete")
-    @LogAround(foreignKeys = {"orderId"},foreignKeyTypes = {"采购订单"})
+    @LogAround(foreignKeys = {"orderId"}, foreignKeyTypes = {"采购订单"})
     public Map<String, Object> purchaseOrderDelete(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchaseOrderDelete(map);
     }
@@ -86,8 +86,8 @@ public class AMScontroller{
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
     })
     @PostMapping(value = "/purchaseRequirementAdd")
-    @LogAround(foreignKeys = {"transRequirementId"},foreignKeyTypes = {"采购需求"})
-    public Map<String, Object> purchaseRequirementAdd(@RequestBody(required = false) Map<String ,Object> map) {
+    @LogAround(foreignKeys = {"transRequirementId"}, foreignKeyTypes = {"采购需求"})
+    public Map<String, Object> purchaseRequirementAdd(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchaseRequirementAdd(map);
     }
 
@@ -96,8 +96,8 @@ public class AMScontroller{
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
     })
     @PostMapping(value = "/purchaseRequirementUpdate")
-    @LogAround(foreignKeys = {"transRequirementId"},foreignKeyTypes = {"采购需求"})
-    public Map<String, Object> purchaseRequirementUpdate(@RequestBody(required = false) Map<String ,Object> map) {
+    @LogAround(foreignKeys = {"transRequirementId"}, foreignKeyTypes = {"采购需求"})
+    public Map<String, Object> purchaseRequirementUpdate(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchaseRequirementUpdate(map);
     }
 
@@ -106,12 +106,12 @@ public class AMScontroller{
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
     })
     @PostMapping(value = "/purchaseRequirementChange")
-    @LogAround(foreignKeys = {"transRequirementId"},foreignKeyTypes = {"采购需求"})
-    public Map<String, Object> purchaseRequirementChange(@RequestBody(required = false) Map<String ,Object> map) {
+    @LogAround(foreignKeys = {"transRequirementId"}, foreignKeyTypes = {"采购需求"})
+    public Map<String, Object> purchaseRequirementChange(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchaseRequirementChange(map);
     }
 
-    @ApiOperation(value="展示采购需求详情")
+    @ApiOperation(value = "展示采购需求详情")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -119,15 +119,15 @@ public class AMScontroller{
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping(value = "/getPurchaseRequirementList")
-    Map<String, Object> getPurchaseRequirementList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                             Integer apiId,
-                                             Integer pageNum,
-                                             Integer pageSize
-    ){
-        return amsFeign.getPurchaseRequirementList(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    Map<String, Object> getPurchaseRequirementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize
+    ) {
+        return amsFeign.getPurchaseRequirementList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
-    @ApiOperation(value="展示采购计划详情")
+    @ApiOperation(value = "展示采购计划详情")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -135,12 +135,12 @@ public class AMScontroller{
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping(value = "/getPurchasePlanList")
-    Map<String, Object> getPurchasePlanList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                   Integer apiId,
-                                                   Integer pageNum,
-                                                   Integer pageSize
-    ){
-        return amsFeign.getPurchasePlanList(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    Map<String, Object> getPurchasePlanList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize
+    ) {
+        return amsFeign.getPurchasePlanList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
     @ApiOperation(value = "采购计划新增接口", notes = "采购计划新增接口")
@@ -148,13 +148,12 @@ public class AMScontroller{
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
     })
     @PostMapping(value = "/purchasePlanAdd")
-    @LogAround(foreignKeys = {"transPlanId"},foreignKeyTypes = {"采购计划"})
-    public Map<String, Object> purchasePlanAdd(@RequestBody(required = false) Map<String ,Object> map) {
+    @LogAround(foreignKeys = {"transPlanId"}, foreignKeyTypes = {"采购计划"})
+    public Map<String, Object> purchasePlanAdd(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchasePlanAdd(map);
     }
 
-
-    @ApiOperation(value = "采购计划修改接口", notes = "采购计划修改接口")
+@ApiOperation(value = "采购计划修改接口", notes = "采购计划修改接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
     })
@@ -174,15 +173,14 @@ public class AMScontroller{
         return amsFeign.purchasePlanChange(map);
     }
 
-    @ApiOperation(value="同步销售订单")
-    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @ApiOperation(value="同步销售订单")    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/saleOrderSync")
     @LogAround(foreignKeys = {"orderId"}, foreignKeyTypes = {"销售订单"})
-    public Map<String, Object> saleOrderSync(@RequestBody(required = false) Map<String ,Object> map) {
+    public Map<String, Object> saleOrderSync(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.saleOrderSync(map);
     }
 
-    @ApiOperation(value="承运合同")
+    @ApiOperation(value = "承运合同")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -190,42 +188,43 @@ public class AMScontroller{
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping(value = "/getAmsTransPriceList")
-    public Map<String, Object> getAmsTransPriceList(@RequestBody(required = false) Map<String ,Object> map,Integer apiId,
+    public Map<String, Object> getAmsTransPriceList(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
                                                     Integer pageNum,
                                                     Integer pageSize) {
-        return amsFeign.list(map==null ?new HashMap<>():map,apiId,pageNum,pageSize);
+        return amsFeign.list(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
-    @ApiOperation(value="新增承运合同")
+
+    @ApiOperation(value = "新增承运合同")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
-    @LogAround(foreignKeys = {"priceId"},foreignKeyTypes = {"承运合同"})
+    @LogAround(foreignKeys = {"priceId"}, foreignKeyTypes = {"承运合同"})
     @PostMapping("/")
-    public  Map<String, Object>  insertTransPrice(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
+    public Map<String, Object> insertTransPrice(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
 
-        if (!map.isEmpty()){
-            if (!map.get("priceDate").toString().isEmpty()){
-                SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
+        if (!map.isEmpty()) {
+            if (!map.get("priceDate").toString().isEmpty()) {
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
                 Date priceDate = simpleDateFormat.parse(map.get("priceDate").toString());
-                map.put("priceDate",priceDate);
+                map.put("priceDate", priceDate);
             }
         }
-        map.put("insertUsername",map.get("userName").toString());
-               return  amsFeign.add(map);
+        map.put("insertUsername", map.get("userName").toString());
+        return amsFeign.add(map);
     }
 
-    @ApiOperation(value="修改承运合同")
+    @ApiOperation(value = "修改承运合同")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PutMapping(value = "/{id}")
-    @LogAround(foreignKeys = {"priceId"},foreignKeyTypes = {"承运合同"})
-    public Map<String, Object> purchaseOrderUpdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map){
-        map.put("updateUsername",map.get("userName").toString());
-        return amsFeign.update(id,map);
+    @LogAround(foreignKeys = {"priceId"}, foreignKeyTypes = {"承运合同"})
+    public Map<String, Object> purchaseOrderUpdate(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map) {
+        map.put("updateUsername", map.get("userName").toString());
+        return amsFeign.update(id, map);
     }
 
-    @ApiOperation(value="承运合同逻辑删除")
+    @ApiOperation(value = "承运合同逻辑删除")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PutMapping(value = "/logicdelete")
-    @LogAround(foreignKeys = {"priceId"},foreignKeyTypes = {"承运合同"})
-    public Map<String, Object> purchaseOrderLogicDelete(@RequestBody(required = false) Map<String, Object> map){
+    @LogAround(foreignKeys = {"priceId"}, foreignKeyTypes = {"承运合同"})
+    public Map<String, Object> purchaseOrderLogicDelete(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.logicdelete(map);
     }
 
@@ -233,10 +232,57 @@ public class AMScontroller{
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/saleContractSync")
     @LogAround(foreignKeys = {"orderId"},foreignKeyTypes = {"销售合同"})
-    public Map<String, Object> saleContractSync(@RequestBody(required = false) HashMap<String, Object> map){
+    public Map<String, Object> saleContractSync(@RequestBody(required = false) HashMap<String, Object> map) {
         return amsFeign.saleContractSync(map);
     }
 
+    //工资合同
+    @ApiOperation(value = "工资合同")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", 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 = "/getSalaryContrac")
+    public Map<String, Object> getAmsSalaryContracList(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize) {
+        return amsFeign.getAmsSalaryContracList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+    @ApiOperation(value = "新增工资合同")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"contractId"}, foreignKeyTypes = {"工资合同"})
+    @PostMapping("/insertSalaryContrac")
+    public Map<String, Object> insertAmsSalaryContrac(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
+        if (!map.isEmpty()) {
+            if (!map.get("contractSignDate").toString().isEmpty()) {
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                Date contractSignDate = simpleDateFormat.parse(map.get("contractSignDate").toString());
+                map.put("contractSignDate", contractSignDate);
+            }
+        }
+        map.put("insertUsername", map.get("userName").toString());
+        return amsFeign.insertAmsSalaryContrac(map);
+    }
+
+    @ApiOperation(value = "修改工资合同")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/updateSalaryContrac/{id}")
+    @LogAround(foreignKeys = {"contractId"}, foreignKeyTypes = {"工资合同"})
+    public Map<String, Object> updateAmsSalaryContrac(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map) {
+        map.put("updateUsername", map.get("userName").toString());
+        return amsFeign.updateAmsSalaryContrac(id, map);
+    }
+
+    @ApiOperation(value = "工资合同逻辑删除")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/SalaryContraclogicdelete")
+    @LogAround(foreignKeys = {"contractId"}, foreignKeyTypes = {"工资合同"})
+    public Map<String, Object> logicdeleteAmsSaalryContrac(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.logicdeleteAmsSaalryContrac(map);
+    }
+
 
     @ApiOperation(value="展示销售合同")
     @ApiImplicitParams({

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

@@ -918,4 +918,80 @@ public class RMScontroller extends BaseRESTfulController {
         map.put("updateUsername", map.get("userName").toString());
         return rmsFeign.Formulaupdate(id,map);
     }
+
+    //   ========================= 需求快捷匹配
+
+    @ApiOperation(value = "需求快捷匹配")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", 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 = "/getrmsdemandruless")
+    public Map<String, Object> getrmsdemandrulesslist(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize) {
+        return rmsFeign.rmsdemandrulesslist(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+    @ApiOperation(value="新增需求快捷匹配")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"rulesId"},foreignKeyTypes = {"计算公式"})
+    @PostMapping("/addrmsdemandruless")
+    public  Map<String, Object> insertrmsdemandruless(@RequestBody(required = false) Map<String, Object> map) {
+        map.put("insertUsername",  map.get("userName").toString());
+        return  rmsFeign.addrmsdemandruless(map);
+    }
+
+
+    @ApiOperation(value="修改需求快捷匹配")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/rmsdemandrulessUpdate/{id}")
+    @LogAround(foreignKeys = {"rulesId"},foreignKeyTypes = {"需求快捷匹配"})
+    public Map<String, Object> rmsdemandrulessUpdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map){
+        map.put("updateUsername", map.get("userName").toString());
+        return rmsFeign.rmsdemandrulessupdate(id,map);
+    }
+
+    //   ========================= 费用类别
+
+    @ApiOperation(value = "费用类别")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", 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 = "/rmsexpansecategorysList")
+    public Map<String, Object> getrmsexpansecategorys(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize) {
+        return rmsFeign.rmsexpansecategorysList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+    @ApiOperation(value="新增费用类别")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"categoryId"},foreignKeyTypes = {"费用类别"})
+    @PostMapping("/rmsexpansecategorysInsert")
+    public  Map<String, Object> insertrmsexpansecategorys(@RequestBody(required = false) Map<String, Object> map) {
+        map.put("insertUsername", map.get("userName").toString());
+        return  rmsFeign.addrmsexpansecategorys(map);
+    }
+
+    @ApiOperation(value="费用类别删除")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/rmsexpansecategorysDelete")
+    @LogAround(foreignKeys = {"categoryId"},foreignKeyTypes = {"费用类别"})
+    public Map<String, Object> rmsexpansecategorysDelete(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.rmsexpansecategorysdelete(map);
+    }
+
+    @ApiOperation(value="修改费用类别")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/rmsexpansecategorysUpdate/{id}")
+    @LogAround(foreignKeys = {"categoryId"},foreignKeyTypes = {"费用类别"})
+    public Map<String, Object> rmsexpansecategorysUpdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map){
+        map.put("updateUsername", map.get("userName").toString());
+        return rmsFeign.rmsexpansecategorysupdate(id,map);
+    }
+
 }

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

@@ -0,0 +1,167 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.util.FtpFileUtil;
+import com.steerinfo.dil.util.IDutils;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.dil.model.SystemFile;
+import com.steerinfo.dil.service.ISystemFileService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.math.BigDecimal;
+
+/**
+ * SystemFile RESTful接口：
+ *
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-10-30 09:19
+ * 类描述
+ * 修订历史：
+ * 日期：2023-10-30
+ * 作者：generator
+ * 参考：
+ * 描述：SystemFile RESTful接口
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
+ */
+@RestController
+@RequestMapping("/${api.version}/systemfiles")
+public class SystemFileController extends BaseRESTfulController {
+
+    @Autowired
+    ISystemFileService systemFileService;
+
+    @Autowired
+    private FtpFileUtil ftpFileUtil;
+
+    @PostMapping("/insertFile")
+    public RESTfulResult insertFile(String alternateFields1, @ModelAttribute MultipartFile[] file) {
+        String filenames = "";
+        for (int i = 0; i < file.length; i++) {
+            filenames += file[i].getOriginalFilename() + ";";
+        }
+        String filesid = "";
+        if (file != null) {
+            for (int i = 0; i < file.length; i++) {
+                try {
+
+                    //获取系统时间
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("/yyyy/MM/dd");
+                    //获取文件名
+                    String oldName = file[i].getOriginalFilename();
+                    //取当前时间的长整形值包含毫秒
+                    String newName = IDutils.getImageName();
+                    //重新命名文件
+                    newName = newName + oldName.substring(oldName.lastIndexOf("."));
+                    String filePath = simpleDateFormat.format(new Date());
+                    //获取输入流
+                    InputStream inputStream = file[i].getInputStream();
+                    boolean result = ftpFileUtil.uploadToFtp(inputStream, filePath, newName, false);
+                    inputStream.close();
+                    if (result) {
+                        SystemFile uploadFile = new SystemFile();
+                        uploadFile.setFilename(oldName);
+                        uploadFile.setFilepath(filePath + "/" + newName);
+                        uploadFile.setId(alternateFields1);
+                        SystemFile modela = systemFileService.add(uploadFile);
+                        if (modela != null) {
+                            filesid += "," + modela.getId();
+                        }
+                    } else {
+                        return failed(null, "上传文件失败");
+                    }
+                } catch (Exception e) {
+                    e.getMessage();
+                }
+            }
+            return success(filesid);
+
+        } else {
+            return failed();
+        }
+
+    }
+
+    @PostMapping("/previewfile")
+    public RESTfulResult previewfile(@RequestBody HashMap parmas) {
+        String filename = parmas.get("filename").toString();
+        String filepath = parmas.get("filepath").toString();
+        if (filename == null ||filename.isEmpty()) {
+            return failed("该图片不存在！");
+        }
+        if (filepath == null ||filepath.isEmpty()) {
+            return failed("该图片地址不存在！");
+        }
+        try {
+            String result = ftpFileUtil.downloadFile(filename, filepath);
+            return success(result);
+        } catch (IOException e) {
+            e.getMessage();
+            return failed();
+        }
+
+    }
+
+
+    @PostMapping("/updateFile")
+    public RESTfulResult updateFile(String alternateFields1, @ModelAttribute MultipartFile[] file) {
+        systemFileService.delete(alternateFields1);
+        String filenames = "";
+        for (int i = 0; i < file.length; i++) {
+            filenames += file[i].getOriginalFilename() + ";";
+        }
+        String filesid = "";
+        if (file != null) {
+            for (int i = 0; i < file.length; i++) {
+                try {
+
+                    //获取系统时间
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("/yyyy/MM/dd");
+                    //获取文件名
+                    String oldName = file[i].getOriginalFilename();
+                    //取当前时间的长整形值包含毫秒
+                    String newName = IDutils.getImageName();
+                    //重新命名文件
+                    newName = newName + oldName.substring(oldName.lastIndexOf("."));
+                    String filePath = simpleDateFormat.format(new Date());
+                    //获取输入流
+                    InputStream inputStream = file[i].getInputStream();
+                    boolean result = ftpFileUtil.uploadToFtp(inputStream, filePath, newName, false);
+                    inputStream.close();
+                    if (result) {
+                        SystemFile uploadFile = new SystemFile();
+                        uploadFile.setFilename(oldName);
+                        uploadFile.setFilepath(filePath + "/" + newName);
+                        uploadFile.setId(alternateFields1);
+                        SystemFile modela = systemFileService.add(uploadFile);
+                        if (modela != null) {
+                            filesid += "," + modela.getId();
+                        }
+                    } else {
+                        return failed(null, "上传文件失败");
+                    }
+                } catch (Exception e) {
+                    e.getMessage();
+                }
+            }
+            return success(filesid);
+
+        } else {
+            return failed();
+        }
+
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.controller;
 
 
+import com.steerinfo.dil.annotaion.LogAround;
 import com.steerinfo.dil.feign.TmsFeign;
 import com.steerinfo.dil.mapper.UniversalMapper;
 import com.steerinfo.dil.util.BaseRESTfulController;
@@ -13,6 +14,9 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -28,6 +32,66 @@ import java.util.concurrent.Callable;
 public class TMSController extends BaseRESTfulController {
     @Autowired
     private TmsFeign tmsFeign;
+    @ApiOperation(value = "车辆实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", 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 = "/getcomprehensiveresults")
+    public Map<String, Object> getecomprehensiveresultslist(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize) {
+        return tmsFeign.getAmsSalaryContracList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+    @ApiOperation(value="新增车辆实绩")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"计算公式"})
+    @PostMapping("/addcomprehensiveresults")
+    public  Map<String, Object> insertcomprehensiveresults(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
+        if (!map.isEmpty()) {
+            if (!map.get("resultTime").toString().isEmpty()) {
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                Date resultTime = simpleDateFormat.parse(map.get("resultTime").toString());
+                map.put("resultTime", resultTime);
+            }
+        }
+        map.put("insertUsername",  map.get("userName").toString());
+        return  tmsFeign.insertAmsSalaryContrac(map);
+    }
 
+    @ApiOperation(value="车辆实绩删除")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/comprehensiveresultslogicdelete")
+    @LogAround(foreignKeys = {"resultId"},foreignKeyTypes = {"计算公式"})
+    public Map<String, Object> comprehensiveresultsLogicDelete(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.logicdeleteAmsSaalryContrac(map);
+    }
 
+    @ApiOperation(value="修改车辆实绩")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/comprehensiveresultsupadete/{id}")
+    @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);
+    }
+
+    @ApiOperation(value="派发运输订单")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/dispatchOrder")
+    @LogAround(foreignKeys = {"transOrderId"},foreignKeyTypes = {"运输订单"})
+    public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.dispatchOrder(map);
+    }
+
+    @ApiOperation(value = "查询运输订单")
+    @PostMapping("/getTransOrderList")
+    public Map<String, Object> getTransOrderList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        return tmsFeign.getTransOrderList(map ==null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
 }

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

@@ -52,7 +52,7 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "边输边查物资类型")
     @GetMapping("/getMaterialTypeByLike")
-    public RESTfulResult getMaterialTypeByLike(String index,String id) {
+    public RESTfulResult getMaterialTypeByLike(String index,@RequestParam(required = false) List<String> id) {
         Map<String,Object> map = new HashMap<>();
         map.put("index",index);
         map.put("id",id);
@@ -62,7 +62,7 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "边输边查公司单位")
     @GetMapping("/getCompanyMesByLike")
-    public RESTfulResult getCompanyMesByLike(String index,String companyType,String id) {
+    public RESTfulResult getCompanyMesByLike(String index,String companyType,@RequestParam(required = false) List<String> id) {
         Map<String,Object> map = new HashMap<>();
         map.put("index",index);
         map.put("companyType",companyType);
@@ -74,7 +74,7 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "边输边查环保标准")
     @GetMapping("/getEmissionStandardByLike")
-    public RESTfulResult getEmissionStandardByLike(String index,String id) {
+    public RESTfulResult getEmissionStandardByLike(String index,@RequestParam(required = false) List<String> id) {
         Map<String,Object> map = new HashMap<>();
         map.put("index",index);
         map.put("id",id);
@@ -84,7 +84,7 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "边输边查作业点")
     @GetMapping("/getOperationPointByLike")
-    public RESTfulResult getOperationPointByLike(String index,String operationPointType,String id) {
+    public RESTfulResult getOperationPointByLike(String index,String operationPointType,@RequestParam(required = false) List<String> id) {
         Map<String,Object> map = new HashMap<>();
         map.put("index",index);
         map.put("operationPointType",operationPointType);
@@ -95,7 +95,7 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "边输边查人员")
     @GetMapping("/getPersonnelByLike")
-    public RESTfulResult getPersonnelByLike(String index,String id) {
+    public RESTfulResult getPersonnelByLike(String index,@RequestParam(required = false) List<String> id) {
         Map<String,Object> map = new HashMap<>();
         map.put("index",index);
         map.put("id",id);
@@ -103,6 +103,37 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "边输边查车牌号")
+    @GetMapping("/getCapacityByLike")
+    public RESTfulResult getCapacityByLike(String index,String orgCode,@RequestParam(required = false) List<String> id) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("index",index);
+        map.put("orgCode",orgCode);
+        map.put("id",id);
+        List<Map<String, Object>> list = universalMapper.getCapacityByLike(map);
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "边输岗位信息")
+    @GetMapping("/getJobInfosByLike")
+    public RESTfulResult getrmsrmsjobinfosBylike(String index,@RequestParam(required = false) List<String> id) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("index",index);
+        map.put("id",id);
+        List<Map<String, Object>> list = universalMapper.getrmsrmsjobinfosBylike(map);
+        return success(list);
+    }
+
+
+    @ApiModelProperty(value = "边输边查运输范围")
+    @GetMapping("/getTransRangeByLike")
+    public RESTfulResult getTransRange(String index,@RequestParam(required = false) List<String> id) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("index",index);
+        map.put("id",id);
+        List<Map<String, Object>> list = universalMapper.getTransRangeByLike(map);
+        return success(list);
+    }
     @ApiOperation("上传文件通用方法,返回成功后的url")
     @PostMapping("/uploadFile")
     public RESTfulResult uploadFile(MultipartRequest request) throws Exception {

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

@@ -14,6 +14,9 @@ import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -107,5 +110,44 @@ public class WMSController extends BaseRESTfulController {
     public RESTfulResult editButton(@RequestBody(required = false) HashMap<String, Object> params) {
         return wmsFeign.editButton(params);
     }
+    //实时库存
+    @ApiOperation(value = "实时库存")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", 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 = "/wmsgridmaterialsList")
+    public Map<String, Object> getAmsSalaryContracList(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
+                                                       Integer pageNum,
+                                                       Integer pageSize) {
+        return wmsFeign.list(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("/wmsgridmaterialsinsert")
+    public Map<String, Object> insertAmsSalaryContrac(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
+        map.put("insertUsername", map.get("userName").toString());
+        return wmsFeign.insert(map);
+    }
+
+    @ApiOperation(value = "修改实时库存")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/wmsgridmaterialsUpdate/{id}")
+    @LogAround(foreignKeys = {"gridMaterialId"}, foreignKeyTypes = {"实时库存"})
+    public Map<String, Object> updateAmsSalaryContrac(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map) {
+        map.put("updateUsername", map.get("userName").toString());
+        return wmsFeign.update(id, map);
+    }
+
+    @ApiOperation(value = "实时库存逻辑删除")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/wmsgridmaterialsDelete")
+    @LogAround(foreignKeys = {"gridMaterialId"}, foreignKeyTypes = {"实时库存"})
+    public Map<String, Object> logicdeleteAmsSaalryContrac(@RequestBody(required = false) Map<String, Object> map) {
+        return wmsFeign.delete(map);
+    }
 }
 

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

@@ -30,10 +30,10 @@ public interface AmsFeign {
     Map<String, Object> purchaseOrderDelete(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/ams/amsorders/getPurchaseOrderList")
-    Map<String, Object> getPurchaseOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                     @RequestParam  Integer apiId,
-                                     @RequestParam  Integer pageNum,
-                                     @RequestParam  Integer pageSize
+    Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize
     );
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/purchaseRequirementAdd")
@@ -46,16 +46,16 @@ public interface AmsFeign {
     Map<String, Object> purchaseRequirementChange(Map<String, Object> map);
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/getPurchaseRequirementList")
-    Map<String, Object> getPurchaseRequirementList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                   @RequestParam  Integer apiId,
-                                                   @RequestParam  Integer pageNum,
-                                                   @RequestParam  Integer pageSize);
+    Map<String, Object> getPurchaseRequirementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   @RequestParam Integer apiId,
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize);
 
     @PostMapping(value = "api/v1/ams/amstransplans/getPurchasePlanList")
-    Map<String, Object> getPurchasePlanList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                   @RequestParam  Integer apiId,
-                                                   @RequestParam  Integer pageNum,
-                                                   @RequestParam  Integer pageSize);
+    Map<String, Object> getPurchasePlanList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize);
 
     @PostMapping(value = "api/v1/ams/amstransplans/purchasePlanAdd")
     Map<String, Object> purchasePlanAdd(Map<String, Object> map);
@@ -70,25 +70,42 @@ public interface AmsFeign {
     Map<String, Object> saleOrderSync(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/ams/amstransprices/getAmsTransPriceList")
-        Map<String, Object> list(@RequestBody(required = false) Map<String, Object> map,@RequestParam  Integer apiId,
-                             @RequestParam  Integer pageNum,
-                             @RequestParam  Integer pageSize);
+    Map<String, Object> list(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
+                             @RequestParam Integer pageNum,
+                             @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/ams/amstransprices/")
     Map<String, Object> add(@RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/ams/amstransprices/{id}")
-    Map<String, Object> update(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> update(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/ams/amstransprices/logicdelete")
     Map<String, Object> logicdelete(@RequestBody(required = false) Map<String, Object> map);
 
+
     @PostMapping("api/v1/ams/amssalecontracts/saleContractSync")
-    Map<String, Object> saleContractSync(@RequestBody(required = false) HashMap<String, Object> map);
+            Map<String, Object> saleContractSync(@RequestBody(required = false) HashMap<String, Object> map);
 
     @PostMapping("api/v1/ams/amssalecontracts/selectSaleContractPage")
-    Map<String, Object> selectSaleContractPage(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               @RequestParam  Integer apiId,
-                                               @RequestParam  Integer pageNum,
-                                               @RequestParam  Integer pageSize);
+    Map<String, Object> selectSaleContractPage(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam Integer apiId,
+                                               @RequestParam Integer pageNum,
+                                               @RequestParam Integer pageSize);
+
+   // 工资合同
+   @PostMapping("api/v1/ams/amssalarycontracts/getSalaryContrac")
+   Map<String, Object> getAmsSalaryContracList(@RequestBody(required = false) Map<String, Object> map,@RequestParam  Integer apiId,
+                            @RequestParam  Integer pageNum,
+                            @RequestParam  Integer pageSize);
+
+    @PostMapping("api/v1/ams/amssalarycontracts/insert")
+    Map<String, Object> insertAmsSalaryContrac(@RequestBody(required = false) Map<String, Object> map);
+
+    @PutMapping("api/v1/ams/amssalarycontracts/{id}")
+    Map<String, Object> updateAmsSalaryContrac(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+
+    @PutMapping("api/v1/ams/amssalarycontracts/logicdelete")
+    Map<String, Object> logicdeleteAmsSaalryContrac(@RequestBody(required = false) Map<String, Object> map);
+
 }

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

@@ -569,19 +569,19 @@ public interface RmsFeign {
     Map<String, Object> add(@RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/rms/rmsjobinfos/{id}")
-    Map<String, Object> update(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> update(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/rms/rmsjobinfos/logicdelete")
     Map<String, Object> logicdelete(@RequestBody(required = false) Map<String, Object> map);
 
-    @PostMapping(value = "api/v1/rms/rmsjobinfos/readExcel",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @PostMapping(value = "api/v1/rms/rmsjobinfos/readExcel", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     RESTfulResult readExcel(MultipartFile file);
 
     //==================提取比例
     @PostMapping("api/v1/rms/rmsextractscales/getrmsextractscales")
     Map<String, Object> extractscalelist(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
-                             @RequestParam Integer pageNum,
-                             @RequestParam Integer pageSize);
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/rms/rmsextractscales/add")
     Map<String, Object> addExtractscale(@RequestBody(required = false) Map<String, Object> map);
@@ -590,14 +590,14 @@ public interface RmsFeign {
     Map<String, Object> Extractscalelogicdelete(@RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/rms/rmsextractscales/{id}")
-    Map<String, Object> Extractscaleupdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> Extractscaleupdate(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map);
 
     //==================计算公式
 
     @PostMapping("api/v1/rms/rmsformulas/getformula")
     Map<String, Object> FormulaList(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
-                                         @RequestParam Integer pageNum,
-                                         @RequestParam Integer pageSize);
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/rms/rmsformulas/add")
     Map<String, Object> addFormula(@RequestBody(required = false) Map<String, Object> map);
@@ -606,7 +606,36 @@ public interface RmsFeign {
     Map<String, Object> Formulalogicdelete(@RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/rms/rmsformulas/{id}")
-    Map<String, Object> Formulaupdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> Formulaupdate(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map);
+//========================》需求快捷匹配
+
+    @PostMapping("api/v1/rms/rmsdemandruless/rmsdemandrulesslist")
+    Map<String, Object> rmsdemandrulesslist(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize);
 
+    @PostMapping("api/v1/rms/rmsdemandruless/rmsdemandrulessInsert")
+    Map<String, Object> addrmsdemandruless(@RequestBody(required = false) Map<String, Object> map);
+
+
+    @PutMapping("api/v1/rms/rmsdemandruless/rmsdemandrulessUpdate/{id}")
+    Map<String, Object> rmsdemandrulessupdate(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map);
+
+    //==================费用类别
+
+    @PostMapping("api/v1/rms/rmsexpansecategorys/rmsexpansecategorysList")
+    Map<String, Object> rmsexpansecategorysList(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/rms/rmsexpansecategorys/rmsexpansecategorysInsert")
+    Map<String, Object> addrmsexpansecategorys(@RequestBody(required = false) Map<String, Object> map);
+
+    @PutMapping("api/v1/rms/rmsexpansecategorys/rmsexpansecategorysDelete")
+    Map<String, Object> rmsexpansecategorysdelete(@RequestBody(required = false) Map<String, Object> map);
+
+    @PutMapping("api/v1/rms/rmsexpansecategorys/rmsexpansecategorysUpdate/{id}")
+    Map<String, Object> rmsexpansecategorysupdate(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map);
 }
 
+

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

@@ -22,824 +22,38 @@ import java.util.Map;
 @FeignClient(name = "ANTAI-TMS-API", url = "${openfeign.TmsFeign.url}")
 public interface TmsFeign {
 
-    /*
-    TmstruckLoadResultController
-     */
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/addLoadResultForConverted")
-    Map<String,Object> addLoadResultForConverted(@RequestBody(required=false) Map<String,Object> map);
+    //======================>车辆综合实绩
+    @PostMapping("api/v1/tms/tmscomprehensiveresults/gettmscomprehensiveresult")
+    Map<String, Object> getAmsSalaryContracList(@RequestBody(required = false) Map<String, Object> map,@RequestParam  Integer apiId,
+                                                @RequestParam  Integer pageNum,
+                                                @RequestParam  Integer pageSize);
 
+    @PostMapping("api/v1/tms/tmscomprehensiveresults/add")
+    Map<String, Object> insertAmsSalaryContrac(@RequestBody(required = false) Map<String, Object> map);
 
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/getSaleOrderOnQueue")
-    public Map<String, Object> getSaleOrderOnQueue(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                   @RequestParam("apiId") Integer apiId,
-                                                   @RequestParam("pageNum") Integer pageNum,
-                                                   @RequestParam("pageSize") Integer pageSize,
-                                                   @RequestParam("con") String con);
+    @PutMapping("api/v1/tms/tmscomprehensiveresults/{id}")
+    Map<String, Object> updateAmsSalaryContrac(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
 
-    @ApiOperation(value="查询订单下的物资")
-    @GetMapping("api/v1/truckTms/dropDown/getOrderMaterial/{orderId}")
-    public Map<String, Object> getOrderMaterial(@PathVariable("orderId") Integer orderId);
+    @PutMapping("api/v1/tms/tmscomprehensiveresults/logicdelete")
+    Map<String, Object> logicdeleteAmsSaalryContrac(@RequestBody(required = false) Map<String, Object> map);
 
-    @ApiOperation(value="查询仓库下所有月台")
-    @GetMapping("api/v1/truckTms/dropDown/getPlatformIdByWarehouse/{warehouseId}")
-    public Map<String, Object> getPlatformIdByWarehouse(@PathVariable("warehouseId") Integer warehouseId);
+    @PostMapping("api/v1/tms/omstransorders/dispatchOrder")
+    Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> map);
 
-    @ApiOperation(value="修改装车点和装车顺序：销售钢材专用 ")
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/updateLoadingIdAndLoadSq")
-    public Map<String, Object> updateLoadingIdAndLoadSq(@RequestBody(required=false) Map<String, Object> map);
+    @PostMapping("api/v1/tms/omstransorders/getTransOrderList")
+    Map<String, Object> getTransOrderList(@RequestBody(required = false) Map<String, Object> map,
+                                                @RequestParam  Integer apiId,
+                                                @RequestParam  Integer pageNum,
+                                                @RequestParam  Integer pageSize);
 
-    @ApiOperation(value="根据运输订单号查询装/卸点、卸货物资、装机备注信息：后台管理 ")
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/selectLoadingIdRemark")
-    Map<String, Object> selectLoadingIdRemark(@RequestBody(required=false) Map<String, Object> map);
+    @PostMapping("api/v1/tms/omstransorders/deleteTransOrder")
+    Map<String, Object> deleteTransOrder(@RequestBody(required = false) Map<String, Object> map);
 
-    @ApiOperation(value="修改装/卸点、卸货物资、装机备注等：后台管理 ")
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/updateLoadingIdRemark")
-    Map<String, Object> updateLoadingIdRemark(@RequestBody(required=false) Map<String, Object> map);
+    @PostMapping("api/v1/tms/omstransorders/closeTransOrder")
+    Map<String, Object> closeTransOrder(@RequestBody(required = false) Map<String, Object> map);
 
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/getAllLoadResult")
-    public Map<String, Object> getAllLoadResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize,
-                                          @RequestParam("status") Integer status ,
-                                          @RequestParam("orderType") Integer orderType,
-                                          @RequestParam("con")   String con,
-                                          @RequestParam("userId") String userId,
-                                          @RequestParam("userIds") String userIds,
-                                                @RequestParam("startTime") String startTime,
-                                                @RequestParam("endTime") String endTime
-    );
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/selectLoadResultForConverted")
-    public Map<String,Object> selectLoadResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize);
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/getLoadResultByResultId/{resultId}")
-    public Map<String,Object> getLoadResultByResultId(@PathVariable("resultId") Integer resultId);
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/addUnLoadResultForconverted")
-    public Map<String,Object> addUnLoadResultForconverted(@RequestBody(required = false) Map<String,Object> map);
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/addCGLoadResult")
-    public Map<String, Object> addCGLoadResult(@RequestBody(required=false) Map<String,Object> mapValue);
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/addSaleLoadResult")
-    public Map<String, Object> addSaleLoadResult(@RequestBody(required=false) Map<String, Object> map);
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/addSale2LoadResult")
-    public Map<String, Object> addSale2LoadResult(@RequestBody(required=false) Map<String, Object> map);
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/updateLoadResult")
-    public Map<String, Object> updateLoadResult(@RequestBody(required=false) Map<String,Object> mapValue);
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/getLoadResultById/{resultId}")
-    public Map<String, Object> getLoadResultById(@PathVariable("resultId") Integer resultId);
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/deleteLoadResult/{resultId}")
-    public Map<String, Object> deleteLoadResult(@PathVariable("resultId")Integer resultId);
-    /*
-        TmstruckEnfactoryResultController
-     */
-
-    @ApiOperation(value="查询所有的进厂实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(99)", 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("api/v1/truckTms/tmstruckenfactoryresults/getAllEnFactoryResult")
-    public Map<String, Object> getAllEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                     @RequestParam("apiId")     Integer apiId,
-                                                     @RequestParam("pageNum")   Integer pageNum,
-                                                     @RequestParam("pageSize")  Integer pageSize,
-                                                     @RequestParam("orderType") Integer orderType,
-                                                     @RequestParam("startTime") String startTime,
-                                                     @RequestParam("endTime") String endTime,
-                                                     @RequestParam("userId")    String userId,
-                                                     @RequestParam("userIds")   String userIds
-    );
-    @GetMapping("api/v1/truckTms/tmstruckenfactoryresults/getMaterial")
-    public Map<String , Object> getMaterial(@RequestParam("orderId")  Integer orderId);
-
-    @ApiOperation(value="通过采集系统传来的数据新增进厂作业实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
-    })
-    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/addEnFactoryResult")
-    public Map<String, Object> addEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue);
-
-
-    @ApiOperation(value="PDA扫描更新进厂作业实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
-    })
-    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/enFactoryResultByPDA")
-    Map<String, Object> enFactoryResultByPDA(@RequestBody(required=false) Map<String,Object> mapValue);
-
-
-    /*
-        TmstruckWeightResultController
-     */
-
-    @PostMapping("api/v1/truckTms/tmstruckweightresults/getAllJiMaoResult")
-    public Map<String, Object> getAllJiMaoResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                 @RequestParam("apiId") Integer apiId,
-                                                 @RequestParam("pageNum") Integer pageNum,
-                                                 @RequestParam("pageSize") Integer pageSize,
-                                                 @RequestParam("orderType") Integer orderType,
-                                                 @RequestParam("con")     String con,
-                                                 @RequestParam("userId")  String userId,
-                                                 @RequestParam("userIds") String userIds,
-                                                 @RequestParam("startTime")String startTime,
-                                                 @RequestParam("endTime")String endTime
-                                                 );
-
-    @PostMapping("api/v1/truckTms/tmstruckweightresults/getAllJiPiResult")
-    public Map<String, Object> getAllJiPiResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                @RequestParam("apiId") Integer apiId,
-                                                @RequestParam("pageNum") Integer pageNum,
-                                                @RequestParam("pageSize") Integer pageSize,
-                                                @RequestParam("orderType") Integer orderType,
-                                                @RequestParam("con") String con,
-                                                @RequestParam("userId")String userId,
-                                                @RequestParam("userIds")String userIds,
-                                                @RequestParam("startTime")String startTime,
-                                                @RequestParam("endTime")String endTime);
-
-    @PostMapping("api/v1/truckTms/tmstruckweightresults/addJiMaoResult")
-    public Map<String, Object> addJiMaoResult(@RequestBody Map<String, Object> mapValue);
-
-    @PostMapping("api/v1/truckTms/tmstruckweightresults/addJiPiResult")
-    public Map<String, Object> addJiPiResult(@RequestBody Map<String, Object> mapValue);
-
-
-    /*
-     TmstruckUnloadResultController
-     */
-
-    @PostMapping("api/v1/truckTms/tmstruckunloadresult/getUnloadResult")
-    public Map<String, Object> getUnloadResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               @RequestParam("apiId") Integer apiId,
-                                               @RequestParam("pageNum") Integer pageNum,
-                                               @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("orderType") Integer orderType,
-                                               @RequestParam("con")      String con,
-                                               @RequestParam("userId") String userId,
-                                               @RequestParam("userIds") String userIds,
-                                               @RequestParam("startTime")String startTime,
-                                               @RequestParam("endTime")String endTime
-    );
-
-    @PostMapping("api/v1/truckTms/tmstruckunloadresult/addUnloadResult")
-    public Map<String, Object> addUnloadResult(@RequestBody Map<String, Object> mapValue);
-
-    @PostMapping("api/v1/truckTms/tmstruckunloadresult/updateUnloadResult")
-    public Map<String, Object> updateUnloadResult(@RequestBody Map<String, Object> mapValue);
-
-    /*
-    TmstruckReceiptResultController
-     */
-
-
-    @PostMapping("api/v1/truckTms/tmstruckreciveresult/getReceiveResult")
-    public Map<String, Object> getReceiveResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize,
-                                          @RequestParam("orderType") Integer orderType,
-                                          @RequestParam("con")  String con,
-                                                @RequestParam("startTime")String startTime,
-                                                @RequestParam("endTime")String endTime);
-
-    /*
-    TmstruckLeaveFactoryResultController
-     */
-
-
-    @PostMapping("api/v1/truckTms/tmstruckleavefactoryresults/getLeaveFactoryResult")
-    public Map<String, Object> getLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               @RequestParam("apiId") Integer apiId,
-                                               @RequestParam("pageNum") Integer pageNum,
-                                               @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("orderType") Integer orderType,
-                                               @RequestParam("con") String con,
-                                               @RequestParam("carrierSsoId")String carrierSsoId,
-                                               @RequestParam("userId") String userId,
-                                               @RequestParam("userIds") String userIds,
-                                               @RequestParam("startTime") String startTime,
-                                               @RequestParam("endTime") String endTime
-    );
-
-    @PostMapping("api/v1/truckTms/tmstruckleavefactoryresults/addLeaveFactoryResult")
-    public Map<String, Object> addLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue);
-
-
-    /*
-    TmstruckMeasureCommissionController
-     */
-
-    @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/getAllMeasureCommission")
-    public Map<String, Object> getAllMeasureCommission(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                       @RequestParam("apiId") Integer apiId,
-                                                       @RequestParam("pageNum") Integer pageNum,
-                                                       @RequestParam("pageSize") Integer pageSize,
-                                                       @RequestParam("con")String con);
-
-
-    /*
-    TmstruckQualityResultController
-     */
-    @PostMapping("api/v1/truckTms/tmstruckqualityresults/getQualityResult")
-    public Map<String, Object> getQualityResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize,
-                                          @RequestParam("orderType") Integer orderType,
-                                          @RequestParam("con")String con,
-                                                @RequestParam("startTime")String startTime,
-                                                @RequestParam("endTime")String endTime);
-
-
-    @PostMapping("api/v1/truckTms/tmstruckqualityresults/getQualityResultById/{resultId}")
-    public Map<String, Object> getQualityResultById(@PathVariable("resultId") Integer resultId);
-
-
-    @PostMapping("api/v1/truckTms/tmstruckqualityresults/updateQualityResult")
-    public Map<String, Object> updateQualityResult(@RequestBody(required=false) Map<String,Object> mapValue);
-
-    //查询质检实绩
-    @PostMapping("api/v1/truckTms/tmstruckqualityresults/getQualityResult")
-    Map<String,Object> selectQualityResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                       @RequestParam("apiId")    Integer apiId,
-                                                       @RequestParam("pageNum")  Integer pageNum,
-                                                       @RequestParam("pageSize") Integer pageSize);
-
-    /**
-     * TmstruckTotalResult
-     */
-    @PostMapping("api/v1/truckTms/tmstrucktotalresults/selectCountList")
-    Map<String,Object> selectCountList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                       @RequestParam("apiId")    Integer apiId,
-                                                       @RequestParam("pageNum")  Integer pageNum,
-                                                       @RequestParam("pageSize") Integer pageSize);
-
-    /**
-     * 下拉框
-     */
-    @GetMapping("api/v1/truckTms/dropDown/getDilBatch")
-    Map<String, Object> getDilBatch();
-
-    @GetMapping("api/v1/truckTms/dropDown/getCarrier")
-    Map<String, Object> getCarrier();
-
-    @GetMapping("api/v1/truckTms/dropDown/getLine")
-    Map<String, Object> getLine();
-
-    @GetMapping("api/v1/truckTms/dropDown/getWarehouse")
-    Map<String, Object> getWarehouse();
-
-    @GetMapping("api/v1/truckTms/dropDown/getGatepost")
-    Map<String, Object> getGatepost();
-
-    @GetMapping("api/v1/truckTms/dropDown/getAPO")
-    Map<String, Object> getAPO();
-
-    @GetMapping("api/v1/truckTms/dropDown/getFuCapacityId")
-    Map<String, Object> getFuCapacityId();
-
-    @GetMapping("api/v1/truckTms/dropDown/getPort")
-    Map<String, Object> getPort();
-
-    @GetMapping("api/v1/truckTms/dropDown/getFuMaterial/{type}")
-    Map<String, Object> getFuMaterial(@PathVariable("type")Integer type);
-
-    @GetMapping("api/v1/truckTms/dropDown/getUnloadPoint/{type}")
-    Map<String, Object> getUnloadPoint(@PathVariable("type") Integer type);
-    /**
-     * 包月总实绩
-     */
-    @PostMapping("api/v1/truckTms/tmstrucktotalresults/getTmstruckMonthResult")
-    Map<String,Object> getTmstruckMonthResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                       @RequestParam("apiId")    Integer apiId,
-                                       @RequestParam("pageNum")  Integer pageNum,
-                                       @RequestParam("pageSize") Integer pageSize);
-    /**
-     *通过运输订单判断下一步是否需要计量,更新汽车衡到计量实绩中
-     */
-    @PostMapping("api/v1/truckTms/tmstruckweightresults/{orderId}")
-    Map<String,Object> isNextNeedJl(@PathVariable("orderId") Integer orderId);
-
-
-    /**
-     *查询短信实绩
-     */
-    @PostMapping("api/v1/truckTms/tmstrucksmsrusults/getSmsResult")
-    Map<String,Object> getSmsResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                    @RequestParam("apiId") Integer apiId,
-                                    @RequestParam("pageNum") Integer pageNum,
-                                    @RequestParam("pageSize") Integer pageSize,
-                                    @RequestParam("con") String con);
-
-    @ApiOperation(value="APP查询进厂实绩")
-    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/getEnfactoryResultList")
-    Map<String, Object> getEnfactoryResultList();
-
-    @ApiOperation(value="APP通过运输订单id查询进厂实绩")
-    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/getEnfactoryMessageByOrderId")
-    Map<String, Object> getEnfactoryMessageByOrderId(@RequestParam String orderNumber);
-
-    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/getAllTimeTaskResult")
-    public RESTfulResult getAllTimeTaskResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("con") String con,
-                                              @RequestParam("userId") String userId,
-                                              @RequestParam("startTime") String startTime,
-                                              @RequestParam("endTime") String endTime,
-                                              @RequestParam("orderType")Integer orderType);
-
-    @PostMapping("api/v1/truckTms/tmstrucktotalresults/getAllReverseResult")
-    RESTfulResult getAllReverseResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("con") String con,
-                                              @RequestParam("userId") String userId,
-                                              @RequestParam("startTime") String startTime,
-                                              @RequestParam("endTime") String endTime);
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/addDaZhouToDaGangLoadResult")
-    Map<String, Object> addDaZhouToDaGangLoadResult(@RequestBody(required = false)Map<String, Object> map);
-
-    @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
-    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/addSteelNzReceiptResult")
-    public Map<String, Object> addSteelNzReceiptResult(@RequestBody(required = false) Map<String, Object> map);
-
-
-    @PostMapping("api/v1/truckTms/tmstruckweightresults/updateTruckWeight")
-    public Map<String, Object> updateTruckWeight(@RequestBody List<Map<String, Object>> mapList);
-
-    @PostMapping("api/v1/truckTms/tmstruckreturnresults/getAllReturnResult")
-    public Map<String, Object>  getAllReturnResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                   @RequestParam("apiId") Integer apiId,
-                                                   @RequestParam("pageNum") Integer pageNum,
-                                                   @RequestParam("pageSize") Integer pageSize,
-                                                   @RequestParam("orderType") Integer orderType,
-                                                   @RequestParam("con") String con);
-
-    @PostMapping("api/v1/truckTms/selfMachine/getBillOrder")
-    Map<String, Object> getBillOrder(@RequestParam String orderNumber);
-
-    @PostMapping("api/v1/truckTms/selfMachine/getDeliveryOrder")
-    Map<String, Object> getDeliveryOrder(@RequestParam String orderNumber);
-
-    @PostMapping("api/v1/truckTms/selfMachine/queryNumber")
-    Map<String, Object> queryNumber(@RequestParam String orderNumber);
-
-    @PostMapping("api/v1/truckTms/selfMachine/changeNumber")
-    Map<String, Object> changeNumber(@RequestParam String orderNumber);
-
-    @PostMapping("api/v1/truckTms/statisticalReport/getRLFLReport")
-    Map<String, Object> getRLFLReport(@RequestBody(required=false) Map<String,Object> mapValue,
-                                      @RequestParam("apiId") Integer apiId,
-                                      @RequestParam("pageNum") Integer pageNum,
-                                      @RequestParam("pageSize") Integer pageSize,
-                                      @RequestParam("startTime") String startTime,
-                                      @RequestParam("endTime")   String endTime,
-                                      @RequestParam("orderType") Integer orderType,
-                                      @RequestParam("con")String con
-    );
-
-    @PostMapping("api/v1/truckTms/tmstruckloadresults/cgNzLoadingResult")
-    Map<String, Object> cgNzLoadingResult(@RequestBody(required = false) Map<String, Object> mapval,
-                                          @RequestParam Integer apiId,
-                                          @RequestParam Integer pageNum,
-                                          @RequestParam Integer pageSize,
-                                          @RequestParam Integer orderType,
-                                          @RequestParam Integer orderStatus);
-
-    @PostMapping("api/v1/truckTms/statisticalReport/getAllSaleReport")
-    Map<String, Object> getAllSaleReport(@RequestBody(required=false) Map<String,Object> mapValue,
-                                      @RequestParam("apiId") Integer apiId,
-                                      @RequestParam("pageNum") Integer pageNum,
-                                      @RequestParam("pageSize") Integer pageSize,
-                                         @RequestParam("startTime") String startTime,
-                                         @RequestParam("endTime")   String endTime,
-                                      @RequestParam("carrierSsoId")   String carrierSsoId,
-                                         @RequestParam("orderType") Integer orderType,
-                                         @RequestParam("shipperId") Integer shipperId,
-                                         @RequestParam("receiveName") String receiveName,
-                                         @RequestParam String materialName,
-                                         @RequestParam String wareHouse
-    );
-
-    @PostMapping("api/v1/truckTms/statisticalReport/getAllSaleReportTotal")
-    Map<String, Object> getAllSaleReportTotal(@RequestBody(required=false) Map<String,Object> mapValue,
-                                         @RequestParam("startTime") String startTime,
-                                         @RequestParam("endTime")   String endTime,
-                                         @RequestParam("carrierSsoId")   String carrierSsoId
-    );
-
-    @PostMapping("api/v1/truckTms/statisticalReport/getSporadicSuppliesReport1")
-    Map<String, Object> getSporadicSuppliesReport1(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                   @RequestParam("apiId") Integer apiId,
-                                                   @RequestParam("pageNum") Integer pageNum,
-                                                   @RequestParam("pageSize") Integer pageSize,
-                                                   @RequestParam("startTime") String startTime,
-                                                   @RequestParam("endTime") String endTime,
-                                                   @RequestParam("carrierSsoId") String carrierSsoId,
-                                                   @RequestParam("userId") String userId,
-                                                   @RequestParam("userIds") String userIds,
-                                                   @RequestParam("con") String con,
-                                                   @RequestParam("orderType") Integer orderType
-    );
-    @PostMapping("api/v1/truckTms/statisticalReport/getSporadicSuppliesReport2")
-    Map<String, Object> getSporadicSuppliesReport2(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                   @RequestParam("apiId") Integer apiId,
-                                                   @RequestParam("pageNum") Integer pageNum,
-                                                   @RequestParam("pageSize") Integer pageSize,
-                                                   @RequestParam("startTime") String startTime,
-                                                   @RequestParam("endTime") String endTime,
-                                                   @RequestParam("carrierSsoId") String carrierSsoId,
-                                                   @RequestParam("userId") String userId,
-                                                   @RequestParam("userIds") String userIds,
-                                                   @RequestParam("con") String con,
-                                                   @RequestParam("orderType") Integer orderType
-    );
-    //内转统计报表
-    @PostMapping("api/v1/truckTms/statisticalReport/getAllInwardResult")
-    Map<String, Object> getAllInwardResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                         @RequestParam("apiId") Integer apiId,
-                                         @RequestParam("pageNum") Integer pageNum,
-                                         @RequestParam("pageSize") Integer pageSize,
-                                         @RequestParam("startTime") String startTime,
-                                         @RequestParam("endTime")   String endTime,
-                                         @RequestParam("carrierSsoId")   String carrierSsoId
-    );
-
-    //采购内转统计报表
-    @PostMapping("api/v1/truckTms/statisticalReport/getPurInwardReport")
-    Map<String, Object> getPurInwardReport(@RequestBody(required = false) Map<String, Object> mapValue,
-                                           @RequestParam Integer apiId,
-                                           @RequestParam Integer pageNum,
-                                           @RequestParam Integer pageSize,
-                                           @RequestParam String startTime,
-                                           @RequestParam String endTime);
-//内转统计报表
-    @PostMapping("api/v1/truckTms/statisticalReport/getInwardReport")
-    Map<String, Object> getInwardReport(@RequestBody(required = false) Map<String, Object> mapValue,
-                                           @RequestParam Integer apiId,
-                                           @RequestParam Integer pageNum,
-                                           @RequestParam Integer pageSize,
-                                           @RequestParam String startTime,
-                                           @RequestParam String endTime);
-
-    @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendMeasureCommission")
-    Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
-
-
-    //发送留皮计量委托
-    @GetMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendLiuPiMeasureCommission")
-    Map<String, Object> sendLiuPiMeasureCommission(@RequestParam("capacityNumber")String capacityNumber);
-
-
-    //新增计时作业实绩
-    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/addTimeTaskResult")
-    Map<String, Object> addTimeTaskResult(@RequestBody(required = false) Map<String, Object> map);
-
-
-    @PostMapping("api/v1/truckTms/statisticalReport/getLoading")
-    Map<String, Object> getLoading(@RequestBody(required = false) Map<String, Object> mapValue,
-                                   @RequestParam Integer apiId,
-                                   @RequestParam Integer pageNum,
-                                   @RequestParam Integer pageSize,
-                                   @RequestParam String startTime,
-                                   @RequestParam String endTime);
-
-
-
-    @PostMapping("api/v1/truckTms/statisticalReport/getLoaderForResultDetail")
-    Map<String, Object> getLoaderForResultDetail(@RequestBody(required = false) Map<String, Object> mapValue,
-                                   @RequestParam("apiId") Integer apiId,
-                                   @RequestParam("pageNum") Integer pageNum,
-                                   @RequestParam("pageSize") Integer pageSize,
-                                   @RequestParam("startTime") String startTime,
-                                   @RequestParam("endTime") String endTime, @RequestParam("con") String con, @RequestParam("isPage") String  isPage);
-
-    @PostMapping("api/v1/truckTms/statisticalReport/getUnLoading")
-    Map<String, Object> getUnLoading(@RequestBody(required = false) Map<String, Object> mapValue,
-                                     @RequestParam Integer apiId,
-                                     @RequestParam Integer pageNum,
-                                     @RequestParam Integer pageSize,
-                                     @RequestParam String startTime,
-                                     @RequestParam String endTime);
-
-
-    @PostMapping("api/v1/truckTms/statisticalReport/getLoaderResult")
-    Map<String, Object> getLoaderResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                     @RequestParam Integer apiId,
-                                     @RequestParam Integer pageNum,
-                                     @RequestParam Integer pageSize,
-                                     @RequestParam String startTime,
-                                     @RequestParam String endTime);
-
-
-    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/JudgeTimeTask")
-    Map<String, Object> JudgeTimeTask(@RequestBody Map<String, Object> map);
-
-    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/unitSureEndTimeout")
-    Map<String, Object> unitSureEndTimeout(@RequestBody Map<String, Object> map);
-
-    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/JudgeTimeTaskPause")
-    Map<String, Object> JudgeTimeTaskPause(@RequestBody Map<String, Object> map);
-
-    @PostMapping("api/v1/truckTms/statisticalReport/getLXInwardReport")
-    Map<String, Object> getLXInwardReport(@RequestBody(required = false) Map<String, Object> mapValue,
-                                     @RequestParam Integer apiId,
-                                     @RequestParam Integer pageNum,
-                                     @RequestParam Integer pageSize,
-                                     @RequestParam String startTime,
-                                     @RequestParam String endTime,
-                                          @RequestParam String con);
-
-
-    @PostMapping("api/v1/truckTms/statisticalReport/getInwardReportForAssemble")
-    Map<String, Object> getInwardReportForAssemble(@RequestBody(required = false) Map<String, Object> mapValue,
-                                          @RequestParam Integer apiId,
-                                          @RequestParam Integer pageNum,
-                                          @RequestParam Integer pageSize,
-                                          @RequestParam String startTime,
-                                          @RequestParam String endTime,
-                                                   @RequestParam BigDecimal orderType,
-                                                   @RequestParam String index,
-                                                   @RequestParam String isPage,
-                                                   @RequestParam String orgCode);
-
-
-    @PostMapping("api/v1/truckTms/statisticalReport/getCapacityByDefend")
-    Map<String, Object> getCapacityByDefend(@RequestBody(required = false) Map<String, Object> mapValue,
-                                          @RequestParam Integer apiId,
-                                          @RequestParam Integer pageNum,
-                                          @RequestParam Integer pageSize,
-                                            @RequestParam String startTime,
-                                            @RequestParam String endTime,
-                                          @RequestParam String con,
-                                            @RequestParam String yes
-                                         );
-
-    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceiptResult")
-    Map<String, Object> getReceiptResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                            @RequestParam Integer apiId,
-                                            @RequestParam Integer pageNum,
-                                            @RequestParam Integer pageSize,
-                                            @RequestParam String con,
-                                            @RequestParam String startTime,
-                                            @RequestParam String endTime
-    );
-
-    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceiptPhoto")
-    String getReceiptPhoto(@RequestParam String orderNumber);
-
-    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceivingResult")
-    Map<String, Object> getReceivingResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                         @RequestParam Integer apiId,
-                                         @RequestParam Integer pageNum,
-                                         @RequestParam Integer pageSize,
-                                         @RequestParam String con,
-                                         @RequestParam String startTime,
-                                         @RequestParam String endTime
-    );
-
-    @PostMapping("/api/v1/truckTms/tmstruckreceiptresults/getReceivingPhoto")
-    Map<String,Object> getReceivingPhoto(@RequestParam String orderNumber);
-    @PostMapping("/api/v1/truckTms/pathDisplay/fullPathVisualizationByCarNumber")
-    public Object fullPathVisualizationByCarNumber(@RequestBody HashMap mapValue);
-    @PostMapping("/api/v1/truckTms/pathDisplay/fullPath")
-    public Object fullPath(@RequestParam("orderNumber") String orderNumber) throws Exception;
-    @PostMapping("/api/v1/truckTms/pathDisplay/getInTransitTransportation")
-    public RESTfulResult getInTransitTransportation(@RequestBody Map<String,Object> mapValue,
-                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
-                                                    @RequestParam(required = false,name = "pageNum")Integer pageNum,
-                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize);
-    @PostMapping(value = "/api/v1/truckTms/tmstruckarrivalresults/addtmstruckArrivalResult",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public RESTfulResult addtmstruckArrivalResult(@RequestParam("orderNumber")String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress,@RequestPart("file") MultipartFile file);
-
-    @PostMapping(value = "/api/v1/truckTms/pathDisplay/addTmstruckReceiptResult")
-    public  RESTfulResult addTmstruckReceiptResult(@RequestBody Map<String,Object>  mapValaue  , @RequestParam("num") Integer num, @RequestParam("orderNumber")  String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress, @RequestParam("imgcount3") Integer imgcount3, @RequestParam("imgcount4")Integer imgcount4);
-
-    @PostMapping(value = "/api/v1/truckTms/tmstruckarrivalresults/uploadImage",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public String uploadImage(@RequestParam("orderNumber")String orderNumber,@RequestPart("file") MultipartFile file);
-
-//    @PostMapping(value = "/api/v1/truckTms/pathDisplay/addTmstruckReceiptResult", headers = "content-type=multipart/form-data",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-//    public  RESTfulResult addTmstruckReceiptResult(@RequestPart("file")MultipartRequest request,@RequestParam("num") Integer num,@RequestParam("orderNumber")  String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress,@RequestParam("imgcount3") Integer imgcount3, @RequestParam("imgcount4")Integer imgcount4);
-    @PostMapping("/api/v1/truckTms/pathDisplay/getFinishTruckOrderInfo")
-    public RESTfulResult getFinishTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
-                                                 @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
-                                                 @RequestParam(required = false,defaultValue = "1",name = "pageNum")Integer pageNum,
-                                                 @RequestParam(required = false,defaultValue = "20",name = "pageSize")Integer pageSize
-    );
-
-    @PostMapping(value = "/api/v1/truckTms/pathDisplay/selectWarnSwitch")
-    public RESTfulResult selectWarnSwitch();
-
-    @PostMapping(value = "/api/v1/truckTms/pathDisplay/inTransitWarn")
-    public RESTfulResult inTransitWarn(@RequestParam String warnSwitch,@RequestParam String radio);
-
-    @PostMapping("/api/v1/truckTms/pathDisplay/offLineWarn")
-    public String offLineWarn(@RequestParam(value = "data") String data) throws Exception;
-    @PostMapping("/api/v1/truckTms/pathDisplay/parkWarn")
-    public String parkWarn(@RequestParam(value = "data",required = false) String data) throws Exception;
-    @PostMapping("/api/v1/truckTms/pathDisplay/abnormalLineWarn")
-    public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception;
-
-    @PostMapping("/api/v1/truckTms/pathDisplay/getHaveAbnormalTruckOrderInfo")
-    public RESTfulResult getHaveAbnormalTruckOrderInfo(@RequestBody Map<String,Object> mapValue,
-                                                    @RequestParam(required = true,defaultValue = "468",name = "apiId")Integer apiId,
-                                                    @RequestParam(required = false,name = "pageNum")Integer pageNum,
-                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize);
-    @PostMapping("/api/v1/truckTms/pathDisplay/getTransportAbnormalInfo")
-    public RESTfulResult getTransportAbnormalInfo(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                  @RequestParam(name = "apiId",defaultValue = "472") Integer apiId,
-                                                  @RequestParam(name = "pageNum") Integer pageNum,
-                                                  @RequestParam(name = "pageSize") Integer pageSize);
-
-
-    @ApiOperation(value = "获取收货作业照片")
-    @PostMapping("/api/v1/truckTms/tmstruckreceiptresults/getReceivingPhotoByUrl")
-    public Map<String,Object> getReceivingPhotoByUrl(@RequestParam String orderNumber);
-
-
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getPurchaseInwardList")
-    Map<String, Object> getPurchaseInwardList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                      @RequestParam("apiId") Integer apiId,
-                                      @RequestParam("pageNum") Integer pageNum,
-                                      @RequestParam("pageSize") Integer pageSize,
-                                      @RequestParam("startTime") String startTime,
-                                      @RequestParam("endTime") String endTime,
-                                      @RequestParam("orgCode") String orgCode,
-                                      @RequestParam("isPage") String isPage,
-                                      @RequestParam("index") String index);
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getPurchaseOrderList")
-    Map<String, Object> getPurchaseOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("startTime") String startTime,
-                                              @RequestParam("endTime") String endTime,
-                                              @RequestParam("orgCode") String orgCode,
-                                              @RequestParam("isPage") String isPage,
-                                             @RequestParam("index") String index);
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleOrderList")
-    Map<String, Object> getSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                         @RequestParam("apiId") Integer apiId,
-                                         @RequestParam("pageNum") Integer pageNum,
-                                         @RequestParam("pageSize") Integer pageSize,
-                                         @RequestParam("startTime") String startTime,
-                                         @RequestParam("endTime") String endTime,
-                                         @RequestParam("orgCode") String orgCode,
-                                         @RequestParam("isPage") String isPage,
-                                         @RequestParam("index") String index);
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getInwardInFactory")
-    Map<String, Object> getInwardInFactory(@RequestBody(required = false) Map<String, Object> mapValue,
-                                           @RequestParam("apiId") Integer apiId,
-                                           @RequestParam("pageNum") Integer pageNum,
-                                           @RequestParam("pageSize") Integer pageSize,
-                                           @RequestParam("startTime") String startTime,
-                                           @RequestParam("endTime") String endTime,
-                                           @RequestParam("orgCode") String orgCode,
-                                           @RequestParam("isPage") String isPage,
-                                           @RequestParam("index") String index);
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getOutFactoryInwardList")
-    Map<String, Object> getOutFactoryInwardList(@RequestBody(required = false)Map<String, Object> mapValue,
-                                                @RequestParam("apiId")Integer apiId,
-                                                @RequestParam("pageNum")Integer pageNum,
-                                                @RequestParam("pageSize")Integer pageSize,
-                                                @RequestParam("startTime")String startTime,
-                                                @RequestParam("endTime")String endTime,
-                                                @RequestParam("orgCode")String orgCode,
-                                                @RequestParam("isPage")String isPage,
-                                                @RequestParam("index")String index);
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleSteelReport")
-    Map<String, Object> getSaleSteelReport(@RequestBody(required = false)Map<String, Object> map,
-                                           @RequestParam("startTime")String startTime,
-                                           @RequestParam("endTime")String endTime,
-                                           @RequestParam("carrierSsoId")String carrierSsoId,
-                                           @RequestParam("receiveName")String receiveName,
-                                           @RequestParam("materialName")String materialName,
-                                           @RequestParam("specification")String specification,
-                                           @RequestParam("remark")String remark,
-                                           @RequestParam("capacityNo") String capacityNo,
-                                           @RequestParam("carrierName") String carrierName,
-                                           @RequestParam("consigneeName") String consigneeName,
-                                           @RequestParam("saler") String saler,
-                                           @RequestParam("easPrimaryId") String easPrimaryId
-                                           );
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleSteelSpellingReport")
-    Map<String, Object> getSaleSteelSpellingReport(@RequestBody(required = false)Map<String, Object> map);
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleSteelReportNew")
-    Map<String, Object> getSaleSteelReportNew(@RequestBody(required = false)Map<String, Object> map,
-                                           @RequestParam("startTime")String startTime,
-                                           @RequestParam("endTime")String endTime,
-                                           @RequestParam("carrierSsoId")String carrierSsoId,
-                                           @RequestParam("receiveName")String receiveName,
-                                           @RequestParam("materialName")String materialName,
-                                           @RequestParam("specification")String specification,
-                                           @RequestParam("remark")String remark,
-                                           @RequestParam("capacityNo") String capacityNo,
-                                           @RequestParam("carrierName") String carrierName,
-                                           @RequestParam("consigneeName") String consigneeName,
-                                           @RequestParam("saler") String saler,
-                                           @RequestParam("easPrimaryId") String easPrimaryId
-    );
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getSettledSaleSteelReportNew")
-    Map<String, Object> getSettledSaleSteelReportNew(@RequestBody(required = false)Map<String, Object> map,
-                                              @RequestParam("startTime")String startTime,
-                                              @RequestParam("endTime")String endTime,
-                                              @RequestParam("carrierSsoId")String carrierSsoId,
-                                              @RequestParam("receiveName")String receiveName,
-                                              @RequestParam("materialName")String materialName,
-                                              @RequestParam("specification")String specification,
-                                              @RequestParam("remark")String remark,
-                                              @RequestParam("capacityNo") String capacityNo,
-                                              @RequestParam("carrierName") String carrierName,
-                                              @RequestParam("consigneeName") String consigneeName,
-                                              @RequestParam("saler") String saler,
-                                              @RequestParam("easPrimaryId") String easPrimaryId
-    );
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/loadingSaleSteelReport")
-    Map<String, Object> loadingSaleSteelReport(@RequestBody(required = false)Map<String, Object> map,
-                                           @RequestParam("startTime")String startTime,
-                                           @RequestParam("endTime")String endTime,
-                                           @RequestParam("carrierSsoId")String carrierSsoId,
-                                           @RequestParam("receiveName")String receiveName,
-                                           @RequestParam("materialName")String materialName,
-                                           @RequestParam("specification")String specification,
-                                           @RequestParam("remark")String remark,
-                                           @RequestParam("capacityNo") String capacityNo,
-                                           @RequestParam("carrierName") String carrierName,
-                                           @RequestParam("consigneeName") String consigneeName,
-                                           @RequestParam("saler") String saler,
-                                           @RequestParam("easPrimaryId") String easPrimaryId
-    );
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getInwardSaleSteelReport")
-    Map<String, Object> getInwardSaleSteelReport(@RequestBody(required = false) Map<String, Object> map,
-                                                 @RequestParam("startTime") String startTime,
-                                                 @RequestParam("endTime") String endTime,
-                                                 @RequestParam("carrierSsoId") String carrierSsoId,
-                                                 @RequestParam("receiveName") String receiveName,
-                                                 @RequestParam("materialName") String materialName,
-                                                 @RequestParam("specification") String specification,
-                                                 @RequestParam("remark") String remark,
-                                                 @RequestParam("capacityNo") String capacityNo,
-                                                 @RequestParam("carrierName") String carrierName,
-                                                 @RequestParam("consigneeName") String consigneeName,
-                                                 @RequestParam("saler") String saler);
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getInwardSaleSteelOrder")
-    Map<String, Object> getInwardSaleSteelOrder(@RequestBody(required = false) Map<String, Object> map,
-                                                 @RequestParam("startTime") String startTime,
-                                                 @RequestParam("endTime") String endTime,
-                                                 @RequestParam("remark") String remark,
-                                                 @RequestParam("capacityNo") String capacityNo,
-                                                 @RequestParam("consigneeName") String consigneeName
-                                                 );
-
-    @PostMapping("/api/v1/truckTms/tmstrucksmsrusults/sendMeaage")
-    Map<String, Object> sendMeaage(@RequestParam String mobile,
-                                   @RequestParam String content);
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getSteelReportDetailsBySmId")
-    Map<String, Object> getSteelReportDetailsBySmId(@RequestParam BigDecimal saleOrderMaterialId);
-
-
-    @PostMapping("api/v1/truckTms/tmstrucktotalresults/changeOrderLine")
-    Map<String, Object> changeOrderLine(@RequestBody(required=false) Map<String,Object> mapValue);
-
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleSteelReportForFinance")
-    Map<String, Object> getSaleSteelReportForFinance(BigDecimal saleOrderMaterialId);
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/steelTransportReport")
-    Map<String, Object> steelTransportReport(@RequestBody(required = false) Map<String, Object> map, @RequestParam String startTime,@RequestParam String endTime);
-
-    @PostMapping("/api/v1/truckTms/statisticalReport/yawnReport")
-    Map<String, Object> yawnReport(@RequestBody(required = false) Map<String, Object> map);
+    @PostMapping("api/v1/tms/omstransorders/closeTransOrderByPlan")
+    Map<String, Object> closeTransOrderByPlan(@RequestBody(required = false) Map<String, Object> map);
 }
 
 

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

@@ -35,6 +35,7 @@ public interface WMSFeign {
                                              @RequestParam("pageNum") Integer pageNum,
                                              @RequestParam("pageSize") Integer pageSize);
 
+
     @PostMapping(value = "api/v1/wms/wmsslmdlivdirs/udpateOrder")
     RESTfulResult udpateOrder(@RequestBody(required = false) HashMap<String, Object> params);
 
@@ -52,4 +53,21 @@ public interface WMSFeign {
 
     @PostMapping(value = "api/v1/wms/wmsslmdlivdirs/editButton")
     RESTfulResult editButton(@RequestBody(required = false) HashMap<String, Object> params);
+
+    //实时库存
+    @PostMapping("api/v1/wms/wmsgridmaterials/wmsgridmaterialsList")
+    Map<String, Object> list(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/wms/wmsgridmaterials/wmsgridmaterialsinsert")
+    Map<String, Object> insert(@RequestBody(required = false) Map<String, Object> map);
+
+    @PutMapping("api/v1/wms/wmsgridmaterials/wmsgridmaterialsDelete")
+    Map<String, Object> delete(@RequestBody(required = false) Map<String, Object> map);
+
+    @PutMapping("api/v1/wms/wmsgridmaterials/wmsgridmaterialsUpdate/{id}")
+    Map<String, Object> update(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+
+
 }

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

@@ -0,0 +1,12 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.SystemFile;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SystemFileMapper extends IBaseMapper<SystemFile, String> {
+
+    SystemFile insertAll(SystemFile systemFile);
+}

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

@@ -26,6 +26,12 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getPersonnelByLike(Map<String, Object> map);
 
+    List<Map<String, Object>> getCapacityByLike(Map<String, Object> map);
+
+    List<Map<String, Object>> getTransRangeByLike(Map<String, Object> map);
+
+    List<Map<String, Object>> getrmsrmsjobinfosBylike(Map<String, Object> map);
+
 
     List<String> getColumnNoRoutList(Map<String, Object> map);
 

src/main/java/com/steerinfo/dil/model/SystemFile.java

@@ -0,0 +1,57 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel(value="null")
+public class SystemFile implements IBasePO<String> {
+    @ApiModelProperty(value="",required=true)
+    private String id;
+
+    @ApiModelProperty(value="",required=false)
+    private String filename;
+
+    @ApiModelProperty(value="",required=false)
+    private String filepath;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getFilename() {
+        return filename;
+    }
+
+    public void setFilename(String filename) {
+        this.filename = filename == null ? null : filename.trim();
+    }
+
+    public String getFilepath() {
+        return filepath;
+    }
+
+    public void setFilepath(String filepath) {
+        this.filepath = filepath == null ? null : filepath.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", filename=").append(filename);
+        sb.append(", filepath=").append(filepath);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/dil/service/ISystemFileService.java

@@ -0,0 +1,27 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.dil.model.SystemFile;
+import io.swagger.models.auth.In;
+
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * SystemFile服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-10-30 09:19
+ * 类描述
+ * 修订历史：
+ * 日期：2023-10-30
+ * 作者：generator
+ * 参考：
+ * 描述：SystemFile服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface ISystemFileService extends IBaseService<SystemFile, String>{
+
+    SystemFile insertFile(SystemFile systemFile);
+
+}

src/main/java/com/steerinfo/dil/service/impl/SystemFileServiceImpl.java

@@ -0,0 +1,47 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.dil.model.SystemFile;
+import com.steerinfo.dil.mapper.SystemFileMapper;
+import com.steerinfo.dil.service.ISystemFileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * SystemFile服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-10-30 09:19
+ * 类描述
+ * 修订历史：
+ * 日期：2023-10-30
+ * 作者：generator
+ * 参考：
+ * 描述：SystemFile服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "systemFileService")
+public class SystemFileServiceImpl extends BaseServiceImpl<SystemFile, String> implements ISystemFileService {
+
+    @Autowired
+    private SystemFileMapper systemFileMapper;
+
+    @Override
+    protected IBaseMapper<SystemFile, String> getMapper() {
+        return systemFileMapper;
+    }
+
+    @Override
+    public SystemFile insertFile(SystemFile systemFile) {
+        SystemFile s = systemFileMapper.insertAll(systemFile);
+        if (s!=null){
+            return s;
+        }else {
+            return null;
+        }
+
+    }
+}

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

@@ -2,11 +2,11 @@ package com.steerinfo.dil.util;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 /**
  * @ author    :TXF
@@ -17,24 +17,55 @@ public class DataChange {
 
 
     /**
-     * 解析前端传来的日期字符串
+     * 时间转换类
+     * 处理了三种类型 yyyy-MM-dd HH:mm:ss  yyyy/MM/dd HH:mm:ss  时间戳类型（带毫秒数时间戳13位）
      * @param vueDate
      * @return
      */
     public static Date dataToDate(Object vueDate){
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        Date parseDate = null;
-        if (vueDate != null){
+        if(vueDate instanceof Date){
+            return (Date) vueDate;
+        } else if(vueDate instanceof Long){
+            return  new Date((Long)vueDate);
+        } else {
             try {
-                String date = (String) vueDate;
-                parseDate = sdf.parse(date);
-            } catch (ParseException e) {
-                e.printStackTrace();
+                String str = String.valueOf(vueDate);
+                if(judgeNumber(str) && str.length() == 13){
+                    return new Date(Long.parseLong(str));
+                }else if(str.contains("-")){
+                    if(str.length() == "yyyy-MM-dd".length()){
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                        return sdf.parse(str);
+                    }
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    return sdf.parse(str);
+                }else if(str.contains("/")){
+                    if(str.length() == "yyyy/MM/dd".length()){
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
+                        return sdf.parse(str);
+                    }
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+                    return sdf.parse(str);
+                }
+            }catch (Exception e){
+                System.out.println("时间解析错误！返回null");
+                return null;
             }
         }
-        return parseDate;
+        return null;
+    }
+
+    /**
+     * 判断是否纯数字（不带小数点）仅供上面方法使用
+     * @param str
+     * @return
+     */
+    public static boolean judgeNumber(String str){
+        Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
+        return pattern.matcher(str).matches();
     }
 
+
     /**
      * 数据转换成BigDecimal
      * @param data
@@ -46,19 +77,19 @@ public class DataChange {
                 return (BigDecimal) data;
             }else{
                 String str = String.valueOf(data);
-                BigDecimal decimal = null;
+                BigDecimal decimal = BigDecimal.ZERO;
                 if(!"".equals(str)){
                     try {
                         decimal = new BigDecimal(str);
                     } catch (Exception e) {
-                        e.printStackTrace();
-                        return new BigDecimal(0);
+                        System.out.println(data + "：数据解析失败！返回0");
+                        return BigDecimal.ZERO;
                     }
                 }
                 return decimal;
             }
         }
-        return new BigDecimal(0);
+        return BigDecimal.ZERO;
     }
 
     /**
@@ -66,49 +97,57 @@ public class DataChange {
      * @param date 传入时间
      * @return
      */
-    public static String dateToDayDate(Object date){
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        Date changeDate = null;
-        if(date == null)
-            return null;
+    public static Date dataToDayDate(Object date) {
         try{
-             changeDate = (Date) date;
+            Date origin = dataToDate(date);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            if(origin == null) {
+                return null;
+            }
+            return sdf.parse(sdf.format(origin));
         }catch (Exception e){
             e.printStackTrace();
+            return null;
         }
-        return sdf.format(changeDate);
     }
 
     /**
-     * 遍历从数据库中传进来的数据
-     * @param list 从数据库查询出来的list数据列表
-     * @param key map中多个需要转换的date参数
+     * 查询日期是否过期,过期则返回 true
+     * @param day 传入时间
+     * @return
      */
-    public static void changeDateToDayDate(List<Map<String, Object>> list, String ...key){
-        //遍历List
-        for (Map<String, Object> map : list) {
-            for (String s : key) {
-                //从map中取 date的值 并转换成字符串类型的日期
-                String stringDate = dateToDayDate(map.get(s));
-                map.put(s, stringDate);
+    public static boolean isExpireDay(Object day) {
+        try{
+            if(dataToDayDate(day).getTime() < dataToDayDate(new Date()).getTime()){
+                return true;
+            }else{
+                return false;
             }
+        }catch (Exception e){
+            e.printStackTrace();
+            return true;
         }
     }
 
+
     /**
      * 遍历列表使只显示两位小数
      * @param list
      * @param key
      */
     public static void dataTo2Number(List<Map<String, Object>> list, String ...key){
+        DecimalFormat df =  new DecimalFormat("0.00");
         //遍历List
         for (Map<String, Object> map : list) {
             for (String s : key) {
                 //修改数据为带两位小数
-                BigDecimal oldDate = (BigDecimal) map.get(s);
-                DecimalFormat df =  new DecimalFormat("0.00");
-                String resultDeduction = df.format(oldDate.doubleValue());
-                map.put(s, resultDeduction);
+                try {
+                    BigDecimal oldDate = dataToBigDecimal(map.get(s));
+                    String resultDeduction = df.format(oldDate.doubleValue());
+                    map.put(s, resultDeduction);
+                } catch (Exception e) {
+                    System.out.println("原料扣减量数据有误");
+                }
             }
         }
     }
@@ -141,6 +180,7 @@ public class DataChange {
      * @return
      */
     public static String generateEightDigitsNumber(String start, Integer id){
+        id = id % 10000000; //保证不超过
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
         StringBuilder sb = new StringBuilder(start + sdf.format(new Date()));
         sb.append(
@@ -156,4 +196,74 @@ public class DataChange {
         return sb.toString();
     }
 
+    /**
+     * 根据时间段查询数据 支持只选择单个时间
+     * @Author TXF
+     * @Date 2022/1/10 23:21
+     * @param startTime
+     * @param endTime
+     * @param map
+     * @param sdf
+     * @return
+     **/
+    public static void queryDataByDate(String startTime, String endTime, Map<String, Object> map, SimpleDateFormat sdf){
+        if (startTime != null && !"null".equals(startTime) && endTime != null && !"null".equals(endTime)) {
+            map.put("startDate", sdf.format(new Date(Long.parseLong(startTime))));
+            map.put("endDate", sdf.format(new Date(Long.parseLong(endTime) + 86400000)));
+        } else if (startTime != null && !"null".equals(startTime)) {
+            map.put("oneDate", sdf.format(new Date(Long.parseLong(startTime))));
+        } else if (endTime != null && !"null".equals(endTime)) {
+            map.put("oneDate", sdf.format(new Date(Long.parseLong(endTime))));
+        } else {
+            map.put("oneDate", sdf.format(new Date()));
+        }
+    }
+
+    /**
+     * 只支持两个时间查询
+     * @Author TXF
+     * @Date 2022/1/15 9:08
+     * @param startTime
+     * @param endTime
+     * @param sdf
+     * @return
+     **/
+    public static void queryDataByDateTime(String startTime, String endTime, Map<String, Object> map,SimpleDateFormat sdf){
+        SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd");
+        if (startTime != null && !"null".equals(startTime) && endTime != null && !"null".equals(endTime)) {
+            map.put("startDate", sdf.format(new Date(Long.parseLong(startTime))));
+            map.put("endDate", sdf.format(new Date(Long.parseLong(endTime))));
+        }
+        //如果开始时间和结束时间有且只有一个为空 则只查那天的数据
+        else if((startTime != null && !"null".equals(startTime)) || (endTime != null && !"null".equals(endTime))){
+            if(startTime != null && !"null".equals(startTime)){
+                queryDataByTwoDateSon(map, startTime, sdfDate);
+            }
+            if(endTime != null && !"null".equals(endTime)){
+                queryDataByTwoDateSon(map, endTime, sdfDate);
+            }
+        }else {
+            //如果两者时间都为空，则查询当天数据
+            String nowDate = sdfDate.format(new Date());
+            map.put("oneDate", nowDate + " 00:00:00");
+        }
+    }
+
+    /**
+     * 上面方法的儿子方法 如果只传入了一个时间 则查询那天的数据
+     * @Author TXF
+     * @Date 2022/1/17 16:17
+     * @param map
+     * @param time
+     * @param sdfDate
+     * @return
+     **/
+    private static void queryDataByTwoDateSon(Map<String, Object> map, String time, SimpleDateFormat sdfDate){
+        Date date1 = new Date(Long.parseLong(time));
+        Date date2 = new Date(Long.parseLong(time) + 86400000);
+        String dayStartTime = sdfDate.format(date1);
+        String dayEndTime = sdfDate.format(date2);
+        map.put("startDate", dayStartTime + " 00:00:00");
+        map.put("endDate", dayEndTime + " 00:00:00");
+    }
 }

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

@@ -0,0 +1,481 @@
+package com.steerinfo.dil.util;
+
+import com.steerinfo.framework.utils.io.IOUtils;
+import com.steerinfo.framework.utils.text.Charsets;
+import org.apache.commons.net.ftp.*;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.util.Base64;
+
+/**
+ * POIExcelToHtml 文件转换：
+ *
+ * @author generator
+ * @version 1.0-SNAPSHOT 2021-08-09 18:06
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-09
+ * 作者：shadow
+ * 参考：
+ * 描述：
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
+ */
+@Component
+public class FtpFileUtil {
+    /**
+     * ftp服务器ip地址
+     */
+
+    // String FTP_ADDRESS;
+    private String FTP_ADDRESS = "172.16.90.238";
+
+    /**
+     * 端口号
+     */
+
+    //Integer FTP_PORT;
+    private Integer FTP_PORT = 21;
+    /**
+     * 用户名
+     */
+
+    private String FTP_USERNAME = "ftptest";
+    /**
+     * 密码
+     */
+
+    private String FTP_PASSWORD = "at286315";
+
+    private FTPClient ftpClient = new FTPClient();
+    private static final String SPOT = ".";
+
+    /**
+     * 上传文件
+     *
+     * @param filePath    文件路径
+     * @param filename    文件名称
+     * @param basePath    上级目录
+     * @param inputStream 文件输入流
+     * @return 是否成功
+     */
+    public boolean uploadFile(String filePath, String filename, String basePath, InputStream inputStream) {
+        boolean result = false;
+        try {
+            // 连接FTP服务器
+            ftpClient.connect(FTP_ADDRESS, FTP_PORT);
+            ftpClient.login(FTP_USERNAME, FTP_PASSWORD);
+            int reply;
+            ftpClient.enterLocalPassiveMode();
+            reply = ftpClient.getReplyCode();
+            if (!FTPReply.isPositiveCompletion(reply)) {
+                ftpClient.disconnect();
+                return false;
+            }
+            //切换到上传目录
+            boolean changed = ftpClient.changeWorkingDirectory(filePath);
+            if (!changed) {
+                //如果目录不存在创建目录
+                String[] dirs = filePath.split("/");
+                String tempPath = basePath;
+                for (String dir : dirs) {
+                    if (null == dir || "".equals(dir)) {
+                        continue;
+                    }
+                    tempPath += "/" + dir;
+                    if (!ftpClient.makeDirectory(tempPath)) {
+                        return false;
+                    } else {
+                        ftpClient.changeWorkingDirectory(tempPath);
+                    }
+                }
+            }
+            System.out.println("当前目录" + ftpClient.printWorkingDirectory());
+            //设置为被动模式
+
+            //设置上传文件的类型为二进制类型
+            ftpClient.setFileType(FTP.BINARY_FILE_TYPE);
+            //上传文件
+            if (!ftpClient.storeFile(filename, inputStream)) {
+                System.out.println("上传文件失败");
+                return false;
+            }
+            ftpClient.logout();
+            result = true;
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (ftpClient.isConnected()) {
+                try {
+                    inputStream.close();
+                    ftpClient.disconnect();
+                } catch (IOException ioe) {
+                    ioe.printStackTrace();
+                }
+            }
+        }
+        return result;
+    }
+
+    /***
+     * 上传
+     * @param buffIn 文件流
+     * @param filePath 文件路径
+     * @param fileName 文件名称
+     * @param needDelete 是否删除
+     * @return 是否成功
+     * @throws FTPConnectionClosedException ftp错误
+     * @throws IOException io流错误
+     * @throws Exception 普通错误
+     */
+    public boolean uploadToFtp(InputStream buffIn, String filePath, String fileName, boolean needDelete)
+            throws FTPConnectionClosedException, IOException, Exception {
+        boolean result;
+        try {
+            //建立连接
+            this.connectToServer();
+            ftpClient.changeWorkingDirectory("/");
+            this.setFileType(FTP.BINARY_FILE_TYPE);
+            int reply = ftpClient.getReplyCode();
+            if (!FTPReply.isPositiveCompletion(reply)) {
+                ftpClient.disconnect();
+                throw new IOException("failed to connect to the FTP Server:" + FTP_ADDRESS);
+            }
+            //进入文件目录
+            boolean changeWork = ftpClient.changeWorkingDirectory(filePath);
+            if (!changeWork) {
+                if (!createDirectory(filePath)) {
+                    return false;
+                }
+            }
+            result = ftpClient.storeFile(fileName, buffIn);
+            if (needDelete) {
+                ftpClient.deleteFile(fileName);
+            }
+            // 输出操作结果信息
+            if (result) {
+                System.out.println("uploadToFtp INFO: upload file  to ftp : succeed!");
+            } else {
+                System.out.println("uploadToFtp INFO: upload file  to ftp : failed!");
+            }
+        } catch (FTPConnectionClosedException e) {
+            System.out.println("ftp连接被关闭！");
+            throw e;
+        } catch (Exception e) {
+            System.out.println("ERR : upload file  to ftp : failed! ");
+            throw e;
+        } finally {
+            try {
+                if (buffIn != null) {
+                    buffIn.close();
+                }
+            } catch (Exception e) {
+                System.out.println("ftp关闭输入流时失败！");
+            }
+            if (ftpClient.isConnected()) {
+                closeConnect();
+            }
+        }
+        return result;
+    }
+
+    /***
+     * 预览
+     * @param fileName 文件名
+     * @param filePath 文件路径
+     * @return 返回HTML
+     * @throws IOException io流错误
+     */
+    public String downloadFile(String fileName, String filePath) throws IOException {
+        InputStream inputStream;
+        String data = fileName + "预览失败";
+        String workhtml = null;
+        File temp = File.createTempFile("temp", ".temp");
+        try {
+            this.connectToServer();
+            // 设置传输二进制文件
+            this.setFileType(FTP.BINARY_FILE_TYPE);
+            ftpClient.enterLocalPassiveMode();
+            int reply = ftpClient.getReplyCode();
+            if (!FTPReply.isPositiveCompletion(reply)) {
+                ftpClient.disconnect();
+                throw new IOException("failed to connect to the FTP Server:" + FTP_ADDRESS);
+            }
+
+            String directory = filePath.substring(0, filePath.lastIndexOf("/") + 1);
+            // 进入文件所在目录，注意编码格式，以能够正确识别中文目录
+            boolean cdStatus = ftpClient.changeWorkingDirectory(directory);
+            if (!cdStatus) {
+                return data;
+            }
+            String file = filePath.substring(filePath.lastIndexOf("/") + 1);
+            // 检验文件是否存在
+            inputStream = ftpClient.retrieveFileStream(file);
+
+            String suffixName;
+            if (inputStream != null) {
+                if (fileName != null && fileName.contains(SPOT)) {
+                    POIWordToHtml poiWordToHtml = new POIWordToHtml();
+                    suffixName = fileName.substring(fileName.indexOf(".") + 1);
+                    switch (suffixName) {
+                        case "docx":
+                            data = poiWordToHtml.readWordImgToHtml(inputStream);
+                            break;
+                        case "doc":
+                            data = poiWordToHtml.docToHtml(inputStream);
+                            break;
+
+                        case "xlsx":
+                        case "xls":
+                            data = POIExcelToHtml.excelToHtml(inputStream);
+                            break;
+                        case "pptx":
+                        case "ppt":
+                            data = POIPptToHtml.pptToHtml(inputStream, suffixName);
+                            break;
+                        case "jpg":
+                        case "gif":
+                        case "png":
+                        case "jpeg":
+                        case "jpe":
+                            ByteArrayOutputStream stream = new ByteArrayOutputStream();
+                            IOUtils.copy(inputStream, stream);
+                            String imgStr = Base64.getEncoder().encodeToString(stream.toByteArray());
+                            data = "<img style='width:100%' src=" + "\"data:image/" + suffixName + ";base64," + imgStr + "\"" + "/>";
+                            stream.close();
+                            break;
+                        case "txt":
+                            ByteArrayOutputStream txtStream = new ByteArrayOutputStream();
+                            IOUtils.copy(inputStream, txtStream);
+                            data = txtStream.toString();
+                            break;
+                        default:
+                            data = fileName + "文件暂时不支持预览。";
+                            break;
+                    }
+                }
+                inputStream.close();
+                ftpClient.completePendingCommand();
+            }
+        } catch (FTPConnectionClosedException e) {
+            System.out.println("ftp连接被关闭！");
+            throw e;
+        } catch (Exception e) {
+            System.out.println("ERR : upload file " + fileName + " from ftp : failed!" + e.getMessage());
+        } finally {
+            if (ftpClient.isConnected()) {
+                closeConnect();
+            }
+        }
+        return data;
+    }
+
+    /**
+     * 下载
+     *
+     * @param response 响应头
+     * @param fileName 文件名
+     * @param filePath 文件路径
+     * @return 返回下载是否成功
+     */
+    public boolean download(HttpServletResponse response, String fileName, String filePath) {
+        boolean flag = false;
+        try {
+            this.connectToServer();
+            // 设置传输二进制文件
+            this.setFileType(FTP.BINARY_FILE_TYPE);
+            this.ftpClient.enterLocalPassiveMode();
+            int reply = ftpClient.getReplyCode();
+            if (!FTPReply.isPositiveCompletion(reply)) {
+                ftpClient.disconnect();
+                throw new IOException("failed to connect to the FTP Server:" + FTP_ADDRESS);
+            }
+            String transferName = new String(fileName.getBytes(Charsets.UTF_8), Charsets.ISO_8859_1);
+            String directory = filePath.substring(0, filePath.lastIndexOf("/") + 1);
+            String file = filePath.substring(filePath.lastIndexOf("/") + 1);
+            // 进入文件所在目录，注意编码格式，以能够正确识别中文目录
+            ftpClient.changeWorkingDirectory(directory);
+            response.setCharacterEncoding("UTF-8");
+            response.setContentType("multipart/form-data;charset=UTF-8");
+            response.setHeader("Content-Disposition", "attachment; filename=\"" + transferName + "\"");
+            FTPFile[] fs = ftpClient.listFiles();
+            for (FTPFile ff : fs) {
+                if (ff.getName().equals(file)) {
+                    OutputStream os = response.getOutputStream();
+                    flag = ftpClient.retrieveFile(ff.getName(), os);
+                    os.flush();
+                    os.close();
+                    break;
+                }
+            }
+            closeConnect();
+
+        } catch (FTPConnectionClosedException ignored) {
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return flag;
+    }
+
+    /**
+     * 下载返回流
+     *
+     * @param fileName 文件名称
+     * @param filePath 文件路径
+     * @return 返回是否成功
+     */
+    public ByteArrayOutputStream download(String fileName, String filePath) {
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        try {
+            this.connectToServer();
+            // 设置传输二进制文件
+            this.setFileType(FTP.BINARY_FILE_TYPE);
+            ftpClient.enterLocalPassiveMode();
+            int reply = ftpClient.getReplyCode();
+            if (!FTPReply.isPositiveCompletion(reply)) {
+                ftpClient.disconnect();
+                throw new IOException("failed to connect to the FTP Server:" + FTP_ADDRESS);
+            }
+            String directory = filePath.substring(0, filePath.lastIndexOf("/") + 1);
+            String file = filePath.substring(filePath.lastIndexOf("/") + 1);
+            // 进入文件所在目录，注意编码格式，以能够正确识别中文目录
+            ftpClient.changeWorkingDirectory(directory);
+            FTPFile[] fs = ftpClient.listFiles();
+            for (FTPFile ff : fs) {
+                if (ff.getName().equals(file)) {
+                    os.close();
+                    break;
+                }
+            }
+            closeConnect();
+        } catch (FTPConnectionClosedException ignored) {
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return os;
+    }
+
+    public boolean deleteFile(String filePath) throws Exception {
+        boolean result;
+        try {
+            //建立连接
+            this.connectToServer();
+            ftpClient.changeWorkingDirectory("/");
+            this.setFileType(FTP.BINARY_FILE_TYPE);
+            int reply = ftpClient.getReplyCode();
+            if (!FTPReply.isPositiveCompletion(reply)) {
+                ftpClient.disconnect();
+                throw new IOException("failed to connect to the FTP Server:" + FTP_ADDRESS);
+            }
+            String directory = filePath.substring(0, filePath.lastIndexOf("/") + 1);
+            String fileName = filePath.substring(filePath.lastIndexOf("/") + 1);
+            //进入文件目录
+            boolean changeWork = ftpClient.changeWorkingDirectory(directory);
+            if (!changeWork) {
+                return false;
+            }
+            result = ftpClient.deleteFile(fileName);
+        } catch (FTPConnectionClosedException e) {
+            System.out.println("ftp连接被关闭！");
+            throw e;
+        } catch (Exception e) {
+            System.out.println("ERR : delete file  to ftp : failed! ");
+            throw e;
+        } finally {
+            if (ftpClient.isConnected()) {
+                closeConnect();
+            }
+        }
+        return result;
+    }
+
+    /***
+     * 建立连接
+     * @throws FTPConnectionClosedException ftp错误
+     * @throws Exception 普通错误
+     */
+    private void connectToServer() throws FTPConnectionClosedException, Exception {
+        if (!ftpClient.isConnected()) {
+            int reply;
+            try {
+                //建立连接
+                ftpClient = new FTPClient();
+                //ftpClient.setControlEncoding("GBK");//windows default服务器gbk
+                ftpClient.setControlEncoding("UTF-8");//linux default UTF-8
+                ftpClient.connect(FTP_ADDRESS, FTP_PORT);
+                ftpClient.login(FTP_USERNAME, FTP_PASSWORD);
+                ftpClient.enterLocalPassiveMode();
+                reply = ftpClient.getReplyCode();
+                if (!FTPReply.isPositiveCompletion(reply)) {
+                    ftpClient.disconnect();
+                    System.out.println("connectToServer FTP server refused connection.");
+                }
+            } catch (FTPConnectionClosedException ex) {
+                System.out.println("没有连接数！there are too many connected users,please try later");
+                throw ex;
+            } catch (Exception e) {
+                System.out.println("登录ftp服务器失败");
+                throw e;
+            }
+        }
+    }
+
+    /**
+     * 设置传输文件类型
+     *
+     * @param fileType 文件类型
+     */
+    private void setFileType(int fileType) {
+        try {
+            ftpClient.setFileType(fileType);
+        } catch (Exception e) {
+            System.out.println("ftp设置传输文件的类型时失败！");
+
+        }
+    }
+
+    /**
+     * 关闭连接
+     */
+    public void closeConnect() {
+        try {
+            if (ftpClient != null) {
+                ftpClient.logout();
+                ftpClient.disconnect();
+            }
+        } catch (Exception e) {
+            System.out.println("ftp连接关闭失败！");
+        }
+    }
+
+    /**
+     * 创建文件夹
+     */
+    public boolean createDirectory(String directory) {
+        try {
+            ftpClient.changeWorkingDirectory("/");
+            String[] dirs = directory.split("/");
+            String tempPath = "";
+            for (String dir : dirs) {
+                if (null == dir || "".equals(dir)) {
+                    continue;
+                }
+                tempPath += "/" + dir;
+                if (!ftpClient.makeDirectory(tempPath)) {
+                    if (!ftpClient.changeWorkingDirectory(tempPath)) {
+                        return false;
+                    }
+                } else {
+                    ftpClient.changeWorkingDirectory(tempPath);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,18 @@
+package com.steerinfo.dil.util;
+
+import java.util.Random;
+
+public class IDutils {
+    public static String getImageName() {
+        //取当前时间的长整形值包含毫秒
+        long millis = System.currentTimeMillis();
+        //long millis = System.nanoTime();
+        //加上三位随机数
+        Random random = new Random();
+        int end3 = random.nextInt(999);
+        //如果不足三位前面补0
+        String str = millis + String.format("%03d", end3);
+
+        return str;
+    }
+}

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

@@ -0,0 +1,424 @@
+package com.steerinfo.dil.util;
+
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.hssf.util.HSSFColor;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+import org.apache.poi.xssf.usermodel.XSSFColor;
+import org.apache.poi.xssf.usermodel.XSSFFont;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * POIExcelToHtml 文件转换：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-09 18:06
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-09
+ * 作者：shadow
+ * 参考：
+ * 描述：Execl转HTML
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public class POIExcelToHtml {
+
+	public static String excelToHtml(InputStream is) {
+
+		String htmlExcel = "预览文件失败";
+		try {
+			Workbook wb = WorkbookFactory.create(is);
+			if (wb instanceof XSSFWorkbook) {
+				XSSFWorkbook xWb = (XSSFWorkbook) wb;
+				htmlExcel = POIExcelToHtml.getExcelInfo(xWb);
+			} else if (wb instanceof HSSFWorkbook) {
+				HSSFWorkbook hWb = (HSSFWorkbook) wb;
+				htmlExcel = POIExcelToHtml.getExcelInfo(hWb);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			try {
+				is.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		return htmlExcel;
+	}
+
+	private static String getExcelInfo(Workbook wb) {
+		StringBuffer sb = new StringBuffer();
+		int sheetCounts = wb.getNumberOfSheets();
+		// sb.append("<!DOCTYPE html> <html> <head> <meta charset='utf-8'
+		// /><title>HTML实例</title></head> ");
+
+		for (int i = 0; i < sheetCounts; i++) {
+			Sheet sheet = wb.getSheetAt(i);// 获取第一个Sheet的内容
+			int lastRowNum = sheet.getLastRowNum();
+			Map<String, String> map[] = getRowSpanColSpanMap(sheet);
+			// sb.append("<br><br>");
+			sb.append(sheet.getSheetName());
+			sb.append("<table style='border-collapse:collapse;' width='100%'>");
+			Row row = null; // 兼容
+			Cell cell = null; // 兼容
+			for (int rowNum = sheet.getFirstRowNum(); rowNum <= lastRowNum; rowNum++) {
+				row = sheet.getRow(rowNum);
+				if (row == null) {
+					sb.append("<tr><td > &nbsp;</td></tr>");
+					continue;
+				}
+				sb.append("<tr>");
+				int lastColNum = row.getLastCellNum();
+				for (int colNum = 0; colNum < lastColNum; colNum++) {
+					cell = row.getCell(colNum);
+					if (cell == null) { // 特殊情况 空白的单元格会返回null
+						sb.append("<td>&nbsp;</td>");
+						continue;
+					}
+
+					String stringValue = getCellValue(cell);//````````````
+					if (map[0].containsKey(rowNum + "," + colNum)) {
+						String pointString = map[0].get(rowNum + "," + colNum);
+						map[0].remove(rowNum + "," + colNum);
+						int bottomeRow = Integer.valueOf(pointString.split(",")[0]);
+						int bottomeCol = Integer.valueOf(pointString.split(",")[1]);
+						int rowSpan = bottomeRow - rowNum + 1;
+						int colSpan = bottomeCol - colNum + 1;
+						sb.append("<td rowspan= '" + rowSpan + "' colspan= '" + colSpan + "' ");
+					} else if (map[1].containsKey(rowNum + "," + colNum)) {
+						map[1].remove(rowNum + "," + colNum);
+						continue;
+					} else {
+						sb.append("<td ");
+					}
+
+					dealExcelStyle(wb, sheet, cell, sb);// 处理单元格样式
+					sb.append(">");
+					if (stringValue == null || "".equals(stringValue.trim())) {
+						sb.append(" &nbsp; ");
+					} else {
+						// 将ascii码为160的空格转换为html下的空格（&nbsp;）
+						sb.append(stringValue.replace(String.valueOf((char) 160), "&nbsp;"));
+					}
+					sb.append("</td>");
+				}
+				sb.append("</tr>");
+			}
+			sb.append("</table>");
+		}
+
+		// sb.append("</body></html> ");
+		return sb.toString();
+	}
+
+	private static Map<String, String>[] getRowSpanColSpanMap(Sheet sheet) {
+		Map<String, String> map0 = new HashMap<String, String>();
+		Map<String, String> map1 = new HashMap<String, String>();
+		int mergedNum = sheet.getNumMergedRegions();
+		CellRangeAddress range = null;
+		for (int i = 0; i < mergedNum; i++) {
+			range = sheet.getMergedRegion(i);
+			int topRow = range.getFirstRow();
+			int topCol = range.getFirstColumn();
+			int bottomRow = range.getLastRow();
+			int bottomCol = range.getLastColumn();
+			map0.put(topRow + "," + topCol, bottomRow + "," + bottomCol);
+			// System.out.println(topRow + "," + topCol + "," + bottomRow + ","
+			// + bottomCol);
+			int tempRow = topRow;
+			while (tempRow <= bottomRow) {
+				int tempCol = topCol;
+				while (tempCol <= bottomCol) {
+					map1.put(tempRow + "," + tempCol, "");
+					tempCol++;
+				}
+				tempRow++;
+			}
+			map1.remove(topRow + "," + topCol);
+		}
+		Map[] map = { map0, map1 };
+		return map;
+	}
+
+	/**
+	 * 200 * 获取表格单元格Cell内容 201 * @param cell 202 * @return 203
+	 */
+	private static String getCellValue(Cell cell) {
+		String result = new String();
+		switch (cell.getCellType()) {
+			case Cell.CELL_TYPE_NUMERIC:// 数字类型
+				if (HSSFDateUtil.isCellDateFormatted(cell)) {// 处理日期格式、时间格式
+					SimpleDateFormat sdf = null;
+					if (cell.getCellStyle().getDataFormat() == HSSFDataFormat.getBuiltinFormat("hh:mm")) {
+						sdf = new SimpleDateFormat("HH:mm");
+					} else if (cell.getCellStyle().getDataFormat() == HSSFDataFormat
+							.getBuiltinFormat("yyyy-MM-dd HH:mm:ss")) {// 日期
+						sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+					} else {
+						sdf = new SimpleDateFormat("yyyy-MM-dd");
+					}
+					Date date = cell.getDateCellValue();
+					result = sdf.format(date);
+				} else if (cell.getCellStyle().getDataFormat() == 58) {
+					// 处理自定义日期格式：m月d日(通过判断单元格的格式id解决，id的值是58)
+					SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+					double value = cell.getNumericCellValue();
+					Date date = DateUtil.getJavaDate(value);
+					result = sdf.format(date);
+				} else {
+					double value = cell.getNumericCellValue();
+					CellStyle style = cell.getCellStyle();
+					DecimalFormat format = new DecimalFormat();
+					String temp = style.getDataFormatString();
+					// 单元格设置成常规
+					if (temp.equals("General")) {
+						format.applyPattern("#");
+					}
+					result = format.format(value);
+				}
+				break;
+			case Cell.CELL_TYPE_STRING:// String类型
+				result = cell.getRichStringCellValue().toString();
+				break;
+			case Cell.CELL_TYPE_BLANK:
+				result = "";
+				break;
+			default:
+				result = "";
+				break;
+		}
+		return result;
+	}
+
+	/**
+	 * 251 * 处理表格样式 252 * @param wb 253 * @param sheet 254 * @param cell 255
+	 * * @param sb 256
+	 */
+	private static void dealExcelStyle(Workbook wb, Sheet sheet, Cell cell, StringBuffer sb) {
+
+		CellStyle cellStyle = cell.getCellStyle();
+		if (cellStyle != null) {
+			//short alignment = cellStyle.getAlignment();旧写法获取枚举数字；新写法获取枚举
+
+			sb.append("align='" + convertAlignToHtml(cellStyle.getAlignmentEnum()) + "' ");// 单元格内容的水平对齐方式
+			//short verticalAlignment = cellStyle.getVerticalAlignment();
+			//short verticalAlignment = cellStyle.getVerticalAlignmentEnum().getCode();
+			sb.append("valign='" + convertVerticalAlignToHtml(cellStyle.getVerticalAlignmentEnum()) + "' ");// 单元格中内容的垂直排列方式
+
+			if (wb instanceof XSSFWorkbook) {
+				XSSFFont xf = ((XSSFCellStyle) cellStyle).getFont();
+				Boolean boldWeight = xf.getBold();
+				//short boldWeight = xf.getBoldweight();
+				String fontfamily = xf.getFontName();
+				int underline = xf.getUnderline();
+				boolean Italic = xf.getItalic();
+
+				sb.append("style='");
+				if (underline >= 1) {
+					sb.append("text-decoration:underline;"); // 字体型号
+				}
+				if (Italic) {
+					sb.append("font-style: italic;"); // 字体型号
+				}
+				sb.append("font-family:" + fontfamily + ";"); // 字体型号
+				sb.append("font-weight:" + (boldWeight ? "bold" : "100") + ";"); // 字体加粗
+				sb.append("font-size: " + xf.getFontHeight() / 2 + "%;"); // 字体大小
+				int columnWidth = sheet.getColumnWidth(cell.getColumnIndex());
+				sb.append("width:" + columnWidth + "px;");
+
+				XSSFColor xc = xf.getXSSFColor();
+				if (xc != null && !"".equals(xc)) {
+					sb.append("color:#" + xc.getARGBHex().substring(2) + ";"); // 字体颜色
+				}
+
+				XSSFColor bgColor = (XSSFColor) cellStyle.getFillForegroundColorColor();
+				if (bgColor != null && !"".equals(bgColor)) {
+					sb.append("background-color:#" + bgColor.getARGBHex().substring(2) + ";"); // 背景颜色
+				}
+				sb.append(getBorderStyle(0, cellStyle.getBorderTop(),
+						((XSSFCellStyle) cellStyle).getTopBorderXSSFColor()));
+				sb.append(getBorderStyle(1, cellStyle.getBorderRight(),
+						((XSSFCellStyle) cellStyle).getRightBorderXSSFColor()));
+				sb.append(getBorderStyle(2, cellStyle.getBorderBottom(),
+						((XSSFCellStyle) cellStyle).getBottomBorderXSSFColor()));
+				sb.append(getBorderStyle(3, cellStyle.getBorderLeft(),
+						((XSSFCellStyle) cellStyle).getLeftBorderXSSFColor()));
+
+			} else if (wb instanceof HSSFWorkbook) {
+
+				HSSFFont hf = ((HSSFCellStyle) cellStyle).getFont(wb);
+				short fontColor = hf.getColor();
+				Boolean boldWeight = hf.getBold();
+				//short boldWeight = hf.getBoldweight();
+				String fontfamily = hf.getFontName();
+				int underline = hf.getUnderline();
+				boolean Italic = hf.getItalic();
+
+				sb.append("style='");
+				if (underline >= 1) {
+					// 字体型号
+					sb.append("text-decoration:underline;");
+				}
+				if (Italic) {
+					// 字体型号
+					sb.append("font-style: italic;");
+				}
+				// 类HSSFPalette用于求的颜色的国际标准形式
+				HSSFPalette palette = ((HSSFWorkbook) wb).getCustomPalette();
+				HSSFColor hc = palette.getColor(fontColor);
+				// 字体加粗
+				sb.append("font-weight:" + (boldWeight ? "bold" : "100") + ";");
+				// 字体型号
+				sb.append("font-family:" + fontfamily + ";");
+				// 字体大小
+				sb.append("font-size: " + hf.getFontHeight() / 2 + "%;");
+				String fontColorStr = convertToStardColor(hc);
+				// 字体颜色
+				if (fontColorStr != null && !"".equals(fontColorStr.trim())) {
+					sb.append("color:" + fontColorStr + ";");
+				}
+				int columnWidth = sheet.getColumnWidth(cell.getColumnIndex());
+				sb.append("width:" + columnWidth + "px;");
+				short bgColor = cellStyle.getFillForegroundColor();
+				//short bgColor = cellStyle.getFillBackgroundColor();
+				hc = palette.getColor(bgColor);
+				String bgColorStr = convertToStardColor(hc);
+				if (bgColorStr != null && !"".equals(bgColorStr.trim())) {
+					// 背景颜色
+					sb.append("background-color:" + bgColorStr + ";");
+				}
+				/**
+				 * 旧版本 cellStyle.getBorderTop()
+				 * 新版本 cellStyle.getBorderTopEnum()
+				 */
+				sb.append(getBorderStyle(palette, 0, cellStyle.getBorderTop(), cellStyle.getTopBorderColor()));
+				sb.append(getBorderStyle(palette, 1, cellStyle.getBorderRight(), cellStyle.getRightBorderColor()));
+				sb.append(getBorderStyle(palette, 3, cellStyle.getBorderLeft(), cellStyle.getLeftBorderColor()));
+				sb.append(getBorderStyle(palette, 2, cellStyle.getBorderBottom(), cellStyle.getBottomBorderColor()));
+			}
+
+			sb.append("' ");
+		}
+	}
+
+	/**
+	 * 330 * 单元格内容的水平对齐方式 331 * @param alignment 332 * @return 333
+	 * @param alignment
+	 */
+	private static String convertAlignToHtml( HorizontalAlignment alignment) {
+
+		String align = "left";
+		/**
+		 * CellStyle.ALIGN_CENTER:旧写法
+		 * HorizontalAlignment.LEFT:新写法
+		 */
+		switch (alignment) {
+			case LEFT:
+				align = "left";
+				break;
+			case CENTER:
+				align = "center";
+				break;
+			case RIGHT:
+				align = "right";
+				break;
+			default:
+				break;
+		}
+		return align;
+	}
+
+	/**
+	 * 354 * 单元格中内容的垂直排列方式 355 * @param verticalAlignment 356 * @return 357
+	 * @param verticalAlignment
+	 */
+	private static String convertVerticalAlignToHtml(VerticalAlignment verticalAlignment) {
+
+		/**
+		 * 旧写法CellStyle.VERTICAL_BOTTOM:
+		 * 新写法VerticalAlignment.BOTTOM:
+		 */
+		String valign = "middle";
+		switch (verticalAlignment) {
+			case BOTTOM:
+				valign = "bottom";
+				break;
+			case CENTER:
+				valign = "center";
+				break;
+			case TOP:
+				valign = "top";
+				break;
+			default:
+				break;
+		}
+		return valign;
+	}
+
+	private static String convertToStardColor(HSSFColor hc) {
+
+		/**
+		 * 颜色定义变化
+		 * 旧版本 : HSSFColor.BLACK.index
+		 * 新版本 : IndexedColors.BLACK.index
+		 */
+		StringBuffer sb = new StringBuffer("");
+		if (hc != null) {
+			if (IndexedColors.AUTOMATIC.index == hc.getIndex()) {
+				return null;
+			}
+			sb.append("#");
+			for (int i = 0; i < hc.getTriplet().length; i++) {
+				sb.append(fillWithZero(Integer.toHexString(hc.getTriplet()[i])));
+			}
+		}
+
+		return sb.toString();
+	}
+
+	private static String fillWithZero(String str) {
+		if (str != null && str.length() < 2) {
+			return "0" + str;
+		}
+		return str;
+	}
+
+	static String[] bordesr = { "border-top:", "border-right:", "border-bottom:", "border-left:" };
+	static String[] borderStyles = { "solid ", "solid ", "solid ", "solid ", "solid ", "solid ", "solid ", "solid ",
+			"solid ", "solid", "solid", "solid", "solid", "solid" };
+
+	private static String getBorderStyle(HSSFPalette palette, int b, short s, short t) {
+		if (s == 0) {
+			return bordesr[b] + borderStyles[s] + "#d0d7e5 1px;";
+		}
+		String borderColorStr = convertToStardColor(palette.getColor(t));
+		borderColorStr = borderColorStr == null || borderColorStr.length() < 1 ? "#000000" : borderColorStr;
+		return bordesr[b] + borderStyles[s] + borderColorStr + " 1px;";
+
+	}
+
+	private static String getBorderStyle(int b, short s, XSSFColor xc) {
+		if (s == 0) {
+			return bordesr[b] + borderStyles[s] + "#d0d7e5 1px;";
+		}
+		if (xc != null && !"".equals(xc)) {
+			// t.getARGBHex();
+			String borderColorStr = xc.getARGBHex();
+			borderColorStr = borderColorStr == null || borderColorStr.length() < 1 ? "#000000"
+					: borderColorStr.substring(2);
+			return bordesr[b] + borderStyles[s] + borderColorStr + " 1px;";
+		}
+		return "";
+	}
+
+}

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

@@ -0,0 +1,155 @@
+package com.steerinfo.dil.util;
+
+import org.apache.poi.hslf.usermodel.*;
+import org.apache.poi.xslf.usermodel.*;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Base64;
+
+/**
+ *
+ * @author ruand http://blog.csdn.net/emoven/article/details/52683215
+ */
+public class POIPptToHtml {
+
+	private final static String PPT = "ppt";
+	private final static String PPTX = "pptx";
+
+	public static String pptToHtml(InputStream is, String type) {
+		String htmlStr = "预览失败";
+		try {
+				if (PPT.equals(type)) {
+					 htmlStr = toImage2003(is);
+				} else if (PPTX.equals(type)) {
+					 htmlStr = toImage2007(is);
+				} else {
+					htmlStr = "the file is not a ppt";
+				}
+
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		return htmlStr;
+	}
+
+	public static String toImage2007(InputStream is) throws Exception {
+		String htmlStr = "预览失败";
+		XMLSlideShow ppt = new XMLSlideShow(is);
+		is.close();
+		Dimension pgsize = ppt.getPageSize();
+		System.out.println(pgsize.width + "--" + pgsize.height);
+
+		StringBuffer sb = new StringBuffer();
+		for (int i = 0; i < ppt.getSlides().size(); i++) {
+			try {
+				// 防止中文乱码
+				for (XSLFShape shape : ppt.getSlides().get(i).getShapes()) {
+					if (shape instanceof XSLFTextShape) {
+						XSLFTextShape tsh = (XSLFTextShape) shape;
+						for (XSLFTextParagraph p : tsh) {
+							for (XSLFTextRun r : p) {
+								r.setFontFamily("宋体");
+							}
+						}
+					}
+				}
+				BufferedImage img = new BufferedImage(pgsize.width, pgsize.height, BufferedImage.TYPE_INT_RGB);
+				Graphics2D graphics = img.createGraphics();
+				// clear the drawing area
+				graphics.setPaint(Color.white);
+				graphics.fill(new Rectangle2D.Float(0, 0, pgsize.width, pgsize.height));
+				// render
+				ppt.getSlides().get(i).draw(graphics);
+				ByteArrayOutputStream stream = new ByteArrayOutputStream();
+				ImageIO.write(img, "png", stream);
+				String imgStr = Base64.getEncoder().encodeToString(stream.toByteArray());
+				// save the output
+				sb.append("<br>");
+				sb.append("<img src=" + "\"data:image/png;base64," + imgStr + "\"" + "/>");
+				stream.close();
+			} catch (Exception e) {
+				System.out.println("第" + i + "张ppt转换出错");
+			}
+		}
+		System.out.println("success");
+		htmlStr = sb.toString();
+
+		return htmlStr;
+	}
+
+	public static String toImage2003(InputStream is) {
+		String htmlStr = "预览失败";
+		try {
+			HSLFSlideShow ppt = new HSLFSlideShow(is);
+			Dimension pgsize = ppt.getPageSize();
+			StringBuffer sb = new StringBuffer();
+			for (int i = 0; i < ppt.getSlides().size(); i++) {
+				// 防止中文乱码
+				for (HSLFShape shape : ppt.getSlides().get(i).getShapes()) {
+					if (shape instanceof HSLFTextShape) {
+						HSLFTextShape tsh = (HSLFTextShape) shape;
+						for (HSLFTextParagraph p : tsh) {
+							for (HSLFTextRun r : p) {
+								r.setFontFamily("宋体");
+							}
+						}
+					}
+				}
+				BufferedImage img = new BufferedImage(pgsize.width, pgsize.height, BufferedImage.TYPE_INT_RGB);
+				Graphics2D graphics = img.createGraphics();
+				// clear the drawing area
+				graphics.setPaint(Color.white);
+				graphics.fill(new Rectangle2D.Float(0, 0, pgsize.width, pgsize.height));
+				// render
+				ppt.getSlides().get(i).draw(graphics);
+				ByteArrayOutputStream stream = new ByteArrayOutputStream();
+				//String imageDir = targetDir + "/" + pptFileName + "/";
+				//FileUtils.createDir(imageDir);// create image dir
+				//String imagePath = imageDir + pptFileName + "-" + (i + 1) + ".png";
+				ImageIO.write(img, "png", stream);
+				String imgStr = Base64.getEncoder().encodeToString(stream.toByteArray());
+				sb.append("<br>");
+				sb.append("<img src=" + "\"data:image/png;base64," + imgStr + "\"" + "/>");
+				stream.close();
+
+			}
+			System.out.println("success");
+			htmlStr = sb.toString();
+		} catch (Exception e) {
+
+		}
+		return htmlStr;
+	}
+
+	/***
+	 * 功能 :调整图片大小
+	 *
+	 * @param srcImgPath
+	 *            原图片路径
+	 * @param distImgPath
+	 *            转换大小后图片路径
+	 * @param width
+	 *            转换后图片宽度
+	 * @param height
+	 *            转换后图片高度
+	 */
+	public static void resizeImage(String srcImgPath, String distImgPath, int width, int height) throws IOException {
+
+		File srcFile = new File(srcImgPath);
+		Image srcImg = ImageIO.read(srcFile);
+		BufferedImage buffImg = null;
+		buffImg = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+		buffImg.getGraphics().drawImage(srcImg.getScaledInstance(width, height, Image.SCALE_SMOOTH), 0, 0, null);
+
+		ImageIO.write(buffImg, "JPEG", new File(distImgPath));
+
+	}
+}

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

@@ -0,0 +1,320 @@
+package com.steerinfo.dil.util;
+
+import fr.opensagres.poi.xwpf.converter.xhtml.Base64EmbedImgManager;
+import fr.opensagres.poi.xwpf.converter.xhtml.XHTMLConverter;
+import fr.opensagres.poi.xwpf.converter.xhtml.XHTMLOptions;
+import org.apache.poi.hwpf.HWPFDocumentCore;
+import org.apache.poi.hwpf.converter.WordToHtmlConverter;
+import org.apache.poi.hwpf.converter.WordToHtmlUtils;
+import org.apache.poi.hwpf.usermodel.Picture;
+import org.apache.poi.xwpf.usermodel.*;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTDecimalNumber;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.*;
+import java.math.BigInteger;
+import java.util.Base64;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * POIExcelToHtml 文件转换：
+ *
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-09 18:06
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-09
+ * 作者：shadow
+ * 参考：https://blog.csdn.net/u013585096/article/details/85104888
+ * 描述：Execl转HTML
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
+ */
+public class POIWordToHtml {
+    private static final String ENCODING = "GB2312";// UTF-8
+
+
+    public String docToHtml(InputStream input) throws Exception {
+        String htmlData = "预览失败";
+        try {
+        HWPFDocumentCore wordDocument = WordToHtmlUtils.loadDoc(input);
+        WordToHtmlConverter wordToHtmlConverter = new ImageConverter(
+                DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument()
+        );
+        //wordToHtmlConverter.setPicturesManager(new PicturesManager() {
+        //    @Override
+        //    public String savePicture(byte[] content,
+        //                              PictureType pictureType, String suggestedName,
+        //                              float widthInches, float heightInches) {
+        //            //给生成的页面写图片的路径
+        //            return "word/media/" + suggestedName;
+        //    }
+        //});
+        wordToHtmlConverter.processDocument(wordDocument);
+        Document htmlDocument = wordToHtmlConverter.getDocument();
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        DOMSource domSource = new DOMSource(htmlDocument);
+        StreamResult streamResult = new StreamResult(outStream);
+        TransformerFactory tf = TransformerFactory.newInstance();
+        Transformer serializer = tf.newTransformer();
+        serializer.setOutputProperty(OutputKeys.ENCODING, "utf-8");
+        serializer.setOutputProperty(OutputKeys.INDENT, "yes");
+        serializer.setOutputProperty(OutputKeys.METHOD, "html");
+        serializer.transform(domSource, streamResult);
+        htmlData =  outStream.toString();
+        outStream.close();
+        } catch (Exception e){
+            e.printStackTrace();
+        }
+        return htmlData;
+    }
+
+    public String docxToHtml(InputStream inputStream) throws IOException {
+        String htmlData = "预览失败";
+        try{
+        XWPFDocument docxDocument = new XWPFDocument(inputStream);
+        XHTMLOptions options = XHTMLOptions.create().indent(4);
+            //获取文档中的图片
+        //List<XWPFPictureData> allPictures = docxDocument.getAllPictures();
+        //for (XWPFPictureData xwpfPictureData : allPictures) {
+        //    String name = xwpfPictureData.getFileName();
+        //    byte[] data = xwpfPictureData.getData();
+        //    InputStream input = new ByteArrayInputStream(data);
+        //    TODO 图片处理
+        //
+        //}
+        //final String imageUrl = "";
+        //不把图片生成出来
+        options.setExtractor(null);
+        options.setIgnoreStylesIfUnused(false);
+        options.setFragment(true);
+        //options.URIResolver(new IURIResolver() {
+        //    @Override
+        //    public String resolve(String uri) {
+        //        return imageUrl + uri;
+        //    }
+        //});
+        // 图片转base64 新版本支持
+        options.setImageManager(new Base64EmbedImgManager());
+         //转换htm1
+        ByteArrayOutputStream htmlStream = new ByteArrayOutputStream();
+        XHTMLConverter.getInstance().convert(docxDocument, htmlStream, options);
+        htmlData = htmlStream.toString();
+        htmlStream.close();
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+        return htmlData;
+    }
+
+
+    /**
+     * 图片处理
+     *
+     *
+     */
+    public class ImageConverter extends WordToHtmlConverter {
+
+        public ImageConverter(Document document) {
+            super(document);
+        }
+
+        @Override
+        protected void processImageWithoutPicturesManager(Element currentBlock, boolean inlined, Picture picture) {
+            Element imgNode = currentBlock.getOwnerDocument().createElement("img");
+            StringBuffer sb = new StringBuffer();
+            sb.append(Base64.getMimeEncoder().encodeToString(picture.getRawContent()));
+            sb.insert(0, "data:" + picture.getMimeType() + ";base64,");
+            imgNode.setAttribute("src", sb.toString());
+            currentBlock.appendChild(imgNode);
+        }
+    }
+
+
+    /**
+     * 读取word中的文本内容（段落、表格、图片分开处理）转HTML docx后缀名的Word
+     * @param
+     * @throws IOException
+     */
+    public  String readWordImgToHtml(InputStream inputStream) throws IOException{
+        String htmlData = "预览失败";
+        XWPFDocument document = new XWPFDocument(inputStream);
+        String htmlText="";
+        try {
+            // 获取word中的所有段落与表格
+            List<IBodyElement> elements = document.getBodyElements();
+            for (IBodyElement element : elements) {
+                // 段落
+                if (element instanceof XWPFParagraph) {
+                    htmlText+=getParagraphHtmlText((XWPFParagraph) element);
+                }
+                // 表格
+                else if (element instanceof XWPFTable) {
+                    htmlText+=getTabelHtmlText((XWPFTable) element);
+                }
+            }
+
+
+            XHTMLOptions options = XHTMLOptions.create().indent(4);
+            options.setExtractor(null);
+            options.setIgnoreStylesIfUnused(false);
+            options.setFragment(true);
+            options.setImageManager(new Base64EmbedImgManager());
+            ByteArrayOutputStream htmlStream = new ByteArrayOutputStream();
+
+            XHTMLConverter.getInstance().convert(document, htmlStream, options);
+            htmlData = htmlStream.toString();
+            htmlStream.close();
+            //获取word中的所有图片
+//            List<XWPFPictureData> picLists= document.getAllPictures();
+//            for(XWPFPictureData pic:picLists){
+//                System.out.println("图片名称:\t" + pic.getFileName());
+//                System.out.println("图片类型：\t" + pic.getPictureType());
+//                byte[] data = pic.getData();
+//                System.out.println(data);
+//                //字节流图片上传，并返回服务器地址
+//                String imgUrl = getImageUrl(data, pic.getFileName());
+//                System.out.println("图片服务器地址："+imgUrl);
+//                //组装img
+//                htmlText+="<p><img alt='' src='"+imgUrl+"'></p>";
+            }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        return  htmlData;
+    }
+    /**
+     * 获取段落内容并组装段落HTML
+     * @param paragraph
+     */
+    private static String getParagraphHtmlText(XWPFParagraph paragraph) {
+        // 获取段落中所有内容
+        List<XWPFRun> runs = paragraph.getRuns();
+        if (runs.size() == 0) {
+            return "";
+        }
+        StringBuffer runText = new StringBuffer();
+        for (XWPFRun run : runs) {
+            runText.append(run.text());
+        }
+        return "<p style='margin:unset;text-align:"+paragraph.getAlignment().name()+"'>"+runText.toString()+"</p>";
+    }
+    /**
+     * 获取表格内容并组装表格HTML
+     * @param table
+     */
+    private static String getTabelHtmlText(XWPFTable table) {
+        String result="";
+        //获取表格数据行
+        List<XWPFTableRow> rows = table.getRows();
+
+        if(rows.size()>0){
+            result+="<table border='1' cellspacing=0 style='border-collapse: collapse;'>";
+            //遍历
+            for (int i=0;i<rows.size();i++) {
+                XWPFTableRow row = rows.get(i);
+                result+="<tr style='font-weight: bold;'>";
+                //获取每行的数据列
+                List<XWPFTableCell> cells = row.getTableCells();
+                for (XWPFTableCell cell : cells) {
+                    //获取单元格跨列个数
+                    BigInteger gridSpanNum = getCellGridSpanNum(cell);
+
+                    result+="<td colspan="+gridSpanNum+" valign=center style='text-align: center;vertical-align: middle;'>";
+                    String cellText="";
+                    // 简单获取内容（简单方式是不能获取字体对齐方式的）
+                    // System.out.println(cell.getText());
+                    // 一个单元格可以理解为一个word文档，单元格里也可以加段落与表格
+                    List<XWPFParagraph> paragraphs = cell.getParagraphs();
+                    for (XWPFParagraph paragraph : paragraphs) {
+                        cellText+="<p style='margin: unset;text-align:"+paragraph.getAlignment().name()+"'>"+getParagraphText(paragraph)+"</p>";
+                    }
+                    result+=cellText;
+                    result+="</td>";
+                }
+
+                result+="</tr>";
+            }
+            result+="</table>";
+        }
+        return result;
+    }
+    /**
+     * 获取段落内容（ docx后缀名的Word）
+     * @param paragraph
+     */
+    private static String getParagraphText(XWPFParagraph paragraph) {
+        // 获取段落中所有内容
+        List<XWPFRun> runs = paragraph.getRuns();
+        if (runs.size() == 0) {
+            //System.out.println("按了回车（新段落）");
+            return "";
+        }
+        StringBuffer runText = new StringBuffer();
+        for (XWPFRun run : runs) {
+            runText.append(run.text());
+        }
+//		if (runText.length() > 0) {
+//			runText.append("，对齐方式：").append(paragraph.getAlignment().name());
+//			System.out.println(runText);
+//		}
+        return runText.toString();
+    }
+
+    /**
+     * 字节流图片上传
+     * @param data:图片字节流
+     * @param fileName:图片名称
+     */
+    public static String getImageUrl(byte[] data,String fileName) throws Exception{
+        String imgUrl="";
+        Long res =new Date().getTime();
+        //设置文件存储路径，可以存放在你想要指定的路径里面
+        String rootPath="D:/mimi/"+File.separator+"upload/images/";
+        // 新文件名
+        String newFileName =res + fileName.substring(fileName.lastIndexOf("."));
+        //新文件
+        File newFile=new File(rootPath+File.separator+newFileName);
+        //判断文件目录是否存在
+        if(!newFile.getParentFile().exists()){
+            //如果目标文件所在的目录不存在，则创建父目录
+            newFile.getParentFile().mkdirs();
+        }
+
+        //-------把图片文件写入磁盘 start ----------------
+        FileOutputStream fos = new FileOutputStream(newFile);
+        fos.write(data);
+        fos.close();
+        //-------把图片文件写入磁盘 end ----------------
+        //服务器图片地址
+        String baseURL = "http://192.168.0.76:8080/mimi/upload/images/";
+        imgUrl=baseURL+newFileName;
+
+        return imgUrl;
+    }
+    /**
+     * 获取单元格跨列个数
+     * @return
+     */
+    public static BigInteger getCellGridSpanNum(XWPFTableCell cell){
+        BigInteger gridSpanNum =null;
+        //获取单元格跨列
+        CTDecimalNumber gridSpanXml = cell.getCTTc().getTcPr().getGridSpan();
+        if(gridSpanXml!=null){
+            gridSpanNum = gridSpanXml.getVal();
+            System.out.println("gridSpanNum:"+gridSpanNum);
+        }
+        return gridSpanNum;
+    }
+
+
+
+}

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -0,0 +1,168 @@
+<?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.SystemFileMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.SystemFile">
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="FILENAME" jdbcType="VARCHAR" property="filename" />
+    <result column="FILEPATH" jdbcType="VARCHAR" property="filepath" />
+  </resultMap>
+  <sql id="columns">
+    ID, FILENAME, FILEPATH
+  </sql>
+  <sql id="columns_alias">
+    t.ID, t.FILENAME, t.FILEPATH
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM SYSTEM_FILE
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM SYSTEM_FILE t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="id != null and id != ''">
+        and ID = #{id}
+      </if>
+      <if test="filename != null and filename != ''">
+        and FILENAME = #{filename}
+      </if>
+      <if test="filepath != null and filepath != ''">
+        and FILEPATH = #{filepath}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="id != null and id != ''">
+        and ID LIKE '%${id}%'
+      </if>
+      <if test="filename != null and filename != ''">
+        and FILENAME LIKE '%${filename}%'
+      </if>
+      <if test="filepath != null and filepath != ''">
+        and FILEPATH LIKE '%${filepath}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from SYSTEM_FILE
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from SYSTEM_FILE
+    where 1!=1 
+      <if test="filename != null and filename != ''">
+        or FILENAME = #{filename}
+      </if>
+      <if test="filepath != null and filepath != ''">
+        or FILEPATH = #{filepath}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.SystemFile">
+    insert into SYSTEM_FILE (ID, FILENAME, FILEPATH
+      )
+    values (#{id,jdbcType=VARCHAR}, #{filename,jdbcType=VARCHAR}, #{filepath,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.SystemFile">
+    insert into SYSTEM_FILE
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="filename != null">
+        FILENAME,
+      </if>
+      <if test="filepath != null">
+        FILEPATH,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="filename != null">
+        #{filename,jdbcType=VARCHAR},
+      </if>
+      <if test="filepath != null">
+        #{filepath,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.SystemFile">
+    update SYSTEM_FILE
+    set FILENAME = #{filename,jdbcType=VARCHAR},
+      FILEPATH = #{filepath,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.SystemFile">
+    update SYSTEM_FILE
+    <set>
+      <if test="filename != null">
+        FILENAME = #{filename,jdbcType=VARCHAR},
+      </if>
+      <if test="filepath != null">
+        FILEPATH = #{filepath,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into SYSTEM_FILE 
+      (ID, 
+      FILENAME, FILEPATH)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.id,jdbcType=VARCHAR}, 
+      #{item.filename,jdbcType=VARCHAR}, #{item.filepath,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+
+  <update id="batchUpdate" parameterType="java.util.List">
+     update SYSTEM_FILE
+     set
+       ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+          when #{item.id,jdbcType=VARCHAR} then #{item.id,jdbcType=VARCHAR}
+       </foreach>
+       ,FILENAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+          when #{item.id,jdbcType=VARCHAR} then #{item.filename,jdbcType=VARCHAR}
+       </foreach>
+       ,FILEPATH=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
+          when #{item.id,jdbcType=VARCHAR} then #{item.filepath,jdbcType=VARCHAR}
+       </foreach>
+     where ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.id,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from SYSTEM_FILE
+    where ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <insert id="insertAll" parameterType="com.steerinfo.dil.model.SystemFile">
+    insert into SYSTEM_FILE (ID, FILENAME, FILEPATH
+    )
+    values (#{id,jdbcType=VARCHAR}, #{filename,jdbcType=VARCHAR}, #{filepath,jdbcType=VARCHAR}
+           )
+  </insert>
+</mapper>

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

@@ -11,31 +11,25 @@
     </sql>
 
 
-<!--   查询所有的汽车衡  -->
+    <!--   查询所有的汽车衡  -->
     <select id="getAllCalculateMes" resultType="java.util.Map">
-        select
-            RTC.TRUCK_CALCULATE_ID "id",
-            RTC.TRUCK_CALCULATE_ID "value",
-            RTC.TRUCK_CALCULATE_NUMBER "label"
-        from
-            RMS_TRUCK_CALCULATE RTC
+        select RTC.TRUCK_CALCULATE_ID     "id",
+               RTC.TRUCK_CALCULATE_ID     "value",
+               RTC.TRUCK_CALCULATE_NUMBER "label"
+        from RMS_TRUCK_CALCULATE RTC
     </select>
 
     <select id="getAllGatepost" resultType="java.util.Map">
-        select
-            GATEPOST_ID "id",
-            GATEPOST_ID "value",
-            GATEPOST_NAME "label"
-        from
-            RMS_GATEPOST
+        select GATEPOST_ID   "id",
+               GATEPOST_ID   "value",
+               GATEPOST_NAME "label"
+        from RMS_GATEPOST
     </select>
     <select id="getAllWareHouse" resultType="java.util.Map">
-        select
-            WAREHOUSE_ID "id",
-            WAREHOUSE_ID "value",
-            WAREHOUSE_NAME "label"
-        from
-            RMS_WAREHOUSE
+        select WAREHOUSE_ID   "id",
+               WAREHOUSE_ID   "value",
+               WAREHOUSE_NAME "label"
+        from RMS_WAREHOUSE
     </select>
     <select id="getColumnNoRoutList" resultType="java.lang.String" parameterType="map">
         select DTCR.COLUMN_NAME from DIL_TABLE_COLUMN_ROLE DTCR
@@ -49,7 +43,7 @@
     </select>
     <select id="getColumnShowData" resultType="java.util.Map" parameterType="map">
         SELECT DTCR.COLUMN_NAME "key",
-               DTCR.COLUMN_NAME "label"
+        DTCR.COLUMN_NAME "label"
         FROM DIL_TABLE_COLUMN_ROLE DTCR
         LEFT JOIN DIL_ROLE_ORGCODE_TABLE DROT on DTCR.PRIMARY_ID = DROT.COLUMN_ID
         WHERE
@@ -80,26 +74,24 @@
         SELECT DTCR.COLUMN_NAME "key",
                DTCR.COLUMN_NAME "label"
         FROM DIL_TABLE_COLUMN_ROLE DTCR
-        WHERE
-            DTCR.TABLE_NAME = #{tableName}
+        WHERE DTCR.TABLE_NAME = #{tableName}
     </select>
     <select id="getColumnAllScheme" resultType="java.util.LinkedHashMap" parameterType="map">
-      SELECT
-            distinct
-             DROT.PRIMARY_NAME "schemeName",
-             DROT.ENABLE_STATUS "enableStatus" ,
-             DROT.USER_NAME "userName",
-             DROT.ORG_CODE  "orgCode",
-             DTCR.TABLE_NAME "tableName"
-      FROM DIL_ROLE_ORGCODE_TABLE DROT
-      LEFT JOIN DIL_TABLE_COLUMN_ROLE DTCR on DROT.COLUMN_ID = DTCR.PRIMARY_ID
-      WHERE DROT.USER_NAME = #{userName}
-      AND DROT.ORG_CODE = #{orgCode}
-      AND DTCR.TABLE_NAME = #{tableName}
-      AND NVL(DROT.PRIMARY_NAME,'') != '默认方案'
+        SELECT distinct DROT.PRIMARY_NAME  "schemeName",
+                        DROT.ENABLE_STATUS "enableStatus",
+                        DROT.USER_NAME     "userName",
+                        DROT.ORG_CODE      "orgCode",
+                        DTCR.TABLE_NAME    "tableName"
+        FROM DIL_ROLE_ORGCODE_TABLE DROT
+                 LEFT JOIN DIL_TABLE_COLUMN_ROLE DTCR on DROT.COLUMN_ID = DTCR.PRIMARY_ID
+        WHERE DROT.USER_NAME = #{userName}
+          AND DROT.ORG_CODE = #{orgCode}
+          AND DTCR.TABLE_NAME = #{tableName}
+          AND NVL(DROT.PRIMARY_NAME, '') != '默认方案'
     </select>
     <select id="getWlUrl" resultType="java.lang.String">
-        SELECT DL.VERSION_VALUE FROM DIL_VERSION DL
+        SELECT DL.VERSION_VALUE
+        FROM DIL_VERSION DL
         WHERE DL.VERSION_ID = 11
     </select>
 
@@ -107,27 +99,29 @@
     <!--  边输边查公司  -->
     <select id="getCompanyMesByLike" resultType="java.util.Map">
         select * from(
-            select
-            RC.COMPANY_ID "companyId",
-            RC.COMPANY_NAME "companyName",
-            RC.COMPANY_TYPE "companyType",
-            RC.SSO_ID "ssoId",
-            RC.SSO_CODE "ssoCode",
-            RC.COMPANY_ID "id",
-            RC.COMPANY_ID "value",
-            RC.COMPANY_NAME "label"
-            from RMS_COMPANY RC
-            where DELETED = 0
-        )
+        select
+        RC.COMPANY_ID "companyId",
+        RC.COMPANY_NAME "companyName",
+        RC.COMPANY_TYPE "companyType",
+        RC.SSO_ID "ssoId",
+        RC.SSO_CODE "ssoCode",
+        RC.COMPANY_ID "id",
+        RC.COMPANY_ID "value",
+        RC.COMPANY_TYPE || '-' || RC.COMPANY_NAME "label"
+        from RMS_COMPANY RC
+        where DELETED = 0        )
         <where>
             <if test="companyType!=null and companyType!=''">
-                AND   "companyType" = #{companyType}
+                AND "companyType" = #{companyType}
             </if>
             <if test="index!=null and index!=''">
-                AND   REGEXP_LIKE("label", #{index})
+                AND REGEXP_LIKE("label", #{index})
             </if>
-            <if test="id!=null">
-                OR   "id" = #{id}
+           <if test="id!=null and id.size>0">
+                AND "id" in
+                <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                    #{item}
+                </foreach>
             </if>
         </where>
         FETCH NEXT 100 ROWS ONLY
@@ -145,10 +139,13 @@
         )
         <where>
             <if test="index!=null and index!=''">
-                AND   REGEXP_LIKE("label", #{index})
+                AND REGEXP_LIKE("label", #{index})
             </if>
-            <if test="id!=null">
-                OR   "id" = #{id}
+           <if test="id!=null and id.size>0">
+                AND "id" in
+                <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                    #{item}
+                </foreach>
             </if>
         </where>
         FETCH NEXT 100 ROWS ONLY
@@ -166,10 +163,13 @@
         )
         <where>
             <if test="index!=null and index!=''">
-                AND   REGEXP_LIKE("label", #{index})
+                AND REGEXP_LIKE("label", #{index})
             </if>
-            <if test="id!=null">
-                OR   "id" = #{id}
+           <if test="id!=null and id.size>0">
+                AND "id" in
+                <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                    #{item}
+                </foreach>
             </if>
         </where>
         FETCH NEXT 100 ROWS ONLY
@@ -188,13 +188,16 @@
         )
         <where>
             <if test="operationPointType!=null and operationPointType!=''">
-                AND   REGEXP_LIKE("operationPointType", #{operationPointType})
+                AND REGEXP_LIKE("operationPointType", #{operationPointType})
             </if>
             <if test="index!=null and index!=''">
-                AND   REGEXP_LIKE("label", #{index})
+                AND REGEXP_LIKE("label", #{index})
             </if>
-            <if test="id!=null">
-                OR   "id" = #{id}
+            <if test="id!=null and id.size>0">
+                AND "id" in
+                <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                    #{item}
+                </foreach>
             </if>
         </where>
         FETCH NEXT 100 ROWS ONLY
@@ -212,12 +215,91 @@
         )
         <where>
             <if test="index!=null and index!=''">
-                AND   REGEXP_LIKE("label", #{index})
+                AND REGEXP_LIKE("label", #{index})
+            </if>
+           <if test="id!=null and id.size>0">
+                AND "id" in
+                <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        FETCH NEXT 100 ROWS ONLY
+    </select>
+    <select id="getCapacityByLike" resultType="java.util.Map">
+        select * from (
+            SELECT DISTINCT
+            RCA .CAPACITY_ID "id",
+            RCA .CAPACITY_ID "value",
+            RCA .CAPACITY_NUMBER "label"
+            FROM RMS_CAPACITY RCA
+            LEFT JOIN RMS_CAPACITY_CARRIER RCC ON RCA .CAPACITY_ID = RCC .CAPACITY_ID
+            LEFT JOIN RMS_COMPANY RC ON RC .COMPANY_ID = RCC .COMPANY_ID
+            WHERE RCA .DELETED = 0
+            <if test="orgCode!=null and orgCode!=''">
+                AND RC.SSO_CODE = #{orgCode}
+            </if>
+        )
+        <where>
+            <if test="index!=null and index!=''">
+                AND REGEXP_LIKE("label", #{index})
+            </if>
+            <if test="id!=null and id.size>0">
+                AND "id" in
+                <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        FETCH NEXT 100 ROWS ONLY
+    </select>
+    <select id="getrmsrmsjobinfosBylike" resultType="java.util.Map">
+        select * from(
+        select
+        RC.JOB_ID "jboId",
+        RC.JOB_NAME "jobName",
+        RC.JOB_ID "id",
+        RC.JOB_ID "value",
+        RC.JOB_NAME "label"
+        from RMS_JOB_INFO RC
+        where DELETED = 0
+        )
+        <where>
+            <if test="index!=null and index!=''">
+                AND REGEXP_LIKE("label", #{index})
+            </if>
+           <if test="id!=null and id.size>0">
+                AND "id" in
+                <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        FETCH NEXT 100 ROWS ONLY
+    </select>
+    <select id="getTransRangeByLike" resultType="java.util.Map">
+        select * from(
+        select
+        RC.TRANS_RANGE_ID "transrangeId",
+        RC.TRANS_RANGE_NAME "transrangeName",
+        RC.TRANS_RANGE_ID "id",
+        RC.TRANS_RANGE_ID "value",
+        RC.TRANS_RANGE_NAME "label"
+        from RMS_TRANS_RANGE RC
+        where DELETED = 0
+        )
+        <where>
+            <if test="index!=null and index!=''">
+                AND REGEXP_LIKE("label", #{index})
             </if>
-              <if test="id!=null">
-                OR   "id" = #{id}
+            <if test="id!=null and id.size>0">
+                AND "id" in
+                <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                    #{item}
+                </foreach>
             </if>
         </where>
         FETCH NEXT 100 ROWS ONLY
     </select>
+
 </mapper>

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=DEBUG,stdout,RUNNING,errorfile
+log4j.rootCategory=INFO,stdout,RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
@@ -20,7 +20,7 @@ log4j.appender.RUNNING = org.apache.log4j.DailyRollingFileAppender
 log4j.appender.RUNNING.File =/logs/log/running.log
 log4j.appender.RUNNING.Append = true
 log4j.appender.RUNNING.Threshold = INFO
-log4j.appender.RUNNING.DatePattern='.'yyyy-MM-dd
+log4j.appender.RUNNING.DatePattern='.'yyyy-MM-dd.
 log4j.appender.RUNNING.layout = org.apache.log4j.PatternLayout
 log4j.appender.RUNNING.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n