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

# Conflicts:
#	src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

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

@@ -34,6 +34,7 @@ public class RequestFilter implements Filter {
            String roleCodes = httpRequest.getHeader("rolecodes");
            String dilCompanyList = httpRequest.getHeader("dilCompanyList");
            String rootCompanyMap = httpRequest.getHeader("rootCompanyMap");
+           String accessToken = httpRequest.getHeader("accessToken");
            //获取cookie用户数据
            if (cookies != null && cookies.length > 0) {
                for (Cookie cookie : cookies) {
@@ -49,6 +50,8 @@ public class RequestFilter implements Filter {
                        dilCompanyList = URLDecoder.decode(cookie.getValue(),"utf-8");
                    } else if (cookie.getName().equals("rootCompanyMap") && rootCompanyMap == null) {
                        rootCompanyMap = URLDecoder.decode(cookie.getValue(),"utf-8");
+                   } else if (cookie.getName().equals("accessToken") && accessToken == null) {
+                       accessToken = URLDecoder.decode(cookie.getValue(), "utf-8");
                    }
                    else if (userId != null && userName != null && orgCode != null && roleCodes != null && dilCompanyList != null && rootCompanyMap != null) {
                        //都查到了，退出
@@ -88,6 +91,7 @@ public class RequestFilter implements Filter {
                params.put("roleCodes",roleCodes);
                params.put("dilCompanyList",dilCompanyListObject);
                params.put("rootCompanyMap",rootCompanyMapObject);
+               params.put("accessToken",accessToken);
                //将新的RequestBody写入新的请求对象保存
                ServletRequest requestWrapper = new RequestWrapper(httpRequest, params.toJSONString());
                chain.doFilter(requestWrapper, response);

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

@@ -717,4 +717,13 @@ public class AMScontroller {
         return amsFeign.getamsproductionordersyncs(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
 
     }
+
+    @ApiOperation(value = "查询发运通知单修改需要内容", notes = "查询发运通知单修改需要内容")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/getUpdateDlivDirno")
+    public RESTfulResult getUpdateDlivDirno(@RequestBody Map<String, Object> map) {
+        return amsFeign.getUpdateDlivDirno(map);
+    }
 }

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

@@ -1314,4 +1314,49 @@ public class RMScontroller extends BaseRESTfulController {
     public Map<String, Object> deleteFuelType(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.deleteFuelType(map);
     }
+
+    @ApiOperation(value="新增地图顶点")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"vertexId"},foreignKeyTypes = {"地图顶点"})
+    @PostMapping("/addVertex")
+    public Map<String, Object> addVertex(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.addVertex(map);
+    }
+
+    @ApiOperation(value="查询地图顶点")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping("/getVertex")
+    public Map<String, Object> getVertex() {
+        return rmsFeign.getVertex();
+    }
+
+    @ApiOperation(value="新增地图边线")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {},foreignKeyTypes = {"地图边线"})
+    @PostMapping("/addEdge")
+    public Map<String, Object> addEdge(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.addEdge(map);
+    }
+
+    @ApiOperation(value="删除地图边线")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {},foreignKeyTypes = {"地图边线"})
+    @PostMapping("/deleteEdge")
+    public Map<String, Object> deleteVertex(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.deleteEdge(map);
+    }
+
+    @ApiOperation(value="查询地图边线")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping("/getEdge")
+    public Map<String, Object> getEdge() {
+        return rmsFeign.getEdge();
+    }
+
+    @ApiOperation(value="查询导航信息")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping("/navigation")
+    public Map<String, Object> navigation(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.navigation(map);
+    }
 }

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

@@ -217,4 +217,11 @@ public class UniversalController extends BaseRESTfulController {
         List<Map<String, Object>> demandRules = universalMapper.getDemandRulesCode(map);
         return success(demandRules);
     }
+
+    @ApiOperation("获取身份证内码,用于判断该车辆是否有")
+    @PostMapping("/getIdCardCode")
+    public RESTfulResult getIdCardCode(@RequestBody Map<String,Object> map) {
+        String idCardCode = universalMapper.getIdCardCode(map);
+        return success(idCardCode);
+    }
 }

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

