feats

src/main/java/com/yunzhi/nanyang/controller/TdDeviceController.java

@@ -86,11 +86,15 @@ public class TdDeviceController extends BaseController {
             return ResponseBean.error("未绑定农机");
         }
 
-        TdDevice origin = iTdDeviceService.getExistBy("machinery_id", tdDevice.getMachineryId(), false, true);
+        if (StringUtils.isEmpty(tdDevice.getDeviceNo()) || StringUtils.isEmpty(tdDevice.getDeviceType())) {
+            return ResponseBean.error("未选择设备");
+        }
+
+        TdDevice origin = iTdDeviceService.getExistByDevice(tdDevice.getDeviceType(), tdDevice.getDeviceNo());
         if (isNew) {
             // 如果是新增操作
             if (null != origin) {
-                return ResponseBean.error("该农机已绑定设备");
+                return ResponseBean.error("该农机已绑定设备, 请先解绑");
             }
         } else {
             if (null != origin) {

src/main/java/com/yunzhi/nanyang/mapper/TdDeviceMapper.java

@@ -18,4 +18,6 @@ import org.apache.ibatis.annotations.Param;
 public interface TdDeviceMapper extends BaseMapper<TdDevice> {
 
     IPage<TdDevice> getPageBy(IPage<TdDevice> pg, @Param("deviceType") String deviceType,@Param("onlineStatus") Integer onlineStatus);
+
+    TdDevice getExistByDevice(@Param("deviceType") String deviceType,@Param("deviceNo") String deviceNo);
 }

src/main/java/com/yunzhi/nanyang/service/ITdDeviceService.java

@@ -15,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface ITdDeviceService extends IBaseService<TdDevice> {
 
     IPage<TdDevice> getPageBy(IPage<TdDevice> pg, String deviceType, Integer onlineStatus);
+
+    TdDevice getExistByDevice(String deviceType, String deviceNo);
 }

src/main/java/com/yunzhi/nanyang/service/impl/TdDeviceServiceImpl.java

@@ -22,4 +22,9 @@ public class TdDeviceServiceImpl extends BaseServiceImpl<TdDeviceMapper, TdDevic
     public IPage<TdDevice> getPageBy(IPage<TdDevice> pg, String deviceType, Integer onlineStatus) {
         return baseMapper.getPageBy(pg, deviceType, onlineStatus);
     }
+
+    @Override
+    public TdDevice getExistByDevice(String deviceType, String deviceNo) {
+        return baseMapper.getExistByDevice(deviceType, deviceNo);
+    }
 }

src/main/resources/mapper/TdDeviceMapper.xml

@@ -17,7 +17,7 @@
         FROM
             td_raw_device t
                 LEFT JOIN td_device s ON t.device_kind = s.device_type
-                AND t.device_no = s.device_no
+                    AND t.device_no = s.device_no AND s.`status` > -1
                 LEFT JOIN ta_machinery m ON s.machinery_id = m.machinery_id
         WHERE
             t.device_kind = #{deviceType}
@@ -25,4 +25,7 @@
         ORDER BY
             t.create_date DESC
     </select>
+    <select id="getExistByDevice" resultType="com.yunzhi.nanyang.entity.TdDevice">
+
+    </select>
 </mapper>