成交记录

ch-admin-api/src/main/java/com/wwdz/ch/admin/config/ShiroConfig.java

@@ -42,8 +42,8 @@ public class ShiroConfig {
 		filterChainDefinitionMap.put("/actuator/health", "anon");
 
 
-	//	filterChainDefinitionMap.put("/admin/**", "anon");
-		filterChainDefinitionMap.put("/admin/**", "authc");
+		filterChainDefinitionMap.put("/admin/**", "anon");
+	//	filterChainDefinitionMap.put("/admin/**", "authc");
 		shiroFilterFactoryBean.setLoginUrl("/admin/auth/401");
 		shiroFilterFactoryBean.setSuccessUrl("/admin/auth/index");
 		shiroFilterFactoryBean.setUnauthorizedUrl("/admin/auth/403");

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/BidRecordController.java

 package com.wwdz.ch.admin.controller;
 
 
-import com.wwdz.ch.admin.entity.vo.BidRecordRequestDto;
+import com.wwdz.ch.db.dto.request.BidRecordRequestDto;
+import com.wwdz.ch.admin.entity.vo.BidRecordVo;
 import com.wwdz.ch.admin.service.BidRecordService;
 import com.wwdz.ch.admin.util.AuthSupport;
 import com.wwdz.ch.core.type.ListResult;
@@ -30,11 +31,12 @@ public class BidRecordController {
 
     @GetMapping("/list")
     @ApiOperation(value = "成交记录列表")
-    public ListResult<BidRecordRequestDto> list(@ApiParam("分类id") Integer cid) {
-        logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 商场管理->成交记录->查询,请求参数:cid:{}", cid);
-        List<BidRecord> collectList = bidRecordService.queryByCid(cid);
-        List<BidRecordRequestDto> data = collectList.parallelStream().map(a -> new BidRecordRequestDto(a)).collect(Collectors.toList());
-        return new ListResult<BidRecordRequestDto>(data, data.size());
+    public ListResult<BidRecordVo> list(@RequestBody BidRecordRequestDto dto) {
+        int cid = dto.getCid();
+        logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 钱币管理->成交记录->查询,请求参数:cid:{}", cid);
+        List<BidRecord> collectList = bidRecordService.query(dto);
+        List<BidRecordVo> data = collectList.parallelStream().map(a -> new BidRecordVo(a)).collect(Collectors.toList());
+        return new ListResult<BidRecordVo>(data, data.size());
     }
 
     @PostMapping("/add")
@@ -45,6 +47,7 @@ public class BidRecordController {
     }
 
     @PostMapping("/findDetail")
+    @ApiOperation(value = "查询成交明细")
     public Result findDetail(@RequestBody BidRecordRequestDto record) {
         BidRecord bidRecord = bidRecordService.queryById(record.getId());
         return Result.success(bidRecord);

ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/vo/BidRecordVo.java

+package com.wwdz.ch.admin.entity.vo;
+
+import com.wwdz.ch.db.domain.BidRecord;
+import com.xxdxxs.entity.Entity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Data
+public class BidRecordVo implements Entity {
+
+    private Long id;
+
+    @ApiModelProperty(value = "购买人", name = "buyer")
+    private String buyer;
+
+    @ApiModelProperty(value = "购买平台", name = "platform")
+    private String platform;
+
+    @ApiModelProperty(value = "分类Id", name = "cid")
+    private Integer cid;
+
+    @ApiModelProperty(value = "图片", name = "images")
+    private List<String> images;
+
+    @ApiModelProperty(value = "成交时间", name = "bidTime")
+    private Integer bidTime;
+
+    @ApiModelProperty(value = "成交价格", name = "price")
+    private Long price;
+
+    @ApiModelProperty(value = "钱币描述", name = "extra")
+    private String extra;
+
+    @ApiModelProperty(value = "成交链接", name = "link")
+    private String link;
+
+    public BidRecordVo(BidRecord record) {
+        this.id = record.getId();
+        this.cid = record.getCid();
+        this.images = Arrays.asList(record.getImages().split(";"));
+        this.bidTime = record.getBidTime();
+        this.price = record.getPrice();
+        this.buyer = record.getBuyer();
+        this.platform = record.getPlatform();
+    }
+}

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/BidRecordServiceImpl.java

 package com.wwdz.ch.admin.impl;
 
+import com.wwdz.ch.db.dto.request.BidRecordRequestDto;
 import com.wwdz.ch.admin.service.BidRecordService;
 import com.wwdz.ch.db.domain.BidRecord;
 import com.wwdz.ch.db.manager.BidRecordManager;
@@ -34,6 +35,11 @@ public class BidRecordServiceImpl implements BidRecordService {
         return bidRecordManager.queryByCid(cid);
     }
 
+    @Override
+    public List<BidRecord> query(BidRecordRequestDto dto) {
+        return null;
+    }
+
     @Override
     public void deleteById(Long id) {
         bidRecordManager.deleteById(id);

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/ItemServiceImpl.java

@@ -17,6 +17,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import java.util.*;
 
@@ -39,7 +40,19 @@ public class ItemServiceImpl implements ItemService {
 
     @Override
     public List<CoinVo> findList(CoinRequestDto coinRequestDto) {
-        return null;
+        try {
+            List<Item> itemList = itemManager.findList(coinRequestDto);
+            List<CoinVo> coinVoList = new ArrayList<>();
+            itemList.forEach(item -> {
+                CoinVo coinVo = convertEntity(item);
+                EntityMapper.copyAttribute(item, coinVo);
+                coinVoList.add(coinVo);
+            });
+            return coinVoList;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Collections.emptyList();
     }
 
     @Override
@@ -48,9 +61,8 @@ public class ItemServiceImpl implements ItemService {
         try {
             //不需要查询新一页数据，则根据id查询明细
             if (ObjectUtils.isEmpty(coinRequestDto.getIsRefresh()) || coinRequestDto.getIsRefresh() != 1) {
-                CoinVo coinVo = new CoinVo();
                 Item item = itemManager.findDetails(coinRequestDto.getId());
-                coinVo = convertEntity(item);
+                CoinVo coinVo = convertEntity(item);
                 EntityMapper.copyAttribute(item, coinVo);
                 map.put("isRefresh", 0);
                 map.put("data", coinVo);

ch-admin-api/src/main/java/com/wwdz/ch/admin/service/BidRecordService.java

 package com.wwdz.ch.admin.service;
 
+import com.wwdz.ch.db.dto.request.BidRecordRequestDto;
 import com.wwdz.ch.db.domain.BidRecord;
 
 import java.util.List;
@@ -14,6 +15,8 @@ public interface BidRecordService {
 
     List<BidRecord> queryByCid (Integer cid);
 
+    List<BidRecord> query (BidRecordRequestDto dto);
+
     void deleteById (Long id);
 
 }

ch-admin-api/src/main/resources/application.yml

@@ -9,17 +9,25 @@ spring:
       max-request-size: 80Mb
       location: /tmp
 
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+    serialization:
+      write-dates-as-timestamps: false
+
 
 server:
   port: 8085
   servlet:
     context-path:
 
+
+
 logging:
   level:
-    root:  debug
-    org.springframework:  debug
+    root:  INFO
+    org.springframework:  INFO
     org.mybatis:  debug
-    com.jbp.db.dao: debug
-    com.wwdz.ch.admin:  DEBUG
-    com.wwdz.ch:  debug
+    com.jbp.db.dao: INFO
+    com.wwdz.ch.admin:  INFO
+    com.wwdz.ch:  INFO
\ No newline at end of file

ch-core/src/main/java/com/wwdz/ch/core/config/TimeConfig.java

+package com.wwdz.ch.core.config;
+
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+@Configuration
+public class TimeConfig implements WebMvcConfigurer {
+
+
+    //定义时间格式转换器
+    @Bean
+    public MappingJackson2HttpMessageConverter jackson2HttpMessageConverter() {
+        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+        converter.setObjectMapper(mapper);
+        return converter;
+    }
+
+    //添加转换器
+    @Override
+    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+        //将我们定义的时间格式转换器添加到转换器列表中,
+        //这样jackson格式化时候但凡遇到Date类型就会转换成我们定义的格式
+        converters.add(jackson2HttpMessageConverter());
+    }
+
+
+}
+

ch-core/src/main/resources/application-dev.yml

@@ -156,3 +156,9 @@ spring:
   elasticsearch:
     jest:
       uris:  172.16.122.190:9200
+
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+    serialization:
+      write-dates-as-timestamps: false
\ No newline at end of file

ch-core/src/main/resources/application-prod.yml

@@ -145,10 +145,15 @@ spring:
       time-between-eviction-runs-millis:  60000
       filters:  stat,wall
 
-
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+    serialization:
+      write-dates-as-timestamps: false
 
   redis:
     host: r-bp1xrb4in3pccqxfat.redis.rds.aliyuncs.com
     port: 6379
     password: Jyt4gT06qdRZnC1z
     database: 0
+

ch-dao/src/main/java/com/wwdz/ch/db/domain/ItemExample.java

@@ -393,7 +393,7 @@ public class ItemExample {
         }
 
         public Criteria andNameLike(String value) {
-            addCriterion("`name` like", value, "name");
+            addCriterion("`name` like", "%" +value+ "% ", "name");
             return (Criteria) this;
         }
 

ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/vo/BidRecordRequestDto.java → ch-dao/src/main/java/com/wwdz/ch/db/dto/request/BidRecordRequestDto.java

-package com.wwdz.ch.admin.entity.vo;
+package com.wwdz.ch.db.dto.request;
 
-import com.qiniu.util.StringUtils;
 import com.wwdz.ch.db.domain.BidRecord;
 import com.xxdxxs.entity.Entity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Arrays;
 import java.util.List;
 
-@ApiModel(value = "BidRecordRequestDto", description = "成交记录前端交互VO")
 @Data
-public class BidRecordRequestDto implements Entity {
+public class BidRecordRequestDto extends BaseRequestDto implements Entity {
 
     private static final long serialVersionUID = 4014894220574552837L;
 
-    @ApiModelProperty(value = "成交记录id", name = "id")
     private Long id;
 
-    @ApiModelProperty(value = "购买人", name = "buyer")
     private String buyer;
 
-    @ApiModelProperty(value = "购买平台", name = "platform")
     private String platform;
 
-    @ApiModelProperty(value = "分类Id", name = "cid")
     private Integer cid;
 
-    @ApiModelProperty(value = "图片", name = "images")
     private List<String> images;
 
-    @ApiModelProperty(value = "成交时间", name = "bidtime")
-    private Integer bidtime;
+    private Integer bidTime;
 
-    @ApiModelProperty(value = "成交价格", name = "price")
     private Long price;
 
+    private String extra;
+
+    private String link;
+
     /**
-     * 额外的成交信息
+     * 用户前端查询
+     * 价格范围
      */
-    private String extra;
+    private Long startPrice;
+
+    private Long endPrice;
 
     /**
-     * 成交链接
+     * 用户前端查询
+     * 成交时间
      */
-    private String link;
+    private Integer startBidTime;
+
+    private Integer endBidTime;
+
 
     public BidRecord toDo() {
         BidRecord record = new BidRecord();
-        record.setBidTime(bidtime);
+        record.setBidTime(bidTime);
         record.setBuyer(buyer);
         record.setIsDeleted(0);
         record.setCid(cid);
@@ -67,7 +68,7 @@ public class BidRecordRequestDto implements Entity {
         this.id = record.getId();
         this.cid = record.getCid();
         this.images = Arrays.asList(record.getImages().split(";"));
-        this.bidtime = record.getBidTime();
+        this.bidTime = record.getBidTime();
         this.price = record.getPrice();
         this.buyer = record.getBuyer();
         this.platform = record.getPlatform();
@@ -113,12 +114,12 @@ public class BidRecordRequestDto implements Entity {
         this.images = images;
     }
 
-    public Integer getBidtime() {
-        return bidtime;
+    public Integer getBidTime() {
+        return bidTime;
     }
 
-    public void setBidtime(Integer bidtime) {
-        this.bidtime = bidtime;
+    public void setBidTime(Integer bidTime) {
+        this.bidTime = bidTime;
     }
 
     public Long getPrice() {

ch-dao/src/main/java/com/wwdz/ch/db/manager/BidRecordManager.java

 package com.wwdz.ch.db.manager;
 
 import com.wwdz.ch.db.domain.BidRecord;
+import com.wwdz.ch.db.dto.request.BidRecordRequestDto;
+
 import java.util.List;
 
 public interface BidRecordManager {
@@ -13,6 +15,8 @@ public interface BidRecordManager {
 
     List<BidRecord> queryByCid (Integer cid);
 
+    List<BidRecord> query (BidRecordRequestDto dto);
+
     void deleteById (Long id);
 
 }
\ No newline at end of file

ch-dao/src/main/java/com/wwdz/ch/db/manager/impl/BidRecordManagerImpl.java

@@ -4,7 +4,9 @@ import com.wwdz.ch.db.dao.BidRecordMapper;
 import com.wwdz.ch.db.domain.BidRecord;
 import com.wwdz.ch.db.domain.BidRecordExample;
 import com.wwdz.ch.db.domain.FavoritesExample;
+import com.wwdz.ch.db.dto.request.BidRecordRequestDto;
 import com.wwdz.ch.db.manager.BidRecordManager;
+import com.xxdxxs.db.component.JdbcHelper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -38,6 +40,18 @@ public class BidRecordManagerImpl implements BidRecordManager {
         return bidRecordMapper.selectByExample(example);
     }
 
+    @Override
+    public List<BidRecord> query(BidRecordRequestDto dto) {
+        BidRecordExample example = new BidRecordExample();
+        BidRecordExample.Criteria criteria = example.createCriteria();
+        example.createCriteria().andCidEqualTo(dto.getCid()).andIsDeletedEqualTo(0);
+        JdbcHelper.ifPresent(dto.getStartPrice(), criteria :: andPriceGreaterThanOrEqualTo);
+        JdbcHelper.ifPresent(dto.getEndPrice(), criteria :: andPriceLessThanOrEqualTo);
+        JdbcHelper.ifPresent(dto.getStartBidTime(), criteria :: andBidTimeGreaterThanOrEqualTo);
+        JdbcHelper.ifPresent(dto.getEndBidTime(), criteria :: andBidTimeLessThanOrEqualTo);
+        return bidRecordMapper.selectByExample(example);
+    }
+
     public BidRecord queryById(Long id) {
         BidRecordExample example = new BidRecordExample();
         BidRecordExample.Criteria criteria = example.createCriteria();