2021-07-12 环控命令水量电量

huimv-smart-datacollection/src/main/java/com/huimv/datacollection/service/impl/ClientDataPacketServiceImpl.java

@@ -1463,7 +1463,7 @@ public class ClientDataPacketServiceImpl implements IClientDataPacketService {
         String gz = String.valueOf(Integer.parseInt(jqid.substring(jqid.length() - 1))
                 + Integer.parseInt(pznr.substring(pznr.length() - 1)) + Integer.parseInt(cmd.substring(cmd.length() - 1)) + Long.parseLong(date) % 10);
         String rs = XtAppConstant.SOCKET_SJSC_START + "+" + result[1] + "+" + cmd + "+";
-        String dbjg = "0";
+        String dbjg = "1";
         if ((gz.substring(gz.length() - 1)).equals(jy)) {
             gz = XtAppConstant.SOCKET_SJSC_GZBZ_0;
             dbjg = XtAppConstant.SOCKET_SJSC_TLGTB_0;

huimv-smart-datacollection/src/main/java/com/huimv/datacollection/tcp/ServerThread.java

@@ -18,7 +18,7 @@ public class ServerThread extends Thread {
 
     private IClientDataPacketService iClientDataPacketService;
 
-    public ServerThread(Socket socket, IClientDataPacketService iClientDataPacketService) {
+    public  ServerThread(Socket socket, IClientDataPacketService iClientDataPacketService) {
         this.socket = socket;
         this.iClientDataPacketService = iClientDataPacketService;
     }

huimv-smart-datacollection/src/main/resources/application-dev.yml

@@ -74,7 +74,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 192.168.1.57:8848
+        server-addr: 192.168.1.44:8848
 
   application:
     name: huimv-smart-datacollection

huimv-smart-management/src/main/java/com/huimv/management/controller/CameraBrandController.java

@@ -78,7 +78,12 @@ public class CameraBrandController {
      */
     @RequestMapping("/delete")
     public R delete(@RequestBody Integer[] ids){
-		cameraBrandService.removeByIds(Arrays.asList(ids));
+        if (cameraBrandService.delete(ids)){
+            cameraBrandService.removeByIds(Arrays.asList(ids));
+        }else {
+            return R.error("有该品牌的摄像头，删除失败");
+        }
+
 
         return R.ok();
     }

huimv-smart-management/src/main/java/com/huimv/management/service/CameraBrandService.java

@@ -16,5 +16,7 @@ import java.util.Map;
 public interface CameraBrandService extends IService<CameraBrandEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
+
+    boolean delete(Integer[] ids);
 }
 

huimv-smart-management/src/main/java/com/huimv/management/service/impl/CameraBrandServiceImpl.java

@@ -1,6 +1,11 @@
 package com.huimv.management.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.management.dao.CameraInfoDao;
+import com.huimv.management.entity.CameraInfoEntity;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -23,6 +28,9 @@ import com.huimv.management.service.CameraBrandService;
 @Service("cameraBrandService")
 public class CameraBrandServiceImpl extends ServiceImpl<CameraBrandDao, CameraBrandEntity> implements CameraBrandService {
 
+    @Autowired
+    private CameraInfoDao cameraInfoDao;
+
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
         QueryWrapper<CameraBrandEntity> wrapper = new QueryWrapper<>();
@@ -39,4 +47,17 @@ public class CameraBrandServiceImpl extends ServiceImpl<CameraBrandDao, CameraBr
         return new PageUtils(page);
     }
 
+    @Override
+    public boolean delete(Integer[] ids) {
+        LambdaQueryWrapper<CameraInfoEntity> wrapper = Wrappers.lambdaQuery();
+        for (Integer id : ids) {
+            wrapper.eq(CameraInfoEntity::getCameraBrandId,id);
+            if ( cameraInfoDao.selectCount(wrapper) > 0){
+                return false;
+            }
+            wrapper.clear();
+        }
+
+        return true;
+    }
 }

huimv-smart-management/src/main/java/com/huimv/management/service/impl/CameraInfoServiceImpl.java

@@ -47,10 +47,10 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoDao, CameraInfo
     public PageUtils queryPage(Map<String, Object> params) {
 
         //根据牧场查询
-        String farmId = (String) params.get("fromFarmId");
+        String farmId = (String) params.get("formFarmId");
 
         QueryWrapper<CameraInfoEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(farmId), "farm_id", farmId);
+        wrapper.eq(StringUtils.isNotBlank(farmId), "farm_id",farmId);
 
         //关键词
         String keyword = (String) params.get("keyword");
@@ -58,7 +58,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoDao, CameraInfo
             wrapper.like("name", keyword)
                     .or().like("area_name", keyword)
                     .or().like("ip", keyword)
-                    .or().like("camera_type", keyword);
+                    .or().like("camera_brand", keyword);
         }
 
         String areaId = (String) params.get("areaId");