diff options
Diffstat (limited to 'server/src/main/java/org/onap/usecaseui/server/service/intent')
2 files changed, 10 insertions, 10 deletions
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java index c47cdc15..372a0c1b 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java @@ -18,7 +18,7 @@ package org.onap.usecaseui.server.service.intent.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; @@ -46,8 +46,8 @@ import org.springframework.stereotype.Service; import retrofit2.Call; import retrofit2.Response; -import javax.annotation.Resource; -import javax.transaction.Transactional; +import jakarta.annotation.Resource; +import jakarta.transaction.Transactional; import java.io.*; import java.text.SimpleDateFormat; import java.util.*; @@ -103,11 +103,11 @@ public class IntentInstanceServiceImpl implements IntentInstanceService { if (null != instance) { if(UuiCommonUtil.isNotNullOrEmpty(instance.getInstanceId())) { String ver =instance.getInstanceId(); - hql.append(" and a.instance_id = '"+ver+"'"); + hql.append(" and a.instanceId = '"+ver+"'"); } if(UuiCommonUtil.isNotNullOrEmpty(instance.getJobId())) { String ver =instance.getJobId(); - hql.append(" and a.job_id = '"+ver+"'"); + hql.append(" and a.jobId = '"+ver+"'"); } if(UuiCommonUtil.isNotNullOrEmpty(instance.getStatus())) { String ver =instance.getStatus(); @@ -141,11 +141,11 @@ public class IntentInstanceServiceImpl implements IntentInstanceService { if (null != instance) { if(UuiCommonUtil.isNotNullOrEmpty(instance.getInstanceId())) { String ver =instance.getInstanceId(); - count.append(" and a.instance_id = '"+ver+"'"); + count.append(" and a.instanceId = '"+ver+"'"); } if(UuiCommonUtil.isNotNullOrEmpty(instance.getJobId())) { String ver =instance.getJobId(); - count.append(" and a.job_id = '"+ver+"'"); + count.append(" and a.jobId = '"+ver+"'"); } if(UuiCommonUtil.isNotNullOrEmpty(instance.getStatus())) { String ver =instance.getStatus(); diff --git a/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentServiceImpl.java index 6d2911a7..57262e63 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentServiceImpl.java @@ -22,11 +22,11 @@ import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; @@ -91,7 +91,7 @@ public class IntentServiceImpl implements IntentService { public List<IntentModel> listModels(){ try(Session session = getSession()){ - StringBuffer hql =new StringBuffer("from IntentModel a where 1=1 order by create_time "); + StringBuffer hql =new StringBuffer("from IntentModel a where 1=1 order by createTime "); Query query = session.createQuery(hql.toString()); //query.setString("sortType",sortType); List<IntentModel> list= query.list(); |