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

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

@@ -35,7 +35,7 @@ public class SessionInterceptor extends HandlerInterceptorAdapter {
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         HandlerMethod hm = (HandlerMethod) handler;
         String requestUrl = "" + request.getRequestURL();
-        if(!requestUrl.contains("/api/v1/bp/bpLogin") && !requestUrl.contains("/api/v1/uc/") && !requestUrl.contains("/api/v1/systemfiles/") && !requestUrl.contains("/api/v1/rms/insertPersonnel")
+        if(!requestUrl.contains("/api/v1/bp/bpLogin") && !requestUrl.contains("/api/v1/ams/dispatch") && !requestUrl.contains("/api/v1/uc/") && !requestUrl.contains("/api/v1/systemfiles/") && !requestUrl.contains("/api/v1/rms/insertPersonnel")
                 && (request.getAttribute("userId")==null || request.getAttribute("userName")==null)){
             //无权访问
             response.setCharacterEncoding("UTF-8");

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

@@ -0,0 +1,28 @@
+package com.steerinfo.dil.controller;
+
+
+import com.steerinfo.dil.feign.DzFeign;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import org.omg.CORBA.OBJ_ADAPTER;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@RequestMapping("${api.version}/dz")
+@RestController
+public class DzController extends BaseRESTfulController {
+
+    @Autowired
+    DzFeign dzFeign;
+
+    @PostMapping("/getDzData")
+    public Map<String,Object> getDzData(@RequestBody Map<String, Object> map) {
+        return dzFeign.getDzData(map);
+    }
+
+
+}

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

@@ -583,8 +583,9 @@ public class TMSController extends BaseRESTfulController {
                     || item.get("车号")==null || item.get("车号").equals("")
                     || item.get("计量日期")==null || item.get("计量日期").equals("")
                     || item.get("皮重")==null || item.get("皮重").equals("")
-                    || item.get("毛重")==null || item.get("毛重").equals("")){
-                throw new Exception("单元格数据异常（通知单号/车号/计量日期/净重/皮重/毛重），请检查模板或数据是否正确!");
+                    || item.get("毛重")==null || item.get("毛重").equals("")
+                    ||  item.get("磅单号")==null || item.get("磅单号").equals("")){
+                throw new Exception("单元格数据异常（通知单号/车号/计量日期/净重/皮重/毛重/磅单号），请检查模板或数据是否正确!");
             }
             item.put("净重", DataChange.dataToBigDecimal(item.get("毛重")).subtract(DataChange.dataToBigDecimal(item.get("皮重"))));
             //校验数据
@@ -898,4 +899,48 @@ public class TMSController extends BaseRESTfulController {
     public Map<String,Object> insertTmsTransitOrder(@RequestBody Map<String,Object> map) {
         return tmsFeign.insertTmsTransitOrder(map);
     }
+
+    @ApiOperation("导入通行登记单")
+    @PostMapping("/importTrasitOrder")
+    public Map<String, Object> importTrasitOrder(@RequestBody MultipartFile file,
+                                       String userId,
+                                       String userName) throws Exception {
+        Map<String, Object> map = new HashMap<>();
+        //获取Excel中包含的对象数组
+        List<Map<String, Object>> list = ExcelToolUtils.getExcelList(file, 0);
+        map.put("list", list);
+        for (Map<String, Object> item : list) {
+            //校验行
+            if (item.get("车牌号") == null || item.get("通行卡类型") == null || item.get("开始时间") == null || item.get("结束时间") == null) {
+                throw new Exception("单元格数据异常，请检查模板或数据是否正确!");
+            }
+        }
+        map.put("userId", userId);
+        map.put("userName", userName);
+        return tmsFeign.importTrasitOrder(map);
+    }
+
+    @ApiOperation(value = "查询请车批车")
+    @PostMapping("/getPleaseApproveList")
+    public Map<String, Object> getPleaseApproveList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        return tmsFeign.getPleaseApproveList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @PostMapping("/addPleaseApprove")
+    public Map<String,Object> addPleaseApprove(@RequestBody Map<String,Object> map) {
+        return tmsFeign.addPleaseApprove(map);
+    }
+
+    @PostMapping("/updPleaseApprove")
+    public Map<String,Object> updPleaseApprove(@RequestBody Map<String,Object> map) {
+        return tmsFeign.updPleaseApprove(map);
+    }
+
+    @PostMapping("/delPleaseApprove")
+    public Map<String,Object> delPleaseApprove(@RequestBody Map<String,Object> map) {
+        return tmsFeign.delPleaseApprove(map);
+    }
 }

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

@@ -20,14 +20,20 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartRequest;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 
+import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletResponse;
+import javax.xml.crypto.Data;
+import java.awt.*;
+import java.awt.image.BufferedImage;
 import java.io.*;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.List;
 
 import static com.steerinfo.dil.util.EasyExcelUitl.exportExcelFile;
 import static com.steerinfo.dil.util.HTTPRequestUtils.getJsonData;
@@ -197,6 +203,15 @@ public class UniversalController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation("水印测试")
+    @PostMapping("/paintTest")
+    public RESTfulResult uploadFile(MultipartFile file,HttpServletResponse response) throws Exception {
+        File targetFile = DataChange.paintWater(file,"地点：xxxx省市县\n时间："+new Date(),50,-100);
+        Thread.sleep(10000);
+        targetFile.delete();
+        return success("上传成功");
+    }
+
 
     @ApiOperation("表格查询显示和隐藏")
     @PostMapping("/getColumnShowHidden")
@@ -366,10 +381,8 @@ public class UniversalController extends BaseRESTfulController {
         String url  =  "http://172.16.90.202:80"+map.get("requestUrl").toString() + "&pageNum=1&pageSize=10000";
         JSONObject json = HttpUtil.sendPost(url,jsonObject);
         Map<String, Object> data = (Map<String, Object>) json.get("data");
-        String listStr = data.get("list").toString();
-        String columnDataStr=data.get("columnData").toString();
-        List<Map<String,Object>> listMap = JSON.parseObject(listStr,new TypeReference<List<Map<String,Object>>>(){});
-        List<Map<String,Object>> columnData = JSON.parseObject(columnDataStr,new TypeReference<List<Map<String,Object>>>(){});
+        List<Map<String,Object>> listMap = (List<Map<String, Object>>) data.get("list");
+        List<Map<String,Object>> columnData = (List<Map<String, Object>>) data.get("columnData");
         LinkedHashMap<String, String> columnMaps = Maps.newLinkedHashMap();
         for (int i = 0; i <columnData.size() ; i++) {
             columnMaps.put(columnData.get(i).get("prop").toString(),columnData.get(i).get("label").toString());

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

@@ -0,0 +1,48 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
+
+@FeignClient(name = "ANTAI-DZ-API", url = "${openfeign.DzFeign.url}")
+public interface DzFeign {
+    @PostMapping("/api/v1/dz/test/getUnloadDetails")
+    Map<String, Object> getUnloadDetails(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getUnUploadOrder")
+    Map<String, Object> getUnUploadOrder();
+
+    @PostMapping("/api/v1/dz/test/getCapacityDetails")
+    Map<String, Object> getCapacityDetails(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getTransOrderDz")
+    List<Map<String, Object>> getTransOrderDz();
+
+    @PostMapping("/api/v1/dz/test/getTransResult")
+    Map<String,Object> getTransResult(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getTransResultList")
+    List<Map<String, Object>> getTransResultList(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getSignList")
+    List<Map<String, Object>> getSignList(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getInnerCode")
+    Map<String,Object> getInnerCode(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getProductionResultList")
+    List<Map<String, Object>> getProductionResultList(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/restartWeightResult")
+    int restartWeightResult(@RequestBody List<String> ysddList);
+
+    @PostMapping("/api/v1/dz/test/getErrorRequirement")
+    Map<String,Object> getErrorRequirement( @RequestBody Map<String,Object> map);
+
+
+    @PostMapping("/api/v1/dz/test/getDzData")
+    Map<String, Object> getDzData(Map<String, Object> map);
+}

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

@@ -311,6 +311,24 @@ public interface TmsFeign {
 
     @PostMapping(value = "api/v1/tms/tmstransitorders/insertTmsTransitOrder")
     Map<String, Object> insertTmsTransitOrder(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/tmstransitorders/importTrasitOrder")
+    Map<String, Object> importTrasitOrder(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/tmspleaseapproves/getPleaseApproveList")
+    Map<String, Object> getPleaseApproveList(@RequestBody Map<String, Object> objectMap,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize);
+
+    @PostMapping(value = "api/v1/tms/tmspleaseapproves/addPleaseApprove")
+    Map<String, Object> addPleaseApprove(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/tmspleaseapproves/updPleaseApprove")
+    Map<String, Object> updPleaseApprove(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/tmspleaseapproves/delPleaseApprove")
+    Map<String, Object> delPleaseApprove(Map<String, Object> map);
 }
 
 

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

@@ -1,6 +1,14 @@
 package com.steerinfo.dil.util;
 
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileOutputStream;
 import java.math.BigDecimal;
+import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -16,7 +24,7 @@ import java.util.regex.Pattern;
 
 public class DataChange {
 
-
+    static String tempDir = "/temp/";
     /**
      * 时间转换类
      * 处理了三种类型 yyyy-MM-dd HH:mm:ss  yyyy/MM/dd HH:mm:ss  时间戳类型（带毫秒数时间戳13位）
@@ -289,4 +297,57 @@ public class DataChange {
         map.put("lastDay",lastDay);
 
     }
+
+    public static File paintWater(MultipartFile file, String text,int xOffset ,int yOffset)  throws Exception{
+        //将文件对象转化为图片对象
+        Image srcImg = ImageIO.read(file.getInputStream());
+        //获取图片的宽
+        int srcImgWidth = srcImg.getWidth(null);
+        //获取图片的高
+        int srcImgHeight = srcImg.getHeight(null);
+        // 加水印
+        BufferedImage bufImg = new BufferedImage(srcImgWidth, srcImgHeight, BufferedImage.TYPE_INT_RGB);
+        //创建画笔
+        Graphics2D graphics = bufImg.createGraphics();
+        //srcImg 为上面获取到的原始图片的图片对象
+        graphics.drawImage(srcImg, 0, 0, srcImgWidth, srcImgHeight, null);
+        //根据图片的背景设置水印颜色
+        graphics.setColor(new Color(255,0,0,255));
+        //设置字体  画笔字体样式为微软雅黑，加粗，文字大小为60pt
+        graphics.setFont(new Font("微软雅黑", Font.BOLD, 40));
+        //设置水印的坐标
+        int x = 0;
+        if(xOffset >= 0){
+            x = xOffset;
+        }else{
+            x = srcImgWidth + (xOffset % srcImgWidth);
+        }
+        int y = 0;
+        if(yOffset >= 0){
+            y = yOffset;
+        }else {
+            y = srcImgHeight + (yOffset % srcImgWidth);
+        }
+        //自定义水印 第一个参数是水印内容，第二个参数是x轴坐标，第三个参数是y轴坐标
+        graphics.drawString(text, x, y);
+        //时间水印
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        graphics.drawString(df.format(new Date()), x, y + 50);
+        graphics.dispose();
+        //待存储的地址
+        File fileDir = new File(tempDir);
+        if(!fileDir.exists() || !fileDir.isDirectory()){
+            fileDir.mkdir();
+        }
+        String tarImgPath = tempDir + file.getOriginalFilename();
+        // 输出图片
+        FileOutputStream outImgStream = new FileOutputStream(tarImgPath);
+        ImageIO.write(bufImg, "png", outImgStream);
+        outImgStream.flush();
+        outImgStream.close();
+        //返回目标图片
+        File targetFile = new File(tarImgPath);
+//        targetFile.delete();//临时文件返回后，保存在其他地方然后及时删除
+        return targetFile;
+    }
 }

src/main/resources/application-prod.yml

@@ -45,6 +45,9 @@ openfeign:
   REPORTFeign:
     url: ${REPORTFEIGN_URL:172.16.90.202:8000}
 #    url: ${REPORTFEIGN_URL:localhost:8055}
+  DzFeign:
+    url: ${DZFEIGN_URL:172.16.90.202:8000}
+#    url: ${DZFEIGN_URL:localhost:8056}
 
 
 #远程调用

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

@@ -1256,11 +1256,18 @@
             SELECT OTO .TRANS_ORDER_ID "transOrderId",
             OOC .ORDER_CHILD_ID "transOrderChildId",
             APC .TRANS_PLAN_ID "transPlanId",
+            ATR .TRANS_REQUIREMENT_ID  "tdls",
+            ARC .REQUIREMENT_CHILD_ID  "tdfl",
+            OTO .ALTERNATE_FIELDS18 "sendStation",
+            OTO .ALTERNATE_FIELDS19 "endStation",
+            OTO .ALTERNATE_FIELDS20     "trainSeq",
             APC .MATERIAL_ID "materialId",
+            to_char(TLR.LOAD_START_TIME, 'yyyymmdd') "loadTime",
             TWR .RESULT_ID "resultId",
             TUR .RESULT_ID "unloadResultId",
             #{item.通知单号} "requireNumber",
             #{item.计量日期} "weightTime",
+            #{item.磅单号} "poundNo",
             #{item.车号} "capacityId",
             #{item.净重} "netWeight",
             #{item.皮重} "tareWeight",
@@ -1289,6 +1296,12 @@
             OOC .ORDER_CHILD_ID "transOrderChildId",
             TUR .RESULT_ID "resultId",
             TUR .ACTUAL_TONNAGE "unloadWeightOld",
+            OTO .ALTERNATE_FIELDS18 "sendStation",
+            OTO .ALTERNATE_FIELDS19 "endStation",
+            OTO .ALTERNATE_FIELDS20     "trainSeq",
+            to_char(TLR.LOAD_START_TIME, 'yyyymmdd') "loadTime",
+            ATR .TRANS_REQUIREMENT_ID  "tdls",
+            ARC .REQUIREMENT_CHILD_ID  "tdfl",
             ATR .SERIAL_NUMBER  "requirementSerialNumber",
             APC .TRANS_PLAN_ID "transPlanId",
             ARC .RECEIVING_POINT_ID "unloadPointId",