From 8e373ae329d1ff4b86b2e0b57ab62bb5acc4c29f Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Wed, 20 Mar 2024 13:24:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OpenController.java | 160 +++--- .../controller/SysLoginController.java | 7 +- .../shxy/xymanager_common/bean/SysUser.java | 2 + .../shxy/xymanager_common/entity/SysUser.java | 8 +- .../entity/SysUserSession.java | 29 -- .../xymanager_dao/dao/SysUserMapperDao.java | 73 --- .../src/main/resources/generatorConfig.xml | 50 +- .../resources/mappers/SysUserMapperDao.xml | 154 ------ .../impl/LoginServiceImpl.java | 36 +- .../impl/OpenServiceImpl.java | 463 +++++++++--------- .../impl/SysUserServiceImpl.java | 48 +- .../impl/TerminalPhotoServiceImpl.java | 5 - .../service/LoginService.java | 7 +- .../service/OpenService.java | 44 +- .../service/SysUserService.java | 29 -- 15 files changed, 399 insertions(+), 716 deletions(-) delete mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUserSession.java delete mode 100644 xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/SysUserMapperDao.java delete mode 100644 xymanager_dao/src/main/resources/mappers/SysUserMapperDao.xml 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 01b8775..84f75d0 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 @@ -1,80 +1,80 @@ -package com.shxy.xymanager_admin.controller; - -import cn.hutool.json.JSONObject; -import com.shxy.xymanager_common.annotation.Log; -import com.shxy.xymanager_common.base.BaseController; -import com.shxy.xymanager_common.base.ResponseReult; -import com.shxy.xymanager_common.bean.ServiceBody; -import com.shxy.xymanager_common.bean.ServiceStatus; -import com.shxy.xymanager_common.model.*; -import com.shxy.xymanager_common.util.xinyin.HeaderUtil; -import com.shxy.xymanager_common.vo.*; -import com.shxy.xymanager_service.service.OpenService; -import com.shxy.xymanager_service.service.TerminalPhotoService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -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; - - -@Api(value = "精益化平台接口", tags = "精益化平台相关") -@RestController -@Slf4j -public class OpenController extends BaseController { - - @Autowired - TerminalPhotoService terminalPhotoService; - - @Autowired - OpenService openService; - - - @ApiOperation(value = "对外图片查询", notes = "对外图片查询", httpMethod = "POST") - @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) - @RequestMapping("/getPhotoListForOpen") - @Log(title = "对外图片查询", type = "查询") - 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 { - return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); - } - } - - @ApiOperation(value = "第三方登录认证接口", notes = "第三方登录认证接口", httpMethod = "POST") - @ApiResponses({@ApiResponse(code = 0, message = "请求成功"), @ApiResponse(code = 1, message = "用户名错误"), @ApiResponse(code = 2, message = "密码错误")}) - @RequestMapping("/cmaUserLogin") - @Log(title = "第三方登录认证接口", type = "查询") - public JSONObject cmaUserLogin(@RequestBody @Validated UserLoginVo vo) { - JSONObject serviceBody = openService.cmaUserLogin(vo); - return serviceBody; - } - - @ApiOperation(value = "远程拍照(短视频)控制", notes = "远程拍照(短视频)控制接口", httpMethod = "POST") - @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) { - JSONObject serviceBody = openService.ctrlCmaDeviceCapture(vo); - return serviceBody; - } - - @ApiOperation(value = "查询装置状态", notes = "查询装置状态接口", httpMethod = "POST") - @ApiResponses({@ApiResponse(code = 0, message = "请求成功"), @ApiResponse(code = 1, message = "用户名错误"), @ApiResponse(code = 2, message = "密码错误")}) - @RequestMapping("/cmaDeviceStatus") - @Log(title = "查询装置状态接口", type = "查询") - public JSONObject cmaDeviceStatus(@RequestBody @Validated OpenCmdidVo vo) { - JSONObject serviceBody = openService.cmaDeviceStatus(vo); - return serviceBody; - } -} +//package com.shxy.xymanager_admin.controller; +// +//import cn.hutool.json.JSONObject; +//import com.shxy.xymanager_common.annotation.Log; +//import com.shxy.xymanager_common.base.BaseController; +//import com.shxy.xymanager_common.base.ResponseReult; +//import com.shxy.xymanager_common.bean.ServiceBody; +//import com.shxy.xymanager_common.bean.ServiceStatus; +//import com.shxy.xymanager_common.model.*; +//import com.shxy.xymanager_common.util.xinyin.HeaderUtil; +//import com.shxy.xymanager_common.vo.*; +//import com.shxy.xymanager_service.service.OpenService; +//import com.shxy.xymanager_service.service.TerminalPhotoService; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiOperation; +//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; +// +// +//@Api(value = "精益化平台接口", tags = "精益化平台相关") +//@RestController +//@Slf4j +//public class OpenController extends BaseController { +// +// @Autowired +// TerminalPhotoService terminalPhotoService; +// +// @Autowired +// OpenService openService; +// +// +// @ApiOperation(value = "对外图片查询", notes = "对外图片查询", httpMethod = "POST") +// @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) +// @RequestMapping("/getPhotoListForOpen") +// @Log(title = "对外图片查询", type = "查询") +// 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 { +// return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); +// } +// } +// +// @ApiOperation(value = "第三方登录认证接口", notes = "第三方登录认证接口", httpMethod = "POST") +// @ApiResponses({@ApiResponse(code = 0, message = "请求成功"), @ApiResponse(code = 1, message = "用户名错误"), @ApiResponse(code = 2, message = "密码错误")}) +// @RequestMapping("/cmaUserLogin") +// @Log(title = "第三方登录认证接口", type = "查询") +// public JSONObject cmaUserLogin(@RequestBody @Validated UserLoginVo vo) { +// JSONObject serviceBody = openService.cmaUserLogin(vo); +// return serviceBody; +// } +// +// @ApiOperation(value = "远程拍照(短视频)控制", notes = "远程拍照(短视频)控制接口", httpMethod = "POST") +// @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) { +// JSONObject serviceBody = openService.ctrlCmaDeviceCapture(vo); +// return serviceBody; +// } +// +// @ApiOperation(value = "查询装置状态", notes = "查询装置状态接口", httpMethod = "POST") +// @ApiResponses({@ApiResponse(code = 0, message = "请求成功"), @ApiResponse(code = 1, message = "用户名错误"), @ApiResponse(code = 2, message = "密码错误")}) +// @RequestMapping("/cmaDeviceStatus") +// @Log(title = "查询装置状态接口", type = "查询") +// public JSONObject cmaDeviceStatus(@RequestBody @Validated OpenCmdidVo vo) { +// JSONObject serviceBody = openService.cmaDeviceStatus(vo); +// return serviceBody; +// } +//} diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SysLoginController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SysLoginController.java index bb095ca..d03bb28 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SysLoginController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SysLoginController.java @@ -4,8 +4,7 @@ package com.shxy.xymanager_admin.controller; 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.bean.SysUser; -import com.shxy.xymanager_common.entity.SysUserSession; +import com.shxy.xymanager_common.entity.SysUser; import com.shxy.xymanager_common.page.TableDataInfo; import com.shxy.xymanager_common.vo.PageVo; import com.shxy.xymanager_common.vo.SysUserUpdateVo; @@ -42,8 +41,8 @@ public class SysLoginController { @ApiOperation(value = "登录", notes = "登录", httpMethod = "POST") @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/login") - public ResponseReult login(@RequestBody SysUser sysUser) { - ServiceBody serviceBody = loginService.remoteLogin(sysUser); + public ResponseReult login(@RequestBody SysUser sysUser) { + ServiceBody serviceBody = loginService.remoteLogin(sysUser); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/bean/SysUser.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/bean/SysUser.java index d249f70..4d27c8a 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/bean/SysUser.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/bean/SysUser.java @@ -42,6 +42,8 @@ public class SysUser { @ApiModelProperty(value="创建时间", name="createTime") private Date createTime; + + /** * 密码 */ diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUser.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUser.java index 838fe32..7f8834e 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUser.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUser.java @@ -1,16 +1,15 @@ package com.shxy.xymanager_common.entity; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonInclude; import com.shxy.xymanager_common.bean.PermissionDetail; import io.swagger.annotations.ApiModelProperty; -import jdk.nashorn.internal.ir.annotations.Ignore; import lombok.Data; import java.util.Date; @Data +@JsonInclude(JsonInclude.Include.NON_NULL) public class SysUser { /** @@ -36,7 +35,6 @@ public class SysUser { private String notes; - @JsonIgnore private String password; /** * 用户角色 @@ -44,6 +42,8 @@ public class SysUser { @ApiModelProperty(value="用户角色", name="role") private Integer role; + @ApiModelProperty(value="token", name="token") + private String token; /** * 用户角色 */ diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUserSession.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUserSession.java deleted file mode 100644 index 6c427c4..0000000 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUserSession.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.shxy.xymanager_common.entity; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigInteger; -import java.util.Date; - -@Data -public class SysUserSession implements Serializable { - private Integer id; - - private String sessionId; - - private String token; - - private String userName; - - private Integer role; - - private BigInteger expireTime; - - private Date createTime; - - private Date updateTime; - - private static final long serialVersionUID = 1L; - -} \ No newline at end of file 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 deleted file mode 100644 index 56526cc..0000000 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/SysUserMapperDao.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.shxy.xymanager_dao.dao; - -import cn.hutool.core.util.StrUtil; -import com.shxy.xymanager_common.bean.SysUser; -import com.shxy.xymanager_common.entity.SysUserSession; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -/** - * @ClassName：SysUserMapper - * @Description： 用户表 Mapper 接口. - * @Author： Arno_Fu - * @CreatTime：11/26/2019 - 2:51 PM - * @Version V1.0 - */ - -@Mapper -public interface SysUserMapperDao { - - - SysUser selectByPrimaryKey(Integer uid); - - /** - * @param userAccount - * @return com.chenxuan.entity.model.SysUser - * @Description 通过用户账户获取用户信息 - */ - SysUser selectByUserAccount(@Param("userName") String userAccount); - - - - int addUser(SysUser user); - - Integer updateById(SysUser user); - - - /** - * 通过用户名查询用户 - * - * @param userName 用户名 - * @return 用户对象信息 - */ - public SysUser selectUserByUserName(String userName); - - /** - * 通过用户ID查询用户 - * - * @param userId 用户ID - * @return 用户对象信息 - */ - public SysUser selectUserById(Long userId); - - - int deleteUserById(String userId); - - - SysUserSession selectUserBySessionId(String sessionId); - - void insertUserSession(SysUserSession session); - - int updateUserSession(SysUserSession session); - - 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_dao/src/main/resources/generatorConfig.xml b/xymanager_dao/src/main/resources/generatorConfig.xml index 03396e9..301af4f 100644 --- a/xymanager_dao/src/main/resources/generatorConfig.xml +++ b/xymanager_dao/src/main/resources/generatorConfig.xml @@ -53,15 +53,51 @@ - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + - + diff --git a/xymanager_dao/src/main/resources/mappers/SysUserMapperDao.xml b/xymanager_dao/src/main/resources/mappers/SysUserMapperDao.xml deleted file mode 100644 index 9088292..0000000 --- a/xymanager_dao/src/main/resources/mappers/SysUserMapperDao.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - SELECT - uid, - user_name, - `status` - FROM - sys_users u - - - - - - - - - - - - - - - - insert into sys_users(user_name,nick_name,password,role,create_time) - values(#{userName},#{userName},#{password},#{role},#{createTime}) - - - - - - update `sys_user_session` - - - expire_time = #{expireTime}, - - - where session_id = #{sessionId} - - - - update `sys_users` - - - user_name = #{userName}, - - - nick_name = #{nickName}, - - - password = #{password}, - - - role = #{role}, - - - status = #{status}, - - - where uid = #{userId} - - - - update `sys_users` - set status = 0 - where uid = #{userId} - - - - insert into sys_user_session (session_id, user_name,role,expire_time) - values (#{sessionId,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{role,jdbcType=VARCHAR}, #{expireTime,jdbcType=INTEGER}) - - - - - - - insert into sys_user_session (session_id,user_name,role,expire_time,create_time,update_time) - values (#{item.sessionId} ,#{item.userName}, #{item.role},#{item.expireTime},#{createat},#{updateat}) - ON DUPLICATE KEY UPDATE - user_name = values(user_name), - role = values(role), - session_id = values (session_id), - expire_time = values (expire_time) - - - - \ No newline at end of file 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 ebf1eb1..065a380 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 @@ -1,33 +1,21 @@ package com.shxy.xymanager_service.impl; -import cn.hutool.core.date.DateTime; import com.shxy.xymanager_common.bean.ServiceBody; -import com.shxy.xymanager_common.bean.SysUser; import com.shxy.xymanager_common.config.CustomRsaProperties; import com.shxy.xymanager_common.config.SecurityConfig; import com.shxy.xymanager_common.constant.HttpStatusCode; -import com.shxy.xymanager_common.constant.UuidUtils; -import com.shxy.xymanager_common.entity.SysUserSession; +import com.shxy.xymanager_common.entity.SysUser; import com.shxy.xymanager_common.exception.Asserts; import com.shxy.xymanager_common.exception.UserPasswordNotMatchException; -import com.shxy.xymanager_common.util.MyDateUtils; import com.shxy.xymanager_common.util.RsaUtils; import com.shxy.xymanager_common.util.StringUtils; import com.shxy.xymanager_common.util.TokenUtil; -import com.shxy.xymanager_dao.dao.SysUserMapperDao; import com.shxy.xymanager_service.service.LoginService; import com.shxy.xymanager_service.service.SysUserService; -import io.jsonwebtoken.Jwts; -import io.jsonwebtoken.security.Keys; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.crypto.SecretKey; -import java.math.BigInteger; -import java.nio.charset.StandardCharsets; -import java.util.Date; -import java.util.UUID; /** * 装置通道实现层 @@ -50,11 +38,12 @@ public class LoginServiceImpl implements LoginService { * @param sysUser * @return */ - public ServiceBody remoteLogin(SysUser sysUser) { + public ServiceBody remoteLogin(SysUser sysUser) { try { - SysUserSession user = getLoginUser(sysUser); - String token = tokenUtil.generateToken(user.getId()); + SysUser user = getLoginUser(sysUser); + String token = tokenUtil.generateToken(user.getUid()); user.setToken(token); + user.setPassword(null); return Asserts.success(user); } catch (UserPasswordNotMatchException e){ return Asserts.error(e.getMessage()); @@ -70,26 +59,19 @@ public class LoginServiceImpl implements LoginService { * @param sysUser * @return */ - public SysUserSession getLoginUser(SysUser sysUser) throws Exception { + public SysUser getLoginUser(SysUser sysUser) throws Exception { // 用户验证 - com.shxy.xymanager_common.entity.SysUser account = sysUserService.findByUserAccount(sysUser.getUserName()); + SysUser user = sysUserService.findByUserAccount(sysUser.getUserName()); // 判断用户是否存在 - if (StringUtils.isNull(account)) { + if (StringUtils.isNull(user)) { throw new UserPasswordNotMatchException("用户不存在", HttpStatusCode.ERROR); } // 密码解密 - String pwd = RsaUtils.decryptByPrivateKey( CustomRsaProperties.privateKey, account.getPassword() ); + String pwd = RsaUtils.decryptByPrivateKey( CustomRsaProperties.privateKey, user.getPassword() ); // 密码对比 if (!sysUser.getPassword().equals(pwd)) { throw new UserPasswordNotMatchException("密码错误", HttpStatusCode.ERROR); } - SysUserSession user = new SysUserSession(); -// loginUser.setPermissions(permissions); - user.setUserName(sysUser.getUserName()); - user.setRole(account.getRole()); - long date = MyDateUtils.TimeMillSecond2Second(new DateTime()); - user.setExpireTime(BigInteger.valueOf(date)); - user.setId(account.getUid()); return user; } } 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 6e05ed3..7c25b32 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 @@ -1,240 +1,231 @@ -package com.shxy.xymanager_service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONObject; -import com.shxy.xymanager_common.constant.Constants; -import com.shxy.xymanager_common.constant.UuidUtils; -import com.shxy.xymanager_common.dto.TerminalsWithHeart; -import com.shxy.xymanager_common.entity.*; -import com.shxy.xymanager_common.enums.CommonStatus; -import com.shxy.xymanager_common.util.CmaUtil; -import com.shxy.xymanager_common.util.MyDateUtils; -import com.shxy.xymanager_common.util.xinyin.ProcessExecUtils; -import com.shxy.xymanager_common.util.xinyin.TerminalUtils; -import com.shxy.xymanager_common.vo.OpenCmdidVo; -import com.shxy.xymanager_common.vo.OpenDeviceCaptureVo; -import com.shxy.xymanager_common.vo.UserLoginVo; -import com.shxy.xymanager_dao.dao.SysUserDao; -import com.shxy.xymanager_dao.dao.SysUserMapperDao; -import com.shxy.xymanager_dao.dao.TerminalStatusDao; -import com.shxy.xymanager_dao.dao.TerminalsDao; -import com.shxy.xymanager_service.service.OpenService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; - -import java.math.BigInteger; -import java.util.Date; -import java.util.List; - -/** - * 第三方对外接口 - */ -@Service -@Component -@Slf4j -public class OpenServiceImpl implements OpenService { - @Autowired - private SysUserMapperDao sysUserMapperDao; - - @Autowired - private SysUserDao sysUserDao; - - @Autowired - private TerminalsDao terminalsDao; - - @Autowired - private TerminalStatusDao terminalStatusDao; - - - @Value("${session.open_expire_time}") - public Integer time; - - /** - * 登录鉴权 - * - * @param vo - * @return - */ - @Override - public JSONObject cmaUserLogin(UserLoginVo vo) { - JSONObject jsonObject = new JSONObject(); - String username = vo.getUserName(); - String userPassword = vo.getPassWord(); - - SysUserExample example = new SysUserExample(); - example.createCriteria().andUserNameEqualTo(username); - List sysUsers = sysUserDao.selectByExample(example); - // 判断用户是否存在 - if (CollectionUtil.isEmpty(sysUsers)) { - jsonObject.putOpt("errcode", 1); - jsonObject.putOpt("errmsg", "用户不存在"); - return jsonObject; - } - // 判断密码是否存在 - String password = vo.getPassWord(); - if (BeanUtil.isEmpty(password)) { - jsonObject.putOpt("errcode", 2); - jsonObject.putOpt("errmsg", "密码错误"); - return jsonObject; - } - SysUser sysUser = sysUsers.get(0); - // 密码对比 - if (!sysUser.getPassword().equals(userPassword)) { - jsonObject.putOpt("errcode", 2); - jsonObject.putOpt("errmsg", "密码错误"); - return jsonObject; - } - - Date date = new Date(); - String sessionId = UuidUtils.getUUID(); - SysUserSession sysUserSession = new SysUserSession(); - sysUserSession.setUserName(username); - sysUserSession.setRole(sysUser.getRole()); - sysUserSession.setSessionId(sessionId); - long expiretime = MyDateUtils.TimeMillSecond2Second(MyDateUtils.offsetMinute(date, time)); - sysUserSession.setExpireTime(BigInteger.valueOf(expiretime)); - sysUserMapperDao.insertOrUpdate(sysUserSession, date, date); - jsonObject.set("errcode", 0); - jsonObject.set("errmsg", "OK"); - jsonObject.set("sessionid", sessionId); - jsonObject.set("keepingtime", time); - - return jsonObject; - } - - /** - * 控制拍照视频 - * - * @param vo - * @return - */ - @Override - public JSONObject ctrlCmaDeviceCapture(OpenDeviceCaptureVo vo) { - JSONObject jsonObject = new JSONObject(); - String sessionID = vo.getSessionID(); - String deviceID = vo.getDeviceID(); - Integer operateType = vo.getOperateType(); - if (StrUtil.isEmpty(sessionID)) { - jsonObject.set("errcode", 1); - jsonObject.set("errmsg", "invalid session"); - return jsonObject; - } - if (StrUtil.isEmpty(deviceID)) { - jsonObject.set("errcode", 2); - jsonObject.set("errmsg", "device not register"); - return jsonObject; - } - - SysUserSession sysUserSession = sysUserMapperDao.selectBySessionId(sessionID); - if (BeanUtil.isEmpty(sysUserSession)) { - jsonObject.set("errcode", 1); - jsonObject.set("errmsg", "invalid session"); - return jsonObject; - } else { - BigInteger expireTime = sysUserSession.getExpireTime(); - long currentTime = MyDateUtils.TimeMillSecond2Second(new DateTime()); - if ((currentTime - expireTime.longValue()) > time.longValue()) { - jsonObject.set("errcode", 1); - jsonObject.set("errmsg", "invalid session"); - return jsonObject; - } - } - - TerminalsExample example = new TerminalsExample(); - example.createCriteria().andCmdidEqualTo(deviceID); - List list = terminalsDao.selectByExample(example); - if (CollectionUtil.isEmpty(list)) { - jsonObject.set("errcode", 2); - jsonObject.set("errmsg", "device not register"); - return jsonObject; - } -// Terminals terminals = terminalsDao.selectByCmdid(deviceID, CommonStatus.EFFECTIVE.value()); -// if (BeanUtil.isEmpty(terminals)) { +//package com.shxy.xymanager_service.impl; +// +//import cn.hutool.core.bean.BeanUtil; +//import cn.hutool.core.collection.CollectionUtil; +//import cn.hutool.core.date.DateTime; +//import cn.hutool.core.util.StrUtil; +//import cn.hutool.json.JSONObject; +//import com.shxy.xymanager_common.constant.Constants; +//import com.shxy.xymanager_common.constant.UuidUtils; +//import com.shxy.xymanager_common.dto.TerminalsWithHeart; +//import com.shxy.xymanager_common.entity.*; +//import com.shxy.xymanager_common.util.CmaUtil; +//import com.shxy.xymanager_common.util.MyDateUtils; +//import com.shxy.xymanager_common.util.xinyin.ProcessExecUtils; +//import com.shxy.xymanager_common.util.xinyin.TerminalUtils; +//import com.shxy.xymanager_common.vo.OpenCmdidVo; +//import com.shxy.xymanager_common.vo.OpenDeviceCaptureVo; +//import com.shxy.xymanager_common.vo.UserLoginVo; +//import com.shxy.xymanager_dao.dao.SysUserDao; +//import com.shxy.xymanager_dao.dao.TerminalStatusDao; +//import com.shxy.xymanager_dao.dao.TerminalsDao; +//import com.shxy.xymanager_service.service.OpenService; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.beans.factory.annotation.Value; +//import org.springframework.stereotype.Component; +//import org.springframework.stereotype.Service; +// +//import java.math.BigInteger; +//import java.util.Date; +//import java.util.List; +// +///** +// * 第三方对外接口 +// */ +//@Service +//@Component +//@Slf4j +//public class OpenServiceImpl implements OpenService { +// @Autowired +// private SysUserMapperDao sysUserMapperDao; +// +// @Autowired +// private SysUserDao sysUserDao; +// +// @Autowired +// private TerminalsDao terminalsDao; +// +// @Autowired +// private TerminalStatusDao terminalStatusDao; +// +// +// @Value("${session.open_expire_time}") +// public Integer time; +// +// /** +// * 登录鉴权 +// * +// * @param vo +// * @return +// */ +// @Override +// public JSONObject cmaUserLogin(UserLoginVo vo) { +// JSONObject jsonObject = new JSONObject(); +// String username = vo.getUserName(); +// String userPassword = vo.getPassWord(); +// +// SysUserExample example = new SysUserExample(); +// example.createCriteria().andUserNameEqualTo(username); +// List sysUsers = sysUserDao.selectByExample(example); +// // 判断用户是否存在 +// if (CollectionUtil.isEmpty(sysUsers)) { +// jsonObject.putOpt("errcode", 1); +// jsonObject.putOpt("errmsg", "用户不存在"); +// return jsonObject; +// } +// // 判断密码是否存在 +// String password = vo.getPassWord(); +// if (BeanUtil.isEmpty(password)) { +// jsonObject.putOpt("errcode", 2); +// jsonObject.putOpt("errmsg", "密码错误"); +// return jsonObject; +// } +// SysUser sysUser = sysUsers.get(0); +// // 密码对比 +// if (!sysUser.getPassword().equals(userPassword)) { +// jsonObject.putOpt("errcode", 2); +// jsonObject.putOpt("errmsg", "密码错误"); +// return jsonObject; +// } +// +// Date date = new Date(); +// String sessionId = UuidUtils.getUUID(); +// SysUserSession sysUserSession = new SysUserSession(); +// sysUserSession.setUserName(username); +// sysUserSession.setRole(sysUser.getRole()); +// sysUserSession.setSessionId(sessionId); +// long expiretime = MyDateUtils.TimeMillSecond2Second(MyDateUtils.offsetMinute(date, time)); +// sysUserSession.setExpireTime(BigInteger.valueOf(expiretime)); +// sysUserDao.insertOrUpdate(sysUserSession, date, date); +// jsonObject.set("errcode", 0); +// jsonObject.set("errmsg", "OK"); +// jsonObject.set("sessionid", sessionId); +// jsonObject.set("keepingtime", time); +// +// return jsonObject; +// } +// +// /** +// * 控制拍照视频 +// * +// * @param vo +// * @return +// */ +// @Override +// public JSONObject ctrlCmaDeviceCapture(OpenDeviceCaptureVo vo) { +// JSONObject jsonObject = new JSONObject(); +// String sessionID = vo.getSessionID(); +// String deviceID = vo.getDeviceID(); +// Integer operateType = vo.getOperateType(); +// if (StrUtil.isEmpty(sessionID)) { +// jsonObject.set("errcode", 1); +// jsonObject.set("errmsg", "invalid session"); +// return jsonObject; +// } +// if (StrUtil.isEmpty(deviceID)) { // jsonObject.set("errcode", 2); // jsonObject.set("errmsg", "device not register"); // return jsonObject; // } - - if (operateType == 1) { - operateType = 0; - } else if (operateType == 2) { - operateType = 1; - } else { - jsonObject.set("errcode", 3); - jsonObject.set("errmsg", "invalid protocol"); - return jsonObject; - } - int requestId = Constants.REQUEST_ID.addAndGet(1); - String cmd1 = CmaUtil.takePic(vo.getDeviceID(), 1,255, operateType, requestId); - ProcessExecUtils.exec(cmd1); - int requestId2 = Constants.REQUEST_ID.addAndGet(1); - String cmd2 = CmaUtil.takePic(vo.getDeviceID(), 2,255, operateType,requestId2); - ProcessExecUtils.exec(cmd2); - jsonObject.set("errcode", 0); - jsonObject.set("errmsg", "OK"); - - return jsonObject; - } - - /** - * 查询设备在线状态 - * - * @param vo - * @return - */ - @Override - public JSONObject cmaDeviceStatus(OpenCmdidVo vo) { - JSONObject jsonObject = new JSONObject(); - String sessionID = vo.getSessionID(); - String deviceID = vo.getDeviceID(); - if (StrUtil.isEmpty(sessionID)) { - jsonObject.set("errcode", 1); - jsonObject.set("errmsg", "invalid session"); - return jsonObject; - } - SysUserSession sysUserSession = sysUserMapperDao.selectBySessionId(sessionID); - if (BeanUtil.isEmpty(sysUserSession)) { - jsonObject.set("errcode", 1); - jsonObject.set("errmsg", "invalid session"); - return jsonObject; - } else { - BigInteger expireTime = sysUserSession.getExpireTime(); - long currentTime = MyDateUtils.TimeMillSecond2Second(new DateTime()); - if ((currentTime - expireTime.longValue()) > time.longValue()) { - jsonObject.set("errcode", 1); - jsonObject.set("errmsg", "invalid session"); - return jsonObject; - } - } - if (StrUtil.isEmpty(deviceID)) { - jsonObject.set("errcode", 2); - jsonObject.set("errmsg", "device not register"); - return jsonObject; - } - TerminalsWithHeart terminalsWithHeart = terminalStatusDao.selectByCmdId(deviceID); - if (BeanUtil.isEmpty(terminalsWithHeart)) { - jsonObject.set("errcode", 2); - jsonObject.set("errmsg", "device not register"); - return jsonObject; - } - BigInteger lastheartbeat = terminalsWithHeart.getLastheartbeat(); - boolean b = TerminalUtils.judgeTerminalStatus(lastheartbeat); - if (b) { - jsonObject.set("isonline", true); - jsonObject.set("errcode", 0); - jsonObject.set("errmsg", "ok"); - } else { - jsonObject.set("isonline", false); - jsonObject.set("errcode", 0); - jsonObject.set("errmsg", "ok"); - } - - return jsonObject; - } -} +// +// SysUserSession sysUserSession = sysUserMapperDao.selectBySessionId(sessionID); +// if (BeanUtil.isEmpty(sysUserSession)) { +// jsonObject.set("errcode", 1); +// jsonObject.set("errmsg", "invalid session"); +// return jsonObject; +// } else { +// BigInteger expireTime = sysUserSession.getExpireTime(); +// long currentTime = MyDateUtils.TimeMillSecond2Second(new DateTime()); +// if ((currentTime - expireTime.longValue()) > time.longValue()) { +// jsonObject.set("errcode", 1); +// jsonObject.set("errmsg", "invalid session"); +// return jsonObject; +// } +// } +// +// TerminalsExample example = new TerminalsExample(); +// example.createCriteria().andCmdidEqualTo(deviceID); +// List list = terminalsDao.selectByExample(example); +// if (CollectionUtil.isEmpty(list)) { +// jsonObject.set("errcode", 2); +// jsonObject.set("errmsg", "device not register"); +// return jsonObject; +// } +// if (operateType == 1) { +// operateType = 0; +// } else if (operateType == 2) { +// operateType = 1; +// } else { +// jsonObject.set("errcode", 3); +// jsonObject.set("errmsg", "invalid protocol"); +// return jsonObject; +// } +// int requestId = Constants.REQUEST_ID.addAndGet(1); +// String cmd1 = CmaUtil.takePic(vo.getDeviceID(), 1,255, operateType, requestId); +// ProcessExecUtils.exec(cmd1); +// int requestId2 = Constants.REQUEST_ID.addAndGet(1); +// String cmd2 = CmaUtil.takePic(vo.getDeviceID(), 2,255, operateType,requestId2); +// ProcessExecUtils.exec(cmd2); +// jsonObject.set("errcode", 0); +// jsonObject.set("errmsg", "OK"); +// +// return jsonObject; +// } +// +// /** +// * 查询设备在线状态 +// * +// * @param vo +// * @return +// */ +// @Override +// public JSONObject cmaDeviceStatus(OpenCmdidVo vo) { +// JSONObject jsonObject = new JSONObject(); +// String sessionID = vo.getSessionID(); +// String deviceID = vo.getDeviceID(); +// if (StrUtil.isEmpty(sessionID)) { +// jsonObject.set("errcode", 1); +// jsonObject.set("errmsg", "invalid session"); +// return jsonObject; +// } +// SysUserSession sysUserSession = sysUserMapperDao.selectBySessionId(sessionID); +// if (BeanUtil.isEmpty(sysUserSession)) { +// jsonObject.set("errcode", 1); +// jsonObject.set("errmsg", "invalid session"); +// return jsonObject; +// } else { +// BigInteger expireTime = sysUserSession.getExpireTime(); +// long currentTime = MyDateUtils.TimeMillSecond2Second(new DateTime()); +// if ((currentTime - expireTime.longValue()) > time.longValue()) { +// jsonObject.set("errcode", 1); +// jsonObject.set("errmsg", "invalid session"); +// return jsonObject; +// } +// } +// if (StrUtil.isEmpty(deviceID)) { +// jsonObject.set("errcode", 2); +// jsonObject.set("errmsg", "device not register"); +// return jsonObject; +// } +// TerminalsWithHeart terminalsWithHeart = terminalStatusDao.selectByCmdId(deviceID); +// if (BeanUtil.isEmpty(terminalsWithHeart)) { +// jsonObject.set("errcode", 2); +// jsonObject.set("errmsg", "device not register"); +// return jsonObject; +// } +// BigInteger lastheartbeat = terminalsWithHeart.getLastheartbeat(); +// boolean b = TerminalUtils.judgeTerminalStatus(lastheartbeat); +// if (b) { +// jsonObject.set("isonline", true); +// jsonObject.set("errcode", 0); +// jsonObject.set("errmsg", "ok"); +// } else { +// jsonObject.set("isonline", false); +// jsonObject.set("errcode", 0); +// jsonObject.set("errmsg", "ok"); +// } +// +// return jsonObject; +// } +//} diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SysUserServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SysUserServiceImpl.java index 52ce653..caac8bd 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SysUserServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SysUserServiceImpl.java @@ -3,14 +3,12 @@ package com.shxy.xymanager_service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateTime; import cn.hutool.core.util.StrUtil; import com.shxy.xymanager_common.bean.ServiceBody; -import com.shxy.xymanager_common.bean.SysUser; import com.shxy.xymanager_common.config.CustomRsaProperties; +import com.shxy.xymanager_common.entity.SysUser; import com.shxy.xymanager_common.entity.SysUserExample; -import com.shxy.xymanager_common.entity.SysUserSession; import com.shxy.xymanager_common.entity.TbRole; import com.shxy.xymanager_common.exception.Asserts; import com.shxy.xymanager_common.page.PageUtils; @@ -20,24 +18,18 @@ import com.shxy.xymanager_common.vo.PageVo; import com.shxy.xymanager_common.vo.SysUserUpdateVo; import com.shxy.xymanager_common.vo.SysUserVo; import com.shxy.xymanager_dao.dao.SysUserDao; -import com.shxy.xymanager_dao.dao.SysUserMapperDao; import com.shxy.xymanager_service.service.RoleService; import com.shxy.xymanager_service.service.SysUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; -import javax.validation.constraints.NotNull; import java.util.Date; import java.util.HashMap; import java.util.List; -import java.util.Map; import static com.shxy.xymanager_common.base.BaseController.getDataTable; @@ -54,9 +46,6 @@ import static com.shxy.xymanager_common.base.BaseController.getDataTable; @Slf4j public class SysUserServiceImpl implements SysUserService { - @Autowired - private SysUserMapperDao sysUserMapperDao; - @Autowired private SysUserDao sysUserDao; @@ -64,7 +53,7 @@ public class SysUserServiceImpl implements SysUserService { private RoleService roleService; @Override - public com.shxy.xymanager_common.entity.SysUser findByUserAccount(String userAccount) { + public SysUser findByUserAccount(String userAccount) { SysUserExample example = new SysUserExample(); example.createCriteria().andUserNameEqualTo(userAccount); List sysUsers = sysUserDao.selectByExample(example); @@ -89,7 +78,7 @@ public class SysUserServiceImpl implements SysUserService { @Override - public com.shxy.xymanager_common.entity.SysUser selectUserById(Integer userId) { + public SysUser selectUserById(Integer userId) { return sysUserDao.selectByPrimaryKey(userId); } @@ -98,7 +87,7 @@ public class SysUserServiceImpl implements SysUserService { if (!this.checkUserNameUnique(vo.getUserName())) { return Asserts.error("新增用户'" + vo.getUserName() + "'失败，登录账号已存在"); } - com.shxy.xymanager_common.entity.SysUser sysUser = new com.shxy.xymanager_common.entity.SysUser(); + SysUser sysUser = new SysUser(); String userName = vo.getUserName(); String nickName = userName; sysUser.setUserName(userName); @@ -119,14 +108,9 @@ public class SysUserServiceImpl implements SysUserService { } } - @Override - public void checkUserAllowed(SysUser user) { - - } - @Override public ServiceBody updateUser(SysUserUpdateVo vo) { - com.shxy.xymanager_common.entity.SysUser user = new com.shxy.xymanager_common.entity.SysUser(); + SysUser user = new SysUser(); Integer uid = vo.getUid(); user.setUid(uid); @@ -158,15 +142,6 @@ public class SysUserServiceImpl implements SysUserService { return Asserts.error("修改失败"); } - @Override - public Boolean updateUserStatus(SysUser user) { - return null; - } - - @Override - public Boolean updateUserProfile(SysUser user) { - return null; - } @Override public ServiceBody deleteUserById(Integer userId) { @@ -177,20 +152,9 @@ public class SysUserServiceImpl implements SysUserService { return Asserts.error("失败"); } - @Override - public SysUserSession selectUserById(String sessionId) { - SysUserSession session = sysUserMapperDao.selectUserBySessionId(sessionId); - return session; - } - - @Override - public int updateUserSession(SysUserSession user) { - int result = sysUserMapperDao.updateUserSession(user); - return result; - } @Override - public ServiceBody> selectUserList(@RequestBody @Validated PageVo vo) { + public ServiceBody> selectUserList(@RequestBody @Validated PageVo vo) { int pageindex = vo.getPageindex(); int pagesize = vo.getPagesize(); PageUtils.SetPage(pageindex, pagesize); 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 05caa9f..1175b41 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 @@ -3,14 +3,11 @@ package com.shxy.xymanager_service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateTime; -import cn.hutool.core.lang.UUID; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; -import com.shxy.xymanager_common.bean.PermissionDetail; import com.shxy.xymanager_common.bean.ServiceBody; -import com.shxy.xymanager_common.bean.SysUser; import com.shxy.xymanager_common.constant.Constants; import com.shxy.xymanager_common.dto.*; import com.shxy.xymanager_common.entity.*; @@ -19,7 +16,6 @@ import com.shxy.xymanager_common.enums.TakePicStatus; import com.shxy.xymanager_common.exception.Asserts; import com.shxy.xymanager_common.model.*; import com.shxy.xymanager_common.page.PageUtils; -import com.shxy.xymanager_common.threadlocal.UserContextHolder; import com.shxy.xymanager_common.util.*; import com.shxy.xymanager_common.util.xinyin.ProcessExecUtils; import com.shxy.xymanager_common.util.xinyin.TerminalUtils; @@ -32,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import javax.validation.constraints.NotNull; import java.io.File; import java.io.IOException; import java.math.BigInteger; 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 cd58125..e17ac91 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 @@ -2,8 +2,7 @@ package com.shxy.xymanager_service.service; import com.shxy.xymanager_common.bean.ServiceBody; -import com.shxy.xymanager_common.bean.SysUser; -import com.shxy.xymanager_common.entity.SysUserSession; +import com.shxy.xymanager_common.entity.SysUser; /** * @ClassName：LoginService @@ -15,9 +14,9 @@ import com.shxy.xymanager_common.entity.SysUserSession; public interface LoginService { - ServiceBody remoteLogin(SysUser sysUser); + ServiceBody remoteLogin(SysUser sysUser); - SysUserSession getLoginUser(SysUser sysUser) throws Exception; + SysUser getLoginUser(SysUser sysUser) throws Exception; diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/OpenService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/OpenService.java index 837c604..0f8b770 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/OpenService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/OpenService.java @@ -1,22 +1,22 @@ -package com.shxy.xymanager_service.service; - - -import cn.hutool.json.JSONObject; -import com.shxy.xymanager_common.vo.OpenCmdidVo; -import com.shxy.xymanager_common.vo.OpenDeviceCaptureVo; -import com.shxy.xymanager_common.vo.UserLoginVo; - -/** - * 第三方接口 - * - * @author 晶晶 - */ -public interface OpenService { - - JSONObject cmaUserLogin(UserLoginVo vo); - - JSONObject ctrlCmaDeviceCapture(OpenDeviceCaptureVo vo); - - JSONObject cmaDeviceStatus(OpenCmdidVo vo); - -} +//package com.shxy.xymanager_service.service; +// +// +//import cn.hutool.json.JSONObject; +//import com.shxy.xymanager_common.vo.OpenCmdidVo; +//import com.shxy.xymanager_common.vo.OpenDeviceCaptureVo; +//import com.shxy.xymanager_common.vo.UserLoginVo; +// +///** +// * 第三方接口 +// * +// * @author 晶晶 +// */ +//public interface OpenService { +// +// JSONObject cmaUserLogin(UserLoginVo vo); +// +// JSONObject ctrlCmaDeviceCapture(OpenDeviceCaptureVo vo); +// +// JSONObject cmaDeviceStatus(OpenCmdidVo vo); +// +//} diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/SysUserService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/SysUserService.java index 97d06e7..5b7f37b 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/SysUserService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/SysUserService.java @@ -2,8 +2,6 @@ package com.shxy.xymanager_service.service; import com.shxy.xymanager_common.bean.ServiceBody; -import com.shxy.xymanager_common.bean.SysUser; -import com.shxy.xymanager_common.entity.SysUserSession; import com.shxy.xymanager_common.page.TableDataInfo; import com.shxy.xymanager_common.vo.PageVo; import com.shxy.xymanager_common.vo.SysUserUpdateVo; @@ -48,13 +46,6 @@ public interface SysUserService { Boolean checkUserNameUnique(String userName); - /** - * 校验用户是否允许操作 - * - * @param user 用户信息 - */ - void checkUserAllowed(SysUser user); - /** * 修改用户信息 * @@ -63,22 +54,6 @@ public interface SysUserService { */ ServiceBody updateUser(SysUserUpdateVo vo); - /** - * 修改用户状态 - * - * @param user 用户信息 - * @return 结果 - */ - Boolean updateUserStatus(SysUser user); - - /** - * 修改用户基本信息 - * - * @param user 用户信息 - * @return 结果 - */ - Boolean updateUserProfile(SysUser user); - /** * 通过用户ID删除用户 @@ -89,10 +64,6 @@ public interface SysUserService { ServiceBody deleteUserById(Integer userId); - SysUserSession selectUserById(String sessionId); - - int updateUserSession(SysUserSession user); - ServiceBody> selectUserList(PageVo vo); }