封装大屏数据结构，修改添加想要产品时必须登录和添加过以后不能再添加

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/BigCompanyController.java

@@ -1,7 +1,8 @@
 package com.hwrj.cloud.admin.controller;
 
-import com.hwrj.cloud.admin.dto.PmsProductCategoryDto;
 import com.hwrj.cloud.admin.dto.UmsCompanyDto;
+import com.hwrj.cloud.admin.dto.UmsMemberOriginParam;
+import com.hwrj.cloud.admin.dto.param.BigDataCompanyInfo;
 import com.hwrj.cloud.admin.service.BigCompanyService;
 import com.hwrj.cloud.admin.service.UmsCompanyService;
 import com.hwrj.cloud.admin.service.UmsMemberOriginService;
@@ -16,8 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @RestController
 @RequestMapping("/big/company")
@@ -33,7 +33,7 @@ public class BigCompanyController {
     @Autowired
     private UmsMemberOriginService umsMemberOriginService;
 
-    @GetMapping("/lis")
+    @GetMapping("/list")
     @ApiOperation("涉林分布-供应商信息获取")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "catId",value = "分类id",required = false,paramType = "Long"),
@@ -41,26 +41,128 @@ public class BigCompanyController {
     })
     public CommonResult compList(@RequestParam(value = "catId",required = false)Long catId, @RequestParam(value = "key",required = false)String key){
         List<Map<String, Object>> companyList = bigCompanyService.getCompanyList(catId, key);
+        List<Map<String,Object>> sh = new ArrayList<>();
+        for (Map<String,Object> map:companyList){
+            List<String> strings = new LinkedList<>();
+            if (map.containsKey("lng")){
+                strings.add(map.get("lng").toString());
+            }
+            if (map.containsKey("latitude")){
+                strings.add(map.get("latitude").toString());
+            }
 
+
+            map.put("laglat",strings);
+            map.put("legend","1");
+            List<Map<String,Object>> list = new LinkedList<>();
+            if (map.containsKey("compConPerson")){
+                Map<String,Object> map1 = new HashMap<>();
+                map1.put("value","联系人："+map.get("compConPerson"));
+                list.add(map1);
+            }
+            if (map.containsKey("address")){
+                Map<String,Object> map2 = new HashMap<>();
+                map2.put("value","联系地址："+map.get("address"));
+                list.add(map2);
+            }
+            map.put("info",list);
+            sh.add(map);
+        }
         return CommonResult.success(companyList);
     }
 
     @GetMapping("/detail")
