#20230510 欣影管理平台装置信息查询代码

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SysLoginController.java

@@ -5,6 +5,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.bean.SysUser;
+import com.shxy.xymanager_common.entity.UserSession;
 import com.shxy.xymanager_common.model.SysUserModel;
 import com.shxy.xymanager_common.vo.PageVo;
 import com.shxy.xymanager_common.vo.SysUserUpdateVo;
@@ -40,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<String> login(@RequestBody SysUser sysUser) throws Exception {
-        ServiceBody<String> serviceBody = loginService.remoteLogin(sysUser);
+    public ResponseReult<UserSession> login(@RequestBody SysUser sysUser) {
+        ServiceBody<UserSession> serviceBody = loginService.remoteLogin(sysUser);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/UserSession.java

@@ -7,7 +7,7 @@ import java.math.BigInteger;
 
 @Data
 public class UserSession implements Serializable {
-    private BigInteger id;
+    private Integer id;
 
     private String sessionId;
 

xymanager_dao/src/main/resources/mappers/SysUserMapperDao.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.shxy.xymanager_dao.dao.SysUserMapperDao">
     <resultMap id="SysUserResult" type="com.shxy.xymanager_common.bean.SysUser">
-        <id column="id" property="userId" />
+        <id column="uid" property="userId" />
         <result column="name" property="userName" />
         <result column="password" property="password" />
         <result column="status" property="status" />
@@ -87,6 +87,9 @@
             <if test="nickName!= null">
                 nick_name = #{nickName},
             </if>
+            <if test="password!= null">
+                password = #{password},
+            </if>
             <if test="role!= null">
                 role = #{role},
             </if>

xymanager_dao/src/main/resources/mappers/TerminalsDao.xml

@@ -139,12 +139,15 @@
         a.latitude as latitude,
         a.longitude as longitude,
         e.id as channel_id,
+        tpm.
         e.channel_name as channel_name
         from
-        ((((terminals a left join `lines` b on a.line_id = b.id )
+        ((((((terminals a left join `lines` b on a.line_id = b.id )
         left join tower c on a.tower_id = c.id)
         left join terminal_channel_mapper d on a.id = d.term_id)
         left join terminal_channels  e on d.channel_id = e.id)
+        left join terminal_photo_marks  tpm on a.id = tpm.term_id and e.id = tpm.channel_id)
+        left join terminal_photo_mark_paths  tpmp on tpmp.mark_id = tpm.id)
         WHERE  a.status = 1
         order by a.create_time desc
     </select>

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LoginServiceImpl.java

@@ -69,12 +69,19 @@ public class LoginServiceImpl implements LoginService {
      * @param sysUser
      * @return
      */
-    public ServiceBody<String> remoteLogin(SysUser sysUser) throws Exception {
-        UserSession user = getLoginUser(sysUser);
-        user.setSessionId(UuidUtils.getUUID());
-        sysUserMapperDao.insertUserSession(user);
-        // 生成token
-        return Asserts.success(user.getSessionId());
+    public ServiceBody<UserSession> remoteLogin(SysUser sysUser)  {
+        String sessionId = UuidUtils.getUUID();
+        try {
+            UserSession user = getLoginUser(sysUser);
+            user.setSessionId(sessionId);
+            sysUserMapperDao.insertUserSession(user);
+            return Asserts.success(user);
+        } catch (UserPasswordNotMatchException e){
+            return Asserts.error(e.getMessage());
+        } catch (Exception e) {
+           log.error("登录异常:{}",e.getMessage());
+        }
+        return Asserts.error("登录失败");
     }
 
     /**
@@ -104,6 +111,7 @@ public class LoginServiceImpl implements LoginService {
         user.setRole(account.getRole());
         BigInteger date = MyDateUtils.TimeMillSecond2Second(new DateTime());
         user.setExpireTime(date);
+        user.setId(account.getUserId());
         return user;
     }
 }

xymanager_service/src/main/java/com/shxy/xymanager_service/service/LoginService.java

@@ -17,7 +17,7 @@ public interface LoginService {
 
     ServiceBody<String> login(String username, String password) throws Exception;
 
-    ServiceBody<String> remoteLogin(SysUser sysUser) throws Exception;
+    ServiceBody<UserSession> remoteLogin(SysUser sysUser);
 
     UserSession getLoginUser(SysUser sysUser) throws Exception;