From 1295c58e706a74ad68d3c2c84b2bdde779507fb5 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 23 十月 2023 21:15:44 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/smoke/SmokeAlarmController.java | 22 +---------------------
1 files changed, 1 insertions(+), 21 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/smoke/AlarmController.java b/ycl-platform/src/main/java/com/ycl/controller/smoke/SmokeAlarmController.java
similarity index 87%
rename from ycl-platform/src/main/java/com/ycl/controller/smoke/AlarmController.java
rename to ycl-platform/src/main/java/com/ycl/controller/smoke/SmokeAlarmController.java
index 068b238..b86dd23 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/smoke/AlarmController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/smoke/SmokeAlarmController.java
@@ -1,35 +1,15 @@
package com.ycl.controller.smoke;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ycl.annotation.LogSave;
-import com.ycl.api.CommonPage;
-import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
-import com.ycl.dto.smoker.InTimeCountDto;
-import com.ycl.dto.smoker.QueryInTimeParam;
-import com.ycl.entity.smoke.OdsCustomer;
-import com.ycl.entity.smoke.OdsInTime;
import com.ycl.service.smoke.IOdsAlarmMsgService;
-import com.ycl.service.smoke.IOdsCustomerService;
-import com.ycl.service.smoke.IOdsInTimeService;
-import com.ycl.utils.EasyExcelUtils;
-import com.ycl.vo.smoke.OdsInTimeVo;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
-import java.util.*;
@RestController
@RequestMapping("/smoke")
@Api(tags = "娌圭儫绠＄悊绠＄悊-鎶ヨ")
-public class AlarmController extends BaseController {
+public class SmokeAlarmController extends BaseController {
IOdsAlarmMsgService alarmMsgService;
--
Gitblit v1.8.0