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

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -47,12 +49,12 @@ public class DeviceAnalogVariableList implements Serializable {
     /**
      * 监控设备
      */
-    private int monitoringEquipment;
+    private Integer monitoringEquipment;
 
     /**
      * 通信设备
      */
-    private int communicationEquipment;
+    private Integer communicationEquipment;
 
     /**
      * 数据地址
@@ -77,7 +79,7 @@ public class DeviceAnalogVariableList implements Serializable {
     /**
      * 创建时间
      */
-    private LocalDateTime createTime;
+    private Date createTime;
 
     /**
      * 创建人
@@ -96,4 +98,9 @@ public class DeviceAnalogVariableList implements Serializable {
      *  电力监控设备
      */
     private String monitorDeviceName;
+
+    /**
+     * 1.模拟量 2.状态量 3.参数量
+     */
+    private Integer dataArea;
 }

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

@@ -31,4 +31,6 @@ public class DeviceAnalogVariableListVo  implements Serializable {
     private Integer size;
 
     private Integer current;
+
+    private Integer dataArea;
 }

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

@@ -19,7 +19,8 @@ public interface DeviceAnalogVariableListMapper extends CrudMapper<DeviceAnalogV
                                                 @Param("id") Integer id,
                                                 @Param("variableName") String variableName,
                                                 @Param("startCurrent") Integer startCurrent,
-                                                @Param("current") Integer current);
+                                                @Param("current") Integer current,
+                                                @Param("dataArea") Integer dataArea);
 
 
 }

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

@@ -36,11 +36,14 @@
             <if test="id != null and id !=0">
                 and a.id = #{id}
             </if>
+            <if test="dataArea != null and dataArea !=0">
+                and a.data_area = #{dataArea}
+            </if>
             <if test="variableName != null and variableName !=''">
                 and a.variable_name LIKE CONCAT(CONCAT('%', #{variableName}), '%')
             </if>
         </where>
-         order by a.id
+         order by a.id desc
         <if test="startCurrent != null and current != null and current !=0">
             LIMIT  #{startCurrent},#{current}
         </if>

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

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -39,7 +40,7 @@ public class DeviceAnalogVariableListServiceImpl extends AbstractCrudService<Dev
     @Override
     public void variableListAdd(DeviceAnalogVariableList deviceAnalogVariableList) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
-        deviceAnalogVariableList.setCreateTime(LocalDateTime.now());
+        deviceAnalogVariableList.setCreateTime(new Date());
         deviceAnalogVariableList.setCreator(user.getUserName());
         deviceAnalogVariableList.setStatus(1);
         this.save(deviceAnalogVariableList);
@@ -79,13 +80,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.getVariableName(), null, null);
+                deviceAnalogVariableListVo.getVariableName(), null, null,deviceAnalogVariableListVo.getDataArea());
         int total=0;
         if (deviceAnalogVariableListOne.size()>0){
             total= deviceAnalogVariableListOne.size();
         }
         List<DeviceAnalogVariableList> deviceAnalogVariableList =  baseMapper.variableList(deviceAnalogVariableListVo.getSiteId(),deviceAnalogVariableListVo.getId(),
-                deviceAnalogVariableListVo.getVariableName(), start_current, deviceAnalogVariableListVo.getCurrent());
+                deviceAnalogVariableListVo.getVariableName(), start_current, deviceAnalogVariableListVo.getCurrent(),deviceAnalogVariableListVo.getDataArea());
         return new CommonPage<>(deviceAnalogVariableList, total, deviceAnalogVariableListVo.getCurrent(), deviceAnalogVariableListVo.getSize());
     }
 

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

@@ -118,7 +118,7 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
         if (DeviceAnalogVariableList.size() > 0) {
             for (int i = 0; i < DeviceAnalogVariableList.size(); i++) {
                 DeviceAnalogVariableList.get(i).setCommunicationEquipment(ID);
-                DeviceAnalogVariableList.get(i).setCreateTime(LocalDateTime.now());
+                DeviceAnalogVariableList.get(i).setCreateTime(new Date());
                 DeviceAnalogVariableList.get(i).setCreator(user.getUserName());
                 DeviceAnalogVariableList.get(i).setStatus(1);
                 deviceAnalogVariableListService.save(DeviceAnalogVariableList.get(i));
@@ -135,7 +135,7 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
         if (DeviceAnalogVariableList.size() > 0) {
             for (int i = 0; i < DeviceAnalogVariableList.size(); i++) {
                 DeviceAnalogVariableList.get(i).setCommunicationEquipment(ID);
-                DeviceAnalogVariableList.get(i).setCreateTime(LocalDateTime.now());
+                DeviceAnalogVariableList.get(i).setCreateTime(new Date());
                 DeviceAnalogVariableList.get(i).setCreator(user.getUserName());
                 DeviceAnalogVariableList.get(i).setStatus(1);
                 deviceAnalogVariableListService.save(DeviceAnalogVariableList.get(i));