Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-webapp-plug into developer

src/main/java/com/gic/plug/web/controller/StoreController.java

+package com.gic.plug.web.controller;
+
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.store.dto.StoreRegionDTO;
+import com.gic.store.service.StoreRegionApiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author zhiwj
+ * @date 2019/7/12
+ */
+@RestController
+public class StoreController {
+
+    @Autowired
+    private StoreRegionApiService storeRegionApiService;
+
+    @RequestMapping("/list-store-region")
+    public RestResponse listStoreRegion(String search) {
+        Integer enterpriseId = 1111;
+        ServiceResponse<List<StoreRegionDTO>> serviceResponse = storeRegionApiService.listStoreRegion(enterpriseId, search);
+        if (serviceResponse.isSuccess()) {
+            return RestResponse.success(serviceResponse.getResult());
+        } else {
+            return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+        }
+    }
+
+}

src/main/java/com/gic/plug/web/controller/StoreFieldController.java

+package com.gic.plug.web.controller;
+
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.EntityUtil;
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.plug.web.vo.StoreFieldRegionVO;
+import com.gic.plug.web.vo.StoreFieldSelectVO;
+import com.gic.store.constant.StoreFieldDateEnum;
+import com.gic.store.constant.StoreFieldTextEnum;
+import com.gic.store.constant.StoreFieldTypeEnum;
+import com.gic.store.constant.StoreGroupConstant;
+import com.gic.store.dto.StoreFieldDTO;
+import com.gic.store.dto.StoreFieldSelectDTO;
+import com.gic.store.service.StoreFieldApiService;
+import com.gic.store.service.StoreFieldSelectApiService;
+import com.gic.store.utils.ErrorCode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author guojx
+ * @date 2019/7/15 9:21 AM
+ */
+@RestController
+@RequestMapping("/store-field")
+public class StoreFieldController {
+    private static final Logger logger = LoggerFactory.getLogger(StoreFieldController.class);
+
+    @Autowired
+    private StoreFieldApiService storeFieldApiService;
+    @Autowired
+    private StoreFieldSelectApiService storeFieldSelectApiService;
+
+    @RequestMapping("/list-store-field-type")
+    public RestResponse listStoreFieldType() {
+        Map<Integer, String> result = new HashMap<>(16);
+        for (StoreFieldTypeEnum typeEnum : StoreFieldTypeEnum.values()) {
+            result.put(typeEnum.getCode(), typeEnum.getMessage());
+        }
+        return RestResponse.success(result);
+    }
+
+    @RequestMapping("/list-store-field-date-type")
+    public RestResponse listStoreFieldDateType() {
+        Map<Integer, String> result = new HashMap<>(16);
+        for (StoreFieldDateEnum typeEnum : StoreFieldDateEnum.values()) {
+            result.put(typeEnum.getCode(), typeEnum.getMessage());
+        }
+        return RestResponse.success(result);
+    }
+
+    /**
+     * 文本类型
+     * @return
+     */
+    @RequestMapping("/list-store-field-text-type")
+    public RestResponse listStoreFieldTextType() {
+        Map<Integer, String> result = new HashMap<>(16);
+        for (StoreFieldTextEnum typeEnum : StoreFieldTextEnum.values()) {
+            result.put(typeEnum.getCode(), typeEnum.getMessage());
+        }
+        return RestResponse.success(result);
+    }
+
+    @RequestMapping("/list-store-field-by-region-id")
+    public RestResponse listStoreFieldByRegionId(Integer regionId) {
+        if (regionId == null) {
+            RestResponse.failure(ErrorCode.ERR_5.getCode(), "域ID不能为空");
+        }
+        ServiceResponse<List<StoreFieldDTO>> result = storeFieldApiService.listStoreFieldByRegionId(regionId);
+        if (result.isSuccess()) {
+            return RestResponse.success(transferDtoToVo(result.getResult()));
+        } else {
+            return RestResponse.failure(result.getCode(), result.getMessage());
+        }
+    }
+
+    @RequestMapping("/list-store-field")
+    public RestResponse listStoreField(String search) {
+        ServiceResponse<List<StoreFieldDTO>> result = storeFieldApiService.listStoreField(StoreGroupConstant.TEST_ENTERPRISE_ID, search);
+        if (result.isSuccess()) {
+            return RestResponse.success(transferDtoToVo(result.getResult()));
+        } else {
+            return RestResponse.failure(result.getCode(), result.getMessage());
+        }
+    }
+
+    @RequestMapping("/list-store-field-select")
+    public RestResponse listStoreFieldSelect(String search, Integer storeFieldId) {
+        ServiceResponse<List<StoreFieldSelectDTO>> result = storeFieldSelectApiService.listStoreFieldSelect(storeFieldId, search);
+        if (result.isSuccess()) {
+            return RestResponse.success(EntityUtil.changeEntityListNew(StoreFieldSelectVO.class, result.getResult()));
+        } else {
+            return RestResponse.failure(result.getCode(), result.getMessage());
+        }
+    }
+
+    private List<StoreFieldRegionVO> transferDtoToVo(List<StoreFieldDTO> dtoList) {
+        List<StoreFieldRegionVO> voList = new ArrayList<>(dtoList.size());
+        for (StoreFieldDTO dto : dtoList) {
+            //不需要文本类型字段
+            if (dto.getStoreFieldType().intValue() != StoreFieldTypeEnum.TEXT.getCode()) {
+                voList.add(EntityUtil.changeEntityNew(StoreFieldRegionVO.class, dto));
+            }
+        }
+        return voList;
+    }
+}

