Commit 8b610ab0 by 陶光胜

回写修改

parent af9a21d1
...@@ -16,10 +16,7 @@ import com.gic.plug.web.qo.StoreWidgetCountQO; ...@@ -16,10 +16,7 @@ import com.gic.plug.web.qo.StoreWidgetCountQO;
import com.gic.plug.web.qo.StoreWidgetQO; import com.gic.plug.web.qo.StoreWidgetQO;
import com.gic.plug.web.strategy.init.StrategyInit; import com.gic.plug.web.strategy.init.StrategyInit;
import com.gic.plug.web.utils.StoreRegionAuthUtil; import com.gic.plug.web.utils.StoreRegionAuthUtil;
import com.gic.plug.web.vo.StoreRegionVO; import com.gic.plug.web.vo.*;
import com.gic.plug.web.vo.StoreResourceVO;
import com.gic.plug.web.vo.StoreVO;
import com.gic.plug.web.vo.StoreWidgetVO;
import com.gic.search.business.api.constant.enums.OperateEnum; import com.gic.search.business.api.constant.enums.OperateEnum;
import com.gic.store.constant.StoreESFieldsEnum; import com.gic.store.constant.StoreESFieldsEnum;
import com.gic.store.dto.StoreInfoDTO; import com.gic.store.dto.StoreInfoDTO;
...@@ -168,39 +165,32 @@ public class StoreController { ...@@ -168,39 +165,32 @@ public class StoreController {
return RestResponse.success(new StoreResourceVO()); return RestResponse.success(new StoreResourceVO());
} }
private String getScreenBack(String param) throws ClassNotFoundException { private ScreenBackVO getScreenBack(String param) throws ClassNotFoundException {
if(StringUtils.isBlank(param)){ if(StringUtils.isBlank(param)){
return ""; return null;
} }
Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId(); Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
JSONArray array = JSON.parseArray(param); JSONArray array = JSON.parseArray(param);
StringBuilder backMessage = new StringBuilder();
for(int i=0; i< array.size(); i++){ for(int i=0; i< array.size(); i++){
JSONObject jsonObject = array.getJSONObject(i); JSONObject jsonObject = array.getJSONObject(i);
ScreenBackVO screenBackVO = new ScreenBackVO();
List<ScreenBack> data = new ArrayList<>();
String type = jsonObject.getString("type"); String type = jsonObject.getString("type");
if(StringUtils.isNotBlank(type)){ if(StringUtils.isNotBlank(type)){
if(OperateEnum.OPERATE_AND_NOT.getValue().equals(type)){ screenBackVO.setType(type);
backMessage.append(OperateEnum.OPERATE_AND_NOT.getDescribe()).append(" ");
}
if(OperateEnum.OPERATE_OR.getValue().equals(type)){
backMessage.append(OperateEnum.OPERATE_OR.getDescribe()).append(" ");
}
} }
JSONArray list = jsonObject.getJSONArray("list"); JSONArray list = jsonObject.getJSONArray("list");
StringBuilder stringBuilder = new StringBuilder();
for(int j = 0; j<list.size(); j++){ for(int j = 0; j<list.size(); j++){
JSONObject json = list.getJSONObject(j); JSONObject json = list.getJSONObject(j);
String key = json.getJSONObject("data").getString("key"); String key = json.getJSONObject("data").getString("key");
String value = json.getJSONObject("data").getString("value"); String value = json.getJSONObject("data").getString("value");
String compute = json.getJSONObject("data").getString("compute"); String compute = json.getJSONObject("data").getString("compute");
String message = this.strategyInit.getStrategyMap().get(key).screenBack(compute, value, key, enterpriseId); ScreenBack screenBack = this.strategyInit.getStrategyMap().get(key).screenBack(compute, value, key, enterpriseId);
stringBuilder.append(message); data.add(screenBack);
if(j < list.size()-1){
stringBuilder.append("并且");
}
} }
backMessage.append(stringBuilder); screenBackVO.setData(data);
return screenBackVO;
} }
return backMessage.toString(); return null;
} }
} }
package com.gic.plug.web.strategy; package com.gic.plug.web.strategy;
import com.gic.plug.web.vo.ScreenBack;
public interface ScreenBackStrategy { public interface ScreenBackStrategy {
String screenBack(String compute, String value, String key, Integer enterpriseId) throws ClassNotFoundException; ScreenBack screenBack(String compute, String value, String key, Integer enterpriseId) throws ClassNotFoundException;
} }
...@@ -3,6 +3,7 @@ package com.gic.plug.web.strategy.impl; ...@@ -3,6 +3,7 @@ package com.gic.plug.web.strategy.impl;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.plug.web.strategy.ScreenBackStrategy; import com.gic.plug.web.strategy.ScreenBackStrategy;
import com.gic.plug.web.utils.ComputeBackUtil; import com.gic.plug.web.utils.ComputeBackUtil;
import com.gic.plug.web.vo.ScreenBack;
import com.gic.store.constant.StoreESFieldsEnum; import com.gic.store.constant.StoreESFieldsEnum;
import com.gic.store.dto.CityDTO; import com.gic.store.dto.CityDTO;
import com.gic.store.dto.ProvinceDTO; import com.gic.store.dto.ProvinceDTO;
...@@ -12,6 +13,7 @@ import org.apache.commons.lang.StringUtils; ...@@ -12,6 +13,7 @@ import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@Component @Component
...@@ -19,16 +21,20 @@ public class StoreAreaBackImpl implements ScreenBackStrategy { ...@@ -19,16 +21,20 @@ public class StoreAreaBackImpl implements ScreenBackStrategy {
@Autowired @Autowired
private ProvincesApiService provincesApiService; private ProvincesApiService provincesApiService;
@Override @Override
public String screenBack(String compute, String value, String key, Integer enterpriseId) { public ScreenBack screenBack(String compute, String value, String key, Integer enterpriseId) {
if(StringUtils.isNotBlank(value)){ if(StringUtils.isNotBlank(value)){
ServiceResponse<List<CityDTO>> cityResponse = this.provincesApiService.selectAllCity(); ServiceResponse<List<CityDTO>> cityResponse = this.provincesApiService.selectAllCity();
StringBuilder stringBuilder = new StringBuilder(StoreESFieldsEnum.AREAIDS.getDesc()).append(" "); ScreenBack screenBack = new ScreenBack();
stringBuilder.append(ComputeBackUtil.getComputeBack(compute)).append(" "); screenBack.setTitle(StoreESFieldsEnum.AREAIDS.getDesc());
screenBack.setCompute(ComputeBackUtil.getComputeBack(compute));
if(cityResponse.isSuccess()){ if(cityResponse.isSuccess()){
List<CityDTO> cityDTOList = cityResponse.getResult(); List<CityDTO> cityDTOList = cityResponse.getResult();
if(CollectionUtils.isNotEmpty(cityDTOList)){ if(CollectionUtils.isNotEmpty(cityDTOList)){
String[] valueArr = value.split(" "); String[] valueArr = value.split(" ");
List<String> view = new ArrayList<>();
List<String> hideView = new ArrayList<>();
for(CityDTO cityDTO : cityDTOList){ for(CityDTO cityDTO : cityDTOList){
int index = 0;
for(String s : valueArr){ for(String s : valueArr){
if(s.equals(cityDTO.getCityId())){ if(s.equals(cityDTO.getCityId())){
String provinceName = ""; String provinceName = "";
...@@ -36,13 +42,20 @@ public class StoreAreaBackImpl implements ScreenBackStrategy { ...@@ -36,13 +42,20 @@ public class StoreAreaBackImpl implements ScreenBackStrategy {
if(provinceById.isSuccess()){ if(provinceById.isSuccess()){
provinceName = provinceById.getResult().getProvinceName(); provinceName = provinceById.getResult().getProvinceName();
} }
stringBuilder.append("【").append(cityDTO.getCityName()).append("-").append(provinceName).append("】"); if(index < 5){
view.add(cityDTO.getCityName() + "-" + provinceName);
}else {
hideView.add(cityDTO.getCityName() + "-" + provinceName);
} }
index++;
} }
} }
} }
screenBack.setView(view);
screenBack.setHideView(hideView);
} }
return stringBuilder.toString(); }
return screenBack;
} }
return null; return null;
} }
......
...@@ -5,6 +5,7 @@ import com.gic.api.base.commons.Page; ...@@ -5,6 +5,7 @@ import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.plug.web.strategy.ScreenBackStrategy; import com.gic.plug.web.strategy.ScreenBackStrategy;
import com.gic.plug.web.utils.ComputeBackUtil; import com.gic.plug.web.utils.ComputeBackUtil;
import com.gic.plug.web.vo.ScreenBack;
import com.gic.store.constant.StoreESFieldsEnum; import com.gic.store.constant.StoreESFieldsEnum;
import com.gic.store.dto.StoreDTO; import com.gic.store.dto.StoreDTO;
import com.gic.store.dto.StoreSearchDTO; import com.gic.store.dto.StoreSearchDTO;
...@@ -14,6 +15,7 @@ import org.apache.commons.lang.StringUtils; ...@@ -14,6 +15,7 @@ import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@Component @Component
...@@ -21,10 +23,11 @@ public class StoreBackImpl implements ScreenBackStrategy { ...@@ -21,10 +23,11 @@ public class StoreBackImpl implements ScreenBackStrategy {
@Autowired @Autowired
private StoreApiService storeApiService; private StoreApiService storeApiService;
@Override @Override
public String screenBack(String compute, String value, String key, Integer enterpriseId) { public ScreenBack screenBack(String compute, String value, String key, Integer enterpriseId) {
if(StringUtils.isNotBlank(value)){ if(StringUtils.isNotBlank(value)){
StringBuilder stringBuilder = new StringBuilder(StoreESFieldsEnum.STORENAME.getDesc()).append(" "); ScreenBack screenBack = new ScreenBack();
stringBuilder.append(ComputeBackUtil.getComputeBack(compute)).append(" "); screenBack.setTitle(StoreESFieldsEnum.STORENAME.getDesc());
screenBack.setCompute(ComputeBackUtil.getComputeBack(compute));
StoreSearchDTO storeSearchDTO = new StoreSearchDTO(); StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
storeSearchDTO.setEnterpriseId(enterpriseId); storeSearchDTO.setEnterpriseId(enterpriseId);
storeSearchDTO.setStoreIds(value); storeSearchDTO.setStoreIds(value);
...@@ -32,13 +35,22 @@ public class StoreBackImpl implements ScreenBackStrategy { ...@@ -32,13 +35,22 @@ public class StoreBackImpl implements ScreenBackStrategy {
if(response.isSuccess()){ if(response.isSuccess()){
List<StoreDTO> list = ((Page)response.getResult()).getResult(); List<StoreDTO> list = ((Page)response.getResult()).getResult();
if(CollectionUtils.isNotEmpty(list)){ if(CollectionUtils.isNotEmpty(list)){
List<String> view = new ArrayList<>();
List<String> hideView = new ArrayList<>();
int index = 0;
for (StoreDTO storeDTO : list) { for (StoreDTO storeDTO : list) {
JSONObject jsonObject = (JSONObject) JSONObject.toJSON(storeDTO); if(index < 5){
stringBuilder.append("【").append(jsonObject.getString(StoreESFieldsEnum.STORENAME.getField())).append("】").append(" "); view.add(storeDTO.getStoreName());
}else {
hideView.add(storeDTO.getStoreName());
} }
index++;
} }
screenBack.setView(view);
screenBack.setHideView(hideView);
} }
return stringBuilder.toString(); }
return screenBack;
} }
return null; return null;
} }
......
...@@ -3,6 +3,7 @@ package com.gic.plug.web.strategy.impl; ...@@ -3,6 +3,7 @@ package com.gic.plug.web.strategy.impl;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.plug.web.strategy.ScreenBackStrategy; import com.gic.plug.web.strategy.ScreenBackStrategy;
import com.gic.plug.web.utils.ComputeBackUtil; import com.gic.plug.web.utils.ComputeBackUtil;
import com.gic.plug.web.vo.ScreenBack;
import com.gic.store.constant.StoreESFieldsEnum; import com.gic.store.constant.StoreESFieldsEnum;
import com.gic.store.dto.StoreBrandDTO; import com.gic.store.dto.StoreBrandDTO;
import com.gic.store.service.StoreBrandApiService; import com.gic.store.service.StoreBrandApiService;
...@@ -18,10 +19,11 @@ public class StoreBrandBackImpl implements ScreenBackStrategy { ...@@ -18,10 +19,11 @@ public class StoreBrandBackImpl implements ScreenBackStrategy {
@Autowired @Autowired
private StoreBrandApiService storeBrandApiService; private StoreBrandApiService storeBrandApiService;
@Override @Override
public String screenBack(String compute, String value, String key, Integer enterpriseId) { public ScreenBack screenBack(String compute, String value, String key, Integer enterpriseId) {
if(StringUtils.isNotBlank(value)){ if(StringUtils.isNotBlank(value)){
StringBuilder stringBuilder = new StringBuilder(StoreESFieldsEnum.STOREBRANDIDLIST.getDesc()).append(" "); ScreenBack screenBack = new ScreenBack();
stringBuilder.append(ComputeBackUtil.getComputeBack(compute)).append(" "); screenBack.setTitle(StoreESFieldsEnum.STOREBRANDIDLIST.getDesc());
screenBack.setCompute(ComputeBackUtil.getComputeBack(compute));
List<Integer> storeBrandIdList = new ArrayList<>(); List<Integer> storeBrandIdList = new ArrayList<>();
String[] valueArr = value.split(" "); String[] valueArr = value.split(" ");
for(String s : valueArr){ for(String s : valueArr){
...@@ -30,11 +32,21 @@ public class StoreBrandBackImpl implements ScreenBackStrategy { ...@@ -30,11 +32,21 @@ public class StoreBrandBackImpl implements ScreenBackStrategy {
ServiceResponse<List<StoreBrandDTO>> listServiceResponse = this.storeBrandApiService.listStoreBrandByIds(storeBrandIdList); ServiceResponse<List<StoreBrandDTO>> listServiceResponse = this.storeBrandApiService.listStoreBrandByIds(storeBrandIdList);
if(listServiceResponse.isSuccess()){ if(listServiceResponse.isSuccess()){
List<StoreBrandDTO> list = listServiceResponse.getResult(); List<StoreBrandDTO> list = listServiceResponse.getResult();
List<String> view = new ArrayList<>();
List<String> hideView = new ArrayList<>();
int index = 0;
for(StoreBrandDTO storeBrandDTO : list){ for(StoreBrandDTO storeBrandDTO : list){
stringBuilder.append("【").append(storeBrandDTO.getStoreBrandName()).append("】").append(" "); if(index <5){
view.add(storeBrandDTO.getStoreBrandName());
}else {
hideView.add(storeBrandDTO.getStoreBrandName());
} }
index++;
} }
return stringBuilder.toString(); screenBack.setView(view);
screenBack.setHideView(hideView);
}
return screenBack;
} }
return null; return null;
} }
......
...@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; ...@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.plug.web.strategy.ScreenBackStrategy; import com.gic.plug.web.strategy.ScreenBackStrategy;
import com.gic.plug.web.utils.ComputeBackUtil; import com.gic.plug.web.utils.ComputeBackUtil;
import com.gic.plug.web.vo.ScreenBack;
import com.gic.redis.data.util.RedisUtil; import com.gic.redis.data.util.RedisUtil;
import com.gic.store.constant.StoreFieldDateEnum; import com.gic.store.constant.StoreFieldDateEnum;
import com.gic.store.constant.StoreFieldTypeEnum; import com.gic.store.constant.StoreFieldTypeEnum;
...@@ -46,7 +47,7 @@ public class StoreCustomBackImpl implements ScreenBackStrategy { ...@@ -46,7 +47,7 @@ public class StoreCustomBackImpl implements ScreenBackStrategy {
} }
@Override @Override
public String screenBack(String compute, String value, String key, Integer enterpriseId) { public ScreenBack screenBack(String compute, String value, String key, Integer enterpriseId) {
if (StringUtils.isNotBlank(value)) { if (StringUtils.isNotBlank(value)) {
Object cache = RedisUtil.getCache(StoreRedisKeyUtils.getStoreFieldKeyC(enterpriseId, key)); Object cache = RedisUtil.getCache(StoreRedisKeyUtils.getStoreFieldKeyC(enterpriseId, key));
if (cache != null) { if (cache != null) {
...@@ -67,9 +68,10 @@ public class StoreCustomBackImpl implements ScreenBackStrategy { ...@@ -67,9 +68,10 @@ public class StoreCustomBackImpl implements ScreenBackStrategy {
return null; return null;
} }
private String dateBack(String compute, String value, StoreFieldDTO storeFieldDTO) { private ScreenBack dateBack(String compute, String value, StoreFieldDTO storeFieldDTO) {
StringBuilder stringBuilder = new StringBuilder(storeFieldDTO.getStoreFieldName()).append(" "); ScreenBack screenBack = new ScreenBack();
stringBuilder.append(ComputeBackUtil.getComputeBack(compute)).append(" "); screenBack.setTitle(storeFieldDTO.getStoreFieldName());
screenBack.setCompute(ComputeBackUtil.getComputeBack(compute));
JSONObject jsonObject = JSON.parseObject(storeFieldDTO.getStoreFieldDetail()); JSONObject jsonObject = JSON.parseObject(storeFieldDTO.getStoreFieldDetail());
int dateType = jsonObject.getIntValue("dateType"); int dateType = jsonObject.getIntValue("dateType");
String methodName = this.methodMap.get(dateType); String methodName = this.methodMap.get(dateType);
...@@ -79,7 +81,9 @@ public class StoreCustomBackImpl implements ScreenBackStrategy { ...@@ -79,7 +81,9 @@ public class StoreCustomBackImpl implements ScreenBackStrategy {
Method method = this.getClass().getMethod(methodName, Class.forName(value.getClass().getCanonicalName())); Method method = this.getClass().getMethod(methodName, Class.forName(value.getClass().getCanonicalName()));
try { try {
String message = (String) method.invoke(this, value); String message = (String) method.invoke(this, value);
return stringBuilder.append(message).toString(); List<String> view = new ArrayList<>();
view.add(message);
return screenBack;
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
e.printStackTrace(); e.printStackTrace();
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {
...@@ -95,9 +99,10 @@ public class StoreCustomBackImpl implements ScreenBackStrategy { ...@@ -95,9 +99,10 @@ public class StoreCustomBackImpl implements ScreenBackStrategy {
return null; return null;
} }
private String selectBack(String compute, String value, Integer enterpriseId, StoreFieldDTO storeFieldDTO) { private ScreenBack selectBack(String compute, String value, Integer enterpriseId, StoreFieldDTO storeFieldDTO) {
StringBuilder stringBuilder = new StringBuilder(storeFieldDTO.getStoreFieldName()).append(" "); ScreenBack screenBack = new ScreenBack();
stringBuilder.append(ComputeBackUtil.getComputeBack(compute)).append(" "); screenBack.setTitle(storeFieldDTO.getStoreFieldName());
screenBack.setCompute(ComputeBackUtil.getComputeBack(compute));
List<Integer> list = new ArrayList<>(); List<Integer> list = new ArrayList<>();
String[] valueArr = value.split(" "); String[] valueArr = value.split(" ");
for (String s : valueArr) { for (String s : valueArr) {
...@@ -106,26 +111,40 @@ public class StoreCustomBackImpl implements ScreenBackStrategy { ...@@ -106,26 +111,40 @@ public class StoreCustomBackImpl implements ScreenBackStrategy {
ServiceResponse<List<StoreFieldSelectDTO>> listServiceResponse = this.storeFieldSelectApiService.listStoreFieldSelectByIds(enterpriseId, list); ServiceResponse<List<StoreFieldSelectDTO>> listServiceResponse = this.storeFieldSelectApiService.listStoreFieldSelectByIds(enterpriseId, list);
if (listServiceResponse.isSuccess()) { if (listServiceResponse.isSuccess()) {
List<StoreFieldSelectDTO> selectDTOS = listServiceResponse.getResult(); List<StoreFieldSelectDTO> selectDTOS = listServiceResponse.getResult();
List<String> view = new ArrayList<>();
List<String> hideView = new ArrayList<>();
int index = 0;
if (CollectionUtils.isNotEmpty(selectDTOS)) { if (CollectionUtils.isNotEmpty(selectDTOS)) {
for (StoreFieldSelectDTO dto : selectDTOS) { for (StoreFieldSelectDTO dto : selectDTOS) {
stringBuilder.append("【").append(dto.getStoreFieldSelectName()).append("】").append(" "); if(index < 5){
view.add(dto.getStoreFieldSelectName());
} else {
hideView.add(dto.getStoreFieldSelectName());
} }
} }
} }
return stringBuilder.toString(); screenBack.setView(view);
screenBack.setHideView(hideView);
}
return screenBack;
} }
private String numberBack(String compute, String value, StoreFieldDTO storeFieldDTO){ private ScreenBack numberBack(String compute, String value, StoreFieldDTO storeFieldDTO){
StringBuilder stringBuilder = new StringBuilder(storeFieldDTO.getStoreFieldName()).append(" "); StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append(ComputeBackUtil.getComputeBack(compute)).append(" "); ScreenBack screenBack = new ScreenBack();
screenBack.setTitle(storeFieldDTO.getStoreFieldName());
screenBack.setCompute(ComputeBackUtil.getComputeBack(compute));
List<String> view = new ArrayList<>();
if(StringUtils.isNotBlank(value)){ if(StringUtils.isNotBlank(value)){
String[] valueArr = value.split(" "); String[] valueArr = value.split(" ");
stringBuilder.append(valueArr[0]); stringBuilder.append(valueArr[0]);
if(valueArr.length > 1){ if(valueArr.length > 1){
stringBuilder.append(" 至 ").append(valueArr[1]); stringBuilder.append(" 至 ").append(valueArr[1]);
} }
view.add(stringBuilder.toString());
} }
return stringBuilder.toString(); screenBack.setView(view);
return screenBack;
} }
public String yyyyMMddHHmmssBack(String value) throws ParseException { public String yyyyMMddHHmmssBack(String value) throws ParseException {
......
...@@ -3,6 +3,7 @@ package com.gic.plug.web.strategy.impl; ...@@ -3,6 +3,7 @@ package com.gic.plug.web.strategy.impl;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.plug.web.strategy.ScreenBackStrategy; import com.gic.plug.web.strategy.ScreenBackStrategy;
import com.gic.plug.web.utils.ComputeBackUtil; import com.gic.plug.web.utils.ComputeBackUtil;
import com.gic.plug.web.vo.ScreenBack;
import com.gic.store.constant.StoreESFieldsEnum; import com.gic.store.constant.StoreESFieldsEnum;
import com.gic.store.dto.StoreGroupDTO; import com.gic.store.dto.StoreGroupDTO;
import com.gic.store.service.StoreGroupApiService; import com.gic.store.service.StoreGroupApiService;
...@@ -18,10 +19,11 @@ public class StoreGroupBackImpl implements ScreenBackStrategy { ...@@ -18,10 +19,11 @@ public class StoreGroupBackImpl implements ScreenBackStrategy {
@Autowired @Autowired
private StoreGroupApiService storeGroupApiService; private StoreGroupApiService storeGroupApiService;
@Override @Override
public String screenBack(String compute, String value, String key, Integer enterpriseId) { public ScreenBack screenBack(String compute, String value, String key, Integer enterpriseId) {
if(StringUtils.isNotBlank(value)){ if(StringUtils.isNotBlank(value)){
StringBuilder stringBuilder = new StringBuilder(StoreESFieldsEnum.STOREGROUPIDLIST.getDesc()).append(" "); ScreenBack screenBack = new ScreenBack();
stringBuilder.append(ComputeBackUtil.getComputeBack(compute)).append(" "); screenBack.setTitle(StoreESFieldsEnum.STOREGROUPIDLIST.getDesc());
screenBack.setCompute(ComputeBackUtil.getComputeBack(compute));
String[] valueArr = value.split(" "); String[] valueArr = value.split(" ");
List<Integer> storeGroupIdList = new ArrayList<>(); List<Integer> storeGroupIdList = new ArrayList<>();
for(String s : valueArr){ for(String s : valueArr){
...@@ -30,12 +32,22 @@ public class StoreGroupBackImpl implements ScreenBackStrategy { ...@@ -30,12 +32,22 @@ public class StoreGroupBackImpl implements ScreenBackStrategy {
ServiceResponse<List<StoreGroupDTO>> listServiceResponse = this.storeGroupApiService.listStoreGroupByIds(storeGroupIdList, enterpriseId); ServiceResponse<List<StoreGroupDTO>> listServiceResponse = this.storeGroupApiService.listStoreGroupByIds(storeGroupIdList, enterpriseId);
if(listServiceResponse.isSuccess()){ if(listServiceResponse.isSuccess()){
if(listServiceResponse.getResult() != null){ if(listServiceResponse.getResult() != null){
List<String> view = new ArrayList<>();
List<String> hideView = new ArrayList<>();
int index=0;
for(StoreGroupDTO storeGroupDTO : listServiceResponse.getResult()){ for(StoreGroupDTO storeGroupDTO : listServiceResponse.getResult()){
stringBuilder.append("【").append(storeGroupDTO.getStoreGroupName()).append("】").append(" "); if(index < 5){
view.add(storeGroupDTO.getStoreGroupName());
} else {
hideView.add(storeGroupDTO.getStoreGroupName());
} }
index++;
} }
screenBack.setView(view);
screenBack.setHideView(hideView);
} }
return stringBuilder.toString(); }
return screenBack;
} }
return null; return null;
} }
......
...@@ -3,6 +3,7 @@ package com.gic.plug.web.strategy.impl; ...@@ -3,6 +3,7 @@ package com.gic.plug.web.strategy.impl;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.plug.web.strategy.ScreenBackStrategy; import com.gic.plug.web.strategy.ScreenBackStrategy;
import com.gic.plug.web.utils.ComputeBackUtil; import com.gic.plug.web.utils.ComputeBackUtil;
import com.gic.plug.web.vo.ScreenBack;
import com.gic.store.constant.StoreESFieldsEnum; import com.gic.store.constant.StoreESFieldsEnum;
import com.gic.store.dto.StoreRegionDTO; import com.gic.store.dto.StoreRegionDTO;
import com.gic.store.service.StoreRegionApiService; import com.gic.store.service.StoreRegionApiService;
...@@ -18,10 +19,11 @@ public class StoreRegionBackImpl implements ScreenBackStrategy { ...@@ -18,10 +19,11 @@ public class StoreRegionBackImpl implements ScreenBackStrategy {
@Autowired @Autowired
private StoreRegionApiService storeRegionApiService; private StoreRegionApiService storeRegionApiService;
@Override @Override
public String screenBack(String compute, String value, String key, Integer enterpriseId) { public ScreenBack screenBack(String compute, String value, String key, Integer enterpriseId) {
if(StringUtils.isNotBlank(value)){ if(StringUtils.isNotBlank(value)){
StringBuilder stringBuilder = new StringBuilder(StoreESFieldsEnum.REGIONID.getDesc()).append(" "); ScreenBack screenBack = new ScreenBack();
stringBuilder.append(ComputeBackUtil.getComputeBack(compute)).append(" "); screenBack.setTitle(StoreESFieldsEnum.REGIONID.getDesc());
screenBack.setCompute(ComputeBackUtil.getComputeBack(compute));
String[] valueArr = value.split(" "); String[] valueArr = value.split(" ");
List<Integer> storeRegionIdList = new ArrayList<>(); List<Integer> storeRegionIdList = new ArrayList<>();
for(String s : valueArr){ for(String s : valueArr){
...@@ -30,12 +32,20 @@ public class StoreRegionBackImpl implements ScreenBackStrategy { ...@@ -30,12 +32,20 @@ public class StoreRegionBackImpl implements ScreenBackStrategy {
ServiceResponse<List<StoreRegionDTO>> listServiceResponse = this.storeRegionApiService.listStoreRegionByIds(enterpriseId, storeRegionIdList); ServiceResponse<List<StoreRegionDTO>> listServiceResponse = this.storeRegionApiService.listStoreRegionByIds(enterpriseId, storeRegionIdList);
if(listServiceResponse.isSuccess()){ if(listServiceResponse.isSuccess()){
if(listServiceResponse.getResult() != null){ if(listServiceResponse.getResult() != null){
List<String> view = new ArrayList<>();
List<String> hideView = new ArrayList<>();
int index = 0;
for(StoreRegionDTO storeRegionDTO : listServiceResponse.getResult()){ for(StoreRegionDTO storeRegionDTO : listServiceResponse.getResult()){
stringBuilder.append("【").append(storeRegionDTO.getRegionName()).append("】").append(" "); if(index < 5){
view.add(storeRegionDTO.getRegionName());
} else {
hideView.add(storeRegionDTO.getRegionName());
} }
index++;
} }
} }
return stringBuilder.toString(); }
return screenBack;
} }
return null; return null;
} }
......
...@@ -3,6 +3,7 @@ package com.gic.plug.web.strategy.impl; ...@@ -3,6 +3,7 @@ package com.gic.plug.web.strategy.impl;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.plug.web.strategy.ScreenBackStrategy; import com.gic.plug.web.strategy.ScreenBackStrategy;
import com.gic.plug.web.utils.ComputeBackUtil; import com.gic.plug.web.utils.ComputeBackUtil;
import com.gic.plug.web.vo.ScreenBack;
import com.gic.store.constant.CreateTypeEnum; import com.gic.store.constant.CreateTypeEnum;
import com.gic.store.constant.StoreCompleteEnum; import com.gic.store.constant.StoreCompleteEnum;
import com.gic.store.constant.StoreESFieldsEnum; import com.gic.store.constant.StoreESFieldsEnum;
...@@ -16,6 +17,7 @@ import org.springframework.stereotype.Component; ...@@ -16,6 +17,7 @@ import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -35,7 +37,7 @@ public class StoreSelectBackImpl implements ScreenBackStrategy { ...@@ -35,7 +37,7 @@ public class StoreSelectBackImpl implements ScreenBackStrategy {
methodMap.put(StoreESFieldsEnum.ERPSTATUS.getField(), "erpStatusBack"); methodMap.put(StoreESFieldsEnum.ERPSTATUS.getField(), "erpStatusBack");
} }
@Override @Override
public String screenBack(String compute, String value, String key, Integer enterpriseId){ public ScreenBack screenBack(String compute, String value, String key, Integer enterpriseId){
String methodName = methodMap.get(key); String methodName = methodMap.get(key);
if(StringUtils.isNotBlank(methodName)){ if(StringUtils.isNotBlank(methodName)){
try { try {
...@@ -43,8 +45,8 @@ public class StoreSelectBackImpl implements ScreenBackStrategy { ...@@ -43,8 +45,8 @@ public class StoreSelectBackImpl implements ScreenBackStrategy {
Method method = this.getClass().getMethod(methodName, Class.forName(compute.getClass().getCanonicalName()), Method method = this.getClass().getMethod(methodName, Class.forName(compute.getClass().getCanonicalName()),
Class.forName(value.getClass().getCanonicalName()),Class.forName(enterpriseId.getClass().getCanonicalName())); Class.forName(value.getClass().getCanonicalName()),Class.forName(enterpriseId.getClass().getCanonicalName()));
try { try {
String message = (String)method.invoke(this, compute, value, enterpriseId); Object invoke = method.invoke(this, compute, value, enterpriseId);
return message; return (ScreenBack) invoke;
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
e.printStackTrace(); e.printStackTrace();
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {
...@@ -61,90 +63,125 @@ public class StoreSelectBackImpl implements ScreenBackStrategy { ...@@ -61,90 +63,125 @@ public class StoreSelectBackImpl implements ScreenBackStrategy {
} }
//单选 //单选
public String storeStatusBack(String compute, String value, Integer enterpriseId){ public ScreenBack storeStatusBack(String compute, String value, Integer enterpriseId){
if(StringUtils.isNotBlank(value)){ if(StringUtils.isNotBlank(value)){
StringBuilder stringBuilder = new StringBuilder(StoreESFieldsEnum.STATUS.getDesc()).append(" "); ScreenBack screenBack = new ScreenBack();
stringBuilder.append(ComputeBackUtil.getComputeBack(compute)).append(" "); screenBack.setTitle(StoreESFieldsEnum.STATUS.getDesc());
screenBack.setCompute(ComputeBackUtil.getComputeBack(compute));
List<String> view = new ArrayList<>();
for(StoreStatusEnum storeStatusEnum : StoreStatusEnum.values()){ for(StoreStatusEnum storeStatusEnum : StoreStatusEnum.values()){
if(storeStatusEnum.getCode() == Integer.valueOf(value)){ if(storeStatusEnum.getCode() == Integer.valueOf(value)){
stringBuilder.append("【").append(storeStatusEnum.getMessage()).append("】 "); view.add(storeStatusEnum.getMessage());
} }
} }
return stringBuilder.toString(); screenBack.setView(view);
return screenBack;
} }
return null; return null;
} }
//单选 //单选
public String storeCompleteBack(String compute, String value, Integer enterpriseId){ public ScreenBack storeCompleteBack(String compute, String value, Integer enterpriseId){
if(StringUtils.isNotBlank(value)){ if(StringUtils.isNotBlank(value)){
StringBuilder stringBuilder = new StringBuilder(StoreESFieldsEnum.COMPLETESTATUS.getDesc()).append(" "); ScreenBack screenBack = new ScreenBack();
stringBuilder.append(ComputeBackUtil.getComputeBack(compute)).append(" "); screenBack.setTitle(StoreESFieldsEnum.COMPLETESTATUS.getDesc());
screenBack.setCompute(ComputeBackUtil.getComputeBack(compute));
List<String> view = new ArrayList<>();
for(StoreCompleteEnum storeStatusEnum : StoreCompleteEnum.values()){ for(StoreCompleteEnum storeStatusEnum : StoreCompleteEnum.values()){
if(storeStatusEnum.getCode() == Integer.valueOf(value)){ if(storeStatusEnum.getCode() == Integer.valueOf(value)){
stringBuilder.append("【").append(storeStatusEnum.getMessage()).append("】 "); view.add(storeStatusEnum.getMessage());
} }
} }
return stringBuilder.toString(); screenBack.setView(view);
return screenBack;
} }
return null; return null;
} }
//多选 //多选
public String storeCreateTypeBack(String compute, String value, Integer enterpriseId){ public ScreenBack storeCreateTypeBack(String compute, String value, Integer enterpriseId){
if(StringUtils.isNotBlank(value)){ if(StringUtils.isNotBlank(value)){
StringBuilder stringBuilder = new StringBuilder(StoreESFieldsEnum.CREATETYPE.getDesc()).append(" "); ScreenBack screenBack = new ScreenBack();
stringBuilder.append(ComputeBackUtil.getComputeBack(compute)).append(" "); screenBack.setTitle(StoreESFieldsEnum.CREATETYPE.getDesc());
screenBack.setCompute(ComputeBackUtil.getComputeBack(compute));
List<String> view = new ArrayList<>();
List<String> hideView = new ArrayList<>();
int index = 0;
String[] valueArr = value.split(" "); String[] valueArr = value.split(" ");
for(String v : valueArr){ for(String v : valueArr){
for(CreateTypeEnum createTypeEnum : CreateTypeEnum.values()){ for(CreateTypeEnum createTypeEnum : CreateTypeEnum.values()){
if(createTypeEnum.getCode() == Integer.valueOf(v)){ if(createTypeEnum.getCode() == Integer.valueOf(v)){
stringBuilder.append("【").append(createTypeEnum.getMessage()).append("】 "); if(index<5){
view.add(createTypeEnum.getMessage());
} else {
hideView.add(createTypeEnum.getMessage());
} }
} }
} }
return stringBuilder.toString(); }
screenBack.setView(view);
screenBack.setHideView(hideView);
return screenBack;
} }
return null; return null;
} }
//多选 //多选
public String storeTypeBack(String compute, String value, Integer enterpriseId){ public ScreenBack storeTypeBack(String compute, String value, Integer enterpriseId){
if(StringUtils.isNotBlank(value)){ if(StringUtils.isNotBlank(value)){
String[] valueArr = value.split(" "); String[] valueArr = value.split(" ");
ServiceResponse<List<StoreDictDTO>> serviceResponse = this.storeDictApiService.listStoreType(enterpriseId); ServiceResponse<List<StoreDictDTO>> serviceResponse = this.storeDictApiService.listStoreType(enterpriseId);
if(serviceResponse.isSuccess()){ if(serviceResponse.isSuccess()){
List<StoreDictDTO> list = serviceResponse.getResult(); List<StoreDictDTO> list = serviceResponse.getResult();
StringBuilder stringBuilder = new StringBuilder(StoreESFieldsEnum.STORETYPE.getDesc()); ScreenBack screenBack = new ScreenBack();
stringBuilder.append(" ").append(ComputeBackUtil.getComputeBack(compute)); screenBack.setTitle(StoreESFieldsEnum.STORETYPE.getDesc());
screenBack.setCompute(ComputeBackUtil.getComputeBack(compute));
int index = 0;
List<String> view = new ArrayList<>();
List<String> hideView = new ArrayList<>();
for(StoreDictDTO dictDTO : list){ for(StoreDictDTO dictDTO : list){
for(String v : valueArr){ for(String v : valueArr){
if(dictDTO.getValue().equals(v)){ if(dictDTO.getValue().equals(v)){
stringBuilder.append(" 【"); if(index < 5){
stringBuilder.append(dictDTO.getKey()).append("】 "); view.add(dictDTO.getKey());
} else {
hideView.add(dictDTO.getKey());
}
index++;
} }
} }
} }
return stringBuilder.toString(); screenBack.setView(view);
screenBack.setHideView(hideView);
return screenBack;
} }
} }
return null; return null;
} }
//多选 //多选
public String erpStatusBack(String compute, String value, Integer enterpriseId){ public ScreenBack erpStatusBack(String compute, String value, Integer enterpriseId){
if(StringUtils.isNotBlank(value)){ if(StringUtils.isNotBlank(value)){
String[] valueArr = value.split(" "); String[] valueArr = value.split(" ");
ServiceResponse<List<StoreDictDTO>> serviceResponse = this.storeDictApiService.listStoreStatus(enterpriseId); ServiceResponse<List<StoreDictDTO>> serviceResponse = this.storeDictApiService.listStoreStatus(enterpriseId);
if(serviceResponse.isSuccess()){ if(serviceResponse.isSuccess()){
List<StoreDictDTO> list = serviceResponse.getResult(); List<StoreDictDTO> list = serviceResponse.getResult();
StringBuilder stringBuilder = new StringBuilder(StoreESFieldsEnum.ERPSTATUS.getDesc()); ScreenBack screenBack = new ScreenBack();
stringBuilder.append(" ").append(ComputeBackUtil.getComputeBack(compute)); screenBack.setTitle(StoreESFieldsEnum.ERPSTATUS.getDesc());
screenBack.setCompute(ComputeBackUtil.getComputeBack(compute));
int index = 0;
List<String> view = new ArrayList<>();
List<String> hideView = new ArrayList<>();
for(StoreDictDTO dictDTO : list){ for(StoreDictDTO dictDTO : list){
for(String v : valueArr){ for(String v : valueArr){
if(dictDTO.getValue().equals(v)){ if(dictDTO.getValue().equals(v)){
stringBuilder.append(" 【"); if(index < 5){
stringBuilder.append(dictDTO.getKey()).append("】 "); view.add(dictDTO.getKey());
} else {
hideView.add(dictDTO.getKey());
}
} }
} }
} }
return stringBuilder.toString(); screenBack.setView(view);
screenBack.setHideView(hideView);
return screenBack;
} }
} }
return null; return null;
......
...@@ -3,6 +3,7 @@ package com.gic.plug.web.strategy.impl; ...@@ -3,6 +3,7 @@ package com.gic.plug.web.strategy.impl;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.plug.web.strategy.ScreenBackStrategy; import com.gic.plug.web.strategy.ScreenBackStrategy;
import com.gic.plug.web.utils.ComputeBackUtil; import com.gic.plug.web.utils.ComputeBackUtil;
import com.gic.plug.web.vo.ScreenBack;
import com.gic.store.constant.StoreESFieldsEnum; import com.gic.store.constant.StoreESFieldsEnum;
import com.gic.store.dto.StoreGroupDTO; import com.gic.store.dto.StoreGroupDTO;
import com.gic.store.dto.StoreTagDTO; import com.gic.store.dto.StoreTagDTO;
...@@ -19,18 +20,29 @@ public class StoreTagBackImpl implements ScreenBackStrategy { ...@@ -19,18 +20,29 @@ public class StoreTagBackImpl implements ScreenBackStrategy {
@Autowired @Autowired
private StoreTagApiService storeTagApiService; private StoreTagApiService storeTagApiService;
@Override @Override
public String screenBack(String compute, String value, String key, Integer enterpriseId) { public ScreenBack screenBack(String compute, String value, String key, Integer enterpriseId) {
if(StringUtils.isNotBlank(value)){ if(StringUtils.isNotBlank(value)){
StringBuilder stringBuilder = new StringBuilder(StoreESFieldsEnum.STORETAG.getDesc()).append(" "); ScreenBack screenBack = new ScreenBack();
stringBuilder.append(ComputeBackUtil.getComputeBack(compute)).append(" "); screenBack.setTitle(StoreESFieldsEnum.STORETAG.getDesc());
screenBack.setCompute(ComputeBackUtil.getComputeBack(compute));
String[] valueArr = value.split(" "); String[] valueArr = value.split(" ");
int index = 0;
List<String> view = new ArrayList<>();
List<String> hideView = new ArrayList<>();
for(String s : valueArr){ for(String s : valueArr){
ServiceResponse<StoreTagDTO> response = this.storeTagApiService.getByStoreTagId(Integer.valueOf(s)); ServiceResponse<StoreTagDTO> response = this.storeTagApiService.getByStoreTagId(Integer.valueOf(s));
if(response.isSuccess() && response.getResult()!= null){ if(response.isSuccess() && response.getResult()!= null){
stringBuilder.append("【").append(response.getResult().getStoreTagName()).append("】").append(" "); if(index < 0){
view.add(response.getResult().getStoreTagName());
} else {
hideView.add(response.getResult().getStoreTagName());
} }
index++;
} }
return stringBuilder.toString(); }
screenBack.setView(view);
screenBack.setHideView(hideView);
return screenBack;
} }
return null; return null;
} }
......
package com.gic.plug.web.vo;
import java.io.Serializable;
import java.util.List;
public class ScreenBack implements Serializable {
private String title;
private String compute;
private List<String> view;
private List<String> hideView;
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getCompute() {
return compute;
}
public void setCompute(String compute) {
this.compute = compute;
}
public List<String> getView() {
return view;
}
public void setView(List<String> view) {
this.view = view;
}
public List<String> getHideView() {
return hideView;
}
public void setHideView(List<String> hideView) {
this.hideView = hideView;
}
}
package com.gic.plug.web.vo;
import java.util.List;
public class ScreenBackVO {
private String type = "and";
private List<ScreenBack> data;
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public List<ScreenBack> getData() {
return data;
}
public void setData(List<ScreenBack> data) {
this.data = data;
}
}
...@@ -3,7 +3,7 @@ package com.gic.plug.web.vo; ...@@ -3,7 +3,7 @@ package com.gic.plug.web.vo;
public class StoreResourceVO { public class StoreResourceVO {
private Integer authMode; private Integer authMode;
private String searchJson; private String searchJson;
private String sceenBack; private ScreenBackVO sceenBack;
public Integer getAuthMode() { public Integer getAuthMode() {
return authMode; return authMode;
...@@ -21,11 +21,11 @@ public class StoreResourceVO { ...@@ -21,11 +21,11 @@ public class StoreResourceVO {
this.searchJson = searchJson; this.searchJson = searchJson;
} }
public String getSceenBack() { public ScreenBackVO getSceenBack() {
return sceenBack; return sceenBack;
} }
public void setSceenBack(String sceenBack) { public void setSceenBack(ScreenBackVO sceenBack) {
this.sceenBack = sceenBack; this.sceenBack = sceenBack;
} }
} }
...@@ -24,7 +24,7 @@ public class StoreWidgetVO implements Serializable { ...@@ -24,7 +24,7 @@ public class StoreWidgetVO implements Serializable {
private String authSearchParam; private String authSearchParam;
private Integer authMode = 1; private Integer authMode = 1;
private String screenBack; private ScreenBackVO screenBack;
public Integer getStoreWidgetId() { public Integer getStoreWidgetId() {
return storeWidgetId; return storeWidgetId;
...@@ -66,11 +66,11 @@ public class StoreWidgetVO implements Serializable { ...@@ -66,11 +66,11 @@ public class StoreWidgetVO implements Serializable {
this.authMode = authMode; this.authMode = authMode;
} }
public String getScreenBack() { public ScreenBackVO getScreenBack() {
return screenBack; return screenBack;
} }
public void setScreenBack(String screenBack) { public void setScreenBack(ScreenBackVO screenBack) {
this.screenBack = screenBack; this.screenBack = screenBack;
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment