Mis 场地相关接口 提交

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/FieldsAuditParam.java

+package com.liquidnet.service.kylin.dto.param;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.kylin.entity.KylinFieldRelations;
+import com.liquidnet.service.kylin.entity.KylinFieldStatus;
+import com.liquidnet.service.kylin.entity.KylinFields;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+/**
+ * 修改场地全部显示数据参数
+ */
+@Data
+public class FieldsAuditParam  implements Serializable {
+    @ApiModelProperty(value = "场地主键")
+    private String fieldsId;
+
+    @ApiModelProperty(value = "认证状态 1已认证 2被拒绝", example = "1")
+    private int validStatus;
+
+    @ApiModelProperty(value = "审核状态 0待审核 1已审核 2被拒绝", example = "0",hidden = true)
+    private int changeStatus;
+
+    @ApiModelProperty(value = "拒绝理由", example = "")
+    private String refuseMessage;
+
+    @ApiModelProperty(example = "",hidden = true)
+    private String updatedAt;
+
+    @JsonIgnore
+    public KylinFieldStatus getFieldStatus() {
+        KylinFieldStatus fieldStatus = new KylinFieldStatus();
+        fieldStatus.setValidStatus(validStatus);
+        fieldStatus.setChangeStatus(changeStatus);
+        return fieldStatus;
+    }
+
+    @JsonIgnore
+    public KylinFields getFields() {
+        KylinFields fields = new KylinFields();
+        fields.setRefuseMessage(refuseMessage);
+        return fields;
+    }
+}
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/FieldsParam.java