-    @ApiOperation("涉林分布-供应商信息获取")
+    @ApiOperation("涉林分布-供应商详细信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "catId",value = "分类id",required = false,paramType = "Long"),
-            @ApiImplicitParam(name = "key",value = "关键字",required = false,paramType = "String")
+            @ApiImplicitParam(name = "供应商id",value = "分类id",required = false,paramType = "Long"),
     })
     public CommonResult compDetail(@RequestParam(value = "id",required = true)Long id){
         UmsCompanyDto detailCompany = umsCompanyService.getDetailCompany(id);
+        UmsMemberOriginParam param = new UmsMemberOriginParam();
+        param.setFkCompanyInfoId(detailCompany.getId());
+        List<UmsMemberOriginParam> list = umsMemberOriginService.list(param);
+        List<BigDataCompanyInfo> listBate = new ArrayList<>();
+        BigDataCompanyInfo big1 = new BigDataCompanyInfo();
+        big1.setId("1");
+        big1.setTitle("企业名称");
+        big1.setData(detailCompany.getCompName());
+        listBate.add(big1);
+        BigDataCompanyInfo big2 = new BigDataCompanyInfo();
+        big2.setId("2");
+        big2.setTitle("联系人");
+        big2.setData(detailCompany.getCompConPerson());
+        listBate.add(big2);
+        BigDataCompanyInfo big3 = new BigDataCompanyInfo();
+        big3.setId("3");
+        big3.setTitle("联系方式");
+        big3.setData(detailCompany.getCompConNum());
+        listBate.add(big3);
+
+        BigDataCompanyInfo big4 = new BigDataCompanyInfo();
 
-        return CommonResult.success();
+        big4.setId("4");
+        big4.setTitle("资质");
+        big4.setData(detailCompany.getCompQual());
+        listBate.add(big4);
+
+        BigDataCompanyInfo big5 = new BigDataCompanyInfo();
+        big5.setId("5");
+        big5.setTitle("类型");
+        big5.setData(detailCompany.getCompanyType());
+        listBate.add(big5);
+
+        BigDataCompanyInfo big6 = new BigDataCompanyInfo();
+        big6.setId("6");
+        big6.setTitle("是否有种植基地");
+        if (list != null && list.size()>0){
+            big6.setData("有");
+        }else {
+            big6.setData("没有");
+        }
+        big6.setData(detailCompany.getCompanyType());
+        listBate.add(big6);
+        BigDataCompanyInfo big7 = new BigDataCompanyInfo();
+        big7.setId("7");
+        big7.setTitle("地址");
+        big7.setData(detailCompany.getProvinceId()+detailCompany.getCityId()+detailCompany.getCountyId());
+        listBate.add(big7);
+        Map<String,Object> map = new HashMap<>();
+        map.put("desc",detailCompany.getCompSum());
+        map.put("list",listBate);
+
+        return CommonResult.success(map);
     }
 
     @GetMapping("/cat")
     @ApiOperation("涉林分布-产品分类信息（刺梨，竹子，竹笋）")
     public CommonResult cat(){
-        List<PmsProductCategoryDto> dto = bigCompanyService.getCategoryDto();
-        return CommonResult.success(dto);
+        String[] title = {"id","type","num"};
+        List<String> dto = bigCompanyService.getCat();
+        List<Map<String, Object>> title1 = getTitle(dto, title);
+        return CommonResult.success(title1);
+    }
+
+    /**
+     *
+     * @param strings 数据
+     * @param params
+     * @return
+     */
+    public List<Map<String,Object>> getTitle(List<String> strings,String[] params){
+        if (strings == null|| strings.size()<1){
+            return null;
+        }
+        List<Map<String,Object>> list = new ArrayList<>();
+        for (String str:strings) {
+            Map<String,Object> map = new HashMap<>();
+            String[] split = str.split("---");
+            for (int i = 0;i<split.length;i++){
+                String param = params[i];
+                String s = split[i];
+                map.put(param,s);
+            }
+            list.add(map);
+        }
+        return list;
     }
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/BigScreamController.java

@@ -1,18 +1,19 @@
 package com.hwrj.cloud.admin.controller;
 
 import com.hwrj.cloud.admin.service.BigScreamService;
+import com.hwrj.cloud.admin.service.UmsCompanyService;
 import com.hwrj.cloud.common.api.CommonResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @RestController
 @Api(tags = "BigScreamController",description = "大屏数据展示")
