记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 5f45a71d authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

Mis 列表接口 提交

parent 8fed1512
Hide whitespace changes
Inline Side-by-side
Showing with 249 additions and 53 deletions
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/FieldsSearchParam.java
View file @ 5f45a71d
......@@ -45,6 +45,12 @@ public class FieldsSearchParam implements Serializable {
@ApiModelProperty(value = "排序类型 1创建时间 1修改时间 ", example = "1")
private int orderType;
@ApiModelProperty(value = "页数 ", example = "1")
private int page;
@ApiModelProperty(value = "数量 ", example = "10")
private int size;
@JsonIgnore
private int provinceId;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/FieldsMisListVo.java 0 → 100644
View file @ 5f45a71d
package com.liquidnet.service.kylin.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.time.LocalDateTime;
//返回
@Data
@EqualsAndHashCode(callSuper = false)
public class FieldsMisListVo implements Serializable {
@ApiModelProperty(value = "主键id")
private String fieldsId;
@ApiModelProperty(value = "场地名称")
private String name;
@ApiModelProperty(value = "封面图")
private String coverImg;
@ApiModelProperty(value = "省名称")
private String provinceName;
@ApiModelProperty(value = "城市名称")
private String cityName;
@ApiModelProperty(value = "县名称")
private String districtName;
@ApiModelProperty(value = "认证状态 0未认证 1已认证")
private int validStatus;
@ApiModelProperty(value = "是否显示 0不显示 1显示")
private int isDisplay;
@ApiModelProperty(value = "是否营业 0不营业 1营业中")
private int isBusiness;
@ApiModelProperty(value = "审核状态 0待审核 1已审核 2被拒绝")
private int changeStatus;
@ApiModelProperty(value = "创建时间")
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createdAt;
@ApiModelProperty(value = "修改时间")
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updatedAt;
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/PagerVo.java 0 → 100644
View file @ 5f45a71d
package com.liquidnet.service.kylin.dto.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class PagerVo<T> {
@ApiModelProperty(value = "返回记录集合")
private List<T> rows;//返回的记录集合
@ApiModelProperty(value = "总记录条数")
private long total;//总记录条数
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/KylinFieldsAdminService.java
View file @ 5f45a71d
package com.liquidnet.service.kylin.service.admin;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.kylin.dao.FieldMisListDao;
import com.liquidnet.service.kylin.dto.param.FieldsParam;
import com.liquidnet.service.kylin.dto.param.FieldsSearchParam;
import com.liquidnet.service.kylin.dto.vo.FieldsMisListVo;
import com.thoughtworks.xstream.core.util.Fields;
import java.util.HashMap;
import java.util.List;
/**
* <p>
* 服务类
......@@ -19,7 +24,9 @@ public interface KylinFieldsAdminService{
boolean fieldCreate(FieldsParam fieldsParam);
boolean fieldList(FieldsSearchParam fieldsSearchParam);
List<FieldMisListDao> fieldList(FieldsSearchParam fieldsSearchParam);
Long fieldListCount(FieldsSearchParam fieldsSearchParam);
boolean fieldDetails(FieldsParam fieldsParam);
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/FieldMisListDao.java 0 → 100644
View file @ 5f45a71d
package com.liquidnet.service.kylin.dao;
import lombok.Data;
import java.io.Serializable;
@Data
public class FieldMisListDao implements Serializable {
private String fieldsId;
private String name;
private String coverImg;
private String provinceName;
private String cityName;
private String districtName;
private String address;
private Integer validStatus;
private Integer isDisplay;
private Integer isBusiness;
private Integer changeStatus;
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinFieldsMapper.java
View file @ 5f45a71d
package com.liquidnet.service.kylin.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.liquidnet.service.kylin.dao.FieldMisListDao;
import com.liquidnet.service.kylin.entity.KylinFields;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public interface KylinFieldsMapper extends BaseMapper<KylinFields> {
Map misSearchFields(Map<String,Object> map);
List<FieldMisListDao> misSearchFields(Map<String,Object> map);
long misSearchFieldsCount(Map<String,Object> map);
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/FieldsMapper.xml
View file @ 5f45a71d
......@@ -2,42 +2,84 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.liquidnet.service.kylin.mapper.KylinFieldsMapper" >
<!-- <insert id="createFields" parameterType="com.liquidnet.service.kylin.entity.KylinFields" >-->
<!-- insert into kylin_fields-->
<!-- (fields_id, name, name_eng, pinyin, cover_img, address, longitude, latitude, phone, description,-->
<!-- province_id, province_name, city_id, city_name, district_id, district_name, refuse_message, comment,-->
<!-- created_at, updated_at)-->
<!-- values (#{fields_id}, #{name}, #{name_eng}, #{pinyin}, #{cover_img}, #{address}, #{longitude}, #{latitude},-->
<!-- #{phone}, #{description},#{province_id}, #{province_name}, #{city_id}, #{city_name}, #{district_id},-->
<!-- #{district_name},#{refuse_message}, #{comment},#{created_at}, #{updated_at})-->
<!-- </insert>-->
<!-- <parameterMap id="misSearchFieldsParam" type="Classify" >-->
<!-- <parameter property="name" javaType="java.lang.String" jdbcType="ResultMap"/>-->
<!-- <parameter property="province_id" javaType="java.lang.String" jdbcType="ResultMap"/>-->
<!-- <parameter property="district_id" javaType="java.lang.String" jdbcType="ResultMap"/>-->
<!-- <parameter property="city_id" javaType="java.lang.String" jdbcType="ResultMap"/>-->
<!-- <parameter property="valid_status" javaType="java.lang.String" jdbcType="ResultMap"/>-->
<!-- <parameter property="is_display" javaType="java.lang.String" jdbcType="ResultMap"/>-->
<!-- <parameter property="is_business" javaType="java.lang.String" jdbcType="ResultMap"/>-->
<!-- <parameter property="change_status" javaType="java.lang.String" jdbcType="ResultMap"/>-->
<!-- <parameter property="order_type" javaType="java.lang.String" jdbcType="ResultMap"/>-->
<resultMap id="FieldMisListResult" type="com.liquidnet.service.kylin.dao.FieldMisListDao" >
<result column="fields_id" property="fieldsId" />
<result column="name" property="name" />
<result column="cover_img" property="coverImg" />
<result column="city_name" property="cityName" />
<result column="province_name" property="provinceName" />
<result column="district_name" property="districtName" />
<result column="valid_status" property="validStatus" />
<result column="change_status" property="changeStatus" />
<result column="is_display" property="isDisplay" />
<result column="is_business" property="isBusiness" />
</resultMap>
<!-- </parameterMap>-->
<sql id="Base_Column_List">
f.fields_id,
f.name,
f.cover_img,
f.address,
f.city_name,
f.province_name,
f.district_name,
fs.valid_status,
fs.change_status,
fs.is_display,
fs.is_business
</sql>
<resultMap id="map1" type="com.liquidnet.service.kylin.entity.KylinFields">
<result property="name" column="name"/>
</resultMap>
<select id="misSearchFields" parameterType="java.util.Map" resultType="java.util.Map" >
SELECT f.name
<!-- mis场地列表 -->
<select id="misSearchFields" parameterType="java.util.Map" resultMap="FieldMisListResult" >
SELECT <include refid="Base_Column_List" />
FROM kylin_fields as f
LEFT JOIN kylin_field_status as fs ON f.fields_id=fs.field_id
<where>
1 = 1
<if test="name != ''">
AND f.name=#{name}
AND f.name LIKE concat('%', #{name}, '%')
</if>
<if test="provinceId != 0">
AND f.province_id=#{provinceId}
</if>
<if test="cityId != 0">
AND f.city_id=#{cityId}
</if>
<if test="districtId != 0">
AND f.district_id=#{districtId}
</if>
<if test="validStatus != -1">
AND fs.valid_status=#{validStatus}
</if>
<if test="isDisplay != -1">
AND fs.is_display=#{isDisplay}
</if>
<if test="isBusiness != -1">
AND fs.is_business=#{isBusiness}
</if>
<if test="changeStatus != -1">
AND fs.change_status=#{changeStatus}
</if>
</where>
<if test="orderType == 1">
ORDER BY f.created_at
</if>
<if test="orderType == 2">
ORDER BY f.updated_at
</if>
LIMIT #{page},#{size}
</select>
<!-- mis场地列表数量 -->
<select id="misSearchFieldsCount" parameterType="java.util.Map" resultType="long" >
SELECT COUNT(0)
FROM kylin_fields as f
LEFT JOIN kylin_field_status as fs ON f.fields_id=fs.field_id
<where>
1 = 1
<if test="name != ''">
AND f.name LIKE concat('%', #{name}, '%')
</if>
<if test="provinceId != 0">
AND f.province_id=#{provinceId}
......@@ -61,6 +103,8 @@
AND fs.change_status=#{changeStatus}
</if>
</where>
ORDER BY #{orderType}
<if test="orderType == 1">
ORDER BY f.created_at
</if>
</select>
</mapper>
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/FieldsAdminController.java
View file @ 5f45a71d
package com.liquidnet.service.kylin.controller.admin;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.kylin.dao.FieldMisListDao;
import com.liquidnet.service.kylin.dto.param.FieldsParam;
import com.liquidnet.service.kylin.dto.param.FieldsSearchParam;
import com.liquidnet.service.kylin.dto.vo.FieldsMisListVo;
import com.liquidnet.service.kylin.dto.vo.FieldsVo;
import com.liquidnet.service.kylin.dto.vo.PagerVo;
import com.liquidnet.service.kylin.service.impl.FieldsServiceImpl;
import com.liquidnet.service.kylin.service.impl.admin.FieldsAdminServiceImpl;
import io.swagger.annotations.Api;
......@@ -12,6 +15,9 @@ import io.swagger.annotations.ApiResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
@Api
@RestController
@RequestMapping("/admin/fields")
......@@ -24,10 +30,10 @@ public class FieldsAdminController {
@ApiOperation(value = "创建场地")
@ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<FieldsVo> createFields(@RequestBody FieldsParam fieldsParam) {
boolean result=fieldsAdminService.fieldCreate(fieldsParam);
if(result) {
boolean result = fieldsAdminService.fieldCreate(fieldsParam);
if (result) {
return ResponseDto.success();
}else{
} else {
return ResponseDto.failure("场地创建失败");
}
}
......@@ -36,23 +42,29 @@ public class FieldsAdminController {
@ApiOperation(value = "mis修改场地全部数据")
@ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<FieldsVo> fieldUpdate(@RequestBody FieldsParam fieldsParam) {
boolean result=fieldsAdminService.fieldUpdateMessage(fieldsParam);
if(result) {
boolean result = fieldsAdminService.fieldUpdateMessage(fieldsParam);
if (result) {
return ResponseDto.success();
}else{
} else {
return ResponseDto.failure("修改场地失败");
}
}
@PostMapping(value = "list")
@ApiOperation(value = "mis获取场地列表")
@ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
public void fieldList(@RequestBody FieldsSearchParam fieldsSearchParam) {
boolean result=fieldsAdminService.fieldList(fieldsSearchParam);
if(result) {
// return ResponseDto.success("成功");
}else{
// return ResponseDto.failure("修改场地失败");
@ApiResponse(response = PagerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<PagerVo<FieldMisListDao>> fieldList(@RequestBody FieldsSearchParam fieldsSearchParam) {
List<FieldMisListDao> result = fieldsAdminService.fieldList(fieldsSearchParam);
Long total = fieldsAdminService.fieldListCount(fieldsSearchParam);
PagerVo<FieldMisListDao> pagerVo = new PagerVo();
pagerVo.setRows(result);
pagerVo.setTotal(total);
if (pagerVo.getRows().size() > 0) {
return ResponseDto.success(pagerVo);
} else {
return ResponseDto.failure("获取列表失败");
}
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/FieldsAdminServiceImpl.java
View file @ 5f45a71d
......@@ -8,8 +8,10 @@ import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.kylin.constant.KylinRedisConst;
import com.liquidnet.service.kylin.dao.FieldMisListDao;
import com.liquidnet.service.kylin.dto.param.FieldsParam;
import com.liquidnet.service.kylin.dto.param.FieldsSearchParam;
import com.liquidnet.service.kylin.dto.vo.FieldsMisListVo;
import com.liquidnet.service.kylin.dto.vo.FieldsVo;
import com.liquidnet.service.kylin.entity.KylinFields;
import com.liquidnet.service.kylin.mapper.KylinFieldRelationMapper;
......@@ -24,14 +26,12 @@ import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.*;
@Service
public class FieldsAdminServiceImpl implements KylinFieldsAdminService {
......@@ -129,16 +129,30 @@ public class FieldsAdminServiceImpl implements KylinFieldsAdminService {
* @return
*/
@Override
public boolean fieldList(FieldsSearchParam fieldsSearchParam) {
public List<FieldMisListDao> fieldList(FieldsSearchParam fieldsSearchParam) {
try {
fieldsSearchParam.setCityId(0);
fieldsSearchParam.setDistrictId(0);
fieldsSearchParam.setProvinceId(0);
Map data=fieldsMapper.misSearchFields(BeanUtil.convertBeanToMap(fieldsSearchParam));
System.out.println("DATA = "+data.toString());
return true;
fieldsSearchParam.setPage((fieldsSearchParam.getPage()-1)*fieldsSearchParam.getSize());
List<FieldMisListDao> data=fieldsMapper.misSearchFields(BeanUtil.convertBeanToMap(fieldsSearchParam));
return data;
} catch (Exception e) {
return false;
return new ArrayList<>();
}
}
@Override
public Long fieldListCount(FieldsSearchParam fieldsSearchParam) {
try {
fieldsSearchParam.setCityId(0);
fieldsSearchParam.setDistrictId(0);
fieldsSearchParam.setProvinceId(0);
Long count = fieldsMapper.misSearchFieldsCount(BeanUtil.convertBeanToMap(fieldsSearchParam));
return count;
}catch (Exception e){
return 0L;
}
}
......
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