站点管理-监控设备和变量列表-增、删、改、查相关接口优化

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceAnalogVariableListController.java

@@ -29,24 +29,49 @@ public class DeviceAnalogVariableListController {
     @Autowired
     private DeviceAnalogVariableListService deviceAnalogVariableListService;
 
+    /**
+     * 站点管理-变量列表-新增
+     * @param deviceAnalogVariableList
+     * @return
+     */
     @GetMapping("variableListAdd")
     public ApiResult<Void> variableListAdd(@RequestBody DeviceAnalogVariableList deviceAnalogVariableList) {
         deviceAnalogVariableListService.variableListAdd(deviceAnalogVariableList);
         return ApiResult.success();
     }
 
+    /**
+     * 站点管理-变量列表-修改
+     * @param deviceAnalogVariableList
+     * @return
+     */
     @GetMapping("variableListUpdate")
     public ApiResult<Void> variableListUpdate(@RequestBody DeviceAnalogVariableList deviceAnalogVariableList) {
         deviceAnalogVariableListService.variableListUpdate(deviceAnalogVariableList);
         return ApiResult.success();
     }
 
+    /**
+     * 站点管理-变量列表-注销
+     * @param id 变量列表主键ID
+     * @return
+     */
+
     @GetMapping("variableListDel")
     public ApiResult<Void> variableListDel(@RequestParam int id) {
         deviceAnalogVariableListService.variableListDel(id);
         return ApiResult.success();
     }
 
+    /**
+     * 站点管理-变量列表-列表查询
+     * @param deviceCode 设备编号
+     * @param screen 筛选条件
+     * @param size 页数
+     * @param current 条数
+     * @return
+     */
+
     @GetMapping("variableList")
     public ApiResult<CommonPage<DeviceAnalogVariableList>> variableList(@RequestParam(required = false) String deviceCode,
                                                                         @RequestParam(required = false) String screen,

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceAttributeController.java

@@ -52,13 +52,15 @@ public class DeviceAttributeController {
      * @param deviceCode 设备编号
      * @param id device_attribute表主键ID
      * @param siteId 点位ID
+     * @param deviceType 设备类型
      * @return
      */
     @GetMapping("deviceNewsList")
     public ApiResult <List<DeviceAttributeVo>> deviceNewsList(@RequestParam(required = false) String deviceCode,
-                                                              @RequestParam(required = false) String id,
-                                                              @RequestParam(required = false) String siteId) {
-        return ApiResult.success(deviceAttributeService.deviceNewsList(deviceCode, Integer.parseInt(id), Integer.parseInt(siteId)));
+                                                              @RequestParam(value = "id", required = false, defaultValue = "0") int id,
+                                                              @RequestParam(value = "siteId", required = false, defaultValue = "0") int siteId,
+                                                              @RequestParam(value = "deviceType", required = false, defaultValue = "0") int deviceType) {
+        return ApiResult.success(deviceAttributeService.deviceNewsList(deviceCode, id, siteId,deviceType));
     }
 
     /**

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/DeviceAttributeMapper.java

@@ -21,5 +21,6 @@ public interface DeviceAttributeMapper extends CrudMapper<DeviceAttribute> {
 
     List<DeviceAttributeVo> deviceList(@Param("deviceCode") String deviceCode,
                                        @Param("id") Integer id,
-                                       @Param("siteId") Integer siteId);
+                                       @Param("siteId") Integer siteId,
+                                       @Param("deviceType") Integer deviceType);
 }

fiveep-persistence/src/main/resources/mapper/mysql/DeviceAttributeMapper.xml

@@ -38,6 +38,9 @@
             <if test="siteId != null and siteId !=0">
                 and b.site_id = #{siteId}
             </if>
+            <if test="deviceType != null and deviceType !=0">
+                and b.device_type = #{deviceType}
+            </if>
         </where>
     </select>
 </mapper>

fiveep-service/src/main/java/com/bizmatics/service/DeviceAttributeService.java

@@ -18,6 +18,6 @@ public interface DeviceAttributeService extends CrudService<DeviceAttribute> {
 
     void deviceNewsAdd(DeviceAttribute deviceAttribute);
     void deviceNewsUpdate(DeviceAttribute deviceAttribute);
-    List<DeviceAttributeVo> deviceNewsList(String deviceCode,int id,int siteId);
+    List<DeviceAttributeVo> deviceNewsList(String deviceCode,int id,int siteId,int deviceType);
     void deviceNewsDel(int id);
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceAttributeServiceImpl.java

@@ -58,11 +58,10 @@ public class DeviceAttributeServiceImpl extends AbstractCrudService<DeviceAttrib
     }
 
     @Override
-    public List<DeviceAttributeVo> deviceNewsList(String deviceCode, int id, int siteId) {
+    public List<DeviceAttributeVo> deviceNewsList(String deviceCode, int id, int siteId,int deviceType) {
         List<DeviceAttributeVo> deviceAttributeVoList = null;
-        deviceAttributeVoList = baseMapper.deviceList(deviceCode, id, siteId);
+        deviceAttributeVoList = baseMapper.deviceList(deviceCode, id, siteId,deviceType);
         return deviceAttributeVoList;
-
     }
 
     @Override