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

图片地址修改 根据请求地址自动返回对应图片地址

Browse Source
master
liuguijing 2 years ago
parent 8f9b69211c
commit b7ced77815
16 changed files with 170 additions and 189 deletions
Show Stats Download Patch File Download Diff File

2
xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java
Unescape Escape View File

@ -17,8 +17,10 @@ import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

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

@ -7,6 +7,7 @@ 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.model.*;
import com.shxy.xymanager_common.util.HeaderUtil;
import com.shxy.xymanager_common.vo.*;
import com.shxy.xymanager_service.service.OpenService;
import com.shxy.xymanager_service.service.TerminalPhotoService;
@ -16,8 +17,10 @@ import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@ -38,8 +41,9 @@ public class OpenController extends BaseController {
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/getPhotoListForOpen")
@Log(title = "对外图片查询", type = "查询")
public ResponseReult<TerminalPhotoListForOpenModel> getPhotoListForOpen(@RequestBody @Validated OpenTerminalAndTimeVo vo) {
ServiceBody<TerminalPhotoListForOpenModel> serviceBody = terminalPhotoService.getPhotoListForOpen(vo);
public ResponseReult<TerminalPhotoListForOpenModel> getPhotoListForOpen(@RequestHeader HttpHeaders headers, @RequestBody @Validated OpenTerminalAndTimeVo vo) {
String requestIp = HeaderUtil.getRequestIp(headers);
ServiceBody<TerminalPhotoListForOpenModel> serviceBody = terminalPhotoService.getPhotoListForOpen(requestIp,vo);
if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
return ResponseReult.success(serviceBody.getData());
} else {
@ -57,7 +61,7 @@ public class OpenController extends BaseController {
}
@ApiOperation(value = "远程拍照(短视频)控制", notes = "远程拍照(短视频)控制接口", httpMethod = "POST")
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@ApiResponses({@ApiResponse(code = 0, message = "请求成功"), @ApiResponse(code = 1, message = "用户名错误"), @ApiResponse(code = 2, message = "密码错误")})
@RequestMapping("/ctrlCmaDeviceCapture")
@Log(title = "远程拍照(短视频)控制", type = "查询")
public JSONObject ctrlCmaDeviceCapture(@RequestBody @Validated OpenDeviceCaptureVo vo) {

37
xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java
Unescape Escape View File

@ -6,6 +6,7 @@ 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.model.*;
import com.shxy.xymanager_common.util.HeaderUtil;
import com.shxy.xymanager_common.vo.*;
import com.shxy.xymanager_service.service.TerminalPhotoService;
import io.swagger.annotations.Api;
@ -14,8 +15,10 @@ import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@ -34,8 +37,9 @@ public class TerminalPhotoController extends BaseController {
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/getTerminalPhotoList")
@Log(title = "获取图片列表", type = "查询")
public ResponseReult<TerminalPhotoListModel> getTerminalPhotoList(@RequestBody @Validated TerminalAndChannelIdAndTimeVo vo) {
ServiceBody<TerminalPhotoListModel> serviceBody = terminalPhotoService.getTerminalPhotoList(vo);
public ResponseReult<TerminalPhotoListModel> getTerminalPhotoList(@RequestHeader HttpHeaders headers, @RequestBody @Validated TerminalAndChannelIdAndTimeVo vo) {
String requestIp = HeaderUtil.getRequestIp(headers);
ServiceBody<TerminalPhotoListModel> serviceBody = terminalPhotoService.getTerminalPhotoList(requestIp,vo);
if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
return ResponseReult.success(serviceBody.getData());
} else {
@ -56,19 +60,6 @@ public class TerminalPhotoController extends BaseController {
}
}
@ApiOperation(value = "拍照时间表", notes = "拍照时间表", httpMethod = "POST")
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/getPhotoTime")
@Log(title = "拍照时间表", type = "查询")
public ResponseReult<String> getPhotoTime(@RequestBody @Validated TerminalPhotoTimeVo vo) {
ServiceBody<String> serviceBody = terminalPhotoService.getPhotoTime(vo);
if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
return ResponseReult.success(serviceBody.getData());
} else {
return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
}
}
@ApiOperation(value = "拍照时间表查询触发", notes = "拍照时间表查询触发", httpMethod = "POST")
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/selectPhotoTimeGet")
@ -95,13 +86,13 @@ public class TerminalPhotoController extends BaseController {
}
}
@ApiOperation(value = "图片查询", notes = "图片查询接口", httpMethod = "POST")
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/getPhotoList")
@Log(title = "图片查询", type = "查询")
public ResponseReult<TerminalPhotoSelectListModel> getPhotoList(@RequestBody @Validated TerminalPhotoSelectVo vo) {
ServiceBody<TerminalPhotoSelectListModel> serviceBody = terminalPhotoService.getPhotoList(vo);
public ResponseReult<TerminalPhotoSelectListModel> getPhotoList(@RequestHeader HttpHeaders headers,@RequestBody @Validated TerminalPhotoSelectVo vo) {
String requestIp = HeaderUtil.getRequestIp(headers);
ServiceBody<TerminalPhotoSelectListModel> serviceBody = terminalPhotoService.getPhotoList(requestIp,vo);
if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
return ResponseReult.success(serviceBody.getData());
} else {
@ -126,8 +117,9 @@ public class TerminalPhotoController extends BaseController {
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/getPhotoBanner")
@Log(title = "图片轮询", type = "查询")
public ResponseReult<TerminalPhotosModel> getPhotoBanner(@RequestBody @Validated PageVo vo) {
ServiceBody<TerminalPhotosModel> serviceBody = terminalPhotoService.getPhotoBanner(vo);
public ResponseReult<TerminalPhotosModel> getPhotoBanner(@RequestHeader HttpHeaders headers,@RequestBody @Validated PageVo vo) {
String requestIp = HeaderUtil.getRequestIp(headers);
ServiceBody<TerminalPhotosModel> serviceBody = terminalPhotoService.getPhotoBanner(requestIp,vo);
if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
return ResponseReult.success(serviceBody.getData());
} else {
@ -179,8 +171,9 @@ public class TerminalPhotoController extends BaseController {
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/getHistoryList")
@Log(title = "历史图片", type = "查询")
public ResponseReult<TerminalPhotoSelectListModel> getHistoryList(@RequestBody @Validated TermIdAndChannelIdVo vo) {
ServiceBody<TerminalPhotoSelectListModel> serviceBody = terminalPhotoService.getHistoryList(vo);
public ResponseReult<TerminalPhotoSelectListModel> getHistoryList(@RequestHeader HttpHeaders headers,@RequestBody @Validated TermIdAndChannelIdVo vo) {
String requestIp = HeaderUtil.getRequestIp(headers);
ServiceBody<TerminalPhotoSelectListModel> serviceBody = terminalPhotoService.getHistoryList(requestIp,vo);
if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
return ResponseReult.success(serviceBody.getData());
} else {

6
xymanager_admin/src/main/resources/application-test.yml
Unescape Escape View File

@ -178,12 +178,14 @@ upload:
# path: file:/usr/local/home/manager/download/
path: http://47.96.238.157/usr/local/home/manager/download/
photo:
address: http://47.96.238.157/photos/
address: /photos/
video:
address: http://47.96.238.157/videos/
address: /videos/
session:
expire_time: 3600
open_expire_time: 1800
heart:
time: 30
rsa:
public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCViq0L+1XCTKOkt9nmy9aQbMRNNJNBOtPYRlCq/bRuwlYaq/I+XqSDkIF8s4JJSy3/Vgjw0fp8d4O+5KBS4Om9Ela60I2Vv/q8LjCNFNYbRE6xI7yrlyPukodmC/s1VgODDRHn3vVyKcK9nyF7xZsXixnlvltAky888CJkLpiGjQIDAQAB
private_key: MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJWKrQv7VcJMo6S32ebL1pBsxE00k0E609hGUKr9tG7CVhqr8j5epIOQgXyzgklLLf9WCPDR+nx3g77koFLg6b0SVrrQjZW/+rwuMI0U1htETrEjvKuXI+6Sh2YL+zVWA4MNEefe9XIpwr2fIXvFmxeLGeW+W0CTLzzwImQumIaNAgMBAAECgYAzOn2LlD9Nv5lzzTPNl9jaQxiAZllnyDJYbcYmvaD5LIP4wRzMdvmexHtHb+tbFnEcfqmzbguEZiDw3Tt7COepQWvNzlM+/HbFtkXzSh6WEu2TgjZwudcCDHDyjDzUNgcWnBIw8/+Sy4COOm4p+UnprYK4sdriMZyz8K5UC8CxFQJBAODTt0lg/HiZKaOX7PMmsiRisd5oAslyDHCt66oPG29KTE1j4fwKDzGJlrOo1f4Q078IDYMO1I/Y3uP8Es3FT1MCQQCqRrD+lO3YCZOUGTHm2WGmbljIoeDpnIn2TZFyqDGKXs6EAx7SXkgarY2OC5O2aifMhXElPUGChfSgPmRUFHafAkEAxFtkWuwf1NxAJ6cKxZpoP6sLGenRdUrsXoUnrBEhruM/HOA9gLjwaB14x1SQASOFK/TGiE4ti6ynjoqbiafoDQJBAI0l6FZAsiBhX9pmQD1yeUXzNtmphr1gK+TmS+lVjyt6h4pa49PSn8atkyfqZNnTiYY6H56U9pbx3+Rtk9E23VUCQEZ9/JHUaGc77s3ibpcKFVemlb0i/Uvj2V45aoNfY34iex4biAUsRq/FJNiqBk+xQWkJ4QY8nKVE45GlaCfZ8/c=

29
xymanager_common/src/main/java/com/shxy/xymanager_common/util/HeaderUtil.java
Unescape Escape View File

@ -0,0 +1,29 @@
package com.shxy.xymanager_common.util;
import cn.hutool.core.util.StrUtil;
import org.springframework.http.HttpHeaders;
import java.util.List;
/**
* 请求头工具类
*/
public class HeaderUtil {
/**
* 获取请求地址
*
* @return
*/
public static String getRequestIp(HttpHeaders httpHeaders) {
String requestip;
String origin = httpHeaders.getOrigin();
if (StrUtil.isEmpty(origin)) {
List<String> list = httpHeaders.get("referer");
requestip = list.get(0);
} else {
requestip = origin;
}
return requestip;
}
}

2
xymanager_common/src/main/java/com/shxy/xymanager_common/vo/OpenCmdidVo.java
Unescape Escape View File

@ -7,7 +7,7 @@ import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
@ApiModel(value = "装置编号对象", description = "装置编号对象")
@ApiModel(value = "对外装置编号对象", description = "对外装置编号对象")
public class OpenCmdidVo {
@ApiModelProperty(value = "装置编号", example = "123455")

2
xymanager_common/src/main/java/com/shxy/xymanager_common/vo/OpenDeviceCaptureVo.java
Unescape Escape View File

@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "用户登录参数", description = "用户登录参数描述")
@ApiModel(value = "抓拍参数", description = "抓拍参数描述")
public class OpenDeviceCaptureVo {
@ApiModelProperty(value = "装置编号", example = "123455")

4
xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UserLoginVo.java
Unescape Escape View File

@ -12,10 +12,10 @@ public class UserLoginVo {
@NotNull(message = "用户名")
@ApiModelProperty(value = "用户名", example = "123455")
private String username;
private String userName;
@NotNull(message = "密码")
@ApiModelProperty(value = "密码", example = "123455")
private String password;
private String passWord;
}

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

@ -98,7 +98,6 @@ public interface SysUserMapperDao {
List<SysUser> selectUserInfoList(@Param("status") Integer status);
int insertOrUpdate(@Param("item") SysUserSession session, @Param("createat") Date create, @Param("updateat") Date update);
SysUserSession selectBySessionId(@Param("sessionid") String sessionid);

3
xymanager_framework/src/main/java/com/shxy/xymanager_framework/config/CustomSecurityConfig.java
Unescape Escape View File

@ -29,6 +29,9 @@ public class CustomSecurityConfig implements WebMvcConfigurer {
.excludePathPatterns("/*/api-docs")
.excludePathPatterns("/error")
.excludePathPatterns("/test/**")
.excludePathPatterns("/getPhotoListForOpen")
.excludePathPatterns("/ctrlCmaDeviceCapture")
.excludePathPatterns("/cmaDeviceStatus")
.excludePathPatterns("/cmaUserLogin");
}

6
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java
Unescape Escape View File

@ -19,6 +19,7 @@ import com.shxy.xymanager_dao.dao.DyLevelDao;
import com.shxy.xymanager_service.service.DyLevelService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.math.BigInteger;
@ -35,6 +36,9 @@ public class DyLevelServiceImpl implements DyLevelService {
@Autowired
DyLevelDao dyLevelDao;
@Value("${heart.time}")
public Integer hearttime;
/**
* 获取电压线路树状接口
*
@ -60,7 +64,7 @@ public class DyLevelServiceImpl implements DyLevelService {
long time = MyDateUtils.TimeSecond2MillSecond(lastheartbeat);
DateTime date = MyDateUtils.date(time);
long between = MyDateUtils.between(MyDateUtils.getNowDate(), date, DateUnit.MINUTE);
if (between > 30) {
if (between > hearttime) {
beans.get(i).getList().get(j).getList().get(k).setOnlinestatus(CommonStatus.DELETE.value());
} else {
beans.get(i).getList().get(j).getList().get(k).setOnlinestatus(CommonStatus.EFFECTIVE.value());

32
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LoginServiceImpl.java
Unescape Escape View File

@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigInteger;
import java.util.Date;
/**
* 装置通道实现层
@ -35,31 +36,6 @@ public class LoginServiceImpl implements LoginService {
@Autowired
private SysUserMapperDao sysUserMapperDao;
/**
* @param username 用户名
* @param password 密码
* @return java.lang.String
* @description 登录验证
*/
public ServiceBody<String> login(String username, String password) throws Exception {
// String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
// String captcha = redisCacheService.getCacheObject(verifyKey);
//
// redisCacheService.deleteObject(verifyKey);
// if (captcha == null) {
// AsyncManager.me().execute(AsyncFactory.recordLoginLog(username, Constants.LOGIN_FAIL, "验证码错误"));
// throw new CustomException("验证码错误", HttpStatusCode.ERROR);
// }
//
// if (!code.equalsIgnoreCase(captcha)) {
// AsyncManager.me().execute(AsyncFactory.recordLoginLog(username, Constants.LOGIN_FAIL, "验证码错误"));
// throw new CustomException("验证码错误", HttpStatusCode.ERROR);
// }
// 生成token
return null;
}
/**
*
* @param sysUser
@ -70,7 +46,9 @@ public class LoginServiceImpl implements LoginService {
try {
SysUserSession user = getLoginUser(sysUser);
user.setSessionId(sessionId);
sysUserMapperDao.insertUserSession(user);
// sysUserMapperDao.insertUserSession(user);
Date date = new Date();
sysUserMapperDao.insertOrUpdate(user, date,date);
return Asserts.success(user);
} catch (UserPasswordNotMatchException e){
return Asserts.error(e.getMessage());
@ -93,8 +71,6 @@ public class LoginServiceImpl implements LoginService {
if (StringUtils.isNull(account)) {
throw new UserPasswordNotMatchException("用户不存在", HttpStatusCode.ERROR);
}
// String userPassword = Md5.getMD5Code(account.getPasswordSalt() + password);
// String userPassword = Md5.getMD5Code(password);
// 密码解密
String pwd = RsaUtils.decryptByPrivateKey( CustomRsaProperties.privateKey, account.getPassword() );
// 密码对比

4
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/OpenServiceImpl.java
Unescape Escape View File

@ -64,7 +64,7 @@ public class OpenServiceImpl implements OpenService {
@Override
public JSONObject cmaUserLogin(UserLoginVo vo) {
JSONObject jsonObject = new JSONObject();
String username = vo.getUsername();
String username = vo.getUserName();
SysUser sysUser = sysUserDao.selectByUserName(username);
// 判断用户是否存在
if (BeanUtil.isEmpty(sysUser)) {
@ -72,7 +72,7 @@ public class OpenServiceImpl implements OpenService {
jsonObject.putOpt("errmsg", "用户不存在");
}
// 判断密码是否存在
String password = vo.getPassword();
String password = vo.getPassWord();
if (BeanUtil.isEmpty(password)) {
jsonObject.putOpt("errcode", 2);
jsonObject.putOpt("errmsg", "密码错误");

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

@ -33,8 +33,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import java.math.BigInteger;
import java.util.*;
@ -82,11 +80,12 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
/**
* 根据装置id和通道id获取图片
*
* @param requestIp
* @param vo
* @return
*/
@Override
public ServiceBody<TerminalPhotoListModel> getTerminalPhotoList(TerminalAndChannelIdAndTimeVo vo) {
public ServiceBody<TerminalPhotoListModel> getTerminalPhotoList(String requestIp, TerminalAndChannelIdAndTimeVo vo) {
TerminalPhotoListModel model = new TerminalPhotoListModel();
Date time = vo.getTime();
DateTime begindateTime = MyDateUtils.beginOfDay(time);
@ -109,7 +108,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
Map<String, TerminalChannelMapper> termchannelMapMap = XyCache.termchannelMapMap;
for (TerminalPhoto item : list) {
Integer mediaType = item.getMediaType();
if (mediaType == 0 || mediaType == 1) {
if (mediaType != null && (mediaType.intValue() == 0 || mediaType.intValue() == 1)) {
TerminalPhotoListModel.PhotoBean photoBean = new TerminalPhotoListModel.PhotoBean();
Integer termId = item.getTermId();
Integer channelId = item.getChannelId();
@ -118,12 +117,12 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
photoBean.setFileSize(item.getFileSize());
photoBean.setHeight(item.getHeight());
photoBean.setMediaType(item.getMediaType());
if (mediaType == 0) {
photoBean.setPath(photoaddress + item.getPath());
if (mediaType.intValue() == 0) {
photoBean.setPath(requestIp + photoaddress + item.getPath());
} else {
photoBean.setPath(videoaddress + item.getPath());
photoBean.setPath(requestIp + videoaddress + item.getPath());
if (StringUtils.isNotBlank(item.getThumb())) {
photoBean.setThumb(videoaddress + item.getThumb());
photoBean.setThumb(requestIp + videoaddress + item.getThumb());
}
}
photoBean.setChannelName(termchannelMap.get(channelId).getChannelName());
@ -157,7 +156,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
* 图片查询
*/
@Override
public ServiceBody<TerminalPhotoSelectListModel> getPhotoList(TerminalPhotoSelectVo vo) {
public ServiceBody<TerminalPhotoSelectListModel> getPhotoList(String requestIp, TerminalPhotoSelectVo vo) {
TerminalPhotoSelectListModel model = new TerminalPhotoSelectListModel();
List<TerminalPhoto> list = new ArrayList<>();
List<TerminalPhotoSelectListModel.PhotoBean> beans = new ArrayList<>();
@ -232,27 +231,30 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
photoBean.setTermid(item.getTermId());
Terminals terminals = terminalMap.get(item.getTermId());
if (!BeanUtil.isEmpty(terminals)) {
photoBean.setDisplayname(terminals.getDisplayName());
photoBean.setLineid(terminals.getLineid());
photoBean.setLinename(lineMap.get(terminals.getLineid()).getName());
photoBean.setChannelid(item.getChannelId());
photoBean.setCmdid(terminals.getCmdid());
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 (item.getMediaType() == 0) {
photoBean.setPath(photoaddress + item.getPath());
} else {
photoBean.setPath(videoaddress + item.getPath());
Integer mediaType = item.getMediaType();
if (mediaType != null && (mediaType.intValue() == 0 || mediaType.intValue() == 1)) {
photoBean.setDisplayname(terminals.getDisplayName());
photoBean.setLineid(terminals.getLineid());
photoBean.setLinename(lineMap.get(terminals.getLineid()).getName());
photoBean.setChannelid(item.getChannelId());
photoBean.setCmdid(terminals.getCmdid());
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) {
photoBean.setPath(requestIp + photoaddress + item.getPath());
} else {
photoBean.setPath(requestIp + videoaddress + item.getPath());
}
photoBean.setPresetId(item.getPresetId());
long phototime = MyDateUtils.TimeSecond2MillSecond(item.getPhotoTime().longValue());
photoBean.setPhotoTime(MyDateUtils.date(phototime));
long rectime = MyDateUtils.TimeSecond2MillSecond(item.getRecvTime().longValue());
photoBean.setRecvTime(MyDateUtils.date(rectime));
beans.add(photoBean);
}
photoBean.setPresetId(item.getPresetId());
long phototime = MyDateUtils.TimeSecond2MillSecond(item.getPhotoTime().longValue());
photoBean.setPhotoTime(MyDateUtils.date(phototime));
long rectime = MyDateUtils.TimeSecond2MillSecond(item.getRecvTime().longValue());
photoBean.setRecvTime(MyDateUtils.date(rectime));
beans.add(photoBean);
}
}
model.setList(beans);
@ -274,11 +276,12 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
/**
* 根据装置和时间提供给第三方
*
* @param requestIp
* @param vo
* @return
*/
@Override
public ServiceBody<TerminalPhotoListForOpenModel> getPhotoListForOpen(OpenTerminalAndTimeVo vo) {
public ServiceBody<TerminalPhotoListForOpenModel> getPhotoListForOpen(String requestIp, OpenTerminalAndTimeVo vo) {
String cmdid = vo.getCmdId();
TerminalPhotoListForOpenModel model = new TerminalPhotoListForOpenModel();
@ -312,29 +315,30 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
} else {
List<TerminalPhotoListForOpenModel.PhotoBean> beans = new ArrayList<>();
for (TerminalPhoto item : list) {
TerminalPhotoListForOpenModel.PhotoBean photoBean = new TerminalPhotoListForOpenModel.PhotoBean();
photoBean.setCmdId(cmdid);
photoBean.setMediaType(item.getMediaType());
photoBean.setOrginalId(item.getOrginalId());
// photoBean.setPath(photoaddress + item.getPath());
String path = item.getPath();
if (item.getMediaType() == 0) {
photoBean.setPath(photoaddress + path);
} else {
photoBean.setPath(videoaddress + item.getPath());
}
if (path != null) {
photoBean.setPath(photoaddress + path);
String[] split = path.split("/");
int length = split.length;
String s = split[length - 1];
photoBean.setName(s);
Integer mediaType = item.getMediaType();
if (mediaType != null && (mediaType.intValue() == 0 || mediaType.intValue() == 1)) {
TerminalPhotoListForOpenModel.PhotoBean photoBean = new TerminalPhotoListForOpenModel.PhotoBean();
photoBean.setCmdId(cmdid);
photoBean.setMediaType(item.getMediaType());
photoBean.setOrginalId(item.getOrginalId());
String path = item.getPath();
if (mediaType.intValue() == 0) {
photoBean.setPath(requestIp + photoaddress + path);
} else {
photoBean.setPath(requestIp + videoaddress + item.getPath());
}
if (path != null) {
photoBean.setPath(photoaddress + path);
String[] split = path.split("/");
int length = split.length;
String s = split[length - 1];
photoBean.setName(s);
}
photoBean.setPresetId(item.getPresetId());
long phototime = MyDateUtils.TimeSecond2MillSecond(item.getPhotoTime().longValue());
photoBean.setPhotoTime(MyDateUtils.date(phototime));
beans.add(photoBean);
}
photoBean.setPresetId(item.getPresetId());
long phototime = MyDateUtils.TimeSecond2MillSecond(item.getPhotoTime().longValue());
photoBean.setPhotoTime(MyDateUtils.date(phototime));
beans.add(photoBean);
}
model.setList(beans);
}
@ -391,11 +395,12 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
/**
* 图片轮询接口
*
* @param requestIp
* @param vo
* @return
*/
@Override
public ServiceBody<TerminalPhotosModel> getPhotoBanner(PageVo vo) {
public ServiceBody<TerminalPhotosModel> getPhotoBanner(String requestIp, PageVo vo) {
TerminalPhotosModel model = new TerminalPhotosModel();
int pageindex = vo.getPageindex();
@ -446,7 +451,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
TermAndChannelLatestPhotoMapperDto item2 = list2.get(y);
if (termid.intValue() == item2.getTermid().intValue() && item.getChannelid().intValue() == item2.getChannelid().intValue()) {
Integer mediatype = item2.getMediatype();
if (mediatype == 0 || mediatype == 1) {
if (mediatype != null && (mediatype.intValue() == 0 || mediatype.intValue() == 1)) {
photosBean.setPath(item2.getPath());
long recvtime = MyDateUtils.TimeSecond2MillSecond(item2.getRecvTime().longValue());
photosBean.setRecvTime(MyDateUtils.date(recvtime));
@ -454,9 +459,9 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
photosBean.setPhotoTime(MyDateUtils.date(phototime));
photosBean.setMediatype(mediatype);
if (mediatype.intValue() == 0) {
photosBean.setPath(photoaddress + item2.getPath());
photosBean.setPath(requestIp + photoaddress + item2.getPath());
} else {
photosBean.setPath(videoaddress + item2.getPath());
photosBean.setPath(requestIp + videoaddress + item2.getPath());
}
photosBean.setOrginalid(item2.getOrginalid());
photosBean.setPresetId(item2.getPresetId());
@ -481,40 +486,6 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
return Asserts.success(model);
}
@Override
public ServiceBody<String> getPhotoTime(TerminalPhotoTimeVo vo) {
List<TerminalPhotoScheduleDto> dtoList = terminalPhotoDao.selectPhotoSchedule(vo);
for (int j = 0; j < dtoList.size(); j++) {
TerminalPhotosTimeModel.PhotosTimeBean bean = new TerminalPhotosTimeModel.PhotosTimeBean();
Short span = dtoList.get(j).getSpan();
Date startTime = dtoList.get(j).getStartTime();
Short startHour = Short.parseShort(MyDateUtils.parseHourAndMinute(startTime).split("/")[0]);
Short startMin = Short.parseShort(MyDateUtils.parseHourAndMinute(startTime).split("/")[1]);
Date endTime = dtoList.get(j).getEndTime();
Short endTimeHour = Short.parseShort(MyDateUtils.parseHourAndMinute(endTime).split("/")[0]);
Short endTimeMin = Short.parseShort(MyDateUtils.parseHourAndMinute(endTime).split("/")[1]);
Short span1 = -1;
Short span2 = -1;
if (span / 60 > 0) {
span1 = (short) (span / 60);
span2 = (short) (span % 60);
} else if (span < 60) {
span1 = (short) 0;
span2 = span;
}
String cmd = Constants.CMD + "schedule --flag=1 --cmdid=" + dtoList.get(j).getCmid() + " --channel=" + vo.getChannel()
+ " --group=3 --hour1=" + startHour + " --min1=" + startMin + " --preset1=255 --hour2=" + endTimeHour + " --min2="
+ endTimeMin + " --preset2=255 --hour3=" + span1 + " --min3=" + span2 + " --preset3=255";
ProcessExecUtils.exec(cmd);
}
;
return Asserts.success("修改成功");
}
@Override
public ServiceBody<GetModel> getPhotoQueryParam(ReturnedPhotoParamsGetVo vo) {
GetModel model = new GetModel();
@ -601,11 +572,12 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
/**
* 获取历史图片接口实现
*
* @param requestIp
* @param vo
* @return
*/
@Override
public ServiceBody<TerminalPhotoSelectListModel> getHistoryList(TermIdAndChannelIdVo vo) {
public ServiceBody<TerminalPhotoSelectListModel> getHistoryList(String requestIp, TermIdAndChannelIdVo vo) {
TerminalPhotoSelectListModel model = new TerminalPhotoSelectListModel();
List<TerminalPhotoSelectListModel.PhotoBean> beans = new ArrayList<>();
Integer termId = vo.getTermId();
@ -627,27 +599,30 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
photoBean.setTermid(item.getTermId());
Terminals terminals = terminalMap.get(item.getTermId());
if (!BeanUtil.isEmpty(terminals)) {
photoBean.setDisplayname(terminals.getDisplayName());
photoBean.setLineid(terminals.getLineid());
photoBean.setLinename(lineMap.get(terminals.getLineid()).getName());
photoBean.setChannelid(item.getChannelId());
photoBean.setCmdid(terminals.getCmdid());
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 (item.getMediaType() == 0) {
photoBean.setPath(photoaddress + item.getPath());
} else {
photoBean.setPath(videoaddress + item.getPath());
Integer mediaType = item.getMediaType();
if (mediaType != null && (mediaType.intValue() == 0 || mediaType.intValue() == 1)) {
photoBean.setDisplayname(terminals.getDisplayName());
photoBean.setLineid(terminals.getLineid());
photoBean.setLinename(lineMap.get(terminals.getLineid()).getName());
photoBean.setChannelid(item.getChannelId());
photoBean.setCmdid(terminals.getCmdid());
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) {
photoBean.setPath(requestIp + photoaddress + item.getPath());
} else {
photoBean.setPath(requestIp + videoaddress + item.getPath());
}
photoBean.setPresetId(item.getPresetId());
long phototime = MyDateUtils.TimeSecond2MillSecond(item.getPhotoTime().longValue());
photoBean.setPhotoTime(MyDateUtils.date(phototime));
long rectime = MyDateUtils.TimeSecond2MillSecond(item.getRecvTime().longValue());
photoBean.setRecvTime(MyDateUtils.date(rectime));
beans.add(photoBean);
}
photoBean.setPresetId(item.getPresetId());
long phototime = MyDateUtils.TimeSecond2MillSecond(item.getPhotoTime().longValue());
photoBean.setPhotoTime(MyDateUtils.date(phototime));
long rectime = MyDateUtils.TimeSecond2MillSecond(item.getRecvTime().longValue());
photoBean.setRecvTime(MyDateUtils.date(rectime));
beans.add(photoBean);
}
}
model.setList(beans);
@ -665,5 +640,4 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
return Asserts.success(model);
}
}

2
xymanager_service/src/main/java/com/shxy/xymanager_service/service/LoginService.java
Unescape Escape View File

@ -15,8 +15,6 @@ import com.shxy.xymanager_common.entity.SysUserSession;
public interface LoginService {
ServiceBody<String> login(String username, String password) throws Exception;
ServiceBody<SysUserSession> remoteLogin(SysUser sysUser);
SysUserSession getLoginUser(SysUser sysUser) throws Exception;

21
xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java
Unescape Escape View File

@ -17,21 +17,23 @@ public interface TerminalPhotoService {
*
* @return
*/
ServiceBody<TerminalPhotoListModel> getTerminalPhotoList(TerminalAndChannelIdAndTimeVo vo);
ServiceBody<TerminalPhotoListModel> getTerminalPhotoList(String requestIp, TerminalAndChannelIdAndTimeVo vo);
/**
* 图片查询
*
* @param requestIp
* @param vo
* @return
*/
ServiceBody<TerminalPhotoSelectListModel> getPhotoList(TerminalPhotoSelectVo vo);
ServiceBody<TerminalPhotoSelectListModel> getPhotoList(String requestIp, TerminalPhotoSelectVo vo);
/**
* 根据装置id获取图片接口提供给第三方
*
* @return
*/
ServiceBody<TerminalPhotoListForOpenModel> getPhotoListForOpen(OpenTerminalAndTimeVo vo);
ServiceBody<TerminalPhotoListForOpenModel> getPhotoListForOpen(String requestIp, OpenTerminalAndTimeVo vo);
/**
* 根据通道和装置id获取最新图片
@ -53,14 +55,7 @@ public interface TerminalPhotoService {
*
* @return
*/
ServiceBody<TerminalPhotosModel> getPhotoBanner(PageVo vo);
/**
*
*
* @return
*/
ServiceBody<String> getPhotoTime(TerminalPhotoTimeVo vo);
ServiceBody<TerminalPhotosModel> getPhotoBanner(String requestIp, PageVo vo);
/**
* 查询图片采集参数列表
@ -79,9 +74,11 @@ public interface TerminalPhotoService {
/**
* 历史图片接口
*
* @param requestIp
* @param vo
* @return
*/
ServiceBody<TerminalPhotoSelectListModel> getHistoryList(TermIdAndChannelIdVo vo);
ServiceBody<TerminalPhotoSelectListModel> getHistoryList(String requestIp, TermIdAndChannelIdVo vo);
}

Write Preview
Loading…
Cancel
Save