Browse Source

料塔余量修改4

wwh 1 year ago
parent
commit
26b1a76b13

+ 2 - 2
snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingenv/controller/FeedingEnvController.java

@@ -123,8 +123,8 @@ public class FeedingEnvController {
     @ApiOperation("设备汇总")
     @CommonLog("设备汇总")
     @PostMapping("/feed/feedingenv/listEnv")
-    public CommonResult<JSONObject> listEnv(@RequestBody String orgId) {
-        return CommonResult.data(feedingEnvService.listEnv(orgId));
+    public CommonResult<JSONObject> listEnv(@RequestBody Map<String,String> paramsMap) {
+        return CommonResult.data(feedingEnvService.listEnv(paramsMap));
     }
 
 

+ 2 - 1
snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingenv/service/FeedingEnvService.java

@@ -24,6 +24,7 @@ import vip.xiaonuo.modular.feed.feedingenv.entity.FeedingEnv;
 import vip.xiaonuo.modular.feed.feedingenv.param.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 精准饲喂设备Service接口
@@ -85,7 +86,7 @@ public interface FeedingEnvService extends IService<FeedingEnv> {
      * 设备汇总
      *
      * */
-    JSONObject listEnv(String orgId);
+    JSONObject listEnv(Map<String,String> paramsMap);
 
     Page<FeedingEnv> page(FeedingEnvListParam envDevicePageParam);
 

+ 3 - 1
snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingenv/service/impl/FeedingEnvServiceImpl.java

@@ -44,6 +44,7 @@ import javax.validation.constraints.NotBlank;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 精准饲喂设备Service接口实现类
@@ -128,7 +129,8 @@ public class FeedingEnvServiceImpl extends ServiceImpl<FeedingEnvMapper, Feeding
     }
 
     @Override
-    public JSONObject listEnv(String orgId) {
+    public JSONObject listEnv(Map<String,String> paramsMap) {
+        String orgId = paramsMap.get("orgId");
         JSONObject jsonObject = new JSONObject();
         List<FeedingEnv> envs = envMapper.selectList(new QueryWrapper<FeedingEnv>().eq("org_id", orgId));
         if (envs.size() > 0){