From dc38d2b63bd35f8e0f67b0f300b587b0575e9bb1 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期一, 11 十月 2021 17:44:53 +0800
Subject: [PATCH] 整合飞羽监管企业用户问题整改功能模块对应的接口功能 1. 修改用户信息获取接口，新增飞羽环境用户在飞羽监管中对应的用户id 用户评分表修改 1. 修复用户评分表获取错乱问题
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/AccessToken.kt | 3 +++
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/UserinfoServiceImpl.kt | 21 +++++++++++++++------
src/main/kotlin/cn/flightfeather/supervision/lightshare/CORSFilter.kt | 1 -
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/EvaluationruleServiceImpl.kt | 2 +-
4 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/CORSFilter.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/CORSFilter.kt
index a2be87a..b7d0861 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/CORSFilter.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/CORSFilter.kt
@@ -32,7 +32,6 @@
response.setHeader("Access-Control-Max-Age", "3600")
response.setHeader("Access-Control-Allow-Headers", "Content-Type,Access-Token,Authorization,ybg")
filterChain.doFilter(servletRequest, servletResponse)
- println("filter==========================")
}
override fun destroy() {
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/EvaluationruleServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/EvaluationruleServiceImpl.kt
index c19974c..6b3d0c3 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/EvaluationruleServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/EvaluationruleServiceImpl.kt
@@ -49,7 +49,7 @@
return if (resultList.isEmpty()) {
//榛樿杩斿洖宸ヤ笟浼佷笟绫诲瀷鐨勮瘎鍒嗚〃鏍�
evaluationruleMapper.selectByExample(Example(Evaluationrule::class.java).apply {
- val criteria1 = example.createCriteria()
+ val criteria1 = createCriteria()
erGuid?.let { criteria1.andEqualTo("guid", it) }
criteria1.andEqualTo("scensetypeid", SceneType.Industrial.value.toByte())
})
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/UserinfoServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/UserinfoServiceImpl.kt
index 21c3102..e27c237 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/UserinfoServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/Impl/UserinfoServiceImpl.kt
@@ -16,11 +16,12 @@
@Service
class UserinfoServiceImpl(
- val userinfoMapper: UserinfoMapper,
- val baseInfoMapper: BaseInfoMapper,
- val companyMapper: CompanyMapper,
- val restaurantBaseInfoMapper: RestaurantBaseInfoMapper,
- val vehicleBaseInfoMapper: VehicleBaseInfoMapper
+ val userinfoMapper: UserinfoMapper,
+ val baseInfoMapper: BaseInfoMapper,
+ val companyMapper: CompanyMapper,
+ val restaurantBaseInfoMapper: RestaurantBaseInfoMapper,
+ val vehicleBaseInfoMapper: VehicleBaseInfoMapper,
+ val userMapMapper: UserMapMapper
) : UserinfoService {
//鏍规嵁userinfo鏉′欢鏌ヨ
@@ -36,7 +37,13 @@
}
}
- override fun findOne(id: String): Userinfo = userinfoMapper.selectByPrimaryKey(id)
+ override fun findOne(id: String): Userinfo{
+ val userInfo = userinfoMapper.selectByPrimaryKey(id)
+ userMapMapper.selectByPrimaryKey(id)?.let {
+ userInfo?.extension3 = it.svUserId
+ }
+ return userInfo ?: Userinfo()
+ }
override fun findAll(): MutableList<Userinfo> = userinfoMapper.selectAll()
@@ -55,6 +62,8 @@
return AccessToken().apply {
if (result.isNotEmpty()) {
userId = result[0].guid
+ val sUser = userMapMapper.selectByPrimaryKey(userId)
+ sUserId = sUser?.svUserId
success = true
} else {
success = false
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/AccessToken.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/AccessToken.kt
index b758772..c6ca2e7 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/AccessToken.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/AccessToken.kt
@@ -6,6 +6,9 @@
* 鐧诲綍鎴愬姛鐨則oken杩斿洖瀵硅薄
*/
class AccessToken {
+ // 椋炵窘鐜涓殑鐢ㄦ埛id
var userId: String? = null
+ // 瀵瑰簲椋炵窘鐩戠涓殑鐢ㄦ埛id
+ var sUserId: String? = null
var success: Boolean = false
}
--
Gitblit v1.9.3