xymp
/
backend
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

缓存优化

Browse Source
master
liuguijing 2 years ago
parent 11c75d7aac
commit 30fb709e85
17 changed files with 494 additions and 388 deletions
Show Stats Download Patch File Download Diff File

40
xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LineController.java
Unescape Escape View File

@ -5,12 +5,10 @@ import com.shxy.xymanager_common.base.BaseController;
import com.shxy.xymanager_common.base.ResponseReult; import com.shxy.xymanager_common.base.ResponseReult;
import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.bean.ServiceBody;
import com.shxy.xymanager_common.bean.ServiceStatus; 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.LineAndGtAndChannelListModel;
import com.shxy.xymanager_common.model.LineListModel; import com.shxy.xymanager_common.model.LineListModel;
import com.shxy.xymanager_common.model.DyLineTreeListModel; import com.shxy.xymanager_common.model.DyLineTreeListModel;
import com.shxy.xymanager_common.vo.*; import com.shxy.xymanager_common.vo.*;
import com.shxy.xymanager_service.service.CacheService;
import com.shxy.xymanager_service.service.LineService; import com.shxy.xymanager_service.service.LineService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; 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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@Api(value = "线路接口", tags = "线路相关") @Api(value = "线路接口", tags = "线路相关")
@RestController @RestController
@ -37,9 +30,6 @@ public class LineController extends BaseController {
@Autowired @Autowired
LineService lineService; LineService lineService;
@Autowired
CacheService cacheService;
@ApiOperation(value = "获取线路列表", notes = "获取线路列表接口", httpMethod = "POST") @ApiOperation(value = "获取线路列表", notes = "获取线路列表接口", httpMethod = "POST")
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/getLineList") @RequestMapping("/getLineList")
@ -118,34 +108,4 @@ public class LineController extends BaseController {
return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); 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<Lines> 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<List<Lines>> insertLine(@RequestParam("id") Integer id) {
// ArrayList<Lines> 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> lines = cacheService.insertLine(list, new Date());
// return ResponseReult.success(lines);
// }
} }

11
xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/OpenController.java
Unescape Escape View File

@ -77,15 +77,4 @@ public class OpenController extends BaseController {
JSONObject serviceBody = openService.cmaDeviceStatus(vo); JSONObject serviceBody = openService.cmaDeviceStatus(vo);
return serviceBody; 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;
}
} }

2
xymanager_admin/src/main/resources/META-INF/spring.factories
Unescape Escape View File

@ -1 +1 @@
#org.springframework.boot.env.EnvironmentPostProcessor=com.shxy.xymanager_framework.config.MyEnvironmentPostProcessor org.springframework.boot.env.EnvironmentPostProcessor=com.shxy.xymanager_framework.config.MyEnvironmentPostProcessor

2
xymanager_admin/src/main/resources/log4j2.xml
Unescape Escape View File

@ -21,7 +21,7 @@
value="%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight{%-5level}[%thread] %style{%logger{36}}{cyan} : %msg%n"/> value="%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight{%-5level}[%thread] %style{%logger{36}}{cyan} : %msg%n"/>
<!-- 定义日志存储的路径，不要配置相对路径 --> <!-- 定义日志存储的路径，不要配置相对路径 -->
<property name="FILE_PATH" value="/var/log/xymp/xymanagerLogs/"/> <property name="FILE_PATH" value="/var/log/xymp/xymanagerLogs"/>
<property name="FILE_NAME" value="xymanagerlog"/> <property name="FILE_NAME" value="xymanagerlog"/>
</Properties> </Properties>

2
xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/LinesDao.java
Unescape Escape View File

