Merge remote-tracking branch 'origin/master'

huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/EcoDeviceServiceImpl.java

@@ -12,6 +12,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -28,10 +29,10 @@ import java.util.PrimitiveIterator;
 @Service
 public class EcoDeviceServiceImpl extends ServiceImpl<EcoDeviceMapper, EcoDevice> implements EcoDeviceService {
 
-    @Autowired
+    @Resource
     private EcoDeviceMapper ecoDeviceMapper;
     @Autowired
-    private static final String globalFarmCode = "330211";
+    private static final String globalFarmCode = "331023001";
     @Override
     public Result add(EcoDevice ecoDevice) {
 
@@ -119,8 +120,13 @@ public class EcoDeviceServiceImpl extends ServiceImpl<EcoDeviceMapper, EcoDevice
         if (farmId == null) {
             farmId = globalFarmCode;
         }
+
+        String deviceCode = paramsMap.get("deviceCode");
+        String deviceType = paramsMap.get("deviceType");
         QueryWrapper<EcoDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StringUtils.isNotBlank(farmId),"farm_id", farmId);
+        queryWrapper.eq(StringUtils.isNotBlank(farmId),"farm_id", farmId)
+                    .like("device_code",deviceCode)
+                    .like("device_type",deviceType);
         Page<EcoDevice> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS,ecoDeviceMapper.selectPage(page,queryWrapper));
     }