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") && (request.getAttribute("userId")==null || request.getAttribute("userName")==null)){
+        if(!requestUrl.contains("/api/v1/bp/bpLogin") && !requestUrl.contains("/api/v1/uc/getAppVersion") && (request.getAttribute("userId")==null || request.getAttribute("userName")==null)){
             //无权访问
             response.setCharacterEncoding("UTF-8");
             response.setContentType("application/json; charset=utf-8");

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

@@ -839,6 +839,11 @@ public class AMScontroller  extends BaseRESTfulController {
     @PostMapping("/selectUnitPrice")
     Map<String,Object> selectUnitPrice(@RequestBody Map<String,Object> map) {return amsFeign.selectUnitPrice(map);}
 
+    @ApiOperation("不分页查询派车证")
+    @PostMapping(value = "/amsScheduleDispatchNoPage")
+    public Map<String, Object> amsScheduleDispatchNoPage(@RequestBody HashMap<String,Object> parmas){
+        return amsFeign.amsScheduleDispatchNoPage(parmas);
+    }
     @ApiOperation("多拼派车")
     @PostMapping("/saleDispatchDuoPin")
     RESTfulResult saleDispatchDuoPin(@RequestBody Map<String,Object> map) {return amsFeign.saleDispatchDuoPin(map);}

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

@@ -282,4 +282,11 @@ public class UniversalController extends BaseRESTfulController {
         requireMap.put("requirementNo",requirementNo);
         return success(requireMap);
     }
+
+    @ApiOperation("查询APP版本更新")
+    @PostMapping("/getAppVersion")
+    public RESTfulResult getAppVersion() {
+        Map<String,Object> config = universalMapper.getConfigByName("APP最新版本");
+        return success(config.get("valueString"));
+    }
 }

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

@@ -309,11 +309,11 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransrequirements/selectUnitPrice")
     Map<String, Object> selectUnitPrice(@RequestBody Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/ams/amsscheduledispatchs/noPage")
+    Map<String, Object> amsScheduleDispatchNoPage(@RequestBody Map<String, Object> map);
     @PostMapping(value = "api/v1/ams/amstransrequirements/saleDispatchDuoPin")
     RESTfulResult saleDispatchDuoPin(@RequestBody Map<String, Object> map);
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/getMaterialOperation")
     RESTfulResult getMaterialOperation(@RequestBody Map<String,Object> map);
-
-
 }

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

@@ -95,4 +95,5 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getDriverByLike(Map<String, Object> map);
 
+    Map<String,Object> getConfigByName(String configName);
 }

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

@@ -1650,4 +1650,18 @@
             ORDER BY "countNumber" DESC
         </if>
     </select>
+
+    <select id="getConfigByName" resultType="java.util.Map">
+        SELECT CONFIG_ID           "configId",
+               CONFIG_NAME         "configName",
+               CONFIG_VALUE_STRING "valueString",
+               CONFIG_VALUE_NUMBER "valueNumber",
+               CONFIG_VALUE_DATE   "valueDate",
+               CONFIG_DESCRIPTION  "configDescription",
+               DELETED             "deleted"
+        FROM DIL_CONFIG
+        WHERE DELETED!=1
+    AND CONFIG_NAME= #{configName}
+            FETCH NEXT 1 ROWS ONLY
+    </select>
 </mapper>