@ -15,7 +15,7 @@ public interface LinesDao {
int deleteById(@Param("list") List<Lines> record, @Param("status") Integer status,@Param("updateat") Date update); int deleteById(@Param("list") List<Lines> record, @Param("status") Integer status,@Param("updateat") Date update);
Lines selectById(Integer id); Lines selectByPrimaryKey(Integer id);
List<Lines> selectLineByDyId(@Param("dyid")Integer dyid,@Param("status") Integer status); List<Lines> selectLineByDyId(@Param("dyid")Integer dyid,@Param("status") Integer status);

1
xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TowerDao.java
Unescape Escape View File

@ -14,7 +14,6 @@ public interface TowerDao {
List<TowerDto> selectAll(@Param("status") Integer status); List<TowerDto> selectAll(@Param("status") Integer status);
List<Towers> selectAllByLineid(@Param("lineid") Integer id, @Param("status") Integer status); List<Towers> selectAllByLineid(@Param("lineid") Integer id, @Param("status") Integer status);
int deleteById(@Param("list") List<Towers> record, @Param("status") Integer status, @Param("update") Date update); int deleteById(@Param("list") List<Towers> record, @Param("status") Integer status, @Param("update") Date update);

2
xymanager_dao/src/main/resources/mappers/LinesDao.xml
Unescape Escape View File

@ -35,7 +35,7 @@
dy_level y dy_level y
where x.dy_level_id = y.id and x.status = #{status} order by x.create_time desc where x.dy_level_id = y.id and x.status = #{status} order by x.create_time desc
</select> </select>
<select id="selectById" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from `lines` from `lines`

8
xymanager_framework/pom.xml
Unescape Escape View File

@ -40,10 +40,10 @@
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
</exclusion> </exclusion>
<!-- <exclusion>--> <exclusion>
<!-- <groupId>org.springframework.boot</groupId>--> <groupId>org.springframework.boot</groupId>
<!-- <artifactId>spring-boot-starter-tomcat</artifactId>--> <artifactId>spring-boot-starter-tomcat</artifactId>
<!-- </exclusion>--> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>

76
xymanager_service/src/main/java/com/shxy/xymanager_service/cache/XyCache.java vendored
Unescape Escape View File

@ -1,85 +1,43 @@
package com.shxy.xymanager_service.cache; package com.shxy.xymanager_service.cache;
import com.shxy.xymanager_common.entity.*; import com.shxy.xymanager_service.service.CacheService;
import com.shxy.xymanager_common.enums.CommonStatus;
import com.shxy.xymanager_dao.dao.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy; import javax.annotation.PreDestroy;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Component @Component
public class XyCache { public class XyCache {
// public static Map<Integer, Terminals> terminalMap = new HashMap<Integer, Terminals>();
// public static Map<Integer, TerminalChannels> termchannelMap = new HashMap<Integer, TerminalChannels>();
// /*装置编号+‘#’+通道编号 装置映射表*/
// public static Map<String, TerminalChannelMapper> termchannelMapMap = new HashMap<String, TerminalChannelMapper>();
// //告警类型
// public static Map<Integer, TerminalImgAlarmParams> alarmParamMap = new HashMap<Integer, TerminalImgAlarmParams>();
@Autowired
private LinesDao linesDao;
@Autowired
private TerminalsDao terminalsDao;
@Autowired
private TowerDao towerDao;
@Autowired @Autowired
private TerminalChannelsDao terminalChannelsDao; CacheService cacheService;
@Autowired
private TerminalChannelMapperDao terminalChannelMapperDao;
@Autowired
private TerminalImgAlarmParamsDao terminalImgAlarmParamsDao;
@Autowired
private TerminalStatusDao terminalStatusDao;
@PostConstruct @PostConstruct
public void init() { public void init() {
//系统启动中。。。加载codeMap //系统启动中。。。加载codeMap
//
// terminalMap.clear(); cacheService.updateLineMap();
// termchannelMap.clear();
// termchannelMapMap.clear(); cacheService.updateTerminalMap();
// alarmParamMap.clear();
// cacheService.updateTermChannelMap();
//
// List<Terminals> termslist = terminalsDao.selectAll(CommonStatus.EFFECTIVE.value()); cacheService.updateTowerMap();
// for (Terminals item : termslist) {
// terminalMap.put(item.getId(), item); cacheService.updateTermChannelMapMap();
// }
// cacheService.updateAlarmParamMap();
// List<TerminalChannels> channelslist = terminalChannelsDao.selectChannelList(CommonStatus.EFFECTIVE.value());
// for (TerminalChannels item : channelslist) { cacheService.updateGolobalMap();
// termchannelMap.put(item.getId(), item);
// }
//
// List<TerminalChannelMapper> terminalChannelMapperlist = terminalChannelMapperDao.selectAll();
// for (TerminalChannelMapper item : terminalChannelMapperlist) {
// String s = item.getTermId() + "#" + item.getChannelId();
// termchannelMapMap.put(s, item);
// }
//
// List<TerminalImgAlarmParams> terminalImgAlarmParams = terminalImgAlarmParamsDao.selectAll();
// for (TerminalImgAlarmParams item : terminalImgAlarmParams) {
// alarmParamMap.put(item.getLabel(), item);
// }
} }
@PreDestroy @PreDestroy
public void destroy() { public void destroy() {
//系统运行结束 //系统运行结束
} }
// @Scheduled(cron = "0 0 0/2 * * ?")
// public void testOne() {
// //每2小时执行一次缓存
// init();
// }
} }

358
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CacheServiceImpl.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.shxy.xymanager_service.impl; 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.dto.TowerDto;
import com.shxy.xymanager_common.entity.*; import com.shxy.xymanager_common.entity.*;
import com.shxy.xymanager_common.enums.CommonStatus; import com.shxy.xymanager_common.enums.CommonStatus;
@ -14,7 +15,9 @@ import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
@ -46,156 +49,315 @@ public class CacheServiceImpl implements CacheService {
@Autowired @Autowired
TerminalImgAlarmParamsDao terminalImgAlarmParamsDao; TerminalImgAlarmParamsDao terminalImgAlarmParamsDao;
@Override // @Override
@Cacheable(value = "globalParams", key = "#param") // @Cacheable(value = "globalParams", key = "#param")
public GlobalParams getGlobalParams(String param) { // public GlobalParams getGlobalParams(String param) {
System.out.println("测试缓存：" + param); // System.out.println("测试缓存：" + param);
return globalParamsDao.selectByParam(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> 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<Towers> 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<Terminals> 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<TerminalChannels> 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<TerminalImgAlarmParams> getAlarmParsms() {
// List<TerminalImgAlarmParams> terminalImgAlarmParams = terminalImgAlarmParamsDao.selectAll();
// return terminalImgAlarmParams;
// }
//
// @Override
// @CacheEvict(value = "alarmParamMap", allEntries = true)
// public List<TerminalImgAlarmParams> updateAlarmParsms(List<TerminalImgAlarmParams> 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> lines) {
int i = linesDao.deleteById(lines, CommonStatus.DELETE.value(), new Date());
return i;
}
@Override @Override
@CachePut(value = "linesMap", key = "#result.id") @Cacheable(value = "globalMap")
public Lines updateLine(Lines lines) { public Map<String, String> getGolobalMap() {
int i = linesDao.updateByPrimaryKeySelective(lines, new Date()); Map<String, String> globalParams = new HashMap<String, String>();
if (i == 0) { List<GlobalParams> globalParamslist = globalParamsDao.selectAll();
return null; for (GlobalParams item : globalParamslist) {
} else { globalParams.put(item.getParamName(), item.getParamValue());
return lines;
} }
return globalParams;
} }
@Override @Override
@Cacheable(value = "towerMap", key = "#id") @Cacheable(value = "alarmParamMap")
public TowerDto getTower(Integer id) { public Map<Integer, TerminalImgAlarmParams> getAlarmParamMap() {
TowerDto dto = towerDao.getInfoByPrimaryKey(id, CommonStatus.EFFECTIVE.value()); Map<Integer, TerminalImgAlarmParams> alarmParamMap = new HashMap<Integer, TerminalImgAlarmParams>();
return dto; List<TerminalImgAlarmParams> terminalImgAlarmParams = terminalImgAlarmParamsDao.selectAll();
for (TerminalImgAlarmParams item : terminalImgAlarmParams) {
alarmParamMap.put(item.getLabel(), item);
}
return alarmParamMap;
} }
@Override @Override
@CacheEvict(value = "towerMap", allEntries = true) @Cacheable(value = "termchannelMapMap")
public Integer deleteTower(List<Towers> list) { public Map<String, TerminalChannelMapper> getTermChannelMapMap() {
int i = towerDao.deleteById(list, CommonStatus.DELETE.value(), new Date()); Map<String, TerminalChannelMapper> termchannelMapMap = new HashMap<String, TerminalChannelMapper>();
return i; List<TerminalChannelMapper> terminalChannelMapperlist = terminalChannelMapperDao.selectAll();
for (TerminalChannelMapper item : terminalChannelMapperlist) {
String s = item.getTermId() + "#" + item.getChannelId();
termchannelMapMap.put(s, item);
}
return termchannelMapMap;
} }
@Override @Override
@CachePut(value = "towerMap", key = "#result.id") @Cacheable(value = "termchannelMap")
public Towers updateTower(Towers towers) { public Map<Integer, TerminalChannels> getTermChannelMap() {
int i = towerDao.updateByPrimaryKeySelective(towers, new Date()); Map<Integer, TerminalChannels> termchannelMap = new HashMap<Integer, TerminalChannels>();
if (i == 0) { List<TerminalChannels> channelslist = terminalChannelsDao.selectChannelList(CommonStatus.EFFECTIVE.value());
return null; for (TerminalChannels item : channelslist) {
} else { termchannelMap.put(item.getId(), item);
return towers;
} }
return termchannelMap;
} }
@Override @Override
@Cacheable(value = "terminalMap", key = "#id") @Cacheable(value = "towerMap")
public Terminals getTerminal(Integer id) { public Map<Integer, TowerDto> getTowerMap() {
Terminals terminals = terminalsDao.selectById(id, CommonStatus.EFFECTIVE.value()); Map<Integer, TowerDto> towerMap = new HashMap<Integer, TowerDto>();
return terminals; List<TowerDto> towerlist = towerDao.selectAll(CommonStatus.EFFECTIVE.value());
for (TowerDto item : towerlist) {
towerMap.put(item.getId(), item);
}
return towerMap;
} }
@Override @Override
@CacheEvict(value = "terminalMap", allEntries = true) @Cacheable(value = "terminalMap")
public Integer deleteTerminal(List<Terminals> list) { public Map<Integer, Terminals> getTerminalMap() {
int i = terminalsDao.deleteById(list, CommonStatus.DELETE.value(), new Date()); Map<Integer, Terminals> terminalMap = new HashMap<Integer, Terminals>();
return i; List<Terminals> termslist = terminalsDao.selectAll(CommonStatus.EFFECTIVE.value());
for (Terminals item : termslist) {
terminalMap.put(item.getId(), item);
}
return terminalMap;
} }
@Override @Override
@CachePut(value = "terminalMap", key = "#result.id") @Cacheable(value = "lineMap")
public Towers updateTerminal(Towers towers) { public Map<Integer, LineAndDyNameDto> getLineMap() {
int i = towerDao.updateByPrimaryKeySelective(towers, new Date()); Map<Integer, LineAndDyNameDto> lineMap = new HashMap<Integer, LineAndDyNameDto>();
if (i == 0) { List<LineAndDyNameDto> lineAndDyNameDtos = linesDao.selectAll(CommonStatus.EFFECTIVE.value());
return null; for (LineAndDyNameDto lineitem : lineAndDyNameDtos) {
} else { lineMap.put(lineitem.getId(), lineitem);
return towers;
} }
return lineMap;
} }
@Override @Override
@Cacheable(value = "termchannelMap", key = "#id") @CachePut(value = "globalMap")
public TerminalChannels getTermchannelMap(Integer id) { public Map<String, String> updateGolobalMap() {
TerminalChannels terminalChannels = terminalChannelsDao.selectByPrimaryKey(id, CommonStatus.EFFECTIVE.value()); Map<String, String> globalParams = new HashMap<String, String>();
return terminalChannels; List<GlobalParams> globalParamslist = globalParamsDao.selectAll();
for (GlobalParams item : globalParamslist) {
globalParams.put(item.getParamName(), item.getParamValue());
}
return globalParams;
} }
@Override @Override
@CacheEvict(value = "termchannelMap", allEntries = true) @CachePut(value = "alarmParamMap")
public Integer deleteTermchannelMap(List<TerminalChannels> list) { public Map<Integer, TerminalImgAlarmParams> updateAlarmParamMap() {
int i = terminalChannelsDao.deleteList(list, CommonStatus.DELETE.value(), new Date()); Map<Integer, TerminalImgAlarmParams> alarmParamMap = new HashMap<Integer, TerminalImgAlarmParams>();
return i; List<TerminalImgAlarmParams> terminalImgAlarmParams = terminalImgAlarmParamsDao.selectAll();
for (TerminalImgAlarmParams item : terminalImgAlarmParams) {
alarmParamMap.put(item.getLabel(), item);
}
return alarmParamMap;
} }
@Override @Override
@CachePut(value = "termchannelMap", key = "#result.id") @CachePut(value = "termchannelMapMap")
public TerminalChannels updateTermchannelMap(TerminalChannels terminalChannels) { public Map<String, TerminalChannelMapper> updateTermChannelMapMap() {
int i = terminalChannelsDao.updateByPrimaryKeySelective(terminalChannels, new Date()); Map<String, TerminalChannelMapper> termchannelMapMap = new HashMap<String, TerminalChannelMapper>();
if (i == 0) { List<TerminalChannelMapper> terminalChannelMapperlist = terminalChannelMapperDao.selectAll();
return null; for (TerminalChannelMapper item : terminalChannelMapperlist) {
} else { String s = item.getTermId() + "#" + item.getChannelId();
return terminalChannels; termchannelMapMap.put(s, item);
} }
return termchannelMapMap;
} }
@Override @Override
@Cacheable(value = "termchannelMapMap", key = "#id") @CachePut(value = "termchannelMap")
public TerminalChannelMapper getTermchannelMapMap(Integer id, Integer channelid) { public Map<Integer, TerminalChannels> updateTermChannelMap() {
TerminalChannelMapper terminalChannels = terminalChannelMapperDao.selectByTermidAndChannelid(id, channelid,CommonStatus.EFFECTIVE.value()); Map<Integer, TerminalChannels> termchannelMap = new HashMap<Integer, TerminalChannels>();
return terminalChannels; List<TerminalChannels> channelslist = terminalChannelsDao.selectChannelList(CommonStatus.EFFECTIVE.value());
for (TerminalChannels item : channelslist) {
termchannelMap.put(item.getId(), item);
}
return termchannelMap;
} }
@Override @Override
@CacheEvict(value = "termchannelMapMap", allEntries = true) @CachePut(value = "towerMap")
public Integer deleteTermchannelMapMap(Integer id) { public Map<Integer, TowerDto> updateTowerMap() {
int i = terminalChannelMapperDao.deleteByTermId(id); Map<Integer, TowerDto> towerMap = new HashMap<Integer, TowerDto>();
return i; List<TowerDto> towerlist = towerDao.selectAll(CommonStatus.EFFECTIVE.value());
for (TowerDto item : towerlist) {
towerMap.put(item.getId(), item);
}
return towerMap;
} }
@Override @Override
@Cacheable(value = "alarmParamMap") @CachePut(value = "terminalMap")
public List<TerminalImgAlarmParams> getAlarmParsms() { public Map<Integer, Terminals> updateTerminalMap() {
List<TerminalImgAlarmParams> terminalImgAlarmParams = terminalImgAlarmParamsDao.selectAll(); Map<Integer, Terminals> terminalMap = new HashMap<Integer, Terminals>();
return terminalImgAlarmParams; List<Terminals> termslist = terminalsDao.selectAll(CommonStatus.EFFECTIVE.value());
for (Terminals item : termslist) {
terminalMap.put(item.getId(), item);
}
return terminalMap;
} }
@Override @Override
@CacheEvict(value = "alarmParamMap", allEntries = true) @CachePut(value = "lineMap")
public List<TerminalImgAlarmParams> updateAlarmParsms(List<TerminalImgAlarmParams> list) { public Map<Integer, LineAndDyNameDto> updateLineMap() {
int i = terminalImgAlarmParamsDao.updateList(list, new Date()); Map<Integer, LineAndDyNameDto> lineMap = new HashMap<Integer, LineAndDyNameDto>();
if (i == 0) { List<LineAndDyNameDto> lineAndDyNameDtos = linesDao.selectAll(CommonStatus.EFFECTIVE.value());
return null; for (LineAndDyNameDto lineitem : lineAndDyNameDtos) {
} else { lineMap.put(lineitem.getId(), lineitem);
return list;
} }
return lineMap;
} }
} }

27
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/GloablParamsServiceImpl.java
Unescape Escape View File

@ -1,17 +1,19 @@
package com.shxy.xymanager_service.impl; package com.shxy.xymanager_service.impl;
import cn.hutool.core.util.StrUtil;
import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.bean.ServiceBody;
import com.shxy.xymanager_common.entity.GlobalParams; import com.shxy.xymanager_common.entity.GlobalParams;
import com.shxy.xymanager_common.enums.GloableParamsType; import com.shxy.xymanager_common.enums.GloableParamsType;
import com.shxy.xymanager_common.exception.Asserts; import com.shxy.xymanager_common.exception.Asserts;
import com.shxy.xymanager_dao.dao.GlobalParamsDao; 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.CacheService;
import com.shxy.xymanager_service.service.GloablParamsService; import com.shxy.xymanager_service.service.GloablParamsService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.Map;
/** /**
@ -27,7 +29,6 @@ public class GloablParamsServiceImpl implements GloablParamsService {
@Autowired @Autowired
CacheService cacheService; CacheService cacheService;
/** /**
* 获取绘制状态 * 获取绘制状态
* *
@ -35,18 +36,9 @@ public class GloablParamsServiceImpl implements GloablParamsService {
*/ */
@Override @Override
public ServiceBody<Integer> getMarkEnableStatus() { public ServiceBody<Integer> getMarkEnableStatus() {
Integer integer; Map<String, String> globalParams = cacheService.getGolobalMap();
GlobalParams globalParams = cacheService.getGlobalParams(GloableParamsType.ImgMark.value()); String s = globalParams.get(GloableParamsType.ImgMark.value());
if (globalParams == null) { Integer integer = Integer.valueOf(s);
integer = 0;
} else {
String paramValue = globalParams.getParamValue();
if (StrUtil.isNotEmpty(paramValue)) {
integer = Integer.valueOf(paramValue);
} else {
integer = 0;
}
}
return Asserts.success(integer); return Asserts.success(integer);
} }
@ -61,8 +53,13 @@ public class GloablParamsServiceImpl implements GloablParamsService {
GlobalParams record = new GlobalParams(); GlobalParams record = new GlobalParams();
record.setParamName(GloableParamsType.ImgMark.value()); record.setParamName(GloableParamsType.ImgMark.value());
record.setParamValue(String.valueOf(status)); record.setParamValue(String.valueOf(status));
cacheService.updateGlobalParams(record); int i = globalParamsDao.updateByParamName(record, new Date());
if (i != 0) {
cacheService.updateGolobalMap();
return Asserts.success("修改成功"); return Asserts.success("修改成功");
} else {
return Asserts.error("修改失败");
}
} }
} }

