From 11c75d7aaca27aa6d75f543dea98594691d286d7 Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Sun, 18 Jun 2023 23:18:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XymanagerAdminApplication.java | 2 + .../controller/GloableParamsController.java | 6 +- .../controller/LineController.java | 40 ++++ .../controller/OpenController.java | 11 + .../main/resources/META-INF/spring.factories | 2 +- .../model/TerminalPhotoListForOpenModel.java | 2 +- .../xymanager_dao/dao/GlobalParamsDao.java | 2 + .../com/shxy/xymanager_dao/dao/LinesDao.java | 2 +- .../dao/TerminalChannelMapperDao.java | 3 + .../dao/TerminalChannelsDao.java | 3 +- .../shxy/xymanager_dao/dao/TerminalsDao.java | 2 + .../com/shxy/xymanager_dao/dao/TowerDao.java | 3 +- .../resources/mappers/GlobalParamsDao.xml | 6 + .../src/main/resources/mappers/LinesDao.xml | 2 +- .../resources/mappers/SysUserMapperDao.xml | 4 +- .../mappers/TerminalChannelMapperDao.xml | 7 + .../resources/mappers/TerminalChannelsDao.xml | 16 +- .../mappers/TerminalImgAlarmsDao.xml | 2 +- .../main/resources/mappers/TerminalsDao.xml | 17 +- .../src/main/resources/mappers/TowerDao.xml | 15 -- xymanager_framework/pom.xml | 14 +- .../config/CustomSecurityConfig.java | 1 - .../shxy/xymanager_service/cache/XyCache.java | 97 +++------ .../impl/CacheServiceImpl.java | 201 ++++++++++++++++++ .../impl/GloablParamsServiceImpl.java | 37 ++-- .../impl/LineServiceImpl.java | 11 +- .../impl/OpenServiceImpl.java | 3 + .../impl/SysUserServiceImpl.java | 10 - .../impl/TerminalAlarmServiceImpl.java | 61 +++--- .../impl/TerminalPhotoServiceImpl.java | 97 ++++----- .../impl/TerminalServiceImpl.java | 17 +- .../impl/TerminalStatusServiceImpl.java | 73 ------- .../impl/TowerServiceImpl.java | 10 +- .../service/CacheService.java | 79 +++++++ .../service/TerminalStatusService.java | 26 --- 35 files changed, 553 insertions(+), 331 deletions(-) create mode 100644 xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CacheServiceImpl.java delete mode 100644 xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalStatusServiceImpl.java create mode 100644 xymanager_service/src/main/java/com/shxy/xymanager_service/service/CacheService.java delete mode 100644 xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalStatusService.java diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/XymanagerAdminApplication.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/XymanagerAdminApplication.java index fd01e85..4fe3cf7 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/XymanagerAdminApplication.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/XymanagerAdminApplication.java @@ -8,6 +8,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; +import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.EnableAspectJAutoProxy; @@ -19,6 +20,7 @@ import org.springframework.core.env.Environment; @Slf4j @EnableConfigurationProperties @ComponentScan(basePackages = {"com.shxy"}) +@EnableCaching public class XymanagerAdminApplication extends SpringBootServletInitializer{ public static void main(String[] args) { diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/GloableParamsController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/GloableParamsController.java index 0d0791f..dff1689 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/GloableParamsController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/GloableParamsController.java @@ -28,7 +28,7 @@ public class GloableParamsController extends BaseController { @ApiOperation(value = "查询图片绘制开关状态", notes = "查询图片绘制开关状态接口", httpMethod = "POST") @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getMarkEnableStatus") - @Log(title = "新增杆塔", type = "查询") + @Log(title = "查询图片绘制开关状态", type = "查询") public ResponseReult getMarkEnableStatus() { ServiceBody serviceBody = gloableParamsService.getMarkEnableStatus(); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { @@ -38,10 +38,10 @@ public class GloableParamsController 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("/updateMarkEnableStatus") - @Log(title = "新增杆塔", type = "查询") + @Log(title = "修改图片绘制开关状态", type = "修改") public ResponseReult updateMarkEnableStatus(@RequestParam("status") Integer status) { ServiceBody serviceBody = gloableParamsService.updateMarkEnableStatus(status); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LineController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LineController.java index f74fb4c..94a1ccb 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LineController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LineController.java @@ -5,10 +5,12 @@ import com.shxy.xymanager_common.base.BaseController; import com.shxy.xymanager_common.base.ResponseReult; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.bean.ServiceStatus; +import com.shxy.xymanager_common.entity.Lines; import com.shxy.xymanager_common.model.LineAndGtAndChannelListModel; import com.shxy.xymanager_common.model.LineListModel; import com.shxy.xymanager_common.model.DyLineTreeListModel; import com.shxy.xymanager_common.vo.*; +import com.shxy.xymanager_service.service.CacheService; import com.shxy.xymanager_service.service.LineService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -19,8 +21,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + @Api(value = "线路接口", tags = "线路相关") @RestController @@ -30,6 +37,9 @@ public class LineController extends BaseController { @Autowired LineService lineService; + @Autowired + CacheService cacheService; + @ApiOperation(value = "获取线路列表", notes = "获取线路列表接口", httpMethod = "POST") @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getLineList") @@ -108,4 +118,34 @@ public class LineController extends BaseController { return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); } } + + @ApiOperation(value = "测试测试测试", notes = "teer", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/teer") + @Log(title = "teer", type = "查询") + public ResponseReult teer(@RequestParam("id") Integer id) { + Lines line = cacheService.getLine(id); + return ResponseReult.success(line); + } + +// @ApiOperation(value = "怎怎怎", notes = "teer", httpMethod = "POST") +// @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) +// @RequestMapping("/insertLine") +// @Log(title = "怎怎怎", type = "查询") +// public ResponseReult> insertLine(@RequestParam("id") Integer id) { +// ArrayList list = new ArrayList<>(); +// Lines lines1 = new Lines(); +// lines1.setStatus(1); +// lines1.setName("dsafsadf"); +// lines1.setBsManufacturer("33333"); +// Lines lines2 = new Lines(); +// lines2.setStatus(2); +// lines2.setName("dsafsadf"); +// lines2.setBsManufacturer("33333"); +// list.add(lines1); +// list.add(lines2); +// List lines = cacheService.insertLine(list, new Date()); +// return ResponseReult.success(lines); +// } + } diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/OpenController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/OpenController.java index e04360e..257982d 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/OpenController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/OpenController.java @@ -77,4 +77,15 @@ public class OpenController extends BaseController { JSONObject serviceBody = openService.cmaDeviceStatus(vo); return serviceBody; } + + @ApiOperation(value = "第三方调试", notes = "第三方调试接口", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 0, message = "请求成功"), @ApiResponse(code = 1, message = "用户名错误"), @ApiResponse(code = 2, message = "密码错误")}) + @RequestMapping("/testConnect") + @Log(title = "查询装置状态接口", type = "查询") + public JSONObject testConnect() { + JSONObject serviceBody = new JSONObject(); + serviceBody.set("errcode", 1); + serviceBody.set("errmsg", "OK"); + return serviceBody; + } } diff --git a/xymanager_admin/src/main/resources/META-INF/spring.factories b/xymanager_admin/src/main/resources/META-INF/spring.factories index 5e2059b..8e7c358 100644 --- a/xymanager_admin/src/main/resources/META-INF/spring.factories +++ b/xymanager_admin/src/main/resources/META-INF/spring.factories @@ -1 +1 @@ -org.springframework.boot.env.EnvironmentPostProcessor=com.shxy.xymanager_framework.config.MyEnvironmentPostProcessor +#org.springframework.boot.env.EnvironmentPostProcessor=com.shxy.xymanager_framework.config.MyEnvironmentPostProcessor diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListForOpenModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListForOpenModel.java index 50be4b0..360f06d 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListForOpenModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListForOpenModel.java @@ -50,7 +50,7 @@ public class TerminalPhotoListForOpenModel implements Serializable { private String name; @ApiModelProperty(value = "拍照时间", example = "123456") - private Date photoTime; + private String photoTime; @ApiModelProperty(value = "照片路径", example = "123456") private String path; diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/GlobalParamsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/GlobalParamsDao.java index 1d5a5c4..191f90d 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/GlobalParamsDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/GlobalParamsDao.java @@ -17,6 +17,8 @@ public interface GlobalParamsDao { List selectAll(); + GlobalParams selectByParam(@Param("param") String param); + int updateByPrimaryKeySelective(GlobalParams record); int updateByPrimaryKey(GlobalParams record); diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/LinesDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/LinesDao.java index 6e9b427..e49e6c3 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/LinesDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/LinesDao.java @@ -15,7 +15,7 @@ public interface LinesDao { int deleteById(@Param("list") List record, @Param("status") Integer status,@Param("updateat") Date update); - Lines selectByPrimaryKey(Integer id); + Lines selectById(Integer id); List selectLineByDyId(@Param("dyid")Integer dyid,@Param("status") Integer status); diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelMapperDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelMapperDao.java index 1fa9d52..62fb6e8 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelMapperDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelMapperDao.java @@ -1,6 +1,7 @@ package com.shxy.xymanager_dao.dao; import com.shxy.xymanager_common.entity.TerminalChannelMapper; +import com.shxy.xymanager_common.entity.TerminalChannels; import org.apache.ibatis.annotations.Param; import java.math.BigInteger; @@ -20,6 +21,8 @@ public interface TerminalChannelMapperDao { TerminalChannelMapper selectByPrimaryKey(Integer id); + TerminalChannelMapper selectByTermidAndChannelid(@Param("termid") Integer termid, @Param("channelid")Integer channelid, @Param("status") Integer status); + List selectAll(); List selectAllByPhotoTime(@Param("time") BigInteger time); diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelsDao.java index 469d227..c260307 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelsDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelsDao.java @@ -23,8 +23,7 @@ public interface TerminalChannelsDao { List selectByTermid(@Param("termid") Integer termid, @Param("status") Integer status); - TerminalChannels selectByPrimaryKey(Integer id); - + TerminalChannels selectByPrimaryKey(@Param("id") Integer id, @Param("status") Integer status); List selectAllAndChannelByTermid(@Param("termid") Integer termid, @Param("status") Integer status); diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java index a73a054..a27305c 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java @@ -16,6 +16,8 @@ public interface TerminalsDao { List selectAll(@Param("status") Integer status); + Terminals selectById(@Param("id") Integer id, @Param("status") Integer status); + List selectChannelAndTermList(@Param("status") Integer status); List selectTermAndLineList(@Param("termidlist") List termidlist, @Param("status") Integer status); diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TowerDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TowerDao.java index 1c78c56..0973f53 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TowerDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TowerDao.java @@ -14,9 +14,8 @@ public interface TowerDao { List selectAll(@Param("status") Integer status); - List selectAllByLineid(@Param("lineid") Integer id, @Param("status") Integer status); - List selectAllByLineidList(@Param("lineidlist") List id, @Param("status") Integer status); + List selectAllByLineid(@Param("lineid") Integer id, @Param("status") Integer status); int deleteById(@Param("list") List record, @Param("status") Integer status, @Param("update") Date update); diff --git a/xymanager_dao/src/main/resources/mappers/GlobalParamsDao.xml b/xymanager_dao/src/main/resources/mappers/GlobalParamsDao.xml index fca3365..506b938 100644 --- a/xymanager_dao/src/main/resources/mappers/GlobalParamsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/GlobalParamsDao.xml @@ -22,7 +22,13 @@ select from global_params + + delete from global_params diff --git a/xymanager_dao/src/main/resources/mappers/LinesDao.xml b/xymanager_dao/src/main/resources/mappers/LinesDao.xml index 28fc9a9..e847ef6 100644 --- a/xymanager_dao/src/main/resources/mappers/LinesDao.xml +++ b/xymanager_dao/src/main/resources/mappers/LinesDao.xml @@ -35,7 +35,7 @@ dy_level y where x.dy_level_id = y.id and x.status = #{status} order by x.create_time desc - select from `lines` diff --git a/xymanager_dao/src/main/resources/mappers/SysUserMapperDao.xml b/xymanager_dao/src/main/resources/mappers/SysUserMapperDao.xml index d6bf946..da6f1d2 100644 --- a/xymanager_dao/src/main/resources/mappers/SysUserMapperDao.xml +++ b/xymanager_dao/src/main/resources/mappers/SysUserMapperDao.xml @@ -29,7 +29,7 @@ + + - select - count(1) + count(1) from terminal_channels where id in #{item.id} - or + + or channel_name in #{item.channelname} - select count(1) from terminal_channels diff --git a/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmsDao.xml index ab7c8d5..6750164 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmsDao.xml @@ -74,7 +74,7 @@ label = #{item.label} - + and prob >= #{item.prob} ) diff --git a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml index 447a257..e8eb058 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml @@ -74,6 +74,13 @@ where status = #{status} + + - -