Merge remote-tracking branch 'origin/master'

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

@@ -1,10 +1,12 @@
 package com.hwrj.cloud.admin.controller;
 
+import com.hwrj.cloud.admin.dto.UmsMemberOriginParam;
 import com.hwrj.cloud.admin.excelEntity.UmsMemberOriginExcel;
 import com.hwrj.cloud.admin.listener.ImportExcelEventListener;
 import com.hwrj.cloud.admin.service.UmsMemberOriginService;
 import com.hwrj.cloud.admin.util.CurrUserUtil;
 import com.hwrj.cloud.admin.util.EasyExcelUtil;
+import com.hwrj.cloud.common.api.CommonPage;
 import com.hwrj.cloud.common.api.CommonResult;
 import com.hwrj.cloud.common.exception.GlobalException;
 import io.swagger.annotations.Api;
@@ -12,10 +14,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-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 org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -84,4 +83,13 @@ public class UmsMemberOriginController {
         return CommonResult.success();
     }
 
+    @ApiOperation(value = "查询列表",notes = "查询列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "origin",value = "",required = true,paramType = "UmsMemberOriginProductParam")
+    })
+    @PostMapping("/list")
+    public CommonResult list(@RequestBody UmsMemberOriginParam origin){
+        List<UmsMemberOriginParam> list = umsMemberOriginService.list(origin);
+        return CommonResult.success(CommonPage.restPage(list));
+    }
 }

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

@@ -1,7 +1,10 @@
 package com.hwrj.cloud.admin.dao;
 
+import com.hwrj.cloud.admin.dto.UmsMemberOriginParam;
 import com.hwrj.cloud.admin.model.UmsMemberOrigin;
 
+import java.util.List;
+
 /**
  * @className:
  * @description:
@@ -17,4 +20,6 @@ public interface UmsMemberOriginDao {
      * @return
      */
     int isExist(UmsMemberOrigin umsMemberOrigin);
+
+    List<UmsMemberOriginParam> list(UmsMemberOriginParam origin);
 }

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

@@ -14,4 +14,12 @@ import java.util.List;
 public interface UmsMemberOriginProductDao {
 
     int batchSave(@Param("list") List<UmsMemberOriginProduct> list);
+
+    /**
+     * 查询生产地产出物
+     * lym
+     * @param originId
+     * @return
+     */
+    List<UmsMemberOriginProduct> selectByOriginId(@Param("originId") Long originId);
 }

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

@@ -0,0 +1,107 @@
+package com.hwrj.cloud.admin.dto;
+
+import com.hwrj.cloud.admin.model.UmsMemberOriginProduct;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @className:
+ * @description:
+ * @author: lym
+ * @date: 2020/9/7 17:50
+ */
+@Data
+@ApiModel("生产基地信息")
+public class UmsMemberOriginParam {
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "供应商id (供应商信息表 ums_company_info -> id)")
+    private Long fkCompanyInfoId;
+
+    @ApiModelProperty(value = "供应商名称")
+    private String compName;
+
+    @ApiModelProperty(value = "生产地名称")
+    private String originName;
+
+    @ApiModelProperty(value = "生产地面积（亩）")
+    private Double originArea;
+
+    @ApiModelProperty(value = "人数")
+    private Integer peopleNum;
+
+    @ApiModelProperty(value = "建立日期（年）")
+    private String foundDate;
+
+    @ApiModelProperty(value = "联系人")
+    private String linkUser;
+
+    @ApiModelProperty(value = "联系方式")
+    private String linkPhone;
+
+    @ApiModelProperty(value = "省")
+    private String provinceName;
+
+    @ApiModelProperty(value = "市")
+    private String cityName;
+
+    @ApiModelProperty(value = "县")
+    private String countyName;
+
+    @ApiModelProperty(value = "详细地址")
+    private String detailAddress;
+
+    private String altitude;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+    @ApiModelProperty(value = "状态 0:可用，1:禁用，2:删除")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    private Integer createId;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "修改人id")
+    private Integer updateId;
+
+    @ApiModelProperty(value = "生产地图片")
+    private String imgUrl;
+
+    @ApiModelProperty(value = "生产地宣传视频地址")
+    private String videoUrl;
+
+    @ApiModelProperty(value = "vr地址")
+    private String vrUrl;
+
+    @ApiModelProperty(value = "实时监控视频地址")
+    private String cameraUrl;
+
+    @ApiModelProperty(value = "简介")
+    private String summary;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    private Integer pageNum = 1;
+
+    private Integer pageSize = 10;
+
+    @ApiModelProperty(value = "生产地产出物")
+    private List<UmsMemberOriginProduct> productlist;
+}

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

