优化 修改项目结构

src/main/java/com/yunfeiyun/agmp/iotm/device/xycb/controller/IotXycbController.java

@@ -206,22 +206,26 @@ public class IotXycbController extends BaseController
      * 性诱测报列表
      * /list  所有性诱测报设备
      * /pt/list 普通性诱测报设备
+     * /2/list 性诱测报2.0设备  宁录性诱测报设备
      * /III/list 性诱测报III设备
      * @param reqVo
      * @return
      */
-    @GetMapping({"/list", "/pt/list", "/III/list"})
+    @GetMapping({"/list", "/pt/list", "/2/list", "/III/list"})
     public TableDataInfo list(HttpServletRequest request, IotDeviceListReqVo reqVo) {
         startPage();
         String reqUri = request.getRequestURI();
         String[] devTypeList = new String[]{
-                IotDeviceDictConst.TYPE_YF_XYCB_III
+                IotDeviceDictConst.TYPE_YF_XYCB_III,
+                IotDeviceDictConst.TYPE_YF_XYCB_2
         };
 
         if(reqUri.endsWith("/pt/list")){
             devTypeList = new String[]{IotDeviceDictConst.TYPE_YF_XYCB_III};
         } else if (reqUri.endsWith("/III/list")) {
             devTypeList = new String[]{IotDeviceDictConst.TYPE_YF_XYCB_III};
+        } else if (reqUri.endsWith("/2/list")) {
+            devTypeList = new String[]{IotDeviceDictConst.TYPE_YF_XYCB_2};
         }
         reqVo.setDevtypeBidList(Arrays.asList(devTypeList));
         List<IotDeviceListResVo> list = iIotDeviceService.selectIotDeviceListByType(reqVo);