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 94a1ccb..f74fb4c 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,12 +5,10 @@ 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; @@ -21,13 +19,8 @@ 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 @@ -37,9 +30,6 @@ 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") @@ -118,34 +108,4 @@ 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 257982d..e04360e 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,15 +77,4 @@ 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 8e7c358..5e2059b 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_admin/src/main/resources/log4j2.xml b/xymanager_admin/src/main/resources/log4j2.xml index afbf5e4..55bd536 100644 --- a/xymanager_admin/src/main/resources/log4j2.xml +++ b/xymanager_admin/src/main/resources/log4j2.xml @@ -21,7 +21,7 @@ value="%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight{%-5level}[%thread] %style{%logger{36}}{cyan} : %msg%n"/> - + 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 e49e6c3..6e9b427 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 selectById(Integer id); + Lines selectByPrimaryKey(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/TowerDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TowerDao.java index 0973f53..392f048 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,7 +14,6 @@ public interface TowerDao { List selectAll(@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/LinesDao.xml b/xymanager_dao/src/main/resources/mappers/LinesDao.xml index e847ef6..28fc9a9 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_framework/pom.xml b/xymanager_framework/pom.xml index 43eb95e..0740a39 100644 --- a/xymanager_framework/pom.xml +++ b/xymanager_framework/pom.xml @@ -40,10 +40,10 @@ ch.qos.logback logback-classic - - - - + + org.springframework.boot + spring-boot-starter-tomcat + diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/cache/XyCache.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/cache/XyCache.java index f3f27e9..4c70430 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/cache/XyCache.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/cache/XyCache.java @@ -1,85 +1,43 @@ package com.shxy.xymanager_service.cache; -import com.shxy.xymanager_common.entity.*; -import com.shxy.xymanager_common.enums.CommonStatus; -import com.shxy.xymanager_dao.dao.*; +import com.shxy.xymanager_service.service.CacheService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; -import java.util.HashMap; -import java.util.List; -import java.util.Map; @Component public class XyCache { -// public static Map terminalMap = new HashMap(); -// public static Map termchannelMap = new HashMap(); -// /*装置编号+‘#’+通道编号 装置映射表*/ -// public static Map termchannelMapMap = new HashMap(); -// //告警类型 -// public static Map alarmParamMap = new HashMap(); - - @Autowired - private LinesDao linesDao; - @Autowired - private TerminalsDao terminalsDao; - @Autowired - private TowerDao towerDao; @Autowired - private TerminalChannelsDao terminalChannelsDao; - @Autowired - private TerminalChannelMapperDao terminalChannelMapperDao; - @Autowired - private TerminalImgAlarmParamsDao terminalImgAlarmParamsDao; - @Autowired - private TerminalStatusDao terminalStatusDao; + CacheService cacheService; @PostConstruct public void init() { //系统启动中。。。加载codeMap -// -// terminalMap.clear(); -// termchannelMap.clear(); -// termchannelMapMap.clear(); -// alarmParamMap.clear(); -// -// -// List termslist = terminalsDao.selectAll(CommonStatus.EFFECTIVE.value()); -// for (Terminals item : termslist) { -// terminalMap.put(item.getId(), item); -// } -// -// List channelslist = terminalChannelsDao.selectChannelList(CommonStatus.EFFECTIVE.value()); -// for (TerminalChannels item : channelslist) { -// termchannelMap.put(item.getId(), item); -// } -// -// List terminalChannelMapperlist = terminalChannelMapperDao.selectAll(); -// for (TerminalChannelMapper item : terminalChannelMapperlist) { -// String s = item.getTermId() + "#" + item.getChannelId(); -// termchannelMapMap.put(s, item); -// } -// -// List terminalImgAlarmParams = terminalImgAlarmParamsDao.selectAll(); -// for (TerminalImgAlarmParams item : terminalImgAlarmParams) { -// alarmParamMap.put(item.getLabel(), item); -// } + + cacheService.updateLineMap(); + + cacheService.updateTerminalMap(); + + cacheService.updateTermChannelMap(); + + cacheService.updateTowerMap(); + + cacheService.updateTermChannelMapMap(); + + cacheService.updateAlarmParamMap(); + + cacheService.updateGolobalMap(); } + @PreDestroy public void destroy() { //系统运行结束 } -// @Scheduled(cron = "0 0 0/2 * * ?") -// public void testOne() { -// //每2小时执行一次缓存 -// init(); -// } - } \ No newline at end of file diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CacheServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CacheServiceImpl.java index 604c50c..f96e447 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CacheServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CacheServiceImpl.java @@ -1,5 +1,6 @@ package com.shxy.xymanager_service.impl; +import com.shxy.xymanager_common.dto.LineAndDyNameDto; import com.shxy.xymanager_common.dto.TowerDto; import com.shxy.xymanager_common.entity.*; import com.shxy.xymanager_common.enums.CommonStatus; @@ -14,7 +15,9 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** @@ -46,156 +49,315 @@ public class CacheServiceImpl implements CacheService { @Autowired TerminalImgAlarmParamsDao terminalImgAlarmParamsDao; - @Override - @Cacheable(value = "globalParams", key = "#param") - public GlobalParams getGlobalParams(String param) { - System.out.println("测试缓存：" + param); - return globalParamsDao.selectByParam(param); - } +// @Override +// @Cacheable(value = "globalParams", key = "#param") +// public GlobalParams getGlobalParams(String param) { +// System.out.println("测试缓存：" + param); +// return globalParamsDao.selectByParam(param); +// } +// +// @Override +// @CachePut(value = "globalParams", key = "#result.paramName") +// public GlobalParams updateGlobalParams(GlobalParams record) { +// globalParamsDao.updateByParamName(record, new Date()); +// return record; +// +// } +// +// @Override +// @Cacheable(value = "linesMap", key = "#id") +// public Lines getLine(Integer id) { +// Lines lines = linesDao.selectByPrimaryKey(id); +// return lines; +// } +// +// @Override +// @CacheEvict(value = "linesMap", allEntries = true) +// public Integer deleteLine(List lines) { +// int i = linesDao.deleteById(lines, CommonStatus.DELETE.value(), new Date()); +// return i; +// } +// +// @Override +// @CachePut(value = "linesMap", key = "#result.id") +// public Lines updateLine(Lines lines) { +// int i = linesDao.updateByPrimaryKeySelective(lines, new Date()); +// if (i == 0) { +// return null; +// } else { +// return lines; +// } +// } +// +// @Override +// @Cacheable(value = "towerMap", key = "#id") +// public TowerDto getTower(Integer id) { +// TowerDto dto = towerDao.getInfoByPrimaryKey(id, CommonStatus.EFFECTIVE.value()); +// return dto; +// } +// +// @Override +// @CacheEvict(value = "towerMap", allEntries = true) +// public Integer deleteTower(List list) { +// int i = towerDao.deleteById(list, CommonStatus.DELETE.value(), new Date()); +// return i; +// } +// +// @Override +// @CachePut(value = "towerMap", key = "#result.id") +// public Towers updateTower(Towers towers) { +// int i = towerDao.updateByPrimaryKeySelective(towers, new Date()); +// if (i == 0) { +// return null; +// } else { +// return towers; +// } +// } +// +// @Override +// @Cacheable(value = "terminalMap", key = "#id") +// public Terminals getTerminal(Integer id) { +// Terminals terminals = terminalsDao.selectById(id, CommonStatus.EFFECTIVE.value()); +// return terminals; +// } +// +// @Override +// @CacheEvict(value = "terminalMap", allEntries = true) +// public Integer deleteTerminal(List list) { +// int i = terminalsDao.deleteById(list, CommonStatus.DELETE.value(), new Date()); +// return i; +// } +// +// @Override +// @CachePut(value = "terminalMap", key = "#result.id") +// public Towers updateTerminal(Towers towers) { +// int i = towerDao.updateByPrimaryKeySelective(towers, new Date()); +// if (i == 0) { +// return null; +// } else { +// return towers; +// } +// } +// +// +// @Override +// @Cacheable(value = "termchannelMap", key = "#id") +// public TerminalChannels getTermchannelMap(Integer id) { +// TerminalChannels terminalChannels = terminalChannelsDao.selectByPrimaryKey(id, CommonStatus.EFFECTIVE.value()); +// return terminalChannels; +// } +// +// @Override +// @CacheEvict(value = "termchannelMap", allEntries = true) +// public Integer deleteTermchannelMap(List list) { +// int i = terminalChannelsDao.deleteList(list, CommonStatus.DELETE.value(), new Date()); +// return i; +// } +// +// @Override +// @CachePut(value = "termchannelMap", key = "#result.id") +// public TerminalChannels updateTermchannelMap(TerminalChannels terminalChannels) { +// int i = terminalChannelsDao.updateByPrimaryKeySelective(terminalChannels, new Date()); +// if (i == 0) { +// return null; +// } else { +// return terminalChannels; +// } +// } +// +// +// @Override +// @Cacheable(value = "termchannelMapMap", key = "#id") +// public TerminalChannelMapper getTermchannelMapMap(Integer id, Integer channelid) { +// TerminalChannelMapper terminalChannels = terminalChannelMapperDao.selectByTermidAndChannelid(id, channelid, CommonStatus.EFFECTIVE.value()); +// return terminalChannels; +// } +// +// @Override +// @CacheEvict(value = "termchannelMapMap", allEntries = true) +// public Integer deleteTermchannelMapMap(Integer id) { +// int i = terminalChannelMapperDao.deleteByTermId(id); +// return i; +// } +// +// @Override +// @Cacheable(value = "alarmParamMap") +// public List getAlarmParsms() { +// List terminalImgAlarmParams = terminalImgAlarmParamsDao.selectAll(); +// return terminalImgAlarmParams; +// } +// +// @Override +// @CacheEvict(value = "alarmParamMap", allEntries = true) +// public List updateAlarmParsms(List list) { +// int i = terminalImgAlarmParamsDao.updateList(list, new Date()); +// if (i == 0) { +// return null; +// } else { +// return list; +// } +// } - @Override - @CachePut(value = "globalParams", key = "#result.paramName") - public GlobalParams updateGlobalParams(GlobalParams record) { - globalParamsDao.updateByParamName(record, new Date()); - return record; - } - @Override - @Cacheable(value = "linesMap", key = "#id") - public Lines getLine(Integer id) { - Lines lines = linesDao.selectById(id); - return lines; - } - @Override - @CacheEvict(value = "linesMap", allEntries = true) - public Integer deleteLine(List lines) { - int i = linesDao.deleteById(lines, CommonStatus.DELETE.value(), new Date()); - return i; - } @Override - @CachePut(value = "linesMap", key = "#result.id") - public Lines updateLine(Lines lines) { - int i = linesDao.updateByPrimaryKeySelective(lines, new Date()); - if (i == 0) { - return null; - } else { - return lines; + @Cacheable(value = "globalMap") + public Map getGolobalMap() { + Map globalParams = new HashMap(); + List globalParamslist = globalParamsDao.selectAll(); + for (GlobalParams item : globalParamslist) { + globalParams.put(item.getParamName(), item.getParamValue()); } + return globalParams; } @Override - @Cacheable(value = "towerMap", key = "#id") - public TowerDto getTower(Integer id) { - TowerDto dto = towerDao.getInfoByPrimaryKey(id, CommonStatus.EFFECTIVE.value()); - return dto; + @Cacheable(value = "alarmParamMap") + public Map getAlarmParamMap() { + Map alarmParamMap = new HashMap(); + List terminalImgAlarmParams = terminalImgAlarmParamsDao.selectAll(); + for (TerminalImgAlarmParams item : terminalImgAlarmParams) { + alarmParamMap.put(item.getLabel(), item); + } + return alarmParamMap; } @Override - @CacheEvict(value = "towerMap", allEntries = true) - public Integer deleteTower(List list) { - int i = towerDao.deleteById(list, CommonStatus.DELETE.value(), new Date()); - return i; + @Cacheable(value = "termchannelMapMap") + public Map getTermChannelMapMap() { + Map termchannelMapMap = new HashMap(); + List terminalChannelMapperlist = terminalChannelMapperDao.selectAll(); + for (TerminalChannelMapper item : terminalChannelMapperlist) { + String s = item.getTermId() + "#" + item.getChannelId(); + termchannelMapMap.put(s, item); + } + return termchannelMapMap; } @Override - @CachePut(value = "towerMap", key = "#result.id") - public Towers updateTower(Towers towers) { - int i = towerDao.updateByPrimaryKeySelective(towers, new Date()); - if (i == 0) { - return null; - } else { - return towers; + @Cacheable(value = "termchannelMap") + public Map getTermChannelMap() { + Map termchannelMap = new HashMap(); + List channelslist = terminalChannelsDao.selectChannelList(CommonStatus.EFFECTIVE.value()); + for (TerminalChannels item : channelslist) { + termchannelMap.put(item.getId(), item); } + return termchannelMap; } @Override - @Cacheable(value = "terminalMap", key = "#id") - public Terminals getTerminal(Integer id) { - Terminals terminals = terminalsDao.selectById(id, CommonStatus.EFFECTIVE.value()); - return terminals; + @Cacheable(value = "towerMap") + public Map getTowerMap() { + Map towerMap = new HashMap(); + List towerlist = towerDao.selectAll(CommonStatus.EFFECTIVE.value()); + for (TowerDto item : towerlist) { + towerMap.put(item.getId(), item); + } + return towerMap; } @Override - @CacheEvict(value = "terminalMap", allEntries = true) - public Integer deleteTerminal(List list) { - int i = terminalsDao.deleteById(list, CommonStatus.DELETE.value(), new Date()); - return i; + @Cacheable(value = "terminalMap") + public Map getTerminalMap() { + Map terminalMap = new HashMap(); + List termslist = terminalsDao.selectAll(CommonStatus.EFFECTIVE.value()); + for (Terminals item : termslist) { + terminalMap.put(item.getId(), item); + } + return terminalMap; } @Override - @CachePut(value = "terminalMap", key = "#result.id") - public Towers updateTerminal(Towers towers) { - int i = towerDao.updateByPrimaryKeySelective(towers, new Date()); - if (i == 0) { - return null; - } else { - return towers; + @Cacheable(value = "lineMap") + public Map getLineMap() { + Map lineMap = new HashMap(); + List lineAndDyNameDtos = linesDao.selectAll(CommonStatus.EFFECTIVE.value()); + for (LineAndDyNameDto lineitem : lineAndDyNameDtos) { + lineMap.put(lineitem.getId(), lineitem); } + return lineMap; } @Override - @Cacheable(value = "termchannelMap", key = "#id") - public TerminalChannels getTermchannelMap(Integer id) { - TerminalChannels terminalChannels = terminalChannelsDao.selectByPrimaryKey(id, CommonStatus.EFFECTIVE.value()); - return terminalChannels; + @CachePut(value = "globalMap") + public Map updateGolobalMap() { + Map globalParams = new HashMap(); + List globalParamslist = globalParamsDao.selectAll(); + for (GlobalParams item : globalParamslist) { + globalParams.put(item.getParamName(), item.getParamValue()); + } + return globalParams; } @Override - @CacheEvict(value = "termchannelMap", allEntries = true) - public Integer deleteTermchannelMap(List list) { - int i = terminalChannelsDao.deleteList(list, CommonStatus.DELETE.value(), new Date()); - return i; + @CachePut(value = "alarmParamMap") + public Map updateAlarmParamMap() { + Map alarmParamMap = new HashMap(); + List terminalImgAlarmParams = terminalImgAlarmParamsDao.selectAll(); + for (TerminalImgAlarmParams item : terminalImgAlarmParams) { + alarmParamMap.put(item.getLabel(), item); + } + return alarmParamMap; } @Override - @CachePut(value = "termchannelMap", key = "#result.id") - public TerminalChannels updateTermchannelMap(TerminalChannels terminalChannels) { - int i = terminalChannelsDao.updateByPrimaryKeySelective(terminalChannels, new Date()); - if (i == 0) { - return null; - } else { - return terminalChannels; + @CachePut(value = "termchannelMapMap") + public Map updateTermChannelMapMap() { + Map termchannelMapMap = new HashMap(); + List terminalChannelMapperlist = terminalChannelMapperDao.selectAll(); + for (TerminalChannelMapper item : terminalChannelMapperlist) { + String s = item.getTermId() + "#" + item.getChannelId(); + termchannelMapMap.put(s, item); } + return termchannelMapMap; } - @Override - @Cacheable(value = "termchannelMapMap", key = "#id") - public TerminalChannelMapper getTermchannelMapMap(Integer id, Integer channelid) { - TerminalChannelMapper terminalChannels = terminalChannelMapperDao.selectByTermidAndChannelid(id, channelid,CommonStatus.EFFECTIVE.value()); - return terminalChannels; + @CachePut(value = "termchannelMap") + public Map updateTermChannelMap() { + Map termchannelMap = new HashMap(); + List channelslist = terminalChannelsDao.selectChannelList(CommonStatus.EFFECTIVE.value()); + for (TerminalChannels item : channelslist) { + termchannelMap.put(item.getId(), item); + } + return termchannelMap; } @Override - @CacheEvict(value = "termchannelMapMap", allEntries = true) - public Integer deleteTermchannelMapMap(Integer id) { - int i = terminalChannelMapperDao.deleteByTermId(id); - return i; + @CachePut(value = "towerMap") + public Map updateTowerMap() { + Map towerMap = new HashMap(); + List towerlist = towerDao.selectAll(CommonStatus.EFFECTIVE.value()); + for (TowerDto item : towerlist) { + towerMap.put(item.getId(), item); + } + return towerMap; } @Override - @Cacheable(value = "alarmParamMap") - public List getAlarmParsms() { - List terminalImgAlarmParams = terminalImgAlarmParamsDao.selectAll(); - return terminalImgAlarmParams; + @CachePut(value = "terminalMap") + public Map updateTerminalMap() { + Map terminalMap = new HashMap(); + List termslist = terminalsDao.selectAll(CommonStatus.EFFECTIVE.value()); + for (Terminals item : termslist) { + terminalMap.put(item.getId(), item); + } + return terminalMap; } @Override - @CacheEvict(value = "alarmParamMap", allEntries = true) - public List updateAlarmParsms(List list) { - int i = terminalImgAlarmParamsDao.updateList(list, new Date()); - if (i == 0) { - return null; - } else { - return list; + @CachePut(value = "lineMap") + public Map updateLineMap() { + Map lineMap = new HashMap(); + List lineAndDyNameDtos = linesDao.selectAll(CommonStatus.EFFECTIVE.value()); + for (LineAndDyNameDto lineitem : lineAndDyNameDtos) { + lineMap.put(lineitem.getId(), lineitem); } + return lineMap; } - - } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/GloablParamsServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/GloablParamsServiceImpl.java index 2f5c4b8..b76a71f 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/GloablParamsServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/GloablParamsServiceImpl.java @@ -1,17 +1,19 @@ package com.shxy.xymanager_service.impl; -import cn.hutool.core.util.StrUtil; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.entity.GlobalParams; import com.shxy.xymanager_common.enums.GloableParamsType; import com.shxy.xymanager_common.exception.Asserts; import com.shxy.xymanager_dao.dao.GlobalParamsDao; +import com.shxy.xymanager_service.cache.XyCache; import com.shxy.xymanager_service.service.CacheService; import com.shxy.xymanager_service.service.GloablParamsService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.Map; /** @@ -27,7 +29,6 @@ public class GloablParamsServiceImpl implements GloablParamsService { @Autowired CacheService cacheService; - /** * 获取绘制状态 * @@ -35,18 +36,9 @@ public class GloablParamsServiceImpl implements GloablParamsService { */ @Override public ServiceBody getMarkEnableStatus() { - Integer integer; - GlobalParams globalParams = cacheService.getGlobalParams(GloableParamsType.ImgMark.value()); - if (globalParams == null) { - integer = 0; - } else { - String paramValue = globalParams.getParamValue(); - if (StrUtil.isNotEmpty(paramValue)) { - integer = Integer.valueOf(paramValue); - } else { - integer = 0; - } - } + Map globalParams = cacheService.getGolobalMap(); + String s = globalParams.get(GloableParamsType.ImgMark.value()); + Integer integer = Integer.valueOf(s); return Asserts.success(integer); } @@ -61,8 +53,13 @@ public class GloablParamsServiceImpl implements GloablParamsService { GlobalParams record = new GlobalParams(); record.setParamName(GloableParamsType.ImgMark.value()); record.setParamValue(String.valueOf(status)); - cacheService.updateGlobalParams(record); - return Asserts.success("修改成功"); + int i = globalParamsDao.updateByParamName(record, new Date()); + if (i != 0) { + cacheService.updateGolobalMap(); + return Asserts.success("修改成功"); + } else { + return Asserts.error("修改失败"); + } } } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java index bea20ce..04c4337 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java @@ -18,7 +18,6 @@ import com.shxy.xymanager_common.model.LineListModel; import com.shxy.xymanager_common.page.PageUtils; import com.shxy.xymanager_common.vo.*; import com.shxy.xymanager_dao.dao.*; -import com.shxy.xymanager_service.service.CacheService; import com.shxy.xymanager_service.service.LineService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -50,9 +49,6 @@ public class LineServiceImpl implements LineService { @Autowired private TerminalChannelsDao terminalChannelsDao; - @Autowired - private CacheService cacheService; - /** * 获取线路 @@ -115,7 +111,8 @@ public class LineServiceImpl implements LineService { @Override public ServiceBody deleteLine(LineIdVo vo) { List lines = BeanUtil.copyToList(vo.getList(), Lines.class); - int i = cacheService.deleteLine(lines); + Date date = new Date(); + int i = linesDao.deleteById(lines, CommonStatus.DELETE.value(), date); if (i != 0) { return Asserts.success("删除成功"); } else { @@ -134,8 +131,8 @@ public class LineServiceImpl implements LineService { public ServiceBody updateLine(UpdateLineVo vo) { Lines lines = new Lines(); BeanUtil.copyProperties(vo, lines, true); - Lines bean = cacheService.updateLine(lines); - if (bean != null) { + int i = linesDao.updateByPrimaryKeySelective(lines, new Date()); + if (i != 0) { return Asserts.success("修改成功"); } else { return Asserts.error("修改失败"); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalAlarmServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalAlarmServiceImpl.java index 1a4dabd..2f32f38 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalAlarmServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalAlarmServiceImpl.java @@ -49,6 +49,9 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService { @Autowired private TerminalImgAlarmParamsDao terminalImgAlarmParamsDao; + @Autowired + private CacheService cacheService; + @Autowired DyLevelDao dyLevelDao; @@ -58,9 +61,6 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService { @Autowired TowerDao towerDao; - @Autowired - CacheService cacheService; - @Value("${photo.address}") private String photoaddress; @@ -76,12 +76,7 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService { Integer towerid = vo.getTowerId(); Integer label = vo.getLabel(); List labellist = new ArrayList<>(); - Map alarmParamMap = new HashMap(); - - List alarmParsms = cacheService.getAlarmParsms(); - for (TerminalImgAlarmParams item : alarmParsms) { - alarmParamMap.put(item.getLabel(), item); - } + Map alarmParamMap = cacheService.getAlarmParamMap(); if (label == null || label == -1) { alarmParamMap.forEach((key, value) -> { labellist.add(value); @@ -126,11 +121,24 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService { list = terminalImgAlarmsDao.selectAlarmsDetails(termidlist, labellist, BigInteger.valueOf(start), BigInteger.valueOf(end)); } if (CollectionUtil.isNotEmpty(list)) { + + Map terminalMap = cacheService.getTerminalMap(); + Map towerMap = cacheService.getTowerMap(); + Map termchannelMap = cacheService.getTermChannelMap(); + Map termchannelMapMap = cacheService.getTermChannelMapMap(); + + +// ArrayList originidlist = new ArrayList<>(); +// for (TerminalImgAlarmsDto item : list) { +// originidlist.add(item.getPhotoOrgId()); +// } List alarmphotolist = terminalPhotoDao.selectPhotoListByOrginIdAndTermList(list); Map map = new HashMap<>(); for (TerminalPhoto item : alarmphotolist) { map.put(item.getTermId() + "#" + item.getOrginalId(), item); } + +// List alarmBeans = BeanUtil.copyToList(list, TerminalAlarmListModel.AlarmBean.class, CopyOptions.create().ignoreCase()); List alarmBeans = new ArrayList<>(); for (TerminalImgAlarmsDto item : list) { TerminalAlarmListModel.AlarmBean alarmBean = new TerminalAlarmListModel.AlarmBean(); @@ -141,11 +149,11 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService { alarmBean.setTermId(termId); alarmBean.setChannelId(channelId); - Terminals terminals = cacheService.getTerminal(termId); + Terminals terminals = terminalMap.get(termId); if (terminals != null) { alarmBean.setDisplayName(terminals.getDisplayName()); Integer termtowerid = terminals.getTowerid(); - TowerDto towerDto = cacheService.getTower(termtowerid); + TowerDto towerDto = towerMap.get(termtowerid); if (towerDto != null) { alarmBean.setTowerId(termtowerid); alarmBean.setTowerName(towerDto.getName()); @@ -153,11 +161,11 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService { alarmBean.setLineName(towerDto.getLineName()); } } - TerminalChannels terminalChannels = cacheService.getTermchannelMap(channelId); + TerminalChannels terminalChannels = termchannelMap.get(channelId); if (terminalChannels != null) { alarmBean.setChannnelName(terminalChannels.getChannelName()); } - TerminalChannelMapper terminalChannelMapper = cacheService.getTermchannelMapMap(termId, channelId); + TerminalChannelMapper terminalChannelMapper = termchannelMapMap.get(termId + "#" + channelId); if (terminalChannelMapper != null) { alarmBean.setAlias(terminalChannelMapper.getAlias()); } @@ -250,21 +258,15 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService { public ServiceBody getAlarmTypeList() { TerminalImgAlarmParamsModel model = new TerminalImgAlarmParamsModel(); ArrayList list = new ArrayList<>(); - Map alarmParamMap = new HashMap(); - List alarmParsms = cacheService.getAlarmParsms(); - if (CollectionUtil.isNotEmpty(alarmParsms)) { - for (TerminalImgAlarmParams item : alarmParsms) { - alarmParamMap.put(item.getLabel(), item); - } - alarmParamMap.forEach((key, value) -> { - TerminalImgAlarmParamsModel.AlarmParamBean alarmBean = new TerminalImgAlarmParamsModel.AlarmParamBean(); - alarmBean.setId(value.getId()); - alarmBean.setLabel(value.getLabel()); - alarmBean.setName(value.getName()); - alarmBean.setProb(value.getProb()); - list.add(alarmBean); - }); - } + Map beans = cacheService.getAlarmParamMap(); + beans.forEach((key, value) -> { + TerminalImgAlarmParamsModel.AlarmParamBean alarmBean = new TerminalImgAlarmParamsModel.AlarmParamBean(); + alarmBean.setId(value.getId()); + alarmBean.setLabel(value.getLabel()); + alarmBean.setName(value.getName()); + alarmBean.setProb(value.getProb()); + list.add(alarmBean); + }); model.setList(list); return Asserts.success(model); } @@ -290,13 +292,14 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService { params.setName(item.getName()); record.add(params); } - List bean = cacheService.updateAlarmParsms(record); - Map alarmParamMap = new HashMap<>(); - List terminalImgAlarmParams = terminalImgAlarmParamsDao.selectAll(); - for (TerminalImgAlarmParams item : terminalImgAlarmParams) { - alarmParamMap.put(item.getLabel(), item); - } - if (bean != null) { + int i = terminalImgAlarmParamsDao.updateList(record, new Date()); +// Map alarmParamMap = new HashMap<>(); +// List terminalImgAlarmParams = terminalImgAlarmParamsDao.selectAll(); +// for (TerminalImgAlarmParams item : terminalImgAlarmParams) { +// alarmParamMap.put(item.getLabel(), item); +// } + cacheService.updateAlarmParamMap(); + if (i != 0) { return Asserts.success("修改成功"); } else { return Asserts.error("修改失败"); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java index b36f6fc..c001764 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java @@ -22,6 +22,7 @@ import com.shxy.xymanager_common.page.PageUtils; import com.shxy.xymanager_common.util.*; import com.shxy.xymanager_common.vo.*; import com.shxy.xymanager_dao.dao.*; +import com.shxy.xymanager_service.cache.XyCache; import com.shxy.xymanager_service.service.CacheService; import com.shxy.xymanager_service.service.TerminalPhotoService; import com.shxy.xymanager_service.service.TerminalScheduleRuleService; @@ -64,10 +65,11 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { @Autowired TerminalScheduleRuleService terminalScheduleRuleService; + + @Autowired CacheService cacheService; - @Value("${photo.address}") private String photoaddress; @@ -104,6 +106,8 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { model.setList(new ArrayList<>()); } else { List beans = new ArrayList<>(); + Map termchannelMap = cacheService.getTermChannelMap(); + Map termchannelMapMap = cacheService.getTermChannelMapMap(); for (TerminalPhoto item : list) { Integer mediaType = item.getMediaType(); if (mediaType != null && (mediaType.intValue() == 0 || mediaType.intValue() == 1)) { @@ -123,10 +127,14 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { photoBean.setThumb(requestIp + videoaddress + item.getThumb()); } } - photoBean.setChannelName(cacheService.getTermchannelMap(channelId).getChannelName()); - TerminalChannelMapper termchannelMapMap = cacheService.getTermchannelMapMap(termId, channelId); + photoBean.setChannelName(termchannelMap.get(channelId).getChannelName()); if (termchannelMapMap != null) { - photoBean.setAlias(termchannelMapMap.getAlias()); + TerminalChannelMapper terminalChannelMapper = termchannelMapMap.get(termId + "#" + channelId); + if (terminalChannelMapper != null) { + photoBean.setAlias(terminalChannelMapper.getAlias()); + } else { + photoBean.setAlias(""); + } } else { photoBean.setAlias(""); } @@ -200,10 +208,12 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { } } if (channelid == null || channelid.intValue() == 0) { + } else { channelidlist.add(channelid); } if (termidlist.size() == 0) { + } else { PageUtils.SetPage(pageindex, pagesize); list = terminalPhotoDao.selectPhotoListByTermList(termidlist, channelidlist, BigInteger.valueOf(start), BigInteger.valueOf(end)); @@ -214,26 +224,25 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { if (empty) { model.setList(new ArrayList<>()); } else { + Map terminalMap = cacheService.getTerminalMap(); + Map lineMap = cacheService.getLineMap(); + Map termchannelMap = cacheService.getTermChannelMap(); + Map termchannelMapMap = cacheService.getTermChannelMapMap(); for (TerminalPhoto item : list) { TerminalPhotoSelectListModel.PhotoBean photoBean = new TerminalPhotoSelectListModel.PhotoBean(); photoBean.setTermid(item.getTermId()); - Terminals terminals = cacheService.getTerminal(item.getTermId()); + Terminals terminals = terminalMap.get(item.getTermId()); if (!BeanUtil.isEmpty(terminals)) { Integer mediaType = item.getMediaType(); if (mediaType != null && (mediaType.intValue() == 0 || mediaType.intValue() == 1)) { photoBean.setDisplayname(terminals.getDisplayName()); photoBean.setLineid(terminals.getLineid()); - Lines line = cacheService.getLine(terminals.getLineid()); - if (BeanUtil.isNotEmpty(line)) { - photoBean.setLinename(line.getName()); - } else { - photoBean.setLinename(""); - } + photoBean.setLinename(lineMap.get(terminals.getLineid()).getName()); photoBean.setChannelid(item.getChannelId()); photoBean.setCmdid(terminals.getCmdid()); - photoBean.setChannnelname(cacheService.getTermchannelMap(item.getChannelId()).getChannelName()); + photoBean.setChannnelname(termchannelMap.get(item.getChannelId()).getChannelName()); - photoBean.setAlias(cacheService.getTermchannelMapMap(item.getTermId(), item.getChannelId()).getAlias()); + photoBean.setAlias(termchannelMapMap.get(item.getTermId() + "#" + item.getChannelId()).getAlias()); photoBean.setMediaType(item.getMediaType()); photoBean.setOrginalid(item.getOrginalId()); if (mediaType.intValue() == 0) { @@ -294,20 +303,20 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { String startTime = vo.getStartTime(); Date startDate = null; if (StrUtil.isEmpty(startTime)) { - startDate = MyDateUtils.getNowDate(); + startDate = null; } else { startDate = MyDateUtils.myparseDate(startTime); } - long start = 0; + BigInteger start = null; if (startDate != null) { - start = MyDateUtils.TimeMillSecond2Second(DateTime.of(startDate)); + start = BigInteger.valueOf(MyDateUtils.TimeMillSecond2Second(DateTime.of(startDate))); } Date endtime = MyDateUtils.myparseDate(vo.getEndTime()); - long end = 0; + BigInteger end = null; if (endtime != null) { - end = MyDateUtils.TimeMillSecond2Second(DateTime.of(endtime)); + end = BigInteger.valueOf(MyDateUtils.TimeMillSecond2Second(DateTime.of(endtime))); } - List list = terminalPhotoDao.selectPhotoListForOpen(terminals.getId(), BigInteger.valueOf(start), BigInteger.valueOf(end)); + List list = terminalPhotoDao.selectPhotoListForOpen(terminals.getId(), start, end); boolean empty = CollectionUtil.isEmpty(list); if (empty) { model.setList(new ArrayList<>()); @@ -358,7 +367,8 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { public ServiceBody getLatestPhoto(TerminalPhotoVo vo) { Integer termId = vo.getTermId(); DateTime now = DateTime.now(); - Terminals terminals = cacheService.getTerminal(termId); + Map terminalMap = cacheService.getTerminalMap(); + Terminals terminals = terminalMap.get(termId); String cmdid = null; if (terminals != null) { cmdid = terminals.getCmdid(); @@ -502,6 +512,10 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { for (TerminalChannelMapper item : list) { photolist.add(item.getPhotoId()); } + Map lineMap = cacheService.getLineMap(); + Map termchannelMapMap = cacheService.getTermChannelMapMap(); + Map terminalMap = cacheService.getTerminalMap(); + Map termchannelMap = cacheService.getTermChannelMap(); List photoList = terminalPhotoDao.selectPhotosByIdList(photolist); for (TerminalChannelMapper item : list) { @@ -511,7 +525,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { BigInteger photoId = item.getPhotoId(); Integer lineid = null; photosBean.setTermid(termid); - Terminals terminals = cacheService.getTerminal(termid); + Terminals terminals = terminalMap.get(termid); if (terminals != null) { lineid = terminals.getLineid(); photosBean.setLineid(lineid); @@ -519,18 +533,22 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { photosBean.setCmdid(terminals.getCmdid()); } photosBean.setChannelid(channelid); - photosBean.setChannnelname(cacheService.getTermchannelMap(channelid).getChannelName()); + photosBean.setChannnelname(termchannelMap.get(channelid).getChannelName()); - TerminalChannelMapper termchannelMapMap = cacheService.getTermchannelMapMap(termid, channelid); if (termchannelMapMap != null) { - photosBean.setAlias(termchannelMapMap.getAlias()); + TerminalChannelMapper terminalChannelMapper = termchannelMapMap.get(termid + "#" + channelid); + if (terminalChannelMapper != null) { + photosBean.setAlias(terminalChannelMapper.getAlias()); + } else { + photosBean.setAlias(""); + } } else { photosBean.setAlias(""); } if (lineid != null) { - Lines line = cacheService.getLine(lineid); - if (line != null) { - photosBean.setLinename(line.getName()); + LineAndDyNameDto lineAndDyNameDto = lineMap.get(lineid); + if (lineAndDyNameDto != null) { + photosBean.setLinename(lineAndDyNameDto.getName()); } else { photosBean.setLinename(""); } @@ -678,26 +696,25 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { if (empty) { model.setList(new ArrayList<>()); } else { + Map terminalMap = cacheService.getTerminalMap(); + Map lineMap = cacheService.getLineMap(); + Map termchannelMap = cacheService.getTermChannelMap(); + Map termchannelMapMap = cacheService.getTermChannelMapMap(); for (TerminalPhoto item : list) { TerminalPhotoSelectListModel.PhotoBean photoBean = new TerminalPhotoSelectListModel.PhotoBean(); photoBean.setTermid(item.getTermId()); - Terminals terminals = cacheService.getTerminal(item.getTermId()); + Terminals terminals = terminalMap.get(item.getTermId()); if (!BeanUtil.isEmpty(terminals)) { Integer mediaType = item.getMediaType(); if (mediaType != null && (mediaType.intValue() == 0 || mediaType.intValue() == 1)) { photoBean.setDisplayname(terminals.getDisplayName()); photoBean.setLineid(terminals.getLineid()); - Lines line = cacheService.getLine(terminals.getLineid()); - if (BeanUtil.isNotEmpty(line)) { - photoBean.setLinename(line.getName()); - } else { - photoBean.setLinename(""); - } + photoBean.setLinename(lineMap.get(terminals.getLineid()).getName()); photoBean.setChannelid(item.getChannelId()); photoBean.setCmdid(terminals.getCmdid()); - photoBean.setChannnelname(cacheService.getTermchannelMap(item.getChannelId()).getChannelName()); - TerminalChannelMapper termchannelMapMap = cacheService.getTermchannelMapMap(item.getTermId(), item.getChannelId()); - photoBean.setAlias(termchannelMapMap.getAlias()); + photoBean.setChannnelname(termchannelMap.get(item.getChannelId()).getChannelName()); + + photoBean.setAlias(termchannelMapMap.get(item.getTermId() + "#" + item.getChannelId()).getAlias()); photoBean.setMediaType(item.getMediaType()); photoBean.setOrginalid(item.getOrginalId()); if (mediaType.intValue() == 0) { diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java index c8713ad..fadd3cf 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java @@ -13,7 +13,6 @@ import com.shxy.xymanager_common.dto.DyLineAndTerminalNoHeartDto; import com.shxy.xymanager_common.dto.PhotoMarkDto; import com.shxy.xymanager_common.dto.TerminalInfoDto; import com.shxy.xymanager_common.dto.TerminalsAndLineAndChannelDto; -import com.shxy.xymanager_common.entity.GlobalParams; import com.shxy.xymanager_common.entity.TerminalChannelMapper; import com.shxy.xymanager_common.entity.TerminalStatus; import com.shxy.xymanager_common.entity.Terminals; @@ -384,17 +383,13 @@ public class TerminalServiceImpl implements TerminalService { @Override public ServiceBody getCoordinate(String requestIp, MarkReqVo vo) { - GlobalParams globalParams = cacheService.getGlobalParams(GloableParamsType.ImgMark.value()); + Map globalParams = cacheService.getGolobalMap(); + String s = globalParams.get(GloableParamsType.ImgMark.value()); Integer integer = null; - if (globalParams == null) { + if (StrUtil.isEmpty(s)) { integer = 0; } else { - String s = globalParams.getParamValue(); - if (StrUtil.isEmpty(s)) { - integer = 0; - } else { - integer = Integer.valueOf(s); - } + integer = Integer.valueOf(s); } PhotoMarkModel model = new PhotoMarkModel(); model.setMarkEnable(integer); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TowerServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TowerServiceImpl.java index fe7550a..42515f6 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TowerServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TowerServiceImpl.java @@ -14,7 +14,7 @@ import com.shxy.xymanager_common.model.TowerListModel; import com.shxy.xymanager_common.page.PageUtils; import com.shxy.xymanager_common.vo.*; import com.shxy.xymanager_dao.dao.TowerDao; -import com.shxy.xymanager_service.service.CacheService; +import com.shxy.xymanager_service.cache.XyCache; import com.shxy.xymanager_service.service.TowerService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -30,7 +30,6 @@ import java.util.List; * * @author 晶晶 */ - @Slf4j @Service public class TowerServiceImpl implements TowerService { @@ -38,9 +37,6 @@ public class TowerServiceImpl implements TowerService { @Autowired private TowerDao towerDao; - @Autowired - private CacheService cacheService; - @Override public ServiceBody addTower(TowersVo vo) { List towersLst = BeanUtil.copyToList(vo.getList(), Towers.class, CopyOptions.create().ignoreCase()); @@ -78,13 +74,15 @@ public class TowerServiceImpl implements TowerService { int pages = pageData.getPages(); model.setTotalpage(pages); + return Asserts.success(model); } @Override public ServiceBody deleteTower(TowerIdVo vo) { List lines = BeanUtil.copyToList(vo.getList(), Towers.class); - Integer i = cacheService.deleteTower(lines); + Date date = new Date(); + int i = towerDao.deleteById(lines, CommonStatus.DELETE.value(), date); if (i != 0) { return Asserts.success("删除成功"); } else { diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/CacheService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/CacheService.java index afdd01f..6f77841 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/CacheService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/CacheService.java @@ -1,11 +1,14 @@ package com.shxy.xymanager_service.service; +import com.shxy.xymanager_common.dto.LineAndDyNameDto; import com.shxy.xymanager_common.dto.TowerDto; import com.shxy.xymanager_common.entity.*; import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; import java.util.List; +import java.util.Map; /** @@ -15,65 +18,93 @@ import java.util.List; */ public interface CacheService { - /** - * 获取绘制状态 - * - * @return - */ - GlobalParams getGlobalParams(String param); - - /** - * 修改绘制状态 - * - * @return - */ - GlobalParams updateGlobalParams(GlobalParams record); - - /** - * 获取单个线路 - * - * @return - */ - Lines getLine(Integer id); - - /** - * 删除线路 - * - * @return - */ - Integer deleteLine(List lines); - - /** - * 修改线路 - * - * @return - */ - Lines updateLine(Lines lines); - - - TowerDto getTower(Integer id); - - Integer deleteTower(List list); - - Towers updateTower(Towers towers); - - Terminals getTerminal(Integer id); - - Integer deleteTerminal(List list); - - Towers updateTerminal(Towers towers); - - TerminalChannels getTermchannelMap(Integer id); - - Integer deleteTermchannelMap(List list); - - TerminalChannels updateTermchannelMap(TerminalChannels terminalChannels); - - TerminalChannelMapper getTermchannelMapMap(Integer id, Integer channelid); - - Integer deleteTermchannelMapMap(Integer id); - - List getAlarmParsms(); - - List updateAlarmParsms(List list); +// /** +// * 获取绘制状态 +// * +// * @return +// */ +// GlobalParams getGlobalParams(String param); +// +// /** +// * 修改绘制状态 +// * +// * @return +// */ +// GlobalParams updateGlobalParams(GlobalParams record); +// +// /** +// * 获取单个线路 +// * +// * @return +// */ +// Lines getLine(Integer id); +// +// /** +// * 删除线路 +// * +// * @return +// */ +// Integer deleteLine(List lines); +// +// /** +// * 修改线路 +// * +// * @return +// */ +// Lines updateLine(Lines lines); +// +// +// TowerDto getTower(Integer id); +// +// Integer deleteTower(List list); +// +// Towers updateTower(Towers towers); +// +// Terminals getTerminal(Integer id); +// +// Integer deleteTerminal(List list); +// +// Towers updateTerminal(Towers towers); +// +// TerminalChannels getTermchannelMap(Integer id); +// +// Integer deleteTermchannelMap(List list); +// +// TerminalChannels updateTermchannelMap(TerminalChannels terminalChannels); +// +// TerminalChannelMapper getTermchannelMapMap(Integer id, Integer channelid); +// +// Integer deleteTermchannelMapMap(Integer id); +// +// List getAlarmParsms(); +// +// List updateAlarmParsms(List list); + + Map getGolobalMap(); + + Map updateGolobalMap(); + + Map getAlarmParamMap(); + + Map updateAlarmParamMap(); + + Map getTermChannelMapMap(); + + Map updateTermChannelMapMap(); + + Map getTermChannelMap(); + + Map getTowerMap(); + + Map getTerminalMap(); + + Map getLineMap(); + + Map updateTermChannelMap(); + + Map updateTowerMap(); + + Map updateTerminalMap(); + + Map updateLineMap(); }