@@ -0,0 +1,48 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.feign.WebSocketFeign;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @ClassName WebSocketController
+ * @Description TODO
+ * @date 2024-02-27 10:22
+ * @Version 1.0
+ */
+@RequestMapping("${api.version}/websocket")
+@RestController
+public class WebSocketController {
+    @Autowired
+    WebSocketFeign webSocketFeign;
+    @PostMapping("/readWebsocket/{id}")
+    public RESTfulResult readWebsocket(@PathVariable("id") String sendId){
+        return webSocketFeign.readWebsocket(sendId);
+    }
+
+    @PostMapping("/sendWebsocket/{id}")
+    public RESTfulResult sendWebsocket(@PathVariable("id") String webSocketId, @RequestBody HashMap<String,Object> map, HttpServletRequest request){
+        return webSocketFeign.sendWebsocket(webSocketId,map);
+    }
+
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        return webSocketFeign.list(parmas, pageNum, pageSize);
+    }
+
+    @GetMapping("/getMessageCount/{id}")
+    public RESTfulResult getMessageCount(@PathVariable String id,@RequestParam()String readFlag){
+        return webSocketFeign.getMessageCount(id,readFlag);
+    }
+
+    @GetMapping("/getBaseWebsocketPush")
+    public RESTfulResult getBaseWebsocketPush(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        return webSocketFeign.basewebsocketpushsList(parmas,pageNum,pageSize);
+    }
+}

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

@@ -264,4 +264,7 @@ public interface AmsFeign {
                                  @RequestParam Integer pageNum,
                                  @RequestParam Integer pageSize);
 
+    @PostMapping(value = "api/v1/ams/amstransrequirements/getUpdateDlivDirno")
+    public RESTfulResult getUpdateDlivDirno(@RequestBody Map<String, Object> map);
+
 }

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

