添加手机端

shiwan/env/src/main/java/com/huimv/env/controller/EnvironmentController.java

@@ -1,6 +1,5 @@
 package com.huimv.env.controller;
 
-import com.alibaba.fastjson.JSONArray;
 import com.huimv.common.utils.Result;
 import com.huimv.env.service.IEnvironmentService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -82,9 +81,9 @@ public class EnvironmentController {
      * @Time        : 20:51
      */
     @RequestMapping(value="/getLastEnvByLq",method = RequestMethod.GET)
-    public Result getLastEnvByLq(@RequestParam(value = "lqid") Integer lqid){
+    public Result getLastEnvByLq(@RequestParam(value = "lqid") Integer lqid,@RequestParam(value = "zsid",required = false) Integer zsid){
         //
-        return environmentService.getLastEnvByLq(lqid);
+        return environmentService.getLastEnvByLq(lqid,zsid);
     }
 
     @RequestMapping(value="/getTemperature",method = RequestMethod.GET)

shiwan/env/src/main/java/com/huimv/env/service/IEnvironmentService.java

@@ -28,7 +28,7 @@ public interface IEnvironmentService {
 
     Result getZsda(int mcid);
 
-    Result getLastEnvByLq(Integer lqid);
+    Result getLastEnvByLq(Integer lqid,Integer zsid);
 
     Result getTemperatureOnToday(Integer lqid);
 

shiwan/env/src/main/java/com/huimv/env/service/impl/EnvironmentServiceImpl.java

@@ -283,6 +283,10 @@ public class EnvironmentServiceImpl implements IEnvironmentService {
             JSONObject zsJo = new JSONObject();
             zsJa.add(zsJo);
             zsJo.put("zsid", zsid);
+            zsJo.put("isQuanKong",false);
+            if (zsid == 367 || zsid == 378 || zsid == 379){
+                zsJo.put("isQuanKong",true);
+            }
             zsJo.put("zsmc", zsdaEntity.getZSMC());
             for (DaLqdaEntity lqdaEntity : lqdaEntityList) {
                 if (lqdaEntity.getZSID() == zsid) {
@@ -306,7 +310,10 @@ public class EnvironmentServiceImpl implements IEnvironmentService {
      */
     @Override
     @DS("slave")
-    public Result getLastEnvByLq(Integer lqid) {
+    public Result getLastEnvByLq(Integer lqid,Integer zsid) {
+
+
+
         String todayDate = new DateUtil().formatDate(new Date());
         System.out.println(" todayDate>>"+todayDate);
         System.out.println(" lqid>>"+lqid);
@@ -334,6 +341,7 @@ public class EnvironmentServiceImpl implements IEnvironmentService {
         } else {
             envJo.put("temp", "");
         }
+        envJo.put("zsid",zsid);
         return new Result(ResultCode.SUCCESS, envJo);
     }
 
@@ -437,7 +445,7 @@ public class EnvironmentServiceImpl implements IEnvironmentService {
     }
 
     @Override
-    @DS("third")
+    @DS("master")
     public Result getEnvDetails() {
         /**  */
         EnvironmentDataEntity environmentData = environmentDataRepo.getOneLastEnvData();