@@ -22,25 +23,136 @@ public class BigScreamController  {
     @Autowired
     private BigScreamService bigScreamService;
 
-    @ApiOperation("获取平台信息")
+    @Autowired
+    private UmsCompanyService companyService;
+
+    @ApiOperation("林业态势-获取平台信息")
     @GetMapping("/1/data1")
     public CommonResult data11(@RequestParam(value = "id",required = false,defaultValue = "1")Long id){
         Map<String, Object> map = bigScreamService.data1(id);
         return CommonResult.success(map);
     }
 
-    @ApiOperation("获取供应商分布信息")
+    @ApiOperation("林业态势-获取供应商分布信息")
     @GetMapping("/1/data2")
     public CommonResult data12(@RequestParam(value = "compType",required = false)String compType){
         List<Map<String, Object>> map = bigScreamService.date2(compType);
-        return CommonResult.success(map);
+        List<Map<String, Object>> maps = new ArrayList<>();
+        for (Map<String,Object> m:map) {
+            if (m.containsKey("lng")&&m.containsKey("lat")){
+                String lng = m.get("lng").toString();
+                String lat = m.get("lat").toString();
+                List<String> str = new LinkedList<>();
+                str.add(lng);
+                str.add(lat);
+                m.put("lnglat",str);
+            }
+            maps.add(m);
+        }
+        return CommonResult.success(maps);
     }
 
-    @ApiOperation("获取产品分布信息")
+    @ApiOperation("产品现状-获取产品分布信息")
     @GetMapping("/1/data3")
     public CommonResult data13(){
         List<Map<String, Object>> map = bigScreamService.data4();
         return CommonResult.success(map);
     }
 
+    @ApiOperation("林业态势-获取产品分布信息")
+    @GetMapping("/1/data6")
+    public CommonResult data16(){
+
+        String title = "供应信息";
+        String[] titles = {"供应商名称","供应产品","规格","参考价格"};
+        List<String> strings = bigScreamService.data6();
+        Map<String, Object> listData = getListData(title, titles, strings);
+
+        return CommonResult.success(listData);
+    }
+
+    @ApiOperation("林业态势-需求信息")
+    @GetMapping("/1/data7")
+    public CommonResult data17(){
+
+        String title = "需求信息";
+        String[] titles = {"需求主体","需求产品"};
+        List<String> strings = bigScreamService.data7();
+        Map<String, Object> listData = getListData(title, titles, strings);
+
+        return CommonResult.success(listData);
+    }
+
+    @ApiOperation("林业态势-左下角")
+    @GetMapping("/1/data8")
+    public CommonResult data18(){
+
+
+        String[] titles = {"id","name","num"};
+        List<String> strings = bigScreamService.data8();
+        List<Map<String, Object>> title = getTitle(strings, titles, "name", "企业分布");
+        return CommonResult.success(title);
+    }
+
+    /**
+     * 分装返回大屏数据
+     * @param title
+     * @param titles
+     * @param strings 必须用---分割成和titles一样长度的数组的字符串
+     * @return
+     */
+    public Map<String,Object> getListData(String title,String[] titles,List<String> strings){
+        Map<String,Object> has = new HashMap<>();
+        has.put("title",title);
+        List<Map<String,Object>> tabHeader = new LinkedList<>();
+        for (int i = 0 ;i<titles.length;i++) {
+            Map<String,Object> map = new HashMap<>();
+            map.put("name",titles[i]);
+            tabHeader.add(map);
+        }
+        has.put("tabHeader",tabHeader);
+        List<List<Map<String,Object>>> list = new ArrayList<>();
+        for (String str:strings) {
+            String[] split = str.split("---");
+            List<Map<String,Object>> maps = new LinkedList<>();
+            for (int i = 0;i<split.length;i++){
+                Map<String,Object> map = new HashMap<>();
+                map.put("value",split[i]);
+                maps.add(map);
+            }
+            list.add(maps);
+        }
+        has.put("list",list);
+        return has;
+    }
+
+    /**
+     *
+     * @param strings 数据
+     * @param params
+     * @return
+     */
+    public List<Map<String,Object>> getTitle(List<String> strings,String[] params,String title,String addStr){
+        if (strings == null|| strings.size()<1){
+            return null;
+        }
+        List<Map<String,Object>> list = new ArrayList<>();
+        for (String str:strings) {
+            Map<String,Object> map = new HashMap<>();
+            String[] split = str.split("---");
+            for (int i = 0;i<split.length;i++){
+                String param = params[i];
+                String s = split[i];
+                if ((!StringUtils.isEmpty(title))&&title.equals(param)){
+                    s=s+addStr;
+                }
+                map.put(param,s);
+            }
+            list.add(map);
+        }
+        return list;
+    }
+
+
+
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dao/BigCompanyDao.java

@@ -8,4 +8,6 @@ import java.util.Map;
 public interface BigCompanyDao {
 
     public List<Map<String,Object>> bigCompanyInfo(@Param("key")String key,@Param("catId")Long catId);
+
+    public List<String> getCat();
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dao/BigScreamDao.java

@@ -23,4 +23,10 @@ public interface BigScreamDao {
      * @return
      */
     public List<Map<String,Object>> data5(@org.apache.ibatis.annotations.Param("productName") String productName);
+
+    public List<String> data6();
+
+    public List<String> data7();
+
+    public List<String> data8();
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/UmsCompanyDto.java

@@ -15,13 +15,13 @@ public class UmsCompanyDto extends UmsCompanyInfo  {
     @ApiModelProperty(value = "供应商店铺信息")
     private List<UmsCompanyShop> shops;
     @ApiModelProperty(value = "供应商基地信息")
-    private List<UmsMemberOrigin> origins;
+    private List<UmsMemberOriginParam> origins;
 
-    public List<UmsMemberOrigin> getOrigins() {
+    public List<UmsMemberOriginParam> getOrigins() {
         return origins;
     }
 
-    public void setOrigins(List<UmsMemberOrigin> origins) {
+    public void setOrigins(List<UmsMemberOriginParam> origins) {
         this.origins = origins;
     }
 

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/param/BigDataCompanyInfo.java

@@ -0,0 +1,12 @@
+package com.hwrj.cloud.admin.dto.param;
+
+import lombok.Data;
+
+@Data
+public class BigDataCompanyInfo {
+    private String id;
+
+    private String title;
+
+    private String data;
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/BigCompanyService.java

@@ -13,4 +13,6 @@ public interface BigCompanyService {
 
     List<PmsProductCategoryDto> getCategoryDto();
 
+    List<String> getCat();
+
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/BigScreamService.java

@@ -28,4 +28,22 @@ public interface BigScreamService {
      * @return
      */
     public List<Map<String,Object>> data4();
+
+    /**
+     * 获取供应信息
+     * @return
+     */
+    public List<String> data6();
+
+    /**
+     * 获取需求信息
+     * @return
+     */
+    public List<String> data7();
+
+    /**
+     * 获取需求信息
+     * @return
+     */
+    public List<String> data8();
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/BigCompanyServiceImpl.java

@@ -37,6 +37,12 @@ public class BigCompanyServiceImpl implements BigCompanyService {
         return result;
     }
 
+    @Override
+    public List<String> getCat() {
+        List<String> cat = bigCompanyDao.getCat();
+        return cat;
+    }
+
 
     private PmsProductCategoryDto covert(PmsProductCategory item, List<PmsProductCategory> allList) {
         PmsProductCategoryDto node = new PmsProductCategoryDto();

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/BigScreamServiceImpl.java

@@ -35,4 +35,22 @@ public class BigScreamServiceImpl implements BigScreamService {
     public List<Map<String,Object>> data4() {
         return bigScreamDao.data4();
     }
+
+    @Override
+    public List<String> data6() {
+        List<String> strings = bigScreamDao.data6();
+        return strings;
+    }
+
+    @Override
+    public List<String> data7() {
+        List<String> strings = bigScreamDao.data7();
+
+        return strings;
+    }
+
+    @Override
+    public List<String> data8() {
+        return bigScreamDao.data8();
+    }
 }

forest-admin/admin-server/src/main/resources/dao/BigCompanyDao.xml

@@ -4,12 +4,10 @@
     <select id="bigCompanyInfo" resultType="java.util.Map">
         SELECT
             a.id,
-            a.comp_name AS compName,
-            a.comp_con_person as comp_con_person,
+            a.comp_name AS name,
+            a.comp_con_person as compConPerson,
             a.comp_con_num as compConNum,
-            a.province_id as provinceId,
-            a.city_id as cityId,
-            a.county_id as countyId,
+            concat(a.province_id,a.city_id,a.county_id) as address,
             a.longitude as lng,
             a.latitude as latitude,
             a.company_type as companyType
@@ -28,4 +26,28 @@
             </if>
 
     </select>
+    <select id="getCat" resultType="java.lang.String">
+        SELECT
+            CONCAT(a.id,'---',a.name,'---',IFNULL(SUM(d.numm),0)) as cat
+        FROM
+            pms_product_category a
+            LEFT JOIN (
+            SELECT
+                b.ums_company_info,
+                b.ums_company_info_id,
+                c.parent_id,
+            CASE IFNULL(b.ums_company_info_id,-1)
+            WHEN  -1 THEN
+                0
+            ELSE
+                1
+        END as numm
+
+            FROM
+                pms_product b
+                LEFT JOIN pms_product_category c ON b.product_category_id = c.id GROUP BY c.id,b.ums_company_info_id
+            ) d ON a.id = d.parent_id
+        GROUP BY
+            a.id
+    </select>
 </mapper>

forest-admin/admin-server/src/main/resources/dao/BigScreamDao.xml

@@ -51,4 +51,22 @@
         WHERE a.state = 0 AND b.state = 0
         AND b.product_name = #{productName}
     </select>
+    <select id="data6" resultType="java.lang.String">
+        SELECT CONCAT(IFNULL(a.ums_company_info,'   '),'---',a.`name`,'---',IFNULL(a.spec,'   '),'---',a.price) as pri FROM `pms_product` a where delete_status=0
+    </select>
+
+    <select id="data7" resultType="java.lang.String">
+       SELECT CONCAT(CASE um.cert
+	WHEN 1 THEN
+		IFNULL(um.type,um.nickname)
+	WHEN	2 THEN
+		IFNULL(um.company_info,um.nickname)
+	ELSE
+		um.nickname
+END
+,'---',op.product_name) FROM `oms_pre_item` op LEFT JOIN ums_member um on op.member_id= um.id where op.delete_status=0 and um.`status`=1
+    </select>
+    <select id="data8" resultType="java.lang.String">
+        select CONCAT(company_type,'---',company_type,'---',COUNT(0)) comp from ums_company_info where comp_status=0 GROUP BY company_type
+    </select>
 </mapper>

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/config/GlobalCorsConfig.java

@@ -13,22 +13,22 @@ import org.springframework.web.filter.CorsFilter;
 //@Configuration
 public class GlobalCorsConfig {
 
-//    /**
-//     * 允许跨域调用的过滤器
-//     */
+    /**
+     * 允许跨域调用的过滤器
+     */
 //    @Bean
 //    public CorsFilter corsFilter() {
-//        CorsConfiguration config = new CorsConfiguration();
-//        //允许所有域名进行跨域调用
-//        config.addAllowedOrigin("*");
-//        //允许跨越发送cookie
-//        config.setAllowCredentials(true);
-//        //放行全部原始头信息
-//        config.addAllowedHeader("*");
-//        //允许所有请求方法跨域调用
-//        config.addAllowedMethod("*");
-//        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-//        source.registerCorsConfiguration("/**", config);
-//        return new CorsFilter(source);
+////        CorsConfiguration config = new CorsConfiguration();
+////        //允许所有域名进行跨域调用
+////        config.addAllowedOrigin("*");
+////        //允许跨越发送cookie
+////        config.setAllowCredentials(true);
+////        //放行全部原始头信息
+////        config.addAllowedHeader("*");
+////        //允许所有请求方法跨域调用
+////        config.addAllowedMethod("*");
+////        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+////        source.registerCorsConfiguration("/**", config);
+////        return new CorsFilter(source);
 //    }
 }

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/controller/OmePreItemController.java

@@ -3,6 +3,7 @@ package com.hwrj.cloud.portal.controller;
 import com.github.pagehelper.PageInfo;
 import com.hwrj.cloud.common.api.CommonPage;
 import com.hwrj.cloud.common.api.CommonResult;
+import com.hwrj.cloud.portal.dao.OmsPreItemDao;
 import com.hwrj.cloud.portal.model.OmsPreItem;
 import com.hwrj.cloud.portal.model.UmsMember;
 import com.hwrj.cloud.portal.service.OmsPreItemService;
@@ -22,17 +23,19 @@ import java.util.List;
 @RequestMapping("/pre")
 public class OmePreItemController {
 
-    @Autowired
-    private MemberUtil memberUtil;
+
     @Autowired
     private OmsPreItemService omsPreItemService;
 
     @Autowired
     private UmsMemberService umsMemberService;
+
+
     @PutMapping(value = "/add")
     @ApiOperation("添加有意向商品")
     @ResponseBody
     public CommonResult add(@RequestBody OmsPreItem omsPreItem){
+
         UmsMember currentMember = umsMemberService.getCurrentMember();
         omsPreItem.setMemberId(currentMember.getId());
         omsPreItem.setMemberNickname(currentMember.getNickname());
@@ -47,8 +50,8 @@ public class OmePreItemController {
     @ResponseBody
     public CommonResult detail(@RequestParam(value = "意向id") Long preId){
 
-        omsPreItemService.getOmsPreItemDetail(preId);
-        return CommonResult.success(null);
+        OmsPreItem omsPreItemDetail = omsPreItemService.getOmsPreItemDetail(preId);
+        return CommonResult.success(omsPreItemDetail);
     }
 
     @GetMapping(value = "/own")
@@ -57,7 +60,7 @@ public class OmePreItemController {
     public CommonResult getOwn(@RequestParam(defaultValue = "10") int pageSize,
                                @RequestParam(defaultValue = "1") int pageNO,HttpServletRequest request){
         UmsMember currentMember = umsMemberService.getCurrentMember();
-        List<OmsPreItem> omsPreItemListOwn = omsPreItemService.getOmsPreItemListOwn(currentMember.getId(), pageSize, pageNO);
+        List<OmsPreItemDao> omsPreItemListOwn = omsPreItemService.getOmsPreItemListOwn(currentMember.getId(), pageSize, pageNO);
 
 
 
@@ -71,7 +74,7 @@ public class OmePreItemController {
                                @RequestParam(defaultValue = "1") int pageNO,HttpServletRequest request){
         UmsMember currentMember = umsMemberService.getCurrentMember();
 
-        List<OmsPreItem> omsPreItemListOwn = omsPreItemService.getOmsPreItemListOther(currentMember.getId(), pageSize, pageNO);
+        List<OmsPreItemDao> omsPreItemListOwn = omsPreItemService.getOmsPreItemListOther(currentMember.getId(), pageSize, pageNO);
 
 
 

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/controller/OmsPortalOrderController.java

@@ -6,6 +6,7 @@ import com.hwrj.cloud.portal.domain.ConfirmOrderResult;
 import com.hwrj.cloud.portal.domain.OmsOrderDetail;
 import com.hwrj.cloud.portal.domain.OrderParam;
 import com.hwrj.cloud.portal.service.OmsPortalOrderService;
+import com.hwrj.cloud.portal.service.OmsPreItemService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -27,6 +28,7 @@ public class OmsPortalOrderController {
     @Autowired
     private OmsPortalOrderService portalOrderService;
 
+
     @ApiOperation("根据购物车信息生成确认单信息")
     @RequestMapping(value = "/generateConfirmOrder", method = RequestMethod.POST)
     @ResponseBody

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/controller/PmsPortalProductController.java

@@ -4,10 +4,10 @@ package com.hwrj.cloud.portal.controller;
 import com.hwrj.cloud.common.api.CommonPage;
 import com.hwrj.cloud.common.api.CommonResult;
 import com.hwrj.cloud.portal.domain.*;
+import com.hwrj.cloud.portal.model.OmsPreItem;
 import com.hwrj.cloud.portal.model.PmsProduct;
-import com.hwrj.cloud.portal.service.PmsPortalProductService;
-import com.hwrj.cloud.portal.service.UmsCompanyInfoService;
-import com.hwrj.cloud.portal.service.UmsMemberOriginService;
+import com.hwrj.cloud.portal.model.UmsMember;
+import com.hwrj.cloud.portal.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -35,6 +35,12 @@ public class PmsPortalProductController {
     @Autowired
     private UmsCompanyInfoService umsCompanyInfoService;
 
+    @Autowired
+    private OmsPreItemService omsPreItemService;
+
+    @Autowired
+    private UmsMemberService umsMemberService;
+
 
     @ApiOperation(value = "综合搜索、筛选、排序")
     @ApiImplicitParam(name = "sort", value = "排序字段:0->按相关度；1->按新品；2->按销量；3->价格从低到高；4->价格从高到低",
@@ -62,7 +68,7 @@ public class PmsPortalProductController {
     @ApiOperation("搜索商品类型")
     @RequestMapping(value = "/categorySearch", method = RequestMethod.GET)
     @ResponseBody
-    public CommonResult<List<PmsProductCategoryNode>> searchCategoryTreeList(@RequestParam(value = "关键字",required = false) String key) {
+    public CommonResult<List<PmsProductCategoryNode>> searchCategoryTreeList(@RequestParam(value = "key",required = false) String key) {
         List<PmsProductCategoryNode> list = portalProductService.categorySearchTreeList(key);
         return CommonResult.success(list);
     }
@@ -71,6 +77,7 @@ public class PmsPortalProductController {
     @RequestMapping(value = "/detail/{id}", method = RequestMethod.GET)
     @ResponseBody
     public CommonResult<PmsPortalProductDetail> detail(@PathVariable Long id) {
+
         PmsPortalProductDetail productDetail = portalProductService.detail(id);
         Long placeOfProductionId = productDetail.getProduct().getPlaceOfProductionId();
         if (placeOfProductionId != null){
@@ -82,6 +89,19 @@ public class PmsPortalProductController {
             UmsCompanyInfoDto umsCompanyInfoDto = umsCompanyInfoService.detailInfo(companyInfoId);
             productDetail.setCompanyInfo(umsCompanyInfoDto);
         }
+
+        try{
+            UmsMember currentMember = umsMemberService.getCurrentMember();
+            if (currentMember != null){
+                List<OmsPreItem> productId = omsPreItemService.getOmsPreByMyAndProductId(id, currentMember.getId());
+                if (productId != null&& productId.size()>0){
+                    productDetail.setIsPred(1);
+                }
+            }
+        }catch (Exception e){
+
+        }
+
         return CommonResult.success(productDetail);
     }
 

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/dao/OmsPreItemDao.java

@@ -0,0 +1,14 @@
+package com.hwrj.cloud.portal.dao;
+
+import com.hwrj.cloud.portal.model.PmsProduct;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface OmsPreItemDao {
+
+    public List<OmsPreItemDao> selectOmsPreItemDao(@Param("memberId")Long memberId,@Param("pushId")Long pushId);
+
+    public PmsProduct selectByProductId(@Param("productId")Long productId);
+
+}

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/domain/OmsPreItemDto.java

@@ -0,0 +1,13 @@
+package com.hwrj.cloud.portal.domain;
+
+import com.hwrj.cloud.portal.model.OmsPreItem;
+import com.hwrj.cloud.portal.model.PmsProduct;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public @Data class OmsPreItemDto extends OmsPreItem {
+
+    @ApiModelProperty("产品信息")
+    private PmsProduct pmsProduct;
+}

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/domain/PmsPortalProductDetail.java

@@ -38,5 +38,8 @@ public class PmsPortalProductDetail {
     @ApiModelProperty("商品生产基地")
     private UmsMemberOriginDto origin;
 
+    @ApiModelProperty("是否曾经关注过")
+    private int isPred;
+
 
 }

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/service/OmsPreItemService.java

@@ -1,6 +1,7 @@
 package com.hwrj.cloud.portal.service;
 
 import com.github.pagehelper.PageInfo;
+import com.hwrj.cloud.portal.dao.OmsPreItemDao;
 import com.hwrj.cloud.portal.model.OmsPreItem;
 
 import java.util.List;
@@ -22,13 +23,15 @@ public interface OmsPreItemService {
     /**
      * 查看当前人的有意向的信息
      */
-    public List<OmsPreItem> getOmsPreItemListOwn(Long id, int pageSize, int pageNo);
+    public List<OmsPreItemDao> getOmsPreItemListOwn(Long id, int pageSize, int pageNo);
 
     /**
      * 查看当前人的有意向的信息
      *获取当前人的其他人有意向的信息
      */
-    public List<OmsPreItem> getOmsPreItemListOther(Long id,int pageSize,int pageNo);
+    public List<OmsPreItemDao> getOmsPreItemListOther(Long id, int pageSize, int pageNo);
+
+    public List<OmsPreItem> getOmsPreByMyAndProductId(Long proId,Long memberId);
 
 
 

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/service/impl/OmsPreItemServiceImpl.java

@@ -2,6 +2,7 @@ package com.hwrj.cloud.portal.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.hwrj.cloud.portal.dao.OmsPreItemDao;
 import com.hwrj.cloud.portal.domain.PmsPortalProductDetail;
 import com.hwrj.cloud.portal.domain.UmsCompanyInfoDto;
 import com.hwrj.cloud.portal.mapper.OmsPreItemMapper;
@@ -25,11 +26,19 @@ public class OmsPreItemServiceImpl implements OmsPreItemService {
     @Autowired
     private UmsCompanyInfoService umsCompanyInfoService;
 
+    @Autowired
+    private OmsPreItemDao omsPreItemDao;
+
+
+
+
     @Autowired
     private PmsPortalProductService pmsPortalProductService;
 
     @Override
     public void addOmsPreItem(OmsPreItem omsPreItem) {
+
+
         Long productId = omsPreItem.getProductId();
         if (omsPreItem.getProductId() == null){
             throw new RuntimeException("非法操作");
@@ -45,10 +54,10 @@ public class OmsPreItemServiceImpl implements OmsPreItemService {
         }
         omsPreItem.setProductName(product.getName());
         omsPreItem.setPushId(product.getCreateUser());
-        if (companyInfo != null){
-            omsPreItem.setCompanyId(companyInfo.getId());
-            omsPreItem.setCompanyName(companyInfo.getCompName());
-        }
+
+            omsPreItem.setCompanyId(product.getUmsCompanyInfoId());
+            omsPreItem.setCompanyName(product.getUmsCompanyInfo());
+
         if (brand != null){
             omsPreItem.setProductBrand(brand.getName());
         }
@@ -70,24 +79,28 @@ public class OmsPreItemServiceImpl implements OmsPreItemService {
     }
 
     @Override
-    public List<OmsPreItem> getOmsPreItemListOwn(Long id, int pageSize, int pageNo) {
+    public List<OmsPreItemDao> getOmsPreItemListOwn(Long id, int pageSize, int pageNo) {
         PageHelper.startPage(pageNo,pageSize);
-        OmsPreItemExample example = new OmsPreItemExample();
-        OmsPreItemExample.Criteria criteria = example.createCriteria();
-        criteria.andPushIdEqualTo(id);
-        List<OmsPreItem> omsPreItems = omsPreItemMapper.selectByExample(example);
-        return omsPreItems;
+        List<OmsPreItemDao> omsPreItemDaos = omsPreItemDao.selectOmsPreItemDao(null, id);
+        return omsPreItemDaos;
 
     }
 
     @Override
-    public List<OmsPreItem> getOmsPreItemListOther(Long id,int pageSize,int pageNo) {
+    public List<OmsPreItemDao> getOmsPreItemListOther(Long id,int pageSize,int pageNo) {
         PageHelper.startPage(pageNo,pageSize);
+        List<OmsPreItemDao> omsPreItemDaos = omsPreItemDao.selectOmsPreItemDao(id, null);
+        return omsPreItemDaos;
+    }
+
+    @Override
+    public List<OmsPreItem> getOmsPreByMyAndProductId(Long proId, Long memberId) {
         OmsPreItemExample example = new OmsPreItemExample();
         OmsPreItemExample.Criteria criteria = example.createCriteria();
-        criteria.andMemberIdEqualTo(id);
+        criteria.andMemberIdEqualTo(memberId);
+        criteria.andProductIdEqualTo(proId);
         List<OmsPreItem> omsPreItems = omsPreItemMapper.selectByExample(example);
-        return omsPreItems;
+        return null;
     }
 
 

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/service/impl/PmsPortalProductServiceImpl.java

@@ -155,8 +155,10 @@ public class PmsPortalProductServiceImpl implements PmsPortalProductService {
         PmsProduct product = productMapper.selectByPrimaryKey(id);
         result.setProduct(product);
         //获取品牌信息
-        PmsBrand brand = brandMapper.selectByPrimaryKey(product.getBrandId());
-        result.setBrand(brand);
+        if (product.getBrandId() != null){
+            PmsBrand brand = brandMapper.selectByPrimaryKey(product.getBrandId());
+            result.setBrand(brand);
+        }
 
         if (product.getProductAttributeCategoryId() != null){
             //获取商品属性信息

forest-portal/portal-server/src/main/resources/dao/OmsPreItemDao.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hwrj.cloud.portal.dao.OmsPreItemDao">
+  <resultMap id="BaseResultMap" type="com.hwrj.cloud.portal.domain.OmsPreItemDto">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="product_id" jdbcType="BIGINT" property="productId" />
+    <result column="member_id" jdbcType="BIGINT" property="memberId" />
+    <result column="company_id" jdbcType="BIGINT" property="companyId" />
+    <result column="push_id" jdbcType="BIGINT" property="pushId" />
+    <result column="origin_id" jdbcType="BIGINT" property="originId" />
+    <result column="origin_name" jdbcType="VARCHAR" property="originName" />
+    <result column="company_name" jdbcType="VARCHAR" property="companyName" />
+    <result column="price" jdbcType="DECIMAL" property="price" />
+    <result column="product_pic" jdbcType="VARCHAR" property="productPic" />
+    <result column="product_name" jdbcType="VARCHAR" property="productName" />
+    <result column="product_sub_title" jdbcType="VARCHAR" property="productSubTitle" />
+    <result column="product_sku_code" jdbcType="VARCHAR" property="productSkuCode" />
+    <result column="member_nickname" jdbcType="VARCHAR" property="memberNickname" />
+    <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
+    <result column="modify_date" jdbcType="TIMESTAMP" property="modifyDate" />
+    <result column="delete_status" jdbcType="INTEGER" property="deleteStatus" />
+    <result column="product_category_id" jdbcType="BIGINT" property="productCategoryId" />
+    <result column="product_brand" jdbcType="VARCHAR" property="productBrand" />
+    <result column="product_sn" jdbcType="VARCHAR" property="productSn" />
+    <result column="product_attr" jdbcType="VARCHAR" property="productAttr" />
+    <collection property="pmsProduct" ofType="com.hwrj.cloud.portal.model.PmsProduct" select="selectByProductId" column="product_id"/>
+  </resultMap>
+  <select id="selectOmsPreItemDao" resultMap="BaseResultMap" parameterType="java.lang.Long">
+    select * from oms_pre_item a where a.delete_status=0
+    <if test="memberId != null">
+      and a.member_id = #{memberId}
+    </if>
+    <if test="pushId != null">
+      and a.push_id = #{pushId}
+    </if>
+  </select>
+
+  <select id="selectByProductId" resultType="com.hwrj.cloud.portal.model.PmsProduct" parameterType="java.lang.Long">
+        select * from pms_product where id = #{productId} and delete_status=0
+  </select>
+
+</mapper>

nacos/data/config-data/DEFAULT_GROUP/forest-admin

@@ -82,6 +82,7 @@ secure:
       - /admin/logout
       - /minio/upload
       - /product/import
+      - /big/**
 jwt:
   tokenHeader: Authorization
   secret: forest-admin-secret

nacos/data/config-data/DEFAULT_GROUP/forest-gateway

@@ -50,6 +50,7 @@ secure:
       - /minio/upload
       - /sso/loginPhone
       - /product/import
+      - /big/**
 jwt:
   tokenHeader: Authorization
   secret: forest-admin-secret