From b7ced778150446e5285bceeff30050dfba34333b Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Tue, 13 Jun 2023 16:18:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=9C=B0=E5=9D=80=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E6=A0=B9=E6=8D=AE=E8=AF=B7=E6=B1=82=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E8=87=AA=E5=8A=A8=E8=BF=94=E5=9B=9E=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DyLevelController.java | 2 + .../controller/OpenController.java | 10 +- .../controller/TerminalPhotoController.java | 37 ++-- .../src/main/resources/application-test.yml | 6 +- .../xymanager_common/util/HeaderUtil.java | 29 +++ .../shxy/xymanager_common/vo/OpenCmdidVo.java | 2 +- .../vo/OpenDeviceCaptureVo.java | 2 +- .../shxy/xymanager_common/vo/UserLoginVo.java | 4 +- .../xymanager_dao/dao/SysUserMapperDao.java | 1 - .../config/CustomSecurityConfig.java | 3 + .../impl/DyLevelServiceImpl.java | 6 +- .../impl/LoginServiceImpl.java | 32 +-- .../impl/OpenServiceImpl.java | 4 +- .../impl/TerminalPhotoServiceImpl.java | 198 ++++++++---------- .../service/LoginService.java | 2 - .../service/TerminalPhotoService.java | 21 +- 16 files changed, 170 insertions(+), 189 deletions(-) create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/util/HeaderUtil.java diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java index 9c9b202..740242f 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java @@ -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; diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/OpenController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/OpenController.java index 4816618..e04360e 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/OpenController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/OpenController.java @@ -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 getPhotoListForOpen(@RequestBody @Validated OpenTerminalAndTimeVo vo) { - ServiceBody serviceBody = terminalPhotoService.getPhotoListForOpen(vo); + public ResponseReult getPhotoListForOpen(@RequestHeader HttpHeaders headers, @RequestBody @Validated OpenTerminalAndTimeVo vo) { + String requestIp = HeaderUtil.getRequestIp(headers); + ServiceBody 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) { diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java index 10bf4c1..2068994 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java @@ -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 getTerminalPhotoList(@RequestBody @Validated TerminalAndChannelIdAndTimeVo vo) { - ServiceBody serviceBody = terminalPhotoService.getTerminalPhotoList(vo); + public ResponseReult getTerminalPhotoList(@RequestHeader HttpHeaders headers, @RequestBody @Validated TerminalAndChannelIdAndTimeVo vo) { + String requestIp = HeaderUtil.getRequestIp(headers); + ServiceBody 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 getPhotoTime(@RequestBody @Validated TerminalPhotoTimeVo vo) { - ServiceBody 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 getPhotoList(@RequestBody @Validated TerminalPhotoSelectVo vo) { - ServiceBody serviceBody = terminalPhotoService.getPhotoList(vo); + public ResponseReult getPhotoList(@RequestHeader HttpHeaders headers,@RequestBody @Validated TerminalPhotoSelectVo vo) { + String requestIp = HeaderUtil.getRequestIp(headers); + ServiceBody 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 getPhotoBanner(@RequestBody @Validated PageVo vo) { - ServiceBody serviceBody = terminalPhotoService.getPhotoBanner(vo); + public ResponseReult getPhotoBanner(@RequestHeader HttpHeaders headers,@RequestBody @Validated PageVo vo) { + String requestIp = HeaderUtil.getRequestIp(headers); + ServiceBody 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 getHistoryList(@RequestBody @Validated TermIdAndChannelIdVo vo) { - ServiceBody serviceBody = terminalPhotoService.getHistoryList(vo); + public ResponseReult getHistoryList(@RequestHeader HttpHeaders headers,@RequestBody @Validated TermIdAndChannelIdVo vo) { + String requestIp = HeaderUtil.getRequestIp(headers); + ServiceBody serviceBody = terminalPhotoService.getHistoryList(requestIp,vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { diff --git a/xymanager_admin/src/main/resources/application-test.yml b/xymanager_admin/src/main/resources/application-test.yml index fe4cd08..380afa7 100644 --- a/xymanager_admin/src/main/resources/application-test.yml +++ b/xymanager_admin/src/main/resources/application-test.yml @@ -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= diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/HeaderUtil.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/HeaderUtil.java new file mode 100644 index 0000000..c9b73b0 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/HeaderUtil.java @@ -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 list = httpHeaders.get("referer"); + requestip = list.get(0); + } else { + requestip = origin; + } + return requestip; + } +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/OpenCmdidVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/OpenCmdidVo.java index 939aa5d..9ab2cad 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/OpenCmdidVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/OpenCmdidVo.java @@ -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") diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/OpenDeviceCaptureVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/OpenDeviceCaptureVo.java index f383841..32d756f 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/OpenDeviceCaptureVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/OpenDeviceCaptureVo.java @@ -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") diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UserLoginVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UserLoginVo.java index 34fea4e..057480c 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UserLoginVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UserLoginVo.java @@ -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; } diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/SysUserMapperDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/SysUserMapperDao.java index ee796a1..ec9356c 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/SysUserMapperDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/SysUserMapperDao.java @@ -98,7 +98,6 @@ public interface SysUserMapperDao { List 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); diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/config/CustomSecurityConfig.java b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/config/CustomSecurityConfig.java index 4d2cc9e..4b7064a 100644 --- a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/config/CustomSecurityConfig.java +++ b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/config/CustomSecurityConfig.java @@ -29,6 +29,9 @@ public class CustomSecurityConfig implements WebMvcConfigurer { .excludePathPatterns("/*/api-docs") .excludePathPatterns("/error") .excludePathPatterns("/test/**") + .excludePathPatterns("/getPhotoListForOpen") + .excludePathPatterns("/ctrlCmaDeviceCapture") + .excludePathPatterns("/cmaDeviceStatus") .excludePathPatterns("/cmaUserLogin"); } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java index 6f78bb9..2f9cf05 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java @@ -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()); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LoginServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LoginServiceImpl.java index 11fa1e5..40c4b6c 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LoginServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LoginServiceImpl.java @@ -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 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() ); // 密码对比 diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/OpenServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/OpenServiceImpl.java index f29559a..c620217 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/OpenServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/OpenServiceImpl.java @@ -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", "密码错误"); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java index 5281f75..c5c688b 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java @@ -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 getTerminalPhotoList(TerminalAndChannelIdAndTimeVo vo) { + public ServiceBody 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 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 getPhotoList(TerminalPhotoSelectVo vo) { + public ServiceBody getPhotoList(String requestIp, TerminalPhotoSelectVo vo) { TerminalPhotoSelectListModel model = new TerminalPhotoSelectListModel(); List list = new ArrayList<>(); List 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 getPhotoListForOpen(OpenTerminalAndTimeVo vo) { + public ServiceBody getPhotoListForOpen(String requestIp, OpenTerminalAndTimeVo vo) { String cmdid = vo.getCmdId(); TerminalPhotoListForOpenModel model = new TerminalPhotoListForOpenModel(); @@ -312,29 +315,30 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { } else { List 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 getPhotoBanner(PageVo vo) { + public ServiceBody 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 getPhotoTime(TerminalPhotoTimeVo vo) { - List 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 getPhotoQueryParam(ReturnedPhotoParamsGetVo vo) { GetModel model = new GetModel(); @@ -601,11 +572,12 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { /** * 获取历史图片接口实现 * + * @param requestIp * @param vo * @return */ @Override - public ServiceBody getHistoryList(TermIdAndChannelIdVo vo) { + public ServiceBody getHistoryList(String requestIp, TermIdAndChannelIdVo vo) { TerminalPhotoSelectListModel model = new TerminalPhotoSelectListModel(); List 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); } - } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/LoginService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/LoginService.java index 9e449e2..cd58125 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/LoginService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/LoginService.java @@ -15,8 +15,6 @@ import com.shxy.xymanager_common.entity.SysUserSession; public interface LoginService { - ServiceBody login(String username, String password) throws Exception; - ServiceBody remoteLogin(SysUser sysUser); SysUserSession getLoginUser(SysUser sysUser) throws Exception; diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java index 11c8d42..06450c9 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java @@ -17,21 +17,23 @@ public interface TerminalPhotoService { * * @return */ - ServiceBody getTerminalPhotoList(TerminalAndChannelIdAndTimeVo vo); + ServiceBody getTerminalPhotoList(String requestIp, TerminalAndChannelIdAndTimeVo vo); /** * 图片查询 + * + * @param requestIp * @param vo * @return */ - ServiceBody getPhotoList(TerminalPhotoSelectVo vo); + ServiceBody getPhotoList(String requestIp, TerminalPhotoSelectVo vo); /** * 根据装置id获取图片接口提供给第三方 * * @return */ - ServiceBody getPhotoListForOpen(OpenTerminalAndTimeVo vo); + ServiceBody getPhotoListForOpen(String requestIp, OpenTerminalAndTimeVo vo); /** * 根据通道和装置id获取最新图片 @@ -53,14 +55,7 @@ public interface TerminalPhotoService { * * @return */ - ServiceBody getPhotoBanner(PageVo vo); - - /** - * - * - * @return - */ - ServiceBody getPhotoTime(TerminalPhotoTimeVo vo); + ServiceBody getPhotoBanner(String requestIp, PageVo vo); /** * 查询图片采集参数列表 @@ -79,9 +74,11 @@ public interface TerminalPhotoService { /** * 历史图片接口 + * + * @param requestIp * @param vo * @return */ - ServiceBody getHistoryList(TermIdAndChannelIdVo vo); + ServiceBody getHistoryList(String requestIp, TermIdAndChannelIdVo vo); }