整合飞羽监管企业用户问题整改功能模块对应的接口功能 1. 修改用户信息获取接口，新增飞羽环境用户在飞羽监管中对应的用户id 用户评分表修改 1. 修复...

feiyu02

2021-10-11 dc38d2b63bd35f8e0f67b0f300b587b0575e9bb1

整合飞羽监管企业用户问题整改功能模块对应的接口功能
1. 修改用户信息获取接口，新增飞羽环境用户在飞羽监管中对应的用户id
用户评分表修改
1. 修复用户评分表获取错乱问题

 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() {

 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())
            })

 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

 src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/AccessToken.kt

@@ -6,6 +6,9 @@
 * 登录成功的token返回对象
 */
class AccessToken {
    // 飞羽环境中的用户id
    var userId: String? = null
    // 对应飞羽监管中的用户id
    var sUserId: String? = null
    var success: Boolean = false
}