修改 接口

haiwei-admin/src/main/java/com/haiwei/web/controller/broad/ApiController.java

@@ -5,6 +5,7 @@ import com.haiwei.common.core.domain.AjaxResult;
 import static com.haiwei.common.core.domain.AjaxResult.*;
 
 import com.haiwei.common.utils.poi.ExcelUtil_2;
+import com.haiwei.manage.domain.DeviceState;
 import com.haiwei.manage.domain.RecordRaramData;
 import com.haiwei.manage.service.IApiService;
 import com.haiwei.manage.service.IBaseCustomerService;
@@ -58,14 +59,15 @@ public class ApiController {
 
     @ApiOperation(tags = {"60脱水机"}, value = "获取实时数据")
     @GetMapping("/home/queryParam")
-    public AjaxResult queryPram() {
-        return success(iApiService.queryPram());
+    public AjaxResult queryPram(String deviceName) {
+        return success(iApiService.queryPram(deviceName));
     }
 
     @ApiOperation(tags = {"60脱水机"}, value = "获取设备状态 msg字段")
     @GetMapping("/home/queryDeviceState")
-    public AjaxResult queryDeviceState() {
-        return success(iApiService.queryDeviceState());
+    public AjaxResult queryDeviceState(String name) {
+        int i=name.equals("60型一体机A")?2:8;
+        return success(iApiService.queryDeviceState(i,i+2));
     }
 
     @ApiOperation(tags = {"60脱水机"}, value = "获取历史趋势")
@@ -110,8 +112,8 @@ public class ApiController {
 
     @ApiOperation(tags = {"60脱水机"}, value = "设备介绍")
     @GetMapping("/home/deviceInfo")
-    public AjaxResult deviceInfo() {
-        return success(baseDeviceInfoService.selectBaseDeviceInfoListByName("60型一体机"));
+    public AjaxResult deviceInfo(String name) {
+        return success(baseDeviceInfoService.selectBaseDeviceInfoListByName(name));
     }
 
 

haiwei-manage/src/main/java/com/haiwei/manage/mapper/ApiMapper.java

@@ -15,8 +15,8 @@ import java.util.List;
  */
 @Repository
 public interface ApiMapper {
-    List<ParamVo> queryPram();
-   List<DeviceState>  queryDeviceState();
+    List<ParamVo> queryPram(String deviceName);
+   List<DeviceState>  queryDeviceState(@Param("device") int deviceID,@Param("state") int stateID);
 
     List<RecordRaramData> queryPramList(@Param("beginTime") Date beginTime,@Param("endTime")  Date endTime);
 

haiwei-manage/src/main/java/com/haiwei/manage/service/IApiService.java

@@ -12,9 +12,9 @@ import java.util.List;
  * @date 2023/8/30  17:09
  */
 public interface IApiService {
-    List<ParamVo> queryPram();
+    List<ParamVo> queryPram(String deviceName);
 
-    List<DeviceState> queryDeviceState();
+    List<DeviceState> queryDeviceState(int deviceID,int stateID);
 
     List<RecordRaramData> queryPramList(Date beginTime, Date endTime);
 

haiwei-manage/src/main/java/com/haiwei/manage/service/impl/ApiServiceImpl.java

@@ -21,13 +21,13 @@ public class ApiServiceImpl implements IApiService {
     ApiMapper mapper;
 
     @Override
-    public List<ParamVo> queryPram() {
-        return mapper.queryPram();
+    public List<ParamVo> queryPram(String deviceName) {
+        return mapper.queryPram(deviceName);
     }
 
     @Override
-    public List<DeviceState> queryDeviceState() {
-        return mapper.queryDeviceState();
+    public List<DeviceState> queryDeviceState(int deviceID,int stateID) {
+        return mapper.queryDeviceState(deviceID,stateID);
     }
 
     @Override

haiwei-manage/src/main/resources/mapper/manage/ApiMapper.xml

@@ -20,7 +20,7 @@
         ) ld on ld.PID = ed.PID and ld.LatestTime = CreateTime
                  right join EPointsInfo info on ed.PID = info.ID
                  left join base_point_info ee on ee.objid = info.EID
-        where info.Status = 1 order by order_by
+        where ee.device_name = #{deviceName} order by order_by
     </select>
     <select id="queryDeviceState" resultType="com.haiwei.manage.domain.DeviceState">
         SELECT CASE
@@ -28,14 +28,14 @@
                        case when (SELECT DataType FROM EEquipmentState WHERE ID = 1) = 0 then '停机' else '运行' end
                    else '故障' end AS state, '一体机' as name
         FROM EEquipmentState
-        WHERE ID = 2
+        WHERE ID = #{device}
         union
         SELECT CASE
                    when DataType = 1 then
                        case when (SELECT DataType FROM EEquipmentState WHERE ID = 3) = 0 then '停机' else '运行' end
                    else '故障' end AS state, '切刀' as name
         FROM EEquipmentState
-        WHERE ID = 4
+        WHERE ID = #{state}
     </select>
 
     <select id="queryPramList" resultType="com.haiwei.manage.domain.RecordRaramData">

haiwei-manage/src/main/resources/templates/manage/base_device_info/add.html

@@ -89,13 +89,28 @@
         $("input[name='" + event.currentTarget.id + "']").val(data.response.url)
     }).on('fileremoved', function (event, id, index) {
         $("input[name='" + event.currentTarget.id + "']").val('')
-    })
+    });
 
     $(function () {
         $('#deviceTypeName').select2({
             placeholder: "请选择设备类型",
             allowClear: true
         });
+
+        $('.summernote').each(function(i) {
+            $('#' + this.id).summernote({
+                lang: 'zh-CN',
+                dialogsInBody: true,
+                callbacks: {
+                    onChange: function(contents, $edittable) {
+                        $("input[name='" + this.id + "']").val(contents);
+                    },
+                }
+            });
+            var content = $("input[name='" + this.id + "']").val();
+            $('#' + this.id).summernote('code', content);
+        })
+
     })
 
 </script>