src/main/java/com/gic/plug/web/controller/StoreGroupController.java

+package com.gic.plug.web.controller;
+
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.store.constant.StoreGroupConstant;
+import com.gic.store.dto.StoreGroupDTO;
+import com.gic.store.service.StoreGroupApiService;
+import com.gic.store.utils.storegroup.ChangeListToTree;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author guojx
+ * @date 2019/7/12 2:54 PM
+ */
+@RestController
+@RequestMapping("/store-group")
+public class StoreGroupController {
+    private static final Logger logger = LoggerFactory.getLogger(StoreGroupController.class);
+
+    @Autowired
+    private StoreGroupApiService storeGroupApiService;
+
+    @RequestMapping("/list")
+    public RestResponse listStoreGroup() {
+        StoreGroupDTO dto = new StoreGroupDTO();
+        dto.setEnterpriseId(StoreGroupConstant.TEST_ENTERPRISE_ID);
+        List<StoreGroupDTO> list = storeGroupApiService.listStoreGroup(dto);
+        return RestResponse.success(ChangeListToTree.changeListToTreeNotIncludeAllStore(StoreGroupConstant.ALL_STORE_LEVEL, list));
+    }
+}

src/main/java/com/gic/plug/web/vo/StoreFieldRegionVO.java

+package com.gic.plug.web.vo;
+
+import java.io.Serializable;
+
+/**
+ * @author guojx
+ * @date 2019/7/15 10:13 AM
+ */
+public class StoreFieldRegionVO implements Serializable{
+    private static final long serialVersionUID = -5515638740943494767L;
+
+    private Integer storeFieldId;
+
+    /**
+     * 属性名称
+     */
+    private String storeFieldName;
+
+    private String storeFieldCode;
+    /**
+     * 字段类型；1文本   2单选  3多选  4实数  5时间
+     */
+    private Integer storeFieldType;
+
+    /**
+     * 排序
+     */
+    private Double sort;
+
+    public Integer getStoreFieldId() {
+        return storeFieldId;
+    }
+
+    public void setStoreFieldId(Integer storeFieldId) {
+        this.storeFieldId = storeFieldId;
+    }
+
+    public String getStoreFieldName() {
+        return storeFieldName;
+    }
+
+    public void setStoreFieldName(String storeFieldName) {
+        this.storeFieldName = storeFieldName;
+    }
+
+    public String getStoreFieldCode() {
+        return storeFieldCode;
+    }
+
+    public void setStoreFieldCode(String storeFieldCode) {
+        this.storeFieldCode = storeFieldCode;
+    }
+
+    public Integer getStoreFieldType() {
+        return storeFieldType;
+    }
+
+    public void setStoreFieldType(Integer storeFieldType) {
+        this.storeFieldType = storeFieldType;
+    }
+
+    public Double getSort() {
+        return sort;
+    }
+
+    public void setSort(Double sort) {
+        this.sort = sort;
+    }
+}

src/main/java/com/gic/plug/web/vo/StoreFieldSelectVO.java

+package com.gic.plug.web.vo;
+
+import java.io.Serializable;
+
+/**
+ * @author guojx
+ * @date 2019/7/15 10:46 AM
+ */
+public class StoreFieldSelectVO implements Serializable{
+    private static final long serialVersionUID = -5800764730350439370L;
+
+    private Integer storeFieldSelectId;
+
+    private String storeFieldSelectName;
+
+    private String storeFieldSelectCode;
+
+    private Double sort;
+
+    public Integer getStoreFieldSelectId() {
+        return storeFieldSelectId;
+    }
+
+    public void setStoreFieldSelectId(Integer storeFieldSelectId) {
+        this.storeFieldSelectId = storeFieldSelectId;
+    }
+
+    public String getStoreFieldSelectName() {
+        return storeFieldSelectName;
+    }
+
+    public void setStoreFieldSelectName(String storeFieldSelectName) {
+        this.storeFieldSelectName = storeFieldSelectName;
+    }
+
+    public String getStoreFieldSelectCode() {
+        return storeFieldSelectCode;
+    }
+
+    public void setStoreFieldSelectCode(String storeFieldSelectCode) {
+        this.storeFieldSelectCode = storeFieldSelectCode;
+    }
+
+    public Double getSort() {
+        return sort;
+    }
+
+    public void setSort(Double sort) {
+        this.sort = sort;
+    }
+}

src/main/resources/dubbo-gic-webapp-plug.xml

@@ -22,5 +22,10 @@
     <dubbo:reference interface="com.gic.store.service.StoreGroupApiService" id="storeGroupApiService" timeout="60000" retries="0"/>
     <!--自定义域字段-->
     <dubbo:reference interface="com.gic.store.service.StoreFieldApiService" id="storeFieldApiService" timeout="60000" retries="0"/>
+    <dubbo:reference interface="com.gic.store.service.StoreFieldSelectApiService" id="storeFieldSelectApiService" timeout="60000" retries="0"/>
+
     <dubbo:reference interface="com.gic.store.service.ProvincesApiService" id="provincesApiService" timeout="60000" retries="0"/>
+
+    <!--分组策略-->
+    <dubbo:reference interface="com.gic.store.service.StoreStrategyApiService" id="storeStrategyApiService" timeout="60000" retries="0"/>
 </beans>
\ No newline at end of file