@@ -1,5 +1,6 @@
 package com.hwrj.cloud.admin.service;
 
+import com.hwrj.cloud.admin.dto.UmsMemberOriginParam;
 import com.hwrj.cloud.admin.excelEntity.UmsMemberOriginExcel;
 
 import java.util.List;
@@ -12,4 +13,6 @@ import java.util.List;
  */
 public interface UmsMemberOriginService {
     public int batchSave(List<UmsMemberOriginExcel> list);
+
+    List<UmsMemberOriginParam> list(UmsMemberOriginParam origin);
 }

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

@@ -2,6 +2,7 @@ package com.hwrj.cloud.admin.service.impl;
 
 import com.hwrj.cloud.admin.dao.UmsMemberOriginDao;
 import com.hwrj.cloud.admin.dao.UmsMemberOriginProductDao;
+import com.hwrj.cloud.admin.dto.UmsMemberOriginParam;
 import com.hwrj.cloud.admin.excelEntity.UmsMemberOriginExcel;
 import com.hwrj.cloud.admin.mapper.UmsMemberOriginMapper;
 import com.hwrj.cloud.admin.model.UmsMemberOrigin;
@@ -112,4 +113,11 @@ public class UmsMemberOriginServiceImpl implements UmsMemberOriginService {
                 }
             }
     }
+
+    @Override
+    public List<UmsMemberOriginParam> list(UmsMemberOriginParam origin) {
+        List<UmsMemberOriginParam> list = umsMemberOriginDao.list(origin);
+        return list;
+    }
+
 }

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

@@ -1,6 +1,56 @@
 <?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.admin.dao.UmsMemberOriginDao">
+    <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.dto.UmsMemberOriginParam">
+        <id column="id" jdbcType="BIGINT" property="id" />
+        <result column="fk_company_info_id" jdbcType="BIGINT" property="fkCompanyInfoId" />
+        <result column="comp_name" jdbcType="VARCHAR" property="compName" />
+        <result column="origin_name" jdbcType="VARCHAR" property="originName" />
+        <result column="origin_area" jdbcType="DOUBLE" property="originArea" />
+        <result column="people_num" jdbcType="INTEGER" property="peopleNum" />
+        <result column="found_date" jdbcType="VARCHAR" property="foundDate" />
+        <result column="link_user" jdbcType="VARCHAR" property="linkUser" />
+        <result column="link_phone" jdbcType="VARCHAR" property="linkPhone" />
+        <result column="province_name" jdbcType="VARCHAR" property="provinceName" />
+        <result column="city_name" jdbcType="VARCHAR" property="cityName" />
+        <result column="county_name" jdbcType="VARCHAR" property="countyName" />
+        <result column="detail_address" jdbcType="VARCHAR" property="detailAddress" />
+        <result column="altitude" jdbcType="VARCHAR" property="altitude" />
+        <result column="longitude" jdbcType="VARCHAR" property="longitude" />
+        <result column="latitude" jdbcType="VARCHAR" property="latitude" />
+        <result column="state" jdbcType="INTEGER" property="state" />
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="create_id" jdbcType="INTEGER" property="createId" />
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="update_id" jdbcType="INTEGER" property="updateId" />
+    </resultMap>
+    <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hwrj.cloud.admin.dto.UmsMemberOriginParam">
+        <result column="img_url" jdbcType="LONGVARCHAR" property="imgUrl" />
+        <result column="video_url" jdbcType="LONGVARCHAR" property="videoUrl" />
+        <result column="vr_url" jdbcType="LONGVARCHAR" property="vrUrl" />
+        <result column="camera_url" jdbcType="LONGVARCHAR" property="cameraUrl" />
+        <result column="summary" jdbcType="LONGVARCHAR" property="summary" />
+        <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
+    </resultMap>
+    <resultMap extends="BaseResultMap" id="ResultOrigin" type="com.hwrj.cloud.admin.dto.UmsMemberOriginParam">
+        <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
+    </resultMap>
+
+    <resultMap extends="ResultMapWithBLOBs" id="ResultOriginProduct" type="com.hwrj.cloud.admin.dto.UmsMemberOriginParam">
+        <collection property="productlist" javaType="java.util.ArrayList" select="com.hwrj.cloud.admin.dao.UmsMemberOriginProductDao.selectByOriginId"
+                    column="{originId=id}" ofType="com.hwrj.cloud.admin.model.UmsMemberOriginProduct"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id, fk_company_info_id, comp_name, origin_name, origin_area, people_num, found_date,
+        link_user, link_phone, province_name, city_name, county_name, detail_address, altitude,
+        longitude, latitude, state, create_time, create_id, update_time, update_id
+    </sql>
+    <sql id="Blob_Column_List">
+        img_url, video_url, vr_url, camera_url, summary, remark
+    </sql>
+
+    <!-- 检验是否存在  lym -->
     <select id="isExist" parameterType="com.hwrj.cloud.admin.model.UmsMemberOrigin" resultType="int">
         SELECT COUNT(*) FROM ums_member_origin WHERE state = 0
         <if test="id != null">
