Subversion Repositories SmartDukaan

Rev

Rev 37184 | Rev 37214 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 37184 Rev 37208
Line 3... Line 3...
3
import com.google.gson.Gson;
3
import com.google.gson.Gson;
4
import com.jcraft.jsch.*;
4
import com.jcraft.jsch.*;
5
import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
5
import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
6
import com.spice.profitmandi.common.solr.SolrService;
6
import com.spice.profitmandi.common.solr.SolrService;
7
import com.spice.profitmandi.dao.entity.auth.AuthUser;
7
import com.spice.profitmandi.dao.entity.auth.AuthUser;
-
 
8
import com.spice.profitmandi.dao.entity.catalog.Catalog;
8
import com.spice.profitmandi.dao.entity.catalog.Item;
9
import com.spice.profitmandi.dao.entity.catalog.Item;
9
import com.spice.profitmandi.dao.entity.catalog.MonitorType;
10
import com.spice.profitmandi.dao.entity.catalog.MonitorType;
10
import com.spice.profitmandi.dao.entity.cs.Bulletin;
11
import com.spice.profitmandi.dao.entity.cs.Bulletin;
11
import com.spice.profitmandi.dao.entity.cs.PartnerRegion;
12
import com.spice.profitmandi.dao.entity.cs.PartnerRegion;
12
import com.spice.profitmandi.dao.entity.cs.Region;
13
import com.spice.profitmandi.dao.entity.cs.Region;
Line 474... Line 475...
474
				cp.setKeySpecs(Arrays
475
				cp.setKeySpecs(Arrays
475
						.asList(record.get(KeySpec1), record.get(KeySpec2), record.get(KeySpec3), record.get(KeySpec4))
476
						.asList(record.get(KeySpec1), record.get(KeySpec2), record.get(KeySpec3), record.get(KeySpec4))
476
						.stream().filter(x -> x != null && !x.equals("")).collect(Collectors.toList()));
477
						.stream().filter(x -> x != null && !x.equals("")).collect(Collectors.toList()));
477
				cp.setPackageContents(Arrays.asList(record.get(Package_Contents).split(",")));
478
				cp.setPackageContents(Arrays.asList(record.get(Package_Contents).split(",")));
478
				cp.setDetailedSpecs(getDetailedSpecs(record));
479
				cp.setDetailedSpecs(getDetailedSpecs(record));
-
 
480
				if (cp.getCategoryId() == null) {
-
 
481
					Catalog catalog = catalogRepository.selectCatalogById(Math.toIntExact(entityId));
-
 
482
					if (catalog != null) {
-
 
483
						cp.setCategoryId(catalog.getCategoryId());
-
 
484
					}
-
 
485
				}
479
				returnList.add(cp);
486
				returnList.add(cp);
480
			} catch (Exception e) {
487
			} catch (Exception e) {
481
				continue;
488
				continue;
482
			}
489
			}
483
		}
490
		}