|
@@ -12,6 +12,7 @@ import com.fdkankan.manage.vo.response.SceneVo;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
@@ -23,13 +24,15 @@ public class LaserService {
|
|
|
|
|
|
@Resource
|
|
|
LaserClient laserClient;
|
|
|
-
|
|
|
+ @Value("${4dkk.laserService.basePath}")
|
|
|
+ private String basePath;
|
|
|
|
|
|
public PageInfo pageList(SceneParam param) {
|
|
|
LaserSceneParam newParam = new LaserSceneParam();
|
|
|
BeanUtils.copyProperties(param,newParam);
|
|
|
newParam.setTitle(param.getSceneName());
|
|
|
FdkkResponse response = laserClient.sceneList(newParam);
|
|
|
+
|
|
|
JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(response.getData()));
|
|
|
JSONArray list = jsonObject.getJSONArray("list");
|
|
|
long total =jsonObject.getLong("total");
|
|
@@ -43,6 +46,9 @@ public class LaserService {
|
|
|
vo.setStatusString(getLaserStatus(vo.getStatus()));
|
|
|
vo.setSceneName(obj.getString("title"));
|
|
|
vo.setUserName(obj.getString("phone"));
|
|
|
+
|
|
|
+ basePath = basePath.contains("uat")? basePath += "/uat" : basePath;
|
|
|
+ vo.setThumb(basePath +"/index.html?m="+vo.getNum() );
|
|
|
sceneVoList.add(vo);
|
|
|
}
|
|
|
|