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

.gitignore

@@ -6,7 +6,6 @@ rebel.xml
 out/artifacts/
 dil-api.iml
 src/test
-
 # Compiled class file
 *.class
 

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

@@ -372,7 +372,7 @@ public class SystemFileController extends BaseRESTfulController {
                 //}
             }
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("/yyyy/MM/dd");
-            String filePath = simpleDateFormat.format(new Date()) + "/" + fileType;
+            String filePath = "/" + fileType  + simpleDateFormat.format(new Date());
             boolean result = ftpFileUtil.uploadToFtp(inputStream, filePath, newName, false);
             inputStream.close();
             if (result) {

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

@@ -229,8 +229,13 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiOperation("根据物料编码获取物料信息")
     @PostMapping("/getMaterial")
-    public RESTfulResult getMaterial(@RequestBody Map<String,Object> map) {
+    public RESTfulResult getMaterial(@RequestBody Map<String,Object>
+                                                 map, Integer apiId,
+                                     Integer pageNum,
+                                     Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
         List<Map<String, Object>> material = universalMapper.getMaterial(map);
-        return success(material);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, material);
+        return success(pageList);
     }
 }

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

@@ -45,4 +45,9 @@ public class WebSocketController {
     public RESTfulResult getBaseWebsocketPush(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
         return webSocketFeign.basewebsocketpushsList(parmas,pageNum,pageSize);
     }
+
+    @GetMapping(value = "/getUserByOrgCode/{orgCode}")//String
+    public RESTfulResult getUserByOrgCode(@PathVariable("orgCode") String orgCode){
+        return webSocketFeign.getUserByOrgCode(orgCode);
+    }
 }

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

@@ -30,4 +30,8 @@ public interface WebSocketFeign {
     RESTfulResult noPage(@RequestParam HashMap<String,Object> parmas);
     @GetMapping("api/v1/websocket/basewebsocketpushs/{id}")
     RESTfulResult get(@PathVariable String id);
+    @GetMapping("api/v1/websocket/basewebsocketpushs/getUserByOrgCode/{orgCode}")//String
+    RESTfulResult getUserByOrgCode(@PathVariable("orgCode") String orgCode);
+    @PostMapping("/sendWebsocketByIds/{ids}")
+    RESTfulResult sendWebsocketByIds(@PathVariable("ids") String webSocketIds, @RequestBody HashMap<String,Object> map);
 }

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

@@ -572,7 +572,8 @@
             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"
+            listagg (RFT .FUEL_TYPE_NAME, '/') WITHIN GROUP (ORDER BY RCT .CAPACITY_TYPE_ID)  "fuelTypes",
+            'capacityTypeName' "prop"
             from RMS_CAPACITY_TYPE RCT
             LEFT JOIN RMS_CAPACITY_FUEL_TYPE RCFT ON RCFT.CAPACITY_TYPE_ID = RCT .CAPACITY_TYPE_ID
             LEFT JOIN RMS_FUEL_TYPE RFT ON RFT .FUEL_TYPE_ID = RCFT.FUEL_TYPE_ID
@@ -935,9 +936,6 @@
             <if test="prodCode != null and prodCode != ''">
                 and t.prod_code = #{prodCode}
             </if>
-            <if test="materialId != null and materialId != ''">
-                and b.material_id = #{materialId}
-            </if>
         </where>
         union all
         select '' as "prodCodePk",
@@ -957,7 +955,7 @@
         from rms_material b
         <where>
             <if test="prodCode != null and prodCode != ''">
-                and t.prod_code = #{prodCode}
+                and b.material_code = #{prodCode}
             </if>
             <if test="materialId != null and materialId != ''">
                 and b.material_id = #{materialId}