Merge remote-tracking branch 'origin/master'

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java

@@ -91,7 +91,7 @@ public class TerminalController extends BaseController {
         }
     }
 
-    @ApiOperation(value = "获取装置运行状态触发", notes = "获取装置信息接口", httpMethod = "POST")
+    @ApiOperation(value = "获取装置触发", notes = "获取装置信息接口", httpMethod = "POST")
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/getTerminalStatus")
     @Log(title = "获取装置运行状态触发", type = "修改")
@@ -143,11 +143,11 @@ public class TerminalController extends BaseController {
         }
     }
 
-    @ApiOperation(value = "图像装置ID查询", notes = "图像装置ID查询触发", httpMethod = "POST")
+    @ApiOperation(value = "图像装置ID查询", notes = "图像装置ID查询接口", httpMethod = "POST")
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/selectTerminalId")
     @Log(title = "图像装置ID查询", type = "修改")
-    public ResponseReult<TerminalIdModel> terminalIdGet(@RequestParam("requestId")Integer requestId) {
+    public ResponseReult<TerminalIdModel> selectTerminalId(@RequestParam("requestId")Integer requestId) {
         ServiceBody<TerminalIdModel> serviceBody = terminalService.selectTerminalId(requestId);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java

@@ -5,10 +5,8 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.github.pagehelper.Constant;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import com.shxy.xymanager_common.bean.ServiceBody;
@@ -32,7 +30,6 @@ import com.shxy.xymanager_dao.dao.TerminalPhotoDao;
 import com.shxy.xymanager_dao.dao.TerminalsDao;
 import com.shxy.xymanager_service.service.TerminalPhotoService;
 import com.shxy.xymanager_service.service.TerminalScheduleRuleService;
-import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;