diff --git a/cloud-mart-common/src/main/java/com/muyu/domain/Market.java b/cloud-mart-common/src/main/java/com/muyu/domain/Market.java new file mode 100644 index 0000000..9fb80f6 --- /dev/null +++ b/cloud-mart-common/src/main/java/com/muyu/domain/Market.java @@ -0,0 +1,52 @@ +package com.muyu.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.checkerframework.checker.units.qual.N; + +/** + * @Author：chaiyapeng + * @Package：com.muyu.domain + * @Project：cloud-mart + * @name：Market + * @Date：2024/8/21 21:00 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class Market { + private String name; + private String cardno; + private String descriot; + private String ctfTp; + private String ctfId; + private String gender; + private String birthday; + private String address; + private String zip; + private String dirty; + private String district1; + private String district2; + private String district3; + private String district4; + private String district5; + private String district6; + private String firstnm; + private String lastnm; + private String duty; + private String mobile; + private String tel; + private String fax; + private String email; + private String nation; + private String taste; + private String education; + private String company; + private String ctel; + private String caddress; + private String czip; + private String family; + private String version; + private String id; +} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/EtlService.java b/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/EtlService.java deleted file mode 100644 index 77a6eb5..0000000 --- a/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/EtlService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.muyu.cloud.etl.service; - -import com.muyu.domain.AssetImpower; - -import javax.xml.transform.Result; -import java.util.List; - -/** - * @Author：qdm - * @Package：com.muyu.service - * @Project：cloud-etl - * @name：EtlService - * @Date：2024/8/20 20:46 - */ -public interface EtlService { - List selectAssetImpowerList(AssetImpower assetImpower); - - Result deleteAssetImpowerByIds(Long[] ids); -} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/SourceService.java b/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/SourceService.java deleted file mode 100644 index ec17d40..0000000 --- a/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/SourceService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.muyu.cloud.etl.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.domain.Source; -import com.muyu.domain.req.SourceReq; - -import java.util.List; - -public interface SourceService extends IService { - List selectSourceList(SourceReq sourceReq); - - Source getInfo(Long id); - - int insertBasicConfigInfo(Source sourceReq); - -} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/SourceTypeService.java b/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/SourceTypeService.java deleted file mode 100644 index c0342ef..0000000 --- a/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/SourceTypeService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.muyu.cloud.etl.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.domain.SourceType; -import java.util.List; - - -public interface SourceTypeService extends IService { - - List findSourceType(); -} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/impl/EtlServiceImpl.java b/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/impl/EtlServiceImpl.java deleted file mode 100644 index 15bedd2..0000000 --- a/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/impl/EtlServiceImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.muyu.cloud.etl.service.impl; - -import com.muyu.domain.AssetImpower; -import com.muyu.cloud.etl.mapper.EtlMapper; -import com.muyu.cloud.etl.service.EtlService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.xml.transform.Result; -import java.util.List; - -/** - * @Author：qdm - * @Package：com.muyu.service.serviceImpl - * @Project：cloud-etl - * @name：EtlService - * @Date：2024/8/20 20:46 - */ -@Service -public class EtlServiceImpl implements EtlService { - - @Autowired - private EtlMapper etlMapper; - - @Override - public List selectAssetImpowerList(AssetImpower assetImpower) { - List assetImpowers = etlMapper.list(assetImpower); - return assetImpowers; - } - - @Override - public Result deleteAssetImpowerByIds(Long[] ids) { - return etlMapper.deleteAssetImpowerByIds(ids); - } - - -} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/impl/SourceServiceImpl.java b/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/impl/SourceServiceImpl.java deleted file mode 100644 index 9ac1666..0000000 --- a/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/impl/SourceServiceImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.muyu.cloud.etl.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.cloud.etl.service.SourceService; -import com.muyu.domain.Source; -import com.muyu.domain.req.SourceReq; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class SourceServiceImpl extends ServiceImpl implements SourceService { - @Autowired - private SourceMapper sourceMapper; - - @Override - public List selectSourceList(SourceReq sourceReq) { - return sourceMapper.selectSourceList(sourceReq); - } - - @Override - public Source getInfo(Long id) { - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(Source::getId, id); - return this.sourceMapper.selectOne(lambdaQueryWrapper); - } - - //新增 - @Override - public int insertBasicConfigInfo(Source sourceReq) { - int insert = sourceMapper.insert(sourceReq); - return insert; - } - -} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/impl/SourceTypeServiceImpl.java b/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/impl/SourceTypeServiceImpl.java deleted file mode 100644 index 40a14b2..0000000 --- a/cloud-mart-server/src/main/java/com/muyu/cloud/etl/service/impl/SourceTypeServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.muyu.cloud.etl.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.cloud.etl.service.SourceTypeService; -import com.muyu.domain.SourceType; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class SourceTypeServiceImpl extends ServiceImpl implements SourceTypeService { - - @Override - public List findSourceType() { - LambdaQueryWrapper sourceTypeLambdaQueryWrapper = new LambdaQueryWrapper<>(); - return this.list(sourceTypeLambdaQueryWrapper); - } -} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/MarketApplication.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/MarketApplication.java new file mode 100644 index 0000000..98229c2 --- /dev/null +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/MarketApplication.java @@ -0,0 +1,22 @@ +package com.muyu.cloud.mart; + +import com.muyu.common.security.annotation.EnableCustomConfig; +import com.muyu.common.security.annotation.EnableMyFeignClients; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @Author：chaiyapeng + * @Package：com.muyu.cloud.mart + * @Project：cloud-mart + * @name：MarketApplication + * @Date：2024/8/21 22:14 + */ +@EnableCustomConfig +@EnableMyFeignClients +@SpringBootApplication +public class MarketApplication { + public static void main(String[] args) { + SpringApplication.run(MarketApplication.class,args); + } +} 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 new file mode 100644 index 0000000..6e720af --- /dev/null +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/controller/MarketController.java @@ -0,0 +1,102 @@ +package com.muyu.cloud.mart.controller; + +import com.alibaba.fastjson.JSON; +import com.muyu.cloud.mart.service.MarketService; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.domain.Market; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.io.InputStream; +import java.net.URL; +import java.net.URLConnection; +import java.util.ArrayList; +import java.util.List; + +/** + * @Author：chaiyapeng + * @Package：com.muyu.cloud.etl.controller + * @Project：cloud-mart + * @name：MarketController + * @Date：2024/8/21 21:53 + */ +@RestController +@RequestMapping("list") +public class MarketController extends BaseController { + + @Autowired + private MarketService marketService; + @Autowired + private RedisTemplateredisTemplate; + +// @RequiresPermissions("mart:info:list") + @GetMapping("findMarketList") + public Result> findMarketList(Market market){ + if (redisTemplate.hasKey("list")){ + List list = redisTemplate.opsForList().range("list", 0, -1); + ArrayList markets = new ArrayList<>(); + for (String s : list) { + markets.add(JSON.parseObject(s, Market.class)); + } + redisTemplate.delete("list"); + return getDataTable(markets); + } + + startPage(); + List list = marketService.findMarketList(market); + for (Market market1 : list) { + redisTemplate.opsForList().rightPush("list", JSON.toJSONString(market1)); + } + return getDataTable(list); + } + + @GetMapping("selectMobileAddress") + //查询手机号码所属地区 + public static String getMobileAddress(String mobile) throws Exception + { + String address = ""; + try + { + mobile = mobile.trim(); + if (mobile.matches("^(13|15|18)\\d{9}$") || mobile.matches("^(013|015|018)\\d{9}$")) //以13，15，18开头，后面九位全为数字 + { + String url = "http://172.13.1.1:8080/datamart?action=mobile&mobile=" + mobile; + URLConnection connection = (URLConnection) new URL(url).openConnection(); + connection.setDoOutput(true); + InputStream os = connection.getInputStream(); + Thread.sleep(100); + int length = os.available(); + byte[] buff = new byte[length]; + os.read(buff); + String s = new String(buff, "gbk"); + int len = s.indexOf("卡号归属地"); + s = s.substring(len, len+100); + len = s.lastIndexOf(""); + address = s.substring(0, len); + len = address.lastIndexOf(">"); + address = address.substring(len+1, address.length()); + address = address.replace(" ", ","); + address = address.replace("d> -->", ""); + address = address.replace(" -->", ""); + address = address.replace("-->", ""); + s = null; + buff = null; + os.close(); + connection = null; + } + } + catch(Exception e) + { + address = "未知"; + System.out.println("手机所属地查询失败===================="); + } + return address; + } +} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/mapper/MarketMapper.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/mapper/MarketMapper.java new file mode 100644 index 0000000..170ff2f --- /dev/null +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/mapper/MarketMapper.java @@ -0,0 +1,19 @@ +package com.muyu.cloud.mart.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.domain.Market; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @Author：chaiyapeng + * @Package：com.muyu.cloud.etl.mapper + * @Project：cloud-mart + * @name：MarketMapper + * @Date：2024/8/21 21:54 + */ +@Mapper +public interface MarketMapper extends BaseMapper { + List mybatisplus(Market market); +} diff --git a/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/MarketService.java b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/MarketService.java new file mode 100644 index 0000000..87b34ad --- /dev/null +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/MarketService.java @@ -0,0 +1,17 @@ +package com.muyu.cloud.mart.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.domain.Market; + +import java.util.List; + +/** + * @Author：chaiyapeng + * @Package：com.muyu.cloud.etl.service + * @Project：cloud-mart + * @name：MarketService + * @Date：2024/8/21 21:54 + */ +public interface MarketService extends IService { + List findMarketList(Market market); +} 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 new file mode 100644 index 0000000..4954a50 --- /dev/null +++ b/cloud-mart-server/src/main/java/com/muyu/cloud/mart/service/impl/MarketServiceImpl.java @@ -0,0 +1,29 @@ +package com.muyu.cloud.mart.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.cloud.mart.mapper.MarketMapper; +import com.muyu.cloud.mart.service.MarketService; +import com.muyu.domain.Market; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author：chaiyapeng + * @Package：com.muyu.cloud.etl.service.impl + * @Project：cloud-mart + * @name：MarketServiceImpl + * @Date：2024/8/21 21:54 + */ +@Service +public class MarketServiceImpl extends ServiceImpl implements MarketService { + + @Autowired + private MarketMapper marketMapper; + + @Override + public List findMarketList(Market market) { + return marketMapper.mybatisplus(market); + } +} diff --git a/cloud-mart-server/src/main/resources/bootstrap.yml b/cloud-mart-server/src/main/resources/bootstrap.yml index 5b4040f..db53da3 100644 --- a/cloud-mart-server/src/main/resources/bootstrap.yml +++ b/cloud-mart-server/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.116.184.54:8848 user-name: nacos password: nacos - namespace: text + namespace: cloud-2112 # Spring spring: @@ -58,4 +58,5 @@ mybatis-plus: id-type: auto # 主键生成策略，这里设置为自动增长 logic-delete-value: 1 # 逻辑删除标记值，例如设置为 1 表示已删除 logic-not-delete-value: 0 # 逻辑未删除标记值，例如设置为 0 表示未删除 - banner: false # 关闭控制台打印的 MyBatis-Plus Banner + banner: false # 关闭控制台打印的 MyBatis-Plus Banne + diff --git a/cloud-mart-server/src/main/resources/mapper/EtlMapper.xml b/cloud-mart-server/src/main/resources/mapper/EtlMapper.xml deleted file mode 100644 index eb3a66e..0000000 --- a/cloud-mart-server/src/main/resources/mapper/EtlMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - select id, basic_id, dict_name, dict_type, remark, create_by, create_time, update_by, update_time from asset_data_dict - - - select id, basic_id, dict_name, dict_type, remark, create_by, create_time, update_by, update_time from asset_data_dict - - - - where id = #{id} - - - diff --git a/cloud-mart-server/src/main/resources/mapper/MarketMappers.xml b/cloud-mart-server/src/main/resources/mapper/MarketMappers.xml new file mode 100644 index 0000000..228ad3f --- /dev/null +++ b/cloud-mart-server/src/main/resources/mapper/MarketMappers.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/cloud-mart-server/src/main/resources/mapper/SourceMapper.xml b/cloud-mart-server/src/main/resources/mapper/SourceMapper.xml deleted file mode 100644 index 04a3947..0000000 --- a/cloud-mart-server/src/main/resources/mapper/SourceMapper.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - select id, data_resource_name,username,password, data_sources_system_name, host, port, database_type, database_name, init_link_num, max_link_num, max_wait_time, max_wait_times,connection_params, remark from source - - - - - - - - -