设备管理-通信设备、电力监控设备、电力变量列表相关接口上传

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

@@ -83,7 +83,7 @@ public class DeviceAnalogVariableListController {
 
 
     /**
-     * 站点管理-变量列表-列表查询 无分页
+     * 站点管理-变量列表-列表查询
      * @param deviceAnalogVariableListVo
      * @return
      */

fiveep-model/src/main/java/com/bizmatics/model/DeviceAnalogVariableList.java

@@ -88,4 +88,12 @@ public class DeviceAnalogVariableList implements Serializable {
      * 1:启用、0：不启用
      */
     private Integer status;
+    /**
+     *  通信设备
+     */
+    private String deviceName;
+    /**
+     *  电力监控设备
+     */
+    private String monitorDeviceName;
 }

fiveep-model/src/main/java/com/bizmatics/model/vo/DeviceAnalogVariableListVo.java

@@ -26,11 +26,7 @@ public class DeviceAnalogVariableListVo  implements Serializable {
 
     private Integer siteId;
 
-    private Integer deviceType;
-
-    private String deviceCode;
-
-    private String screen;
+    private String variableName;
 
     private Integer size;
 

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

@@ -17,9 +17,9 @@ import java.util.List;
 public interface DeviceAnalogVariableListMapper extends CrudMapper<DeviceAnalogVariableList> {
     List<DeviceAnalogVariableList> variableList(@Param("siteId") Integer siteId,
                                                 @Param("id") Integer id,
-                                                @Param("deviceCode") String deviceCode,
-                                                @Param("deviceType") Integer deviceType,
-                                                @Param("screen") String screen,
+                                                @Param("variableName") String variableName,
                                                 @Param("startCurrent") Integer startCurrent,
                                                 @Param("current") Integer current);
+
+
 }

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

@@ -20,28 +20,24 @@
     </resultMap>
     <select id="variableList" resultType="com.bizmatics.model.DeviceAnalogVariableList">
         SELECT
-         a.*
+        a.*, b.device_name,
+        c.monitor_device_name
         FROM
-         device_analog_variable_list AS a
-         inner JOIN device AS b ON a.device_code = b.device_code
+        device_analog_variable_list AS a
+        JOIN device AS b ON a.communication_equipment = b.id
+        JOIN device_attribute AS c ON a.monitoring_equipment = c.id
         <where>
-            b.enable =1
-            and a.status =1
+            a. STATUS = 1
+            AND b. ENABLE = 1
+            AND c. STATUS = 1
             <if test="siteId != null and siteId !=0">
-                and b.site_id = #{siteId}
+                and c.site_id = #{siteId}
             </if>
             <if test="id != null and id !=0">
                 and a.id = #{id}
             </if>
-            <if test="deviceCode != null and deviceCode !=''">
-                and b.device_code = #{deviceCode}
-            </if>
-            <if test="deviceType != null and deviceType !=0">
-                and b.device_type = #{deviceType}
-            </if>
-            <if test="screen != null and screen !=''">
-                and ( a.variable_name LIKE CONCAT(CONCAT('%', #{screen}), '%') or a.variable_coding LIKE
-                CONCAT(CONCAT('%', #{screen}), '%'))
+            <if test="variableName != null and variableName !=''">
+                and a.variable_name LIKE CONCAT(CONCAT('%', #{variableName}), '%')
             </if>
         </where>
          order by a.id

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

@@ -1,12 +1,10 @@
 package com.bizmatics.service;
 
 import com.bizmatics.common.core.bean.CommonPage;
-import com.bizmatics.model.DeviceAnalogVariableList;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.DeviceAnalogVariableList;
 import com.bizmatics.model.vo.DeviceAnalogVariableListVo;
 
-import java.util.List;
-
 /**
  * <p>
  * 设备变量列表 服务类
@@ -17,9 +15,13 @@ import java.util.List;
  */
 public interface DeviceAnalogVariableListService extends CrudService<DeviceAnalogVariableList> {
     void variableListAdd(DeviceAnalogVariableList deviceAnalogVariableList);
+
     void variableListUpdate(DeviceAnalogVariableList deviceAnalogVariableList);
+
     void variableListDel(int id);
-    CommonPage<DeviceAnalogVariableList> variableList(String deviceCode, String screen,int size,int current);
+
+    CommonPage<DeviceAnalogVariableList> variableList(String deviceCode, String screen, int size, int current);
+
     CommonPage<DeviceAnalogVariableList> variableListone(DeviceAnalogVariableListVo deviceAnalogVariableListVo);
 
 

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

@@ -38,13 +38,7 @@ public class DeviceAnalogVariableListServiceImpl extends AbstractCrudService<Dev
 
     @Override
     public void variableListAdd(DeviceAnalogVariableList deviceAnalogVariableList) {
-
-        LambdaQueryWrapper<Device> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(Device::getDeviceCode, deviceAnalogVariableList.getDeviceCode());
-        List<Device> deviceList = deviceService.list(queryWrapper);
-        Device DeviceList = (Device) deviceList.get(0);
         SysUser user = SecurityUtils.getLoginUser().getUser();
-        deviceAnalogVariableList.setDeviceCode(DeviceList.getDeviceCode());
         deviceAnalogVariableList.setCreateTime(LocalDateTime.now());
         deviceAnalogVariableList.setCreator(user.getUserName());
         deviceAnalogVariableList.setStatus(1);
@@ -85,16 +79,13 @@ public class DeviceAnalogVariableListServiceImpl extends AbstractCrudService<Dev
     public CommonPage<DeviceAnalogVariableList> variableListone(DeviceAnalogVariableListVo deviceAnalogVariableListVo){
         int start_current=(deviceAnalogVariableListVo.getSize()-1)*deviceAnalogVariableListVo.getCurrent();
         List<DeviceAnalogVariableList> deviceAnalogVariableListOne =  baseMapper.variableList(deviceAnalogVariableListVo.getSiteId(),deviceAnalogVariableListVo.getId(),
-                deviceAnalogVariableListVo.getDeviceCode(),deviceAnalogVariableListVo.getDeviceType(),
-                deviceAnalogVariableListVo.getScreen(), null, null);
+                deviceAnalogVariableListVo.getVariableName(), null, null);
         int total=0;
         if (deviceAnalogVariableListOne.size()>0){
             total= deviceAnalogVariableListOne.size();
         }
-
         List<DeviceAnalogVariableList> deviceAnalogVariableList =  baseMapper.variableList(deviceAnalogVariableListVo.getSiteId(),deviceAnalogVariableListVo.getId(),
-                deviceAnalogVariableListVo.getDeviceCode(),deviceAnalogVariableListVo.getDeviceType(),
-                deviceAnalogVariableListVo.getScreen(), start_current, deviceAnalogVariableListVo.getCurrent());
+                deviceAnalogVariableListVo.getVariableName(), start_current, deviceAnalogVariableListVo.getCurrent());
         return new CommonPage<>(deviceAnalogVariableList, total, deviceAnalogVariableListVo.getCurrent(), deviceAnalogVariableListVo.getSize());
     }