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

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

@@ -5,6 +5,7 @@ import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.model.DeviceAnalogVariableList;
 import com.bizmatics.model.DeviceAttribute;
+import com.bizmatics.model.vo.DeviceAnalogVariableListVo;
 import com.bizmatics.model.vo.DeviceAttributeVo;
 import com.bizmatics.service.DeviceAnalogVariableListService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -79,5 +80,10 @@ public class DeviceAnalogVariableListController {
                                                                         @RequestParam(value = "current", required = false, defaultValue = "10") int current) {
         return ApiResult.success(deviceAnalogVariableListService.variableList(deviceCode, screen,size,current));
     }
+
+    @GetMapping("variableListone")
+    public ApiResult<CommonPage<DeviceAnalogVariableList>> variableListone(@RequestBody DeviceAnalogVariableListVo deviceAnalogVariableListVo) {
+        return ApiResult.success(deviceAnalogVariableListService.variableListone(deviceAnalogVariableListVo));
+    }
 }
 

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

@@ -0,0 +1,38 @@
+package com.bizmatics.model.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 设备属性
+ * </p>
+ *
+ * @author ya
+ * @since 2021-09-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DeviceAnalogVariableListVo  implements Serializable {
+
+    private Integer id;
+
+    private Integer siteId;
+
+    private Integer deviceType;
+
+    private String deviceCode;
+
+    private String screen;
+
+    private Integer size;
+
+    private Integer current;
+}

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

@@ -1,7 +1,10 @@
 package com.bizmatics.persistence.mapper;
 
-import com.bizmatics.model.DeviceAnalogVariableList;
 import com.bizmatics.common.mvc.base.CrudMapper;
+import com.bizmatics.model.DeviceAnalogVariableList;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +15,11 @@ import com.bizmatics.common.mvc.base.CrudMapper;
  * @since 2021-09-24
  */
 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("startCurrent") Integer startCurrent,
+                                                @Param("current") Integer current);
 }

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

@@ -16,6 +16,38 @@
         <result column="save_cycle" property="saveCycle" />
         <result column="create_time" property="createTime" />
         <result column="creator" property="creator" />
+        <result column="enable" property="enable" />
     </resultMap>
+    <select id="variableList" resultType="com.bizmatics.model.DeviceAnalogVariableList">
+        SELECT
+         a.*
+        FROM
+         device_analog_variable_list AS a
+         inner JOIN device AS b ON a.device_code = b.device_code
+        <where>
+            b.enable =1
+            and a.enable =1
+            <if test="siteId != null and siteId !=0">
+                and b.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>
+        </where>
+         order by a.id
+        <if test="startCurrent != null and startCurrent !=0 and current != null and current !=0">
+            LIMIT  #{startCurrent},#{current}
+        </if>
+    </select>
 
 </mapper>

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

@@ -3,6 +3,7 @@ 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.vo.DeviceAnalogVariableListVo;
 
 import java.util.List;
 
@@ -19,6 +20,7 @@ public interface DeviceAnalogVariableListService extends CrudService<DeviceAnalo
     void variableListUpdate(DeviceAnalogVariableList deviceAnalogVariableList);
     void variableListDel(int id);
     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

@@ -8,7 +8,9 @@ import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.Device;
 import com.bizmatics.model.DeviceAnalogVariableList;
+import com.bizmatics.model.TemplateData;
 import com.bizmatics.model.system.SysUser;
+import com.bizmatics.model.vo.DeviceAnalogVariableListVo;
 import com.bizmatics.persistence.mapper.DeviceAnalogVariableListMapper;
 import com.bizmatics.service.DeviceAnalogVariableListService;
 import com.bizmatics.service.DeviceService;
@@ -79,4 +81,22 @@ public class DeviceAnalogVariableListServiceImpl extends AbstractCrudService<Dev
         return new CommonPage<>(page.getRecords(), page.getTotal(), page.getCurrent(), page.getSize());
     }
 
+    @Override
+    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);
+        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());
+        return new CommonPage<>(deviceAnalogVariableList, total, deviceAnalogVariableListVo.getCurrent(), deviceAnalogVariableListVo.getSize());
+    }
+
+
 }