@@ -66,9 +66,6 @@ public class FieldsParam implements Serializable {
     @ApiModelProperty(value = "县名称", example = "朝阳区")
     private String districtName;
 
-    @ApiModelProperty(value = "拒绝理由", example = "")
-    private String refuseMessage;
-
 //    @ApiModelProperty(value = "认证状态 0未认证 1已认证", example = "0")
 //    @JsonIgnore
 //    private int validStatus;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/FieldsStatusParam.java

+package com.liquidnet.service.kylin.dto.param;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.liquidnet.service.kylin.entity.KylinFieldStatus;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 修改场地全部显示数据参数
+ */
+@Data
+public class FieldsStatusParam implements Serializable {
+    @ApiModelProperty(value = "场地主键")
+    private String fieldsId;
+
+    @ApiModelProperty(value = "是否显示 0不显示 1显示", example = "1")
+    private int isDisplay;
+
+    @ApiModelProperty(value = "是否营业 0不营业 1营业中", example = "1")
+    private int isBusiness;
+
+    @ApiModelProperty(example = "", hidden = true)
+    private String updatedAt;
+
+    @JsonIgnore
+    public KylinFieldStatus getFieldStatus() {
+        KylinFieldStatus fieldStatus = new KylinFieldStatus();
+        fieldStatus.setIsBusiness(isBusiness);
+        fieldStatus.setIsDisplay(isDisplay);
+        return fieldStatus;
+    }
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/FieldsMisDetailsVo.java

+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
+public class FieldsMisDetailsVo implements Serializable {
+    @ApiModelProperty(value = "主键id")
+    private String fieldsId;
+
+    @ApiModelProperty(value = "场地名称")
+    private String name;
+
+    @ApiModelProperty(value = "场地英文名")
+    private String name_eng;
+
+    @ApiModelProperty(value = "封面图")
+    private String coverImg;
+
+    @ApiModelProperty(value = "联系地址")
+    private String address;
+
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+
+    @ApiModelProperty(value = "拒绝理由")
+    private String refuseMessage;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+    @ApiModelProperty(value = "省id")
+    private String provinceId;
+
+    @ApiModelProperty(value = "省名称")
+    private String provinceName;
+
+    @ApiModelProperty(value = "城市id")
+    private String cityId;
+
+    @ApiModelProperty(value = "城市名称")
+    private String cityName;
+
+    @ApiModelProperty(value = "县id")
+    private String districtId;
+
+    @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/FieldsMisListVo.java

@@ -26,6 +26,9 @@ public class FieldsMisListVo implements Serializable {
     @ApiModelProperty(value = "封面图")
     private String coverImg;
 
+    @ApiModelProperty(value = "联系地址")
+    private String address;
+
     @ApiModelProperty(value = "省名称")
     private String provinceName;
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/FieldsVo.java

 package com.liquidnet.service.kylin.dto.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
@@ -15,7 +16,6 @@ import java.time.LocalDateTime;
 //返回
 
 @Data
-@EqualsAndHashCode(callSuper = false)
 public class FieldsVo implements Serializable {
     @ApiModelProperty(value = "主键id")
     private String fieldsId;
@@ -84,14 +84,8 @@ public class FieldsVo implements Serializable {
     private String comment;
 
     @ApiModelProperty(value = "创建时间")
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime createdAt;
+    private String  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;
+    private String updatedAt;
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/KylinFieldsAdminService.java

 package com.liquidnet.service.kylin.service.admin;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.kylin.dao.FieldMisDetailsDao;
 import com.liquidnet.service.kylin.dao.FieldMisListDao;
+import com.liquidnet.service.kylin.dto.param.FieldsAuditParam;
 import com.liquidnet.service.kylin.dto.param.FieldsParam;
 import com.liquidnet.service.kylin.dto.param.FieldsSearchParam;
+import com.liquidnet.service.kylin.dto.param.FieldsStatusParam;
+import com.liquidnet.service.kylin.dto.vo.FieldsMisDetailsVo;
 import com.liquidnet.service.kylin.dto.vo.FieldsMisListVo;
 import com.thoughtworks.xstream.core.util.Fields;
 
@@ -28,8 +32,10 @@ public interface KylinFieldsAdminService{
 
     Long fieldListCount(FieldsSearchParam fieldsSearchParam);
 
-    boolean fieldDetails(FieldsParam fieldsParam);
+    FieldMisDetailsDao fieldDetails(String  fieldsId);
 
-    boolean fieldAudit(FieldsParam fieldsParam);
+    boolean fieldAudit(FieldsAuditParam fieldsAuditParam);
+
+    boolean fieldStatus(FieldsStatusParam fieldsStatusParam);
 
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/FieldMisDetailsDao.java

+package com.liquidnet.service.kylin.dao;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class FieldMisDetailsDao implements Serializable {
+
+    private String fieldsId;
+
+    private String name;
+
+    private String name_eng;
+
+    private String coverImg;
+
+    private int provinceId;
+
+    private String provinceName;
+
+    private int cityId;
+
+    private String cityName;
+
+    private int districtId;
+
+    private String districtName;
+
+    private String latitude;
+
+    private String longitude;
+
+    private String address;
+
+    private String phone;
+
+    private String refuseMessage;
+
+    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

 package com.liquidnet.service.kylin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.kylin.dao.FieldMisDetailsDao;
 import com.liquidnet.service.kylin.dao.FieldMisListDao;
 import com.liquidnet.service.kylin.entity.KylinFields;
 
@@ -10,8 +11,18 @@ import java.util.Map;
 
 public interface KylinFieldsMapper extends BaseMapper<KylinFields> {
 
+    //列表
     List<FieldMisListDao> misSearchFields(Map<String,Object> map);
-
+    //分页数量
     long misSearchFieldsCount(Map<String,Object> map);
 
+    //详情
+    FieldMisDetailsDao misFieldsDetails(String  fieldsId);
+
+    //审核
+//    long misFieldsAudit(Map<String,Object> map);
+
+    //修改状态
+//    long misFieldsAudit(Map<String,Object> map);
+
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/FieldsMapper.xml

 <?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.liquidnet.service.kylin.mapper.KylinFieldsMapper" >
+<mapper namespace="com.liquidnet.service.kylin.mapper.KylinFieldsMapper">
 
-    <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 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="address" property="address"/>
+        <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>
 
+    <resultMap id="FieldMisDetailsResult" type="com.liquidnet.service.kylin.dao.FieldMisDetailsDao">
+        <result column="fields_id" property="fieldsId"/>
+        <result column="name" property="name"/>
+        <result column="name_eng" property="nameEng"/>
+        <result column="cover_img" property="coverImg"/>
+        <result column="latitude" property="latitude"/>
+        <result column="longitude" property="longitude"/>
+        <result column="address" property="address"/>
+        <result column="phone" property="phone"/>
+        <result column="refuse_message" property="refuseMessage"/>
+        <result column="city_name" property="cityName"/>
+        <result column="province_name" property="provinceName"/>
+        <result column="district_name" property="districtName"/>
+        <result column="city_id" property="cityId"/>
+        <result column="province_id" property="provinceId"/>
+        <result column="district_id" property="districtId"/>
+        <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>
+
+    <!-- 列表封装 -->
     <sql id="Base_Column_List">
 		f.fields_id,
 		f.name,
@@ -29,12 +53,35 @@
         fs.is_business
 	</sql>
 
+    <!-- 详情封装 -->
+    <sql id="Base_Column_Details">
+		f.fields_id,
+		f.name,
+		f.name_eng,
+		f.cover_img,
+		f.latitude,
+		f.longitude,
+		f.address,
+		f.city_id,
+		f.city_name,
+		f.province_id,
+		f.province_name,
+		f.district_id,
+		f.district_name,
+		f.phone,
+		f.refuse_message,
+		fs.valid_status,
+		fs.change_status,
+		fs.is_display,
+        fs.is_business
+	</sql>
 
     <!-- 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
+    <select id="misSearchFields" parameterType="java.util.Map" resultMap="FieldMisDetailsResult">
+        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 != ''">
@@ -72,7 +119,7 @@
     </select>
 
     <!-- mis场地列表数量 -->
-    <select id="misSearchFieldsCount" parameterType="java.util.Map" resultType="long" >
+    <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
@@ -107,4 +154,15 @@
             ORDER BY f.created_at
         </if>
     </select>
+
+    <!-- mis场地详情 -->
+    <select id="misFieldsDetails" parameterType="java.lang.String" resultMap="FieldMisDetailsResult">
+        SELECT
+        <include refid="Base_Column_Details"/>
+        FROM kylin_fields as f
+        LEFT JOIN kylin_field_status as fs ON f.fields_id=fs.field_id
+        <where>
+            f.fields_id=#{fieldsId}
+        </where>
+    </select>
 </mapper>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql

@@ -61,7 +61,7 @@ CREATE TABLE `kylin_field_status`
     `mid`              int(11)      NOT NULL AUTO_INCREMENT,
     `field_status_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'field_status_id',
     `field_id`        varchar(255) NOT NULL DEFAULT '' COMMENT '场地关联id',
-    `valid_status`    tinyint      NOT NULL DEFAULT 0 COMMENT '认证状态 0未认证 1已认证',
+    `valid_status`    tinyint      NOT NULL DEFAULT 0 COMMENT '认证状态 0未认证 1已认证 2被拒绝',
     `is_display`      tinyint      NOT NULL DEFAULT 1 COMMENT '是否显示 0不显示 1显示',
     `is_business`     tinyint      NOT NULL DEFAULT 0 COMMENT '是否营业 0不营业 1营业中',
     `change_status`   tinyint      NOT NULL DEFAULT 0 COMMENT '审核状态 0待审核 1已审核 2被拒绝',

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/ServiceKylinApplication.java

@@ -23,7 +23,7 @@ public class ServiceKylinApplication implements CommandLineRunner {
     private Environment environment;
 
     public static void main(String[] args) {
-        SpringApplication.run(ServiceKylinApplication.class, args);
+        SpringApplication.  run(ServiceKylinApplication.class, args);
     }
 
     @Override

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/FieldsAdminController.java

 package com.liquidnet.service.kylin.controller.admin;
 
 import com.liquidnet.service.ResponseDto;
+import com.liquidnet.service.kylin.dao.FieldMisDetailsDao;
 import com.liquidnet.service.kylin.dao.FieldMisListDao;
+import com.liquidnet.service.kylin.dto.param.FieldsAuditParam;
 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.param.FieldsStatusParam;
 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;
 import io.swagger.annotations.ApiOperation;
@@ -67,4 +68,43 @@ public class FieldsAdminController {
             return ResponseDto.failure("获取列表失败");
         }
     }
+
+    @GetMapping(value = "details")
+    @ApiOperation(value = "mis场地详情")
+    @ApiResponse(response = FieldMisDetailsDao.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<FieldMisDetailsDao> fieldDetails(@RequestParam("fieldsId") String fieldsId) {
+        FieldMisDetailsDao result = null;
+        result = fieldsAdminService.fieldDetails(fieldsId);
+        if (null != result) {
+            return ResponseDto.success(result);
+        } else {
+            return ResponseDto.failure("获取场地详情失败");
+        }
+    }
+
+    @PostMapping(value = "audit")
+    @ApiOperation(value = "mis场地审核")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<String> fieldAudit(@RequestBody FieldsAuditParam fieldsAuditParam) {
+
+        boolean result = fieldsAdminService.fieldAudit(fieldsAuditParam);
+
+        if (result) {
+            return ResponseDto.success("审核成功");
+        } else {
+            return ResponseDto.failure("审核失败");
+        }
+    }
+
+    @PostMapping(value = "status")
+    @ApiOperation(value = "mis修改场地状态")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<String> fieldStatus(@RequestBody FieldsStatusParam fieldsStatusParam) {
+        boolean result = fieldsAdminService.fieldStatus(fieldsStatusParam);
+        if (result) {
+            return ResponseDto.success("修改成功");
+        } else {
+            return ResponseDto.failure("获取列表失败");
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/FieldsServiceImpl.java

@@ -63,6 +63,7 @@ public class FieldsServiceImpl extends ServiceImpl<KylinFieldsMapper, KylinField
         //不存在 获取 mongo数据
         if (null == info) {
             info = mongoTemplate.findOne(Query.query(Criteria.where("fieldsId").is(fieldId)), FieldsVo.class, FieldsVo.class.getSimpleName());
+            redisUtil.hset(KylinRedisConst.FIELDS, fieldId + "",info);
         }
         return info;
     }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/FieldsAdminServiceImpl.java

@@ -3,34 +3,41 @@ package com.liquidnet.service.kylin.service.impl.admin;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 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.FieldMisDetailsDao;
 import com.liquidnet.service.kylin.dao.FieldMisListDao;
+import com.liquidnet.service.kylin.dto.param.FieldsAuditParam;
 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.param.FieldsStatusParam;
 import com.liquidnet.service.kylin.dto.vo.FieldsVo;
+import com.liquidnet.service.kylin.entity.KylinFieldStatus;
 import com.liquidnet.service.kylin.entity.KylinFields;
 import com.liquidnet.service.kylin.mapper.KylinFieldRelationMapper;
 import com.liquidnet.service.kylin.mapper.KylinFieldStatusMapper;
 import com.liquidnet.service.kylin.mapper.KylinFieldsMapper;
 import com.liquidnet.service.kylin.service.admin.KylinFieldsAdminService;
 import com.mongodb.BasicDBObject;
+import com.mongodb.client.model.FindOneAndUpdateOptions;
+import com.mongodb.client.model.ReturnDocument;
 import com.mongodb.client.result.UpdateResult;
+import org.bson.Document;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 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.time.format.DateTimeFormatter;
 import java.util.*;
 
 @Service
@@ -61,22 +68,28 @@ public class FieldsAdminServiceImpl implements KylinFieldsAdminService {
     public boolean fieldUpdateMessage(FieldsParam fieldsParam) {
         try {
             String fieldsId = fieldsParam.getFieldsId();
+            LocalDateTime updatedAt = LocalDateTime.now();
             // mysql 操作
-            fieldsMapper.update(fieldsParam.getFields(null, null)
+            KylinFields fields = fieldsParam.getFields(null, null);
+            fields.setUpdatedAt(updatedAt);
+            fieldsMapper.update(fields
                     , new UpdateWrapper<KylinFields>().eq("fields_id", fieldsId));
 
             // mongo 操作
-            FieldsVo fieldsVo = new FieldsVo();
-            BeanUtils.copyProperties(fieldsParam, fieldsVo);
-            fieldsVo.setFieldsId(fieldsId);
+            FieldsVo fieldsVoData = new FieldsVo();
+            BeanUtils.copyProperties(fieldsParam, fieldsVoData);
+            fieldsVoData.setFieldsId(fieldsId);
+            fieldsVoData.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
 
-            BasicDBObject object = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(fieldsVo)));
-            UpdateResult updateRst = mongoTemplate.getCollection(FieldsVo.class.getSimpleName()).updateOne(
-                    Query.query(Criteria.where("fieldsId").is(fieldsId)).getQueryObject(), object
+            BasicDBObject object = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(fieldsVoData)));
+            Document doc = mongoTemplate.getCollection(FieldsVo.class.getSimpleName()).findOneAndUpdate(
+                    Query.query(Criteria.where("fieldsId").is(fieldsId)).getQueryObject(),
+                    object,
+                    new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
             );
 
             // redis 操作
-            redisUtil.hset(KylinRedisConst.FIELDS, fieldsId, fieldsVo);
+            redisUtil.hset(KylinRedisConst.FIELDS, fieldsId, JsonUtils.fromJson(doc.toJson(), FieldsVo.class));
             return true;
 
         } catch (Exception e) {
@@ -108,9 +121,10 @@ public class FieldsAdminServiceImpl implements KylinFieldsAdminService {
             FieldsVo fieldsVo = new FieldsVo();
             BeanUtils.copyProperties(fieldsParam, fieldsVo);
             fieldsVo.setFieldsId(fieldsId);
-            fieldsVo.setCreatedAt(createdAt);
-            Collection<FieldsVo> insertRst = mongoTemplate.insert(
-                    Collections.singletonList(fieldsVo), FieldsVo.class.getSimpleName()
+            fieldsVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            fieldsVo.setUpdatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            FieldsVo data = mongoTemplate.insert(
+                    fieldsVo, FieldsVo.class.getSimpleName()
             );
 
             // redis 操作
@@ -134,9 +148,9 @@ public class FieldsAdminServiceImpl implements KylinFieldsAdminService {
             fieldsSearchParam.setCityId(0);
             fieldsSearchParam.setDistrictId(0);
             fieldsSearchParam.setProvinceId(0);
-            fieldsSearchParam.setPage((fieldsSearchParam.getPage()-1)*fieldsSearchParam.getSize());
+            fieldsSearchParam.setPage((fieldsSearchParam.getPage() - 1) * fieldsSearchParam.getSize());
 
-            List<FieldMisListDao> data=fieldsMapper.misSearchFields(BeanUtil.convertBeanToMap(fieldsSearchParam));
+            List<FieldMisListDao> data = fieldsMapper.misSearchFields(BeanUtil.convertBeanToMap(fieldsSearchParam));
             return data;
         } catch (Exception e) {
             return new ArrayList<>();
@@ -151,7 +165,7 @@ public class FieldsAdminServiceImpl implements KylinFieldsAdminService {
             fieldsSearchParam.setProvinceId(0);
             Long count = fieldsMapper.misSearchFieldsCount(BeanUtil.convertBeanToMap(fieldsSearchParam));
             return count;
-        }catch (Exception e){
+        } catch (Exception e) {
             return 0L;
         }
     }
@@ -159,22 +173,85 @@ public class FieldsAdminServiceImpl implements KylinFieldsAdminService {
     /**
      * 场地详情
      *
-     * @param fieldsParam
+     * @param fieldsId
      * @return
      */
     @Override
-    public boolean fieldDetails(FieldsParam fieldsParam) {
-        return false;
+    public FieldMisDetailsDao fieldDetails(String fieldsId) {
+        FieldMisDetailsDao data = fieldsMapper.misFieldsDetails(fieldsId);
+        return data;
     }
 
     /**
      * 场地审核
      *
-     * @param fieldsParam
+     * @param fieldsAuditParam
+     * @return
+     */
+    @Override
+    public boolean fieldAudit(FieldsAuditParam fieldsAuditParam) {
+        try {
+            String fieldsId = fieldsAuditParam.getFieldsId();
+            LocalDateTime updatedAt = LocalDateTime.now();
+            fieldsAuditParam.setChangeStatus(1);
+            fieldsAuditParam.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+
+            // mysql 操作
+            KylinFields fields = fieldsAuditParam.getFields();
+            fields.setUpdatedAt(updatedAt);
+            fieldsMapper.update(fields, new UpdateWrapper<KylinFields>().eq("fields_id", fieldsId));
+
+            KylinFieldStatus fieldStatus = fieldsAuditParam.getFieldStatus();
+            fieldStatus.setUpdatedAt(updatedAt);
+            kylinFieldStatusMapper.update(fieldStatus, new UpdateWrapper<KylinFieldStatus>().eq("field_id", fieldsId));
+
+            // mongo 操作
+            Object obj = JSON.parse(JsonUtils.toJson(fieldsAuditParam));
+            BasicDBObject object = new BasicDBObject("$set", obj);
+            Document doc = mongoTemplate.getCollection(FieldsVo.class.getSimpleName()).findOneAndUpdate(
+                    Query.query(Criteria.where("fieldsId").is(fieldsId)).getQueryObject(),
+                    object,
+                    new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
+            );
+
+            // redis 操作
+            redisUtil.hset(KylinRedisConst.FIELDS, fieldsId, JsonUtils.fromJson(doc.toJson(), FieldsVo.class));
+            return true;
+
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    /**
+     * 修改场地状态
+     *
+     * @param fieldsStatusParam
      * @return
      */
     @Override
-    public boolean fieldAudit(FieldsParam fieldsParam) {
-        return false;
+    public boolean fieldStatus(FieldsStatusParam fieldsStatusParam) {
+        try {
+            String fieldsId = fieldsStatusParam.getFieldsId();
+            LocalDateTime updatedAt = LocalDateTime.now();
+            fieldsStatusParam.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+
+            KylinFieldStatus fieldStatus = fieldsStatusParam.getFieldStatus();
+            fieldStatus.setUpdatedAt(updatedAt);
+            kylinFieldStatusMapper.update(fieldStatus, new UpdateWrapper<KylinFieldStatus>().eq("field_id", fieldsId));
+
+            Object obj = JSON.parse(JsonUtils.toJson(fieldsStatusParam));
+            BasicDBObject object = new BasicDBObject("$set", obj);
+            Document doc = mongoTemplate.getCollection(FieldsVo.class.getSimpleName()).findOneAndUpdate(
+                    Query.query(Criteria.where("fieldsId").is(fieldsId)).getQueryObject(),
+                    object,
+                    new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
+            );
+
+            redisUtil.hset(KylinRedisConst.FIELDS, fieldsId, JsonUtils.fromJson(doc.toJson(), FieldsVo.class));
+            return true;
+        }catch (Exception e){
+            return false;
+        }
     }
 }