11
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java
Unescape Escape View File

@ -18,7 +18,6 @@ import com.shxy.xymanager_common.model.LineListModel;
import com.shxy.xymanager_common.page.PageUtils; import com.shxy.xymanager_common.page.PageUtils;
import com.shxy.xymanager_common.vo.*; import com.shxy.xymanager_common.vo.*;
import com.shxy.xymanager_dao.dao.*; import com.shxy.xymanager_dao.dao.*;
import com.shxy.xymanager_service.service.CacheService;
import com.shxy.xymanager_service.service.LineService; import com.shxy.xymanager_service.service.LineService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -50,9 +49,6 @@ public class LineServiceImpl implements LineService {
@Autowired @Autowired
private TerminalChannelsDao terminalChannelsDao; private TerminalChannelsDao terminalChannelsDao;
@Autowired
private CacheService cacheService;
/** /**
* 获取线路 * 获取线路
@ -115,7 +111,8 @@ public class LineServiceImpl implements LineService {
@Override @Override
public ServiceBody<String> deleteLine(LineIdVo vo) { public ServiceBody<String> deleteLine(LineIdVo vo) {
List<Lines> lines = BeanUtil.copyToList(vo.getList(), Lines.class); List<Lines> 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) { if (i != 0) {
return Asserts.success("删除成功"); return Asserts.success("删除成功");
} else { } else {
@ -134,8 +131,8 @@ public class LineServiceImpl implements LineService {
public ServiceBody<String> updateLine(UpdateLineVo vo) { public ServiceBody<String> updateLine(UpdateLineVo vo) {
Lines lines = new Lines(); Lines lines = new Lines();
BeanUtil.copyProperties(vo, lines, true); BeanUtil.copyProperties(vo, lines, true);
Lines bean = cacheService.updateLine(lines); int i = linesDao.updateByPrimaryKeySelective(lines, new Date());
if (bean != null) { if (i != 0) {
return Asserts.success("修改成功"); return Asserts.success("修改成功");
} else { } else {
return Asserts.error("修改失败"); return Asserts.error("修改失败");

59
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalAlarmServiceImpl.java
Unescape Escape View File

@ -49,6 +49,9 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService {
@Autowired @Autowired
private TerminalImgAlarmParamsDao terminalImgAlarmParamsDao; private TerminalImgAlarmParamsDao terminalImgAlarmParamsDao;
@Autowired
private CacheService cacheService;
@Autowired @Autowired
DyLevelDao dyLevelDao; DyLevelDao dyLevelDao;
@ -58,9 +61,6 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService {
@Autowired @Autowired
TowerDao towerDao; TowerDao towerDao;
@Autowired
CacheService cacheService;
@Value("${photo.address}") @Value("${photo.address}")
private String photoaddress; private String photoaddress;
@ -76,12 +76,7 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService {
Integer towerid = vo.getTowerId(); Integer towerid = vo.getTowerId();
Integer label = vo.getLabel(); Integer label = vo.getLabel();
List<TerminalImgAlarmParams> labellist = new ArrayList<>(); List<TerminalImgAlarmParams> labellist = new ArrayList<>();
Map<Integer, TerminalImgAlarmParams> alarmParamMap = new HashMap<Integer, TerminalImgAlarmParams>(); Map<Integer, TerminalImgAlarmParams> alarmParamMap = cacheService.getAlarmParamMap();
List<TerminalImgAlarmParams> alarmParsms = cacheService.getAlarmParsms();
for (TerminalImgAlarmParams item : alarmParsms) {
alarmParamMap.put(item.getLabel(), item);
}
if (label == null || label == -1) { if (label == null || label == -1) {
alarmParamMap.forEach((key, value) -> { alarmParamMap.forEach((key, value) -> {
labellist.add(value); labellist.add(value);
@ -126,11 +121,24 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService {
list = terminalImgAlarmsDao.selectAlarmsDetails(termidlist, labellist, BigInteger.valueOf(start), BigInteger.valueOf(end)); list = terminalImgAlarmsDao.selectAlarmsDetails(termidlist, labellist, BigInteger.valueOf(start), BigInteger.valueOf(end));
} }
if (CollectionUtil.isNotEmpty(list)) { if (CollectionUtil.isNotEmpty(list)) {
Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
Map<Integer, TowerDto> towerMap = cacheService.getTowerMap();
Map<Integer, TerminalChannels> termchannelMap = cacheService.getTermChannelMap();
Map<String, TerminalChannelMapper> termchannelMapMap = cacheService.getTermChannelMapMap();
// ArrayList<BigInteger> originidlist = new ArrayList<>();
// for (TerminalImgAlarmsDto item : list) {
// originidlist.add(item.getPhotoOrgId());
// }
List<TerminalPhoto> alarmphotolist = terminalPhotoDao.selectPhotoListByOrginIdAndTermList(list); List<TerminalPhoto> alarmphotolist = terminalPhotoDao.selectPhotoListByOrginIdAndTermList(list);
Map<String, TerminalPhoto> map = new HashMap<>(); Map<String, TerminalPhoto> map = new HashMap<>();
for (TerminalPhoto item : alarmphotolist) { for (TerminalPhoto item : alarmphotolist) {
map.put(item.getTermId() + "#" + item.getOrginalId(), item); map.put(item.getTermId() + "#" + item.getOrginalId(), item);
} }
// List<TerminalAlarmListModel.AlarmBean> alarmBeans = BeanUtil.copyToList(list, TerminalAlarmListModel.AlarmBean.class, CopyOptions.create().ignoreCase());
List<TerminalAlarmListModel.AlarmBean> alarmBeans = new ArrayList<>(); List<TerminalAlarmListModel.AlarmBean> alarmBeans = new ArrayList<>();
for (TerminalImgAlarmsDto item : list) { for (TerminalImgAlarmsDto item : list) {
TerminalAlarmListModel.AlarmBean alarmBean = new TerminalAlarmListModel.AlarmBean(); TerminalAlarmListModel.AlarmBean alarmBean = new TerminalAlarmListModel.AlarmBean();
@ -141,11 +149,11 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService {
alarmBean.setTermId(termId); alarmBean.setTermId(termId);
alarmBean.setChannelId(channelId); alarmBean.setChannelId(channelId);
Terminals terminals = cacheService.getTerminal(termId); Terminals terminals = terminalMap.get(termId);
if (terminals != null) { if (terminals != null) {
alarmBean.setDisplayName(terminals.getDisplayName()); alarmBean.setDisplayName(terminals.getDisplayName());
Integer termtowerid = terminals.getTowerid(); Integer termtowerid = terminals.getTowerid();
TowerDto towerDto = cacheService.getTower(termtowerid); TowerDto towerDto = towerMap.get(termtowerid);
if (towerDto != null) { if (towerDto != null) {
alarmBean.setTowerId(termtowerid); alarmBean.setTowerId(termtowerid);
alarmBean.setTowerName(towerDto.getName()); alarmBean.setTowerName(towerDto.getName());
@ -153,11 +161,11 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService {
alarmBean.setLineName(towerDto.getLineName()); alarmBean.setLineName(towerDto.getLineName());
} }
} }
TerminalChannels terminalChannels = cacheService.getTermchannelMap(channelId); TerminalChannels terminalChannels = termchannelMap.get(channelId);
if (terminalChannels != null) { if (terminalChannels != null) {
alarmBean.setChannnelName(terminalChannels.getChannelName()); alarmBean.setChannnelName(terminalChannels.getChannelName());
} }
TerminalChannelMapper terminalChannelMapper = cacheService.getTermchannelMapMap(termId, channelId); TerminalChannelMapper terminalChannelMapper = termchannelMapMap.get(termId + "#" + channelId);
if (terminalChannelMapper != null) { if (terminalChannelMapper != null) {
alarmBean.setAlias(terminalChannelMapper.getAlias()); alarmBean.setAlias(terminalChannelMapper.getAlias());
} }
@ -250,13 +258,8 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService {
public ServiceBody<TerminalImgAlarmParamsModel> getAlarmTypeList() { public ServiceBody<TerminalImgAlarmParamsModel> getAlarmTypeList() {
TerminalImgAlarmParamsModel model = new TerminalImgAlarmParamsModel(); TerminalImgAlarmParamsModel model = new TerminalImgAlarmParamsModel();
ArrayList<TerminalImgAlarmParamsModel.AlarmParamBean> list = new ArrayList<>(); ArrayList<TerminalImgAlarmParamsModel.AlarmParamBean> list = new ArrayList<>();
Map<Integer, TerminalImgAlarmParams> alarmParamMap = new HashMap<Integer, TerminalImgAlarmParams>(); Map<Integer, TerminalImgAlarmParams> beans = cacheService.getAlarmParamMap();
List<TerminalImgAlarmParams> alarmParsms = cacheService.getAlarmParsms(); beans.forEach((key, value) -> {
if (CollectionUtil.isNotEmpty(alarmParsms)) {
for (TerminalImgAlarmParams item : alarmParsms) {
alarmParamMap.put(item.getLabel(), item);
}
alarmParamMap.forEach((key, value) -> {
TerminalImgAlarmParamsModel.AlarmParamBean alarmBean = new TerminalImgAlarmParamsModel.AlarmParamBean(); TerminalImgAlarmParamsModel.AlarmParamBean alarmBean = new TerminalImgAlarmParamsModel.AlarmParamBean();
alarmBean.setId(value.getId()); alarmBean.setId(value.getId());
alarmBean.setLabel(value.getLabel()); alarmBean.setLabel(value.getLabel());
@ -264,7 +267,6 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService {
alarmBean.setProb(value.getProb()); alarmBean.setProb(value.getProb());
list.add(alarmBean); list.add(alarmBean);
}); });
}
model.setList(list); model.setList(list);
return Asserts.success(model); return Asserts.success(model);
} }
@ -290,13 +292,14 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService {
params.setName(item.getName()); params.setName(item.getName());
record.add(params); record.add(params);
} }
List<TerminalImgAlarmParams> bean = cacheService.updateAlarmParsms(record); int i = terminalImgAlarmParamsDao.updateList(record, new Date());
Map<Integer, TerminalImgAlarmParams> alarmParamMap = new HashMap<>(); // Map<Integer, TerminalImgAlarmParams> alarmParamMap = new HashMap<>();
List<TerminalImgAlarmParams> terminalImgAlarmParams = terminalImgAlarmParamsDao.selectAll(); // List<TerminalImgAlarmParams> terminalImgAlarmParams = terminalImgAlarmParamsDao.selectAll();
for (TerminalImgAlarmParams item : terminalImgAlarmParams) { // for (TerminalImgAlarmParams item : terminalImgAlarmParams) {
alarmParamMap.put(item.getLabel(), item); // alarmParamMap.put(item.getLabel(), item);
} // }
if (bean != null) { cacheService.updateAlarmParamMap();
if (i != 0) {
return Asserts.success("修改成功"); return Asserts.success("修改成功");
} else { } else {
return Asserts.error("修改失败"); return Asserts.error("修改失败");

91
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java
Unescape Escape View File

@ -22,6 +22,7 @@ import com.shxy.xymanager_common.page.PageUtils;
import com.shxy.xymanager_common.util.*; import com.shxy.xymanager_common.util.*;
import com.shxy.xymanager_common.vo.*; import com.shxy.xymanager_common.vo.*;
import com.shxy.xymanager_dao.dao.*; 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.CacheService;
import com.shxy.xymanager_service.service.TerminalPhotoService; import com.shxy.xymanager_service.service.TerminalPhotoService;
import com.shxy.xymanager_service.service.TerminalScheduleRuleService; import com.shxy.xymanager_service.service.TerminalScheduleRuleService;
@ -64,10 +65,11 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
@Autowired @Autowired
TerminalScheduleRuleService terminalScheduleRuleService; TerminalScheduleRuleService terminalScheduleRuleService;
@Autowired @Autowired
CacheService cacheService; CacheService cacheService;
@Value("${photo.address}") @Value("${photo.address}")
private String photoaddress; private String photoaddress;
@ -104,6 +106,8 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
model.setList(new ArrayList<>()); model.setList(new ArrayList<>());
} else { } else {
List<TerminalPhotoListModel.PhotoBean> beans = new ArrayList<>(); List<TerminalPhotoListModel.PhotoBean> beans = new ArrayList<>();
Map<Integer, TerminalChannels> termchannelMap = cacheService.getTermChannelMap();
Map<String, TerminalChannelMapper> termchannelMapMap = cacheService.getTermChannelMapMap();
for (TerminalPhoto item : list) { for (TerminalPhoto item : list) {
Integer mediaType = item.getMediaType(); Integer mediaType = item.getMediaType();
if (mediaType != null && (mediaType.intValue() == 0 || mediaType.intValue() == 1)) { 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.setThumb(requestIp + videoaddress + item.getThumb());
} }
} }
photoBean.setChannelName(cacheService.getTermchannelMap(channelId).getChannelName()); photoBean.setChannelName(termchannelMap.get(channelId).getChannelName());
TerminalChannelMapper termchannelMapMap = cacheService.getTermchannelMapMap(termId, channelId);
if (termchannelMapMap != null) { if (termchannelMapMap != null) {
photoBean.setAlias(termchannelMapMap.getAlias()); TerminalChannelMapper terminalChannelMapper = termchannelMapMap.get(termId + "#" + channelId);
if (terminalChannelMapper != null) {
photoBean.setAlias(terminalChannelMapper.getAlias());
} else {
photoBean.setAlias("");
}
} else { } else {
photoBean.setAlias(""); photoBean.setAlias("");
} }
@ -200,10 +208,12 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
} }
} }
if (channelid == null || channelid.intValue() == 0) { if (channelid == null || channelid.intValue() == 0) {
} else { } else {
channelidlist.add(channelid); channelidlist.add(channelid);
} }
if (termidlist.size() == 0) { if (termidlist.size() == 0) {
} else { } else {
PageUtils.SetPage(pageindex, pagesize); PageUtils.SetPage(pageindex, pagesize);
list = terminalPhotoDao.selectPhotoListByTermList(termidlist, channelidlist, BigInteger.valueOf(start), BigInteger.valueOf(end)); list = terminalPhotoDao.selectPhotoListByTermList(termidlist, channelidlist, BigInteger.valueOf(start), BigInteger.valueOf(end));
@ -214,26 +224,25 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
if (empty) { if (empty) {
model.setList(new ArrayList<>()); model.setList(new ArrayList<>());
} else { } else {
Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
Map<Integer, LineAndDyNameDto> lineMap = cacheService.getLineMap();
Map<Integer, TerminalChannels> termchannelMap = cacheService.getTermChannelMap();
Map<String, TerminalChannelMapper> termchannelMapMap = cacheService.getTermChannelMapMap();
for (TerminalPhoto item : list) { for (TerminalPhoto item : list) {
TerminalPhotoSelectListModel.PhotoBean photoBean = new TerminalPhotoSelectListModel.PhotoBean(); TerminalPhotoSelectListModel.PhotoBean photoBean = new TerminalPhotoSelectListModel.PhotoBean();
photoBean.setTermid(item.getTermId()); photoBean.setTermid(item.getTermId());
Terminals terminals = cacheService.getTerminal(item.getTermId()); Terminals terminals = terminalMap.get(item.getTermId());
if (!BeanUtil.isEmpty(terminals)) { if (!BeanUtil.isEmpty(terminals)) {
Integer mediaType = item.getMediaType(); Integer mediaType = item.getMediaType();
if (mediaType != null && (mediaType.intValue() == 0 || mediaType.intValue() == 1)) { if (mediaType != null && (mediaType.intValue() == 0 || mediaType.intValue() == 1)) {
photoBean.setDisplayname(terminals.getDisplayName()); photoBean.setDisplayname(terminals.getDisplayName());
photoBean.setLineid(terminals.getLineid()); photoBean.setLineid(terminals.getLineid());
Lines line = cacheService.getLine(terminals.getLineid()); photoBean.setLinename(lineMap.get(terminals.getLineid()).getName());
if (BeanUtil.isNotEmpty(line)) {
photoBean.setLinename(line.getName());
} else {
photoBean.setLinename("");
}
photoBean.setChannelid(item.getChannelId()); photoBean.setChannelid(item.getChannelId());
photoBean.setCmdid(terminals.getCmdid()); 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.setMediaType(item.getMediaType());
photoBean.setOrginalid(item.getOrginalId()); photoBean.setOrginalid(item.getOrginalId());
if (mediaType.intValue() == 0) { if (mediaType.intValue() == 0) {
@ -294,20 +303,20 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
String startTime = vo.getStartTime(); String startTime = vo.getStartTime();
Date startDate = null; Date startDate = null;
if (StrUtil.isEmpty(startTime)) { if (StrUtil.isEmpty(startTime)) {
startDate = MyDateUtils.getNowDate(); startDate = null;
} else { } else {
startDate = MyDateUtils.myparseDate(startTime); startDate = MyDateUtils.myparseDate(startTime);
} }
long start = 0; BigInteger start = null;
if (startDate != null) { if (startDate != null) {
start = MyDateUtils.TimeMillSecond2Second(DateTime.of(startDate)); start = BigInteger.valueOf(MyDateUtils.TimeMillSecond2Second(DateTime.of(startDate)));
} }
Date endtime = MyDateUtils.myparseDate(vo.getEndTime()); Date endtime = MyDateUtils.myparseDate(vo.getEndTime());
long end = 0; BigInteger end = null;
if (endtime != null) { if (endtime != null) {
end = MyDateUtils.TimeMillSecond2Second(DateTime.of(endtime)); end = BigInteger.valueOf(MyDateUtils.TimeMillSecond2Second(DateTime.of(endtime)));
} }
List<TerminalPhoto> list = terminalPhotoDao.selectPhotoListForOpen(terminals.getId(), BigInteger.valueOf(start), BigInteger.valueOf(end)); List<TerminalPhoto> list = terminalPhotoDao.selectPhotoListForOpen(terminals.getId(), start, end);
boolean empty = CollectionUtil.isEmpty(list); boolean empty = CollectionUtil.isEmpty(list);
if (empty) { if (empty) {
model.setList(new ArrayList<>()); model.setList(new ArrayList<>());
@ -358,7 +367,8 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
public ServiceBody<Date> getLatestPhoto(TerminalPhotoVo vo) { public ServiceBody<Date> getLatestPhoto(TerminalPhotoVo vo) {
Integer termId = vo.getTermId(); Integer termId = vo.getTermId();
DateTime now = DateTime.now(); DateTime now = DateTime.now();
Terminals terminals = cacheService.getTerminal(termId); Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
Terminals terminals = terminalMap.get(termId);
String cmdid = null; String cmdid = null;
if (terminals != null) { if (terminals != null) {
cmdid = terminals.getCmdid(); cmdid = terminals.getCmdid();
@ -502,6 +512,10 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
for (TerminalChannelMapper item : list) { for (TerminalChannelMapper item : list) {
photolist.add(item.getPhotoId()); photolist.add(item.getPhotoId());
} }
Map<Integer, LineAndDyNameDto> lineMap = cacheService.getLineMap();
Map<String, TerminalChannelMapper> termchannelMapMap = cacheService.getTermChannelMapMap();
Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
Map<Integer, TerminalChannels> termchannelMap = cacheService.getTermChannelMap();
List<TerminalPhoto> photoList = terminalPhotoDao.selectPhotosByIdList(photolist); List<TerminalPhoto> photoList = terminalPhotoDao.selectPhotosByIdList(photolist);
for (TerminalChannelMapper item : list) { for (TerminalChannelMapper item : list) {
@ -511,7 +525,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
BigInteger photoId = item.getPhotoId(); BigInteger photoId = item.getPhotoId();
Integer lineid = null; Integer lineid = null;
photosBean.setTermid(termid); photosBean.setTermid(termid);
Terminals terminals = cacheService.getTerminal(termid); Terminals terminals = terminalMap.get(termid);
if (terminals != null) { if (terminals != null) {
lineid = terminals.getLineid(); lineid = terminals.getLineid();
photosBean.setLineid(lineid); photosBean.setLineid(lineid);
@ -519,18 +533,22 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
photosBean.setCmdid(terminals.getCmdid()); photosBean.setCmdid(terminals.getCmdid());
} }
photosBean.setChannelid(channelid); photosBean.setChannelid(channelid);
photosBean.setChannnelname(cacheService.getTermchannelMap(channelid).getChannelName()); photosBean.setChannnelname(termchannelMap.get(channelid).getChannelName());
TerminalChannelMapper termchannelMapMap = cacheService.getTermchannelMapMap(termid, channelid);
if (termchannelMapMap != null) { if (termchannelMapMap != null) {
photosBean.setAlias(termchannelMapMap.getAlias()); TerminalChannelMapper terminalChannelMapper = termchannelMapMap.get(termid + "#" + channelid);
if (terminalChannelMapper != null) {
photosBean.setAlias(terminalChannelMapper.getAlias());
} else {
photosBean.setAlias("");
}
} else { } else {
photosBean.setAlias(""); photosBean.setAlias("");
} }
if (lineid != null) { if (lineid != null) {
Lines line = cacheService.getLine(lineid); LineAndDyNameDto lineAndDyNameDto = lineMap.get(lineid);
if (line != null) { if (lineAndDyNameDto != null) {
photosBean.setLinename(line.getName()); photosBean.setLinename(lineAndDyNameDto.getName());
} else { } else {
photosBean.setLinename(""); photosBean.setLinename("");
} }
@ -678,26 +696,25 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
if (empty) { if (empty) {
model.setList(new ArrayList<>()); model.setList(new ArrayList<>());
} else { } else {
Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
Map<Integer, LineAndDyNameDto> lineMap = cacheService.getLineMap();
Map<Integer, TerminalChannels> termchannelMap = cacheService.getTermChannelMap();
Map<String, TerminalChannelMapper> termchannelMapMap = cacheService.getTermChannelMapMap();
for (TerminalPhoto item : list) { for (TerminalPhoto item : list) {
TerminalPhotoSelectListModel.PhotoBean photoBean = new TerminalPhotoSelectListModel.PhotoBean(); TerminalPhotoSelectListModel.PhotoBean photoBean = new TerminalPhotoSelectListModel.PhotoBean();
photoBean.setTermid(item.getTermId()); photoBean.setTermid(item.getTermId());
Terminals terminals = cacheService.getTerminal(item.getTermId()); Terminals terminals = terminalMap.get(item.getTermId());
if (!BeanUtil.isEmpty(terminals)) { if (!BeanUtil.isEmpty(terminals)) {
Integer mediaType = item.getMediaType(); Integer mediaType = item.getMediaType();
if (mediaType != null && (mediaType.intValue() == 0 || mediaType.intValue() == 1)) { if (mediaType != null && (mediaType.intValue() == 0 || mediaType.intValue() == 1)) {
photoBean.setDisplayname(terminals.getDisplayName()); photoBean.setDisplayname(terminals.getDisplayName());
photoBean.setLineid(terminals.getLineid()); photoBean.setLineid(terminals.getLineid());
Lines line = cacheService.getLine(terminals.getLineid()); photoBean.setLinename(lineMap.get(terminals.getLineid()).getName());
if (BeanUtil.isNotEmpty(line)) {
photoBean.setLinename(line.getName());
} else {
photoBean.setLinename("");
}
photoBean.setChannelid(item.getChannelId()); photoBean.setChannelid(item.getChannelId());
photoBean.setCmdid(terminals.getCmdid()); photoBean.setCmdid(terminals.getCmdid());
photoBean.setChannnelname(cacheService.getTermchannelMap(item.getChannelId()).getChannelName()); photoBean.setChannnelname(termchannelMap.get(item.getChannelId()).getChannelName());
TerminalChannelMapper termchannelMapMap = cacheService.getTermchannelMapMap(item.getTermId(), item.getChannelId());
photoBean.setAlias(termchannelMapMap.getAlias()); photoBean.setAlias(termchannelMapMap.get(item.getTermId() + "#" + item.getChannelId()).getAlias());
photoBean.setMediaType(item.getMediaType()); photoBean.setMediaType(item.getMediaType());
photoBean.setOrginalid(item.getOrginalId()); photoBean.setOrginalid(item.getOrginalId());
if (mediaType.intValue() == 0) { if (mediaType.intValue() == 0) {

9
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java
Unescape Escape View File

@ -13,7 +13,6 @@ import com.shxy.xymanager_common.dto.DyLineAndTerminalNoHeartDto;
import com.shxy.xymanager_common.dto.PhotoMarkDto; import com.shxy.xymanager_common.dto.PhotoMarkDto;
import com.shxy.xymanager_common.dto.TerminalInfoDto; import com.shxy.xymanager_common.dto.TerminalInfoDto;
import com.shxy.xymanager_common.dto.TerminalsAndLineAndChannelDto; 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.TerminalChannelMapper;
import com.shxy.xymanager_common.entity.TerminalStatus; import com.shxy.xymanager_common.entity.TerminalStatus;
import com.shxy.xymanager_common.entity.Terminals; import com.shxy.xymanager_common.entity.Terminals;
@ -384,18 +383,14 @@ public class TerminalServiceImpl implements TerminalService {
@Override @Override
public ServiceBody<PhotoMarkModel> getCoordinate(String requestIp, MarkReqVo vo) { public ServiceBody<PhotoMarkModel> getCoordinate(String requestIp, MarkReqVo vo) {
GlobalParams globalParams = cacheService.getGlobalParams(GloableParamsType.ImgMark.value()); Map<String, String> globalParams = cacheService.getGolobalMap();
String s = globalParams.get(GloableParamsType.ImgMark.value());
Integer integer = null; Integer integer = null;
if (globalParams == null) {
integer = 0;
} else {
String s = globalParams.getParamValue();
if (StrUtil.isEmpty(s)) { if (StrUtil.isEmpty(s)) {
integer = 0; integer = 0;
} else { } else {
integer = Integer.valueOf(s); integer = Integer.valueOf(s);
} }
}
PhotoMarkModel model = new PhotoMarkModel(); PhotoMarkModel model = new PhotoMarkModel();
model.setMarkEnable(integer); model.setMarkEnable(integer);
PhotoMarkDto dto = null; PhotoMarkDto dto = null;

10
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TowerServiceImpl.java
Unescape Escape View File

@ -14,7 +14,7 @@ import com.shxy.xymanager_common.model.TowerListModel;
import com.shxy.xymanager_common.page.PageUtils; import com.shxy.xymanager_common.page.PageUtils;
import com.shxy.xymanager_common.vo.*; import com.shxy.xymanager_common.vo.*;
import com.shxy.xymanager_dao.dao.TowerDao; 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 com.shxy.xymanager_service.service.TowerService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -30,7 +30,6 @@ import java.util.List;
* *
* @author 晶晶 * @author 晶晶
*/ */
@Slf4j @Slf4j
@Service @Service
public class TowerServiceImpl implements TowerService { public class TowerServiceImpl implements TowerService {
@ -38,9 +37,6 @@ public class TowerServiceImpl implements TowerService {
@Autowired @Autowired
private TowerDao towerDao; private TowerDao towerDao;
@Autowired
private CacheService cacheService;
@Override @Override
public ServiceBody addTower(TowersVo vo) { public ServiceBody addTower(TowersVo vo) {
List<Towers> towersLst = BeanUtil.copyToList(vo.getList(), Towers.class, CopyOptions.create().ignoreCase()); List<Towers> towersLst = BeanUtil.copyToList(vo.getList(), Towers.class, CopyOptions.create().ignoreCase());
@ -78,13 +74,15 @@ public class TowerServiceImpl implements TowerService {
int pages = pageData.getPages(); int pages = pageData.getPages();
model.setTotalpage(pages); model.setTotalpage(pages);
return Asserts.success(model); return Asserts.success(model);
} }
@Override @Override
public ServiceBody<String> deleteTower(TowerIdVo vo) { public ServiceBody<String> deleteTower(TowerIdVo vo) {
List<Towers> lines = BeanUtil.copyToList(vo.getList(), Towers.class); List<Towers> 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) { if (i != 0) {
return Asserts.success("删除成功"); return Asserts.success("删除成功");
} else { } else {

153
xymanager_service/src/main/java/com/shxy/xymanager_service/service/CacheService.java
Unescape Escape View File

@ -1,11 +1,14 @@
package com.shxy.xymanager_service.service; 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.dto.TowerDto;
import com.shxy.xymanager_common.entity.*; import com.shxy.xymanager_common.entity.*;
import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.CachePut;
import org.springframework.cache.annotation.Cacheable; import org.springframework.cache.annotation.Cacheable;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
@ -15,65 +18,93 @@ import java.util.List;
*/ */
public interface CacheService { public interface CacheService {
/** // /**
* 获取绘制状态 // * 获取绘制状态
* // *
* @return // * @return
*/ // */
GlobalParams getGlobalParams(String param); // GlobalParams getGlobalParams(String param);
//
/** // /**
* 修改绘制状态 // * 修改绘制状态
* // *
* @return // * @return
*/ // */
GlobalParams updateGlobalParams(GlobalParams record); // GlobalParams updateGlobalParams(GlobalParams record);
//
/** // /**
* 获取单个线路 // * 获取单个线路
* // *
* @return // * @return
*/ // */
Lines getLine(Integer id); // Lines getLine(Integer id);
//
/** // /**
* 删除线路 // * 删除线路
* // *
* @return // * @return
*/ // */
Integer deleteLine(List<Lines> lines); // Integer deleteLine(List<Lines> lines);
//
/** // /**
* 修改线路 // * 修改线路
* // *
* @return // * @return
*/ // */
Lines updateLine(Lines lines); // Lines updateLine(Lines lines);
//
//
TowerDto getTower(Integer id); // TowerDto getTower(Integer id);
//
Integer deleteTower(List<Towers> list); // Integer deleteTower(List<Towers> list);
//
Towers updateTower(Towers towers); // Towers updateTower(Towers towers);
//
Terminals getTerminal(Integer id); // Terminals getTerminal(Integer id);
//
Integer deleteTerminal(List<Terminals> list); // Integer deleteTerminal(List<Terminals> list);
//
Towers updateTerminal(Towers towers); // Towers updateTerminal(Towers towers);
//
TerminalChannels getTermchannelMap(Integer id); // TerminalChannels getTermchannelMap(Integer id);
//
Integer deleteTermchannelMap(List<TerminalChannels> list); // Integer deleteTermchannelMap(List<TerminalChannels> list);
//
TerminalChannels updateTermchannelMap(TerminalChannels terminalChannels); // TerminalChannels updateTermchannelMap(TerminalChannels terminalChannels);
//
TerminalChannelMapper getTermchannelMapMap(Integer id, Integer channelid); // TerminalChannelMapper getTermchannelMapMap(Integer id, Integer channelid);
//
Integer deleteTermchannelMapMap(Integer id); // Integer deleteTermchannelMapMap(Integer id);
//
List<TerminalImgAlarmParams> getAlarmParsms(); // List<TerminalImgAlarmParams> getAlarmParsms();
//
List<TerminalImgAlarmParams> updateAlarmParsms(List<TerminalImgAlarmParams> list); // List<TerminalImgAlarmParams> updateAlarmParsms(List<TerminalImgAlarmParams> list);
Map<String, String> getGolobalMap();
Map<String, String> updateGolobalMap();
Map<Integer, TerminalImgAlarmParams> getAlarmParamMap();
Map<Integer, TerminalImgAlarmParams> updateAlarmParamMap();
Map<String, TerminalChannelMapper> getTermChannelMapMap();
Map<String, TerminalChannelMapper> updateTermChannelMapMap();
Map<Integer, TerminalChannels> getTermChannelMap();
Map<Integer, TowerDto> getTowerMap();
Map<Integer, Terminals> getTerminalMap();
Map<Integer, LineAndDyNameDto> getLineMap();
Map<Integer, TerminalChannels> updateTermChannelMap();
Map<Integer, TowerDto> updateTowerMap();
Map<Integer, Terminals> updateTerminalMap();
Map<Integer, LineAndDyNameDto> updateLineMap();
} }

Write Preview
Loading…
Cancel
Save