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

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

@@ -287,6 +287,41 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.importMaterial(map);
     }
 
+    //====================物资
+    @ApiOperation(value = "获取物资产量列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", 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"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getMaterialYieldList")
+    public Map<String, Object> getMaterialYieldList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize
+    ) {
+        return rmsFeign.getMaterialYieldList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @PostMapping("/insertMaterialYield")
+    public Map<String, Object> insertMaterialYield(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.insertMaterialYield(mapValue);
+    }
+
+    @PostMapping("/updateMaterialYield")
+    public Map<String, Object> updateMaterialYield(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.updateMaterialYield(mapValue);
+    }
+
+    @PostMapping("/deleteMaterialYield")
+    public Map<String, Object> deleteMaterialYield(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.deleteMaterialYield(mapValue);
+    }
+
+
+
     //====================作业点
     @ApiOperation(value = "获取作业点列表")
     @ApiImplicitParams({

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

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -26,6 +27,11 @@ public class WebSocketController {
         return webSocketFeign.readWebsocket(sendId);
     }
 
+    @PostMapping("/readingWebsockets")
+    public RESTfulResult readingWebsockets(@RequestBody HashMap<String,Object> map){
+        return webSocketFeign.readingWebsockets((List<HashMap<String, Object>>) map.get("list"));
+    }
+
     @PostMapping("/sendWebsocket/{id}")
     public RESTfulResult sendWebsocket(@PathVariable("id") String webSocketId, @RequestBody HashMap<String,Object> map, HttpServletRequest request){
         return webSocketFeign.sendWebsocket(webSocketId,map);

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

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -113,6 +114,15 @@ public interface RmsFeign {
                                         @RequestParam("apiId") Integer apiId,
                                         @RequestParam("pageNum") Integer pageNum,
                                         @RequestParam("pageSize") Integer pageSize);
+    //查询物料产量
+    @PostMapping(value = "api/v1/rms/rmsmaterialyields/getMaterialYieldList")
+    Map<String, Object> getMaterialYieldList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize);
+    //新增物料产量
+    @PostMapping(value = "api/v1/rms/rmsmaterialyields/insertMaterialYield")
+    Map<String, Object> insertMaterialYield(@RequestBody(required = false) Map<String,Object> model);
 
     //新增物资
     @PostMapping(value = "api/v1/rms/rmsmaterial/insertMaterial")
@@ -723,6 +733,12 @@ public interface RmsFeign {
 
     @PostMapping(value = "api/v1/rms/rmsmapvertexs/navigation")
     Map<String, Object> navigation(@RequestBody(required = false) Map<String, Object> map);
+    //修改物料产量
+    @PostMapping(value = "api/v1/rms/rmsmaterialyields/updateMaterialYield")
+    Map<String, Object> updateMaterialYield(@RequestBody(required = false) Map<String,Object> model);
+
+    @PostMapping(value = "api/v1/rms/rmsmaterialyields/deleteMaterialYield")
+    Map<String, Object> deleteMaterialYield(@RequestBody(required = false) Map<String,Object> model);
 
     @PostMapping(value = "api/v1/rms/rmsstandardinfos/getPublicCode")
     Map<String, Object> getPublicCode(@RequestBody(required = false) Map<String, Object> mapValue,

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

@@ -7,6 +7,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
+import java.util.List;
+
 /**
  * @ClassName WebSocketFeign
  * @Description TODO
@@ -18,6 +20,8 @@ import java.util.HashMap;
 public interface WebSocketFeign {
     @PostMapping("api/v1/websocket/basewebsocketsends/readWebsocket/{id}")
     RESTfulResult readWebsocket(@PathVariable("id") String sendId);
+    @PostMapping("api/v1/websocket/basewebsocketsends/readingWebsockets")
+    RESTfulResult readingWebsockets(@RequestBody() List<HashMap<String,Object>> list);
     @PostMapping("api/v1/websocket/basewebsocketsends/sendWebsocket/{id}")
     RESTfulResult sendWebsocket(@PathVariable("id") String webSocketId, @RequestBody HashMap<String,Object> map);
     @GetMapping("api/v1/websocket/basewebsocketsends/")

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

@@ -98,6 +98,7 @@
         </if>
         RC.COMPANY_NAME "label",
         RC.COMPANY_NAME "text",
+        RC.COMPANY_NAME "companyName",
         T2 ."rootCompanyId",
         T2 ."rootCompanyName",
         'label' "prop"
@@ -170,6 +171,7 @@
             </if>
             RC.COMPANY_NAME "label",
             RC.COMPANY_NAME "text",
+            RC.COMPANY_NAME "companyName",
             T2 ."rootCompanyId",
             T2 ."rootCompanyName",
             'label' "prop"
@@ -321,6 +323,7 @@
         PERSONNEL_NAME "personnelName",
         PERSONNEL_POST "personnelPost",
         PERSONNEL_PHONE "personnelPhone",
+        to_char(SSO_ID) "ssoId",
         PERSONNEL_ID "id",
         PERSONNEL_ID "value",
         PERSONNEL_NAME "label",