暂时提交

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

@@ -13,10 +13,12 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 
-// 参数
+/**
+ * 修改场地全部显示数据参数
+ */
 @Data
 public class FieldsParam implements Serializable {
-    @JsonIgnore
+    @ApiModelProperty(value = "场地主键", example = "测试场地")
     private String fieldsId;
 
     @ApiModelProperty(value = "场地名称", example = "测试场地")
@@ -67,17 +69,21 @@ public class FieldsParam implements Serializable {
     @ApiModelProperty(value = "拒绝理由", example = "")
     private String refuseMessage;
 
-    @ApiModelProperty(value = "认证状态 0未认证 1已认证", example = "0")
-    private int validStatus;
-
-    @ApiModelProperty(value = "是否显示 0不显示 1显示", example = "1")
-    private int isDisplay;
-
-    @ApiModelProperty(value = "是否营业 0不营业 1营业中", example = "1")
-    private int isBusiness;
-
-    @ApiModelProperty(value = "审核状态 0待审核 1已审核 2被拒绝", example = "0")
-    private int changeStatus;
+//    @ApiModelProperty(value = "认证状态 0未认证 1已认证", example = "0")
+//    @JsonIgnore
+//    private int validStatus;
+//
+//    @ApiModelProperty(value = "是否显示 0不显示 1显示", example = "1")
+//    @JsonIgnore
+//    private int isDisplay;
+//
+//    @ApiModelProperty(value = "是否营业 0不营业 1营业中", example = "1")
+//    @JsonIgnore
+//    private int isBusiness;
+//
+//    @ApiModelProperty(value = "审核状态 0待审核 1已审核 2被拒绝", example = "0")
+//    @JsonIgnore
+//    private int changeStatus;
 
     @ApiModelProperty(value = "补充字段", example = "")
     private String comment;
@@ -86,17 +92,25 @@ public class FieldsParam implements Serializable {
     public KylinFields getFields(String fieldsId, LocalDateTime createdAt) {
         KylinFields fields = new KylinFields();
         BeanUtils.copyProperties(this, fields);
-        fields.setFieldsId(fieldsId);
-        fields.setCreatedAt(createdAt);
+        if (null != fieldsId) {
+            fields.setFieldsId(fieldsId);
+        }
+        if (null != createdAt) {
+            fields.setCreatedAt(createdAt);
+        }
         return fields;
     }
 
     @JsonIgnore
-    public KylinFieldStatus getFieldStatus(String fieldsId, LocalDateTime createdAt) {
+    public KylinFieldStatus getFieldStatus(String fieldsId, LocalDateTime createdAt, int validStatus, int isDisplay, int isBusiness, int changeStatus) {
         KylinFieldStatus fieldStatus = new KylinFieldStatus();
         BeanUtils.copyProperties(this, fieldStatus);
         fieldStatus.setFieldStatusId(IDGenerator.nextSnowId().toString());
         fieldStatus.setFieldId(fieldsId);
+        fieldStatus.setValidStatus(validStatus);
+        fieldStatus.setIsDisplay(isDisplay);
+        fieldStatus.setIsBusiness(isBusiness);
+        fieldStatus.setChangeStatus(changeStatus);
         fieldStatus.setCreatedAt(createdAt);
         return fieldStatus;
     }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/FieldsSearchParam.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 FieldsSearchParam implements Serializable {
+    @ApiModelProperty(value = "场地名称", example = "")
+    private String name;
+
+    @ApiModelProperty(value = "省名称", example = "")
+    private String provinceName;
+
+    @ApiModelProperty(value = "城市名称", example = "")
+    private String cityName;
+
+    @ApiModelProperty(value = "县名称", example = "")
+    private String districtName;
+
+    @ApiModelProperty(value = "认证状态 -1全部 0未认证 1已认证", example = "-1")
+    private int validStatus;
+
+    @ApiModelProperty(value = "是否显示 -1全部 0不显示 1显示", example = "-1")
+    private int isDisplay;
+
+    @ApiModelProperty(value = "是否营业 -1全部 0不营业 1营业中", example = "-1")
+    private int isBusiness;
+
+    @ApiModelProperty(value = "审核状态 -1全部 0待审核 1已审核 2被拒绝", example = "-1")
+    private int changeStatus;
+
+    @ApiModelProperty(value = "排序类型 1创建时间 1修改时间 ", example = "1")
+    private int orderType;
+
+    @JsonIgnore
+    private int provinceId;
+
+    @JsonIgnore
+    private int cityId;
+
+    @JsonIgnore
+    private int districtId;
+}

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

@@ -3,7 +3,6 @@ package com.liquidnet.service.kylin.service;
 import com.liquidnet.service.kylin.dto.vo.FieldsVo;
 
 import java.util.HashMap;
-import java.util.List;
 
 /**
  * <p>

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

@@ -2,6 +2,7 @@ package com.liquidnet.service.kylin.service.admin;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.kylin.dto.param.FieldsParam;
+import com.liquidnet.service.kylin.dto.param.FieldsSearchParam;
 import com.thoughtworks.xstream.core.util.Fields;
 
 /**
@@ -14,6 +15,14 @@ import com.thoughtworks.xstream.core.util.Fields;
  */
 public interface KylinFieldsAdminService{
 
+    boolean fieldUpdateMessage(FieldsParam fieldsParam);
+
     boolean fieldCreate(FieldsParam fieldsParam);
 
+    boolean fieldList(FieldsSearchParam fieldsSearchParam);
+
+    boolean fieldDetails(FieldsParam fieldsParam);
+
+    boolean fieldAudit(FieldsParam fieldsParam);
+
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinFieldsMapper.java

@@ -3,8 +3,11 @@ package com.liquidnet.service.kylin.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.liquidnet.service.kylin.entity.KylinFields;
 
+import java.util.List;
+import java.util.Map;
+
 public interface KylinFieldsMapper extends BaseMapper<KylinFields> {
 
-//    int createFields(KylinFields fields);
+    Map misSearchFields(Map<String,Object> map);
 
 }

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

@@ -11,4 +11,56 @@
 <!--                #{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"/>-->
+
+<!--    </parameterMap>-->
+
+    <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
+    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}
+            </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>
+    ORDER BY #{orderType}
+    </select>
 </mapper>

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

@@ -2,6 +2,7 @@ package com.liquidnet.service.kylin.controller.admin;
 
 import com.liquidnet.service.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.FieldsParam;
+import com.liquidnet.service.kylin.dto.param.FieldsSearchParam;
 import com.liquidnet.service.kylin.dto.vo.FieldsVo;
 import com.liquidnet.service.kylin.service.impl.FieldsServiceImpl;
 import com.liquidnet.service.kylin.service.impl.admin.FieldsAdminServiceImpl;
@@ -9,10 +10,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @Api
 @RestController
@@ -33,4 +31,28 @@ public class FieldsAdminController {
             return ResponseDto.failure("场地创建失败");
         }
     }
+
+    @PutMapping(value = "")
+    @ApiOperation(value = "mis修改场地全部数据")
+    @ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<FieldsVo> fieldUpdate(@RequestBody FieldsParam fieldsParam) {
+        boolean result=fieldsAdminService.fieldUpdateMessage(fieldsParam);
+        if(result) {
+            return ResponseDto.success();
+        }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("修改场地失败");
+        }
+    }
 }

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

@@ -17,9 +17,7 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 
 
 @Service

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

 package com.liquidnet.service.kylin.service.impl.admin;
 
 
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.dto.param.FieldsParam;
+import com.liquidnet.service.kylin.dto.param.FieldsSearchParam;
 import com.liquidnet.service.kylin.dto.vo.FieldsVo;
+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.result.UpdateResult;
 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.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;
 
 @Service
-public class FieldsAdminServiceImpl  implements KylinFieldsAdminService {
+public class FieldsAdminServiceImpl implements KylinFieldsAdminService {
 
     @Autowired
     MongoTemplate mongoTemplate;
@@ -38,8 +51,42 @@ public class FieldsAdminServiceImpl  implements KylinFieldsAdminService {
     @Autowired
     private KylinFieldRelationMapper fieldRelationsMapper;
 
+    /**
+     * mis修改场地全部数据
+     *
+     * @param fieldsParam
+     * @return
+     */
+    @Override
+    public boolean fieldUpdateMessage(FieldsParam fieldsParam) {
+        try {
+            String fieldsId = fieldsParam.getFieldsId();
+            // mysql 操作
+            fieldsMapper.update(fieldsParam.getFields(null, null)
+                    , new UpdateWrapper<KylinFields>().eq("fields_id", fieldsId));
+
+            // mongo 操作
+            FieldsVo fieldsVo = new FieldsVo();
+            BeanUtils.copyProperties(fieldsParam, fieldsVo);
+            fieldsVo.setFieldsId(fieldsId);
+
+            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
+            );
+
+            // redis 操作
+            redisUtil.hset(KylinRedisConst.FIELDS, fieldsId, fieldsVo);
+            return true;
+
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
     /**
      * 创建场地
+     *
      * @param fieldsParam
      * @return boolean
      */
@@ -53,9 +100,9 @@ public class FieldsAdminServiceImpl  implements KylinFieldsAdminService {
             LocalDateTime createdAt = LocalDateTime.now();
 
             // mysql 操作
-            fieldsMapper.insert(fieldsParam.getFields(fieldsId,createdAt));
-            kylinFieldStatusMapper.insert(fieldsParam.getFieldStatus(fieldsId,createdAt));
-            fieldRelationsMapper.insert(fieldsParam.getFieldRelations(fieldsId,createdAt));
+            fieldsMapper.insert(fieldsParam.getFields(fieldsId, createdAt));
+            kylinFieldStatusMapper.insert(fieldsParam.getFieldStatus(fieldsId, createdAt, 1, 1, 1, 1));
+            fieldRelationsMapper.insert(fieldsParam.getFieldRelations(fieldsId, createdAt));
 
             // mongo 操作
             FieldsVo fieldsVo = new FieldsVo();
@@ -74,4 +121,46 @@ public class FieldsAdminServiceImpl  implements KylinFieldsAdminService {
             return false;
         }
     }
+
+    /**
+     * 场地列表 - 条件查询
+     *
+     * @param fieldsSearchParam
+     * @return
+     */
+    @Override
+    public boolean 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;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    /**
+     * 场地详情
+     *
+     * @param fieldsParam
+     * @return
+     */
+    @Override
+    public boolean fieldDetails(FieldsParam fieldsParam) {
+        return false;
+    }
+
+    /**
+     * 场地审核
+     *
+     * @param fieldsParam
+     * @return
+     */
+    @Override
+    public boolean fieldAudit(FieldsParam fieldsParam) {
+        return false;
+    }
 }