diff --git a/cloud-mart-common/src/main/java/com/muyu/domain/Connector.java b/cloud-mart-common/src/main/java/com/muyu/domain/Connector.java new file mode 100644 index 0000000..0e5cc8d --- /dev/null +++ b/cloud-mart-common/src/main/java/com/muyu/domain/Connector.java @@ -0,0 +1,56 @@ +package com.muyu.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @Author:chaiyapeng + * @Package:com.muyu.domain + * @Project:cloud-mart + * @name:Connector + * @Date:2024/8/26 10:03 + */ +@Data +public class Connector { + /** + * id + */ + private Integer connectorId; + /** + * 接口名称 + */ + private String connectorName; + /** + * 接口描述 + */ + private String connectorDescribe; + /** + * 接口图片 + */ + private String connectorPicture; + /** + * 公司 + */ + private String connectorCompany; + /** + * 更新时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date connectorTime; + /** + * 剩余次数 + */ + private Integer connectorResidueDegree; + /** + * 购买次数 + */ + private Integer connectorFrequency; + /** + * 状态 + */ + private Integer connectorStatus; +} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/config/MybatisPlusConfig.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/config/MybatisPlusConfig.java deleted file mode 100644 index 7a0c133..0000000 --- a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/config/MybatisPlusConfig.java +++ /dev/null @@ -1,26 +0,0 @@ -//package com.muyu.cloud.mart.config; -// -//import com.baomidou.mybatisplus.annotation.DbType; -//import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -//import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -//import org.mybatis.spring.annotation.MapperScan; -//import org.springframework.context.annotation.Bean; -//import org.springframework.context.annotation.Configuration; -// -///** -// * @Author:chaiyapeng -// * @Package:com.muyu.cloud.mart.config -// * @Project:cloud-mart -// * @name:MybatisPlusConfig -// * @Date:2024/8/22 16:59 -// */ -//@Configuration -//@MapperScan("com.muyu.cloud.mart.mapper") -//public class MybatisPlusConfig { -// @Bean -// public MybatisPlusInterceptor mybatisPlusInterceptor(){ -// MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); -// interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); -// return interceptor; -// } -//} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/controller/ConnectorController.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/controller/ConnectorController.java new file mode 100644 index 0000000..f28d6d0 --- /dev/null +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/controller/ConnectorController.java @@ -0,0 +1,34 @@ +package com.muyu.cloud.mart.controller; + +import com.muyu.cloud.mart.service.ConnectorService; +import com.muyu.common.core.domain.Result; +import com.muyu.domain.Connector; +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; + +/** + * @Author:chaiyapeng + * @Package:com.muyu.cloud.mart.controller + * @Project:cloud-mart + * @name:ConnectorController + * @Date:2024/8/26 10:22 + */ +@RestController +@RequestMapping("connector") +public class ConnectorController { + @Autowired + private ConnectorService connectorService; + + /** + * 接口列表 + * @param connector + * @return + */ + @PostMapping("findConnectorList") + public Result findConnectorList(@RequestBody Connector connector){ + return connectorService.findConnectorList(connector); + } +} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/controller/MarketController.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/controller/MarketController.java index 0e27060..eba03ba 100644 --- a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/controller/MarketController.java +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/controller/MarketController.java @@ -9,6 +9,7 @@ import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.domain.Birthday; import com.muyu.domain.Market; +import com.muyu.domain.Postcode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.annotation.*; @@ -80,5 +81,12 @@ public class MarketController extends BaseController { public Result getBirthday(@RequestBody Birthday birthday){ return marketService.getBirthday(birthday); } + /** + * 邮编查询 + */ + @PostMapping("getPostcode") + public Result getPostcode(@RequestBody Postcode postcode){ + return marketService.getPostcode(postcode); + } } diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/mapper/ConnectorMapper.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/mapper/ConnectorMapper.java new file mode 100644 index 0000000..145a67a --- /dev/null +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/mapper/ConnectorMapper.java @@ -0,0 +1,16 @@ +package com.muyu.cloud.mart.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.domain.Connector; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Author:chaiyapeng + * @Package:com.muyu.cloud.mart.mapper + * @Project:cloud-mart + * @name:ConnectorMapper + * @Date:2024/8/26 10:23 + */ +@Mapper +public interface ConnectorMapper extends BaseMapper { +} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/ConnectorService.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/ConnectorService.java new file mode 100644 index 0000000..53f885a --- /dev/null +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/ConnectorService.java @@ -0,0 +1,17 @@ +package com.muyu.cloud.mart.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.domain.Result; +import com.muyu.domain.Connector; + +/** + * @Author:chaiyapeng + * @Package:com.muyu.cloud.mart.service + * @Project:cloud-mart + * @name:ConnectorService + * @Date:2024/8/26 10:23 + */ +public interface ConnectorService extends IService { + + Result findConnectorList(Connector connector); +} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/impl/ConnectorServiceImpl.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/impl/ConnectorServiceImpl.java new file mode 100644 index 0000000..4aac914 --- /dev/null +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/impl/ConnectorServiceImpl.java @@ -0,0 +1,39 @@ +package com.muyu.cloud.mart.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.cloud.mart.mapper.ConnectorMapper; +import com.muyu.cloud.mart.service.ConnectorService; +import com.muyu.common.core.domain.Result; +import com.muyu.domain.Connector; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author:chaiyapeng + * @Package:com.muyu.cloud.mart.service.impl + * @Project:cloud-mart + * @name:ConnectorServiceImpl + * @Date:2024/8/26 10:24 + */ +@Service +public class ConnectorServiceImpl extends ServiceImpl implements ConnectorService { + @Autowired + private ConnectorMapper connectorMapper; + /** + * 接口列表 + * @param connector + * @return + */ + @Override + public Result findConnectorList(Connector connector) { + QueryWrapper wrapper = new QueryWrapper<>(); + if (connector.getConnectorName()!=null && !connector.getConnectorName().equals("")){ + wrapper.like("connector_name",connector.getConnectorName()); + } + List connectors = connectorMapper.selectList(wrapper); + return Result.success(connectors); + } +} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/impl/MarketServiceImpl.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/impl/MarketServiceImpl.java index 203c794..89769e0 100644 --- a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/impl/MarketServiceImpl.java +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/impl/MarketServiceImpl.java @@ -10,6 +10,7 @@ import com.muyu.common.core.domain.Result; import com.muyu.domain.Birthday; import com.muyu.domain.Market; import com.muyu.domain.PhonePlace; +import com.muyu.domain.Postcode; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; @@ -106,4 +107,12 @@ public class MarketServiceImpl extends ServiceImpl impleme StringBuffer stringBuffer = BirthdayHelper.queryBirthday(birthday); return Result.success(stringBuffer); } + /** + * 邮编查询 + */ + @Override + public Result getPostcode(Postcode postcode) { + StringBuffer stringBuffer = PostcodeInquire.queryPostcode(postcode); + return Result.success(stringBuffer); + } } diff --git a/cloud-mart-server/src/main/resources/bootstrap.yml b/cloud-mart-server/src/main/resources/bootstrap.yml index db53da3..5f6d22d 100644 --- a/cloud-mart-server/src/main/resources/bootstrap.yml +++ b/cloud-mart-server/src/main/resources/bootstrap.yml @@ -13,7 +13,7 @@ spring: application: # 应用名称 - name: cloud-datamart + name: cloud-mart profiles: # 环境配置 active: dev