@@ -691,6 +691,24 @@ public interface RmsFeign {
 
     @PostMapping(value = "api/v1/rms/rmsfueltypes/deleteFuelType")
     Map<String, Object> deleteFuelType(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    @PostMapping(value = "api/v1/rms/rmsmapvertexs/addVertex")
+    Map<String, Object> addVertex(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmsmapvertexs/getVertex")
+    Map<String, Object> getVertex();
+
+    @PostMapping(value = "api/v1/rms/rmsmapvertexs/addEdge")
+    Map<String, Object> addEdge(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmsmapvertexs/deleteEdge")
+    Map<String, Object> deleteEdge(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmsmapvertexs/getEdge")
+    Map<String, Object> getEdge();
+
+    @PostMapping(value = "api/v1/rms/rmsmapvertexs/navigation")
+    Map<String, Object> navigation(@RequestBody(required = false) Map<String, Object> map);
 }
 
 

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

@@ -0,0 +1,33 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+/**
+ * @ClassName WebSocketFeign
+ * @Description TODO
+ * @date 2024-02-27 9:31
+ * @Version 1.0
+ */
+
+@FeignClient(name = "WEBSOCKET-API", url = "${openfeign.WebSocketFeign.url}")
+public interface WebSocketFeign {
+    @PostMapping("api/v1/websocket/basewebsocketsends/readWebsocket/{id}")
+    RESTfulResult readWebsocket(@PathVariable("id") String sendId);
+    @PostMapping("api/v1/websocket/basewebsocketsends/sendWebsocket/{id}")
+    RESTfulResult sendWebsocket(@PathVariable("id") String webSocketId, @RequestBody HashMap<String,Object> map);
+    @GetMapping("api/v1/websocket/basewebsocketsends/")
+    RESTfulResult list(@RequestParam("parmas")HashMap<String,Object> parmas,@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize);
+    @GetMapping("api/v1/websocket/basewebsocketsends/getMessageCount/{id}")
+    RESTfulResult getMessageCount(@PathVariable String id,@RequestParam()String readFlag);
+    @GetMapping("api/v1/websocket/basewebsocketpushs/")
+    RESTfulResult basewebsocketpushsList(@RequestParam("parmas")HashMap<String,Object> parmas,@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize);
+    @GetMapping("api/v1/websocket/basewebsocketpushs/noPage")
+    RESTfulResult noPage(@RequestParam HashMap<String,Object> parmas);
+    @GetMapping("api/v1/websocket/basewebsocketpushs/{id}")
+    RESTfulResult get(@PathVariable String id);
+}

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

@@ -69,4 +69,6 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getDemandRulesCode(Map<String, Object> map);
 
+    String getIdCardCode(Map<String, Object> map);
+
 }

src/main/resources/application-dev.yml

@@ -58,6 +58,8 @@ openfeign:
     url: ${OTMSFEIGN_URL:localhost:8038}
   EmsFeign:
     url: ${TMSFEIGN_URL:localhost:8096}
+  WebSocketFeign:
+    url: ${WEBSOCKETFEIGN_URL:localhost:8000}
   SSOFeign:
     url: ${SSOFEIGN_URL:172.16.90.214:9001}
 

src/main/resources/application-prod.yml

@@ -45,6 +45,8 @@ openfeign:
     url: ${TMSFEIGN_URL:172.16.90.214:8096}
   SSOFeign:
     url: ${SSOFEIGN_URL:172.16.90.214:9001}
+  WebSocketFeign:
+    url: ${WEBSOCKETFEIGN_URL:172.16.90.214:8000}
 
 
 #远程调用
@@ -55,7 +57,7 @@ feign:
     config:
       default:  #默认配置,连接时间要短，读取时间要长
         connectTimeout: 1000 #单位毫秒
-        readTimeout: 15000 #单位毫秒
+        readTimeout: 30000 #单位毫秒
 #熔断器
 hystrix:
   command:

src/main/resources/bootstrap.yml

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

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

@@ -543,6 +543,7 @@
         RCT.CAPACITY_TYPE_NAME "text",
         RCT .CAPACITY_MAX_LOAD "capacityMaxLoad",
         '[' || listagg (RCFT .FUEL_TYPE_ID, ',') WITHIN GROUP (ORDER BY RCT .CAPACITY_TYPE_ID) || ']' "fuelTypeIds",
+
         listagg (RFT .FUEL_TYPE_NAME, '/') WITHIN GROUP (ORDER BY RCT .CAPACITY_TYPE_ID) "fuelTypes",
         'capacityTypeName' "prop"
         from RMS_CAPACITY_TYPE RCT
@@ -593,6 +594,7 @@
         RL.LINE_NAME "label",
         RL.LINE_NAME "text",
         NVL(RL_TEMP."points",'无') "points",
+
         RL.LINE_TYPE    "lineType",
         'lineName' "prop"
         from RMS_LINE RL
@@ -662,14 +664,27 @@
         RC.MATERIAL_NAME "materialName",
         RC.MATERIAL_ID "id",
         RC.MATERIAL_ID "value",
-        RC.MATERIAL_NAME "label",
+        RC.MATERIAL_CODE || '-' || RC.MATERIAL_NAME ||
+        (CASE WHEN RC.MATERIAL_SPECIFICATION IS NOT NULL
+        THEN '-' || RC.MATERIAL_SPECIFICATION
+        WHEN RC.MATERIAL_MODEL IS NOT NULL
+        THEN '-' || RC.MATERIAL_MODEL
+        ELSE ''
+        END) "label",
+
         RC.MATERIAL_NAME "text",
         'materialName' "prop"
         from RMS_MATERIAL RC
         <where>
             DELETED = 0
             <if test="index!=null and index!=''">
-                AND REGEXP_LIKE(RC.MATERIAL_NAME, #{index})
+                AND REGEXP_LIKE(RC.MATERIAL_CODE || '-' || RC.MATERIAL_NAME ||
+                (CASE WHEN RC.MATERIAL_SPECIFICATION IS NOT NULL
+                THEN '-' || RC.MATERIAL_SPECIFICATION
+                WHEN RC.MATERIAL_MODEL IS NOT NULL
+                THEN '-' || RC.MATERIAL_MODEL
+                ELSE ''
+                END), #{index})
             </if>
             <if test="materialId!=null and materialId!=''">
                 AND RC.MATERIAL_ID = #{materialId}
@@ -682,7 +697,13 @@
             select
             RC.MATERIAL_ID "id",
             RC.MATERIAL_ID "value",
-            RC.MATERIAL_NAME "label",
+            RC.MATERIAL_CODE || '-' || RC.MATERIAL_NAME ||
+            (CASE WHEN RC.MATERIAL_SPECIFICATION IS NOT NULL
+            THEN '-' || RC.MATERIAL_SPECIFICATION
+            WHEN RC.MATERIAL_MODEL IS NOT NULL
+            THEN '-' || RC.MATERIAL_MODEL
+            ELSE ''
+            END) "label",
             RC.MATERIAL_NAME "text"
             from RMS_MATERIAL RC
             WHERE RC.MATERIAL_ID in
@@ -890,5 +911,10 @@
             </if>
         </where>
     </select>
+    <select id="getIdCardCode" resultType="java.lang.String">
+        SELECT RC.INNNER_CODE FROM RMS_PERSONNEL RC
+        WHERE RC.PERSONNEL_JOB_NUMBER = #{jobNumber}
+        FETCH NEXT 1 ROWS ONLY
+    </select>
 
 </mapper>