@@ -8,4 +58,20 @@
         </if>
         AND origin_name = #{originName}
     </select>
-</mapper>
+
+    <select id="list" parameterType="com.hwrj.cloud.admin.dto.UmsMemberOriginParam" resultMap="ResultOriginProduct">
+        select <include refid="Base_Column_List" />,<include refid="Blob_Column_List" />
+        from ums_member_origin
+        WHERE state = 0
+        <if test="fkCompanyInfoId != null">
+            AND fk_company_info_id = #{fkCompanyInfoId,jdbcType=BIGINT}
+        </if>
+        <if test="originName != null and originName != ''">
+            AND origin_name = #{originName,jdbcType=VARCHAR}
+        </if>
+        <if test="foundDate != null and foundDate != ''">
+            AND found_date = #{foundDate,jdbcType=VARCHAR}
+        </if>
+        ORDER BY create_time desc
+    </select>
+</mapper>

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

@@ -1,6 +1,31 @@
 <?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.admin.dao.UmsMemberOriginProductDao">
+    <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsMemberOriginProduct">
+        <id column="id" jdbcType="BIGINT" property="id" />
+        <result column="fk_origin_id" jdbcType="BIGINT" property="fkOriginId" />
+        <result column="product_name" jdbcType="VARCHAR" property="productName" />
+        <result column="plant_area" jdbcType="VARCHAR" property="plantArea" />
+        <result column="output_num" jdbcType="VARCHAR" property="outputNum" />
+        <result column="output_value" jdbcType="VARCHAR" property="outputValue" />
+        <result column="state" jdbcType="INTEGER" property="state" />
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="create_id" jdbcType="INTEGER" property="createId" />
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="update_id" jdbcType="INTEGER" property="updateId" />
+    </resultMap>
+    <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hwrj.cloud.admin.model.UmsMemberOriginProduct">
+        <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id, fk_origin_id, product_name, plant_area, output_num, output_value, state, create_time,
+        create_id, update_time, update_id,remark
+    </sql>
+    <sql id="Blob_Column_List">
+        remark
+    </sql>
+
     <insert id="batchSave" parameterType="com.hwrj.cloud.admin.model.UmsMemberOriginProduct">
         insert into ums_member_origin_product (fk_origin_id, product_name, plant_area,
         output_num, output_value, state,
@@ -14,4 +39,15 @@
         #{item.updateId,jdbcType=INTEGER}, #{item.remark,jdbcType=LONGVARCHAR})
         </foreach>
     </insert>
+
+    <!-- 查询生产地产出物 lym -->
+    <select id="selectByOriginId" resultMap="BaseResultMap">
+        select <include refid="Base_Column_List" />,<include refid="Blob_Column_List" />
+        from ums_member_origin_product
+        WHERE state = 0
+        <if test="originId != null">
+            AND fk_origin_id = #{originId,jdbcType=BIGINT}
+        </if>
+        ORDER BY create_time desc
+    </select>
 </mapper>