修改代码

.gitignore

@@ -7,7 +7,7 @@ target/
 .settings/
 .classpath
 ace-modules/ace-tool/src/main/resources/application-dev.yml
-**/src/test
+#**/src/test
 **/logs
 xx-order/xx-order-server/logs/**
 *.log

xx-order/xx-order-server/src/test/java/RegionTest.java

+package com.xxfc.platform.order;
+
+import cn.hutool.extra.template.Template;
+import cn.hutool.extra.template.TemplateConfig;
+import cn.hutool.extra.template.TemplateEngine;
+import cn.hutool.extra.template.TemplateUtil;
+import com.xxfc.platform.order.biz.BaseOrderBiz;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.HashMap;
+
+@Slf4j
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes={OrderApplication.class})
+public class RegionTest {
+
+
+//    @Autowired
+//    BaseOrderBiz baseOrderBiz;
+
+    @Test
+    public void test() {
+        //自动根据用户引入的模板引擎库的jar来自动选择使用的引擎
+        //TemplateConfig为模板引擎的选项，可选内容有字符编码、模板路径、模板加载方式等，默认通过模板字符串渲染
+        TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig());
+
+        //假设我们引入的是Beetl引擎，则：
+        //Template template = engine.getTemplate("{\"key\":\"费用明细\",\"val\":\"\",\"children\":[{\"key\":\"车辆租赁费\",\"val\":\"￥${vehicleAmount}\",\"children\":[{\"key\":\"${modelName}\",\"val\":\"￥${modelAmount}/天\"},{\"key\":\"租用天数\",\"val\":\"${dayNum}天\"},{\"key\":\"房车数量\",\"val\":\"${vehicleNum}辆\"}]},{\"key\":\"服务费（司机）\",\"val\":\"￥${driverAmount}\",\"children\":[{\"key\":\"欣新司机\",\"val\":\"￥${driverPrice}/天\"},{\"key\":\"司机数量\",\"val\":\"{driverNum}个\"},{\"key\":\"房车数量\",\"val\":\"${dayNum}天\"}]},{\"key\":\"用车押金\",\"val\":\"￥${deposit}\"}]}");
+        Template template = engine.getTemplate("${[a,b,c]}");
+
+        //Dict本质上为Map，此处可用Map
+//        String result = template.render(Dict.create().set("name", "Hutool").set("name2", "Hutool2"));
+
+        String result = "";
+
+        result = template.render(new HashMap<String, Object>(){{
+            put("a", 123);
+            put("b", 456);
+            put("c", 789);
+        }});
+                //template.render(
+                //Dict.parse(new RentVehiclePriceVO(new BigDecimal("126800.03"), new BigDecimal("106800.03"), new BigDecimal("105000.03"), new BigDecimal("1800"), new BigDecimal("20000"))));
+
+//        RentVehiclePriceVO.builder()
+//                .orderAmount(new BigDecimal("126800.03"))
+//                .goodsAmount(new BigDecimal("106800.03"))
+//                .vehicleAmount(new BigDecimal("105000.03"))
+//                .driverAmount(new BigDecimal("1800"))
+//                .deposit(new BigDecimal("20000")).build()
+        //输出：Hello Hutool
+
+
+
+        log.info(result);
+    }
+}

xx-vehicle/xx-vehicle-server/src/test/java/com/xxfc/platform/vehicle/RegionTest.java

+package com.xxfc.platform.vehicle;
+
+import cn.hutool.core.comparator.PinyinComparator;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.file.FileWriter;
+import cn.hutool.core.util.PinyinUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.ace.cache.annotation.Cache;
+import com.alibaba.fastjson.JSONObject;
+import com.github.stuxuhai.jpinyin.PinyinHelper;
+import com.github.wxiaoqi.security.common.msg.TableResultResponse;
+import com.github.wxiaoqi.security.common.util.Query;
+import com.google.common.collect.Sets;
+import com.mysql.cj.conf.RuntimeProperty;
+import com.xxfc.platform.vehicle.VehicleApplication;
+import com.xxfc.platform.vehicle.biz.SysRegionBiz;
+import com.xxfc.platform.vehicle.constant.RedisKey;
+import com.xxfc.platform.vehicle.entity.SysRegion;
+import lombok.Builder;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import org.joda.time.DateTime;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.io.PrintStream;
+import java.util.*;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes={VehicleApplication.class})
+public class RegionTest {
+    @Autowired
+    private RedisTemplate customRedisTemplate;
+
+    @Autowired
+    private SysRegionBiz sysRegionBiz;
+
+//    public static final String TEST_REDIS_KEY ="redis:{1}";
+     private   final String TEST_REDIS_KEY ="redis:{1}";
+    @Data
+    public class Title{
+        String title;
+        List<String> lists;
+    }
+
+    @Data
+    public class City{
+        List<Title> city;
+    }
+
+    @Data
+    public class NewData{
+        Long id;
+        String name;
+        String lat;
+        String lon;
+    }
+
+    @Data
+    public class NewTitle{
+        String title;
+        List<NewData> lists;
+    }
+
+    @Data
+    public class NewCity{
+        List<NewTitle> city;
+    }
+
+    @Test
+    public void test() throws Exception {
+        String jsonstr = "{\"city\":[{\"title\":\"A\",\"lists\":[\"阿坝\",\"阿拉善\",\"阿里\",\"安康\",\"安庆\",\"鞍山\",\"安顺\",\"安阳\",\"澳门\"]},{\"title\":\"B\",\"lists\":[\"北京\",\"白银\",\"保定\",\"宝鸡\",\"保山\",\"包头\",\"巴中\",\"北海\",\"蚌埠\",\"本溪\",\"毕节\",\"滨州\",\"百色\",\"亳州\"]},{\"title\":\"C\",\"lists\":[\"重庆\",\"成都\",\"长沙\",\"长春\",\"沧州\",\"常德\",\"昌都\",\"长治\",\"常州\",\"巢湖\",\"潮州\",\"承德\",\"郴州\",\"赤峰\",\"池州\",\"崇左\",\"楚雄\",\"滁州\",\"朝阳\"]},{\"title\":\"D\",\"lists\":[\"大连\",\"东莞\",\"大理\",\"丹东\",\"大庆\",\"大同\",\"大兴安岭\",\"德宏\",\"德阳\",\"德州\",\"定西\",\"迪庆\",\"东营\"]},{\"title\":\"E\",\"lists\":[\"鄂尔多斯\",\"恩施\",\"鄂州\"]},{\"title\":\"F\",\"lists\":[\"福州\",\"防城港\",\"佛山\",\"抚顺\",\"抚州\",\"阜新\",\"阜阳\"]},{\"title\":\"G\",\"lists\":[\"广州\",\"桂林\",\"贵阳\",\"甘南\",\"赣州\",\"甘孜\",\"广安\",\"广元\",\"贵港\",\"果洛\"]},{\"title\":\"H\",\"lists\":[\"杭州\",\"哈尔滨\",\"合肥\",\"海口\",\"呼和浩特\",\"海北\",\"海东\",\"海南\",\"海西\",\"邯郸\",\"汉中\",\"鹤壁\",\"河池\",\"鹤岗\",\"黑河\",\"衡水\",\"衡阳\",\"河源\",\"贺州\",\"红河\",\"淮安\",\"淮北\",\"怀化\",\"淮南\",\"黄冈\",\"黄南\",\"黄山\",\"黄石\",\"惠州\",\"葫芦岛\",\"呼伦贝尔\",\"湖州\",\"菏泽\"]},{\"title\":\"J\",\"lists\":[\"济南\",\"佳木斯\",\"吉安\",\"江门\",\"焦作\",\"嘉兴\",\"嘉峪关\",\"揭阳\",\"吉林\",\"金昌\",\"晋城\",\"景德镇\",\"荆门\",\"荆州\",\"金华\",\"济宁\",\"晋中\",\"锦州\",\"九江\",\"酒泉\"]},{\"title\":\"K\",\"lists\":[\"昆明\",\"开封\"]},{\"title\":\"L\",\"lists\":[\"兰州\",\"拉萨\",\"来宾\",\"莱芜\",\"廊坊\",\"乐山\",\"凉山\",\"连云港\",\"聊城\",\"辽阳\",\"辽源\",\"丽江\",\"临沧\",\"临汾\",\"临夏\",\"临沂\",\"林芝\",\"丽水\",\"六安\",\"六盘水\",\"柳州\",\"陇南\",\"龙岩\",\"娄底\",\"漯河\",\"洛阳\",\"泸州\",\"吕梁\"]},{\"title\":\"M\",\"lists\":[\"马鞍山\",\"茂名\",\"眉山\",\"梅州\",\"绵阳\",\"牡丹江\"]},{\"title\":\"N\",\"lists\":[\"南京\",\"南昌\",\"南宁\",\"宁波\",\"南充\",\"南平\",\"南通\",\"南阳\",\"那曲\",\"内江\",\"宁德\",\"怒江\"]},{\"title\":\"P\",\"lists\":[\"盘锦\",\"攀枝花\",\"平顶山\",\"平凉\",\"萍乡\",\"莆田\",\"濮阳\"]},{\"title\":\"Q\",\"lists\":[\"青岛\",\"黔东南\",\"黔南\",\"黔西南\",\"庆阳\",\"清远\",\"秦皇岛\",\"钦州\",\"齐齐哈尔\",\"泉州\",\"曲靖\",\"衢州\"]},{\"title\":\"R\",\"lists\":[\"日喀则\",\"日照\"]},{\"title\":\"S\",\"lists\":[\"上海\",\"深圳\",\"苏州\",\"沈阳\",\"石家庄\",\"三门峡\",\"三明\",\"三亚\",\"商洛\",\"商丘\",\"上饶\",\"山南\",\"汕头\",\"汕尾\",\"韶关\",\"绍兴\",\"邵阳\",\"十堰\",\"朔州\",\"四平\",\"绥化\",\"遂宁\",\"随州\",\"宿迁\",\"宿州\"]},{\"title\":\"T\",\"lists\":[\"天津\",\"太原\",\"泰安\",\"泰州\",\"台州\",\"唐山\",\"天水\",\"铁岭\",\"铜川\",\"通化\",\"通辽\",\"铜陵\",\"铜仁\",\"台湾\"]},{\"title\":\"W\",\"lists\":[\"武汉\",\"乌鲁木齐\",\"无锡\",\"威海\",\"潍坊\",\"文山\",\"温州\",\"乌海\",\"芜湖\",\"乌兰察布\",\"武威\",\"梧州\"]},{\"title\":\"X\",\"lists\":[\"厦门\",\"西安\",\"西宁\",\"襄阳\",\"湘潭\",\"湘西\",\"咸宁\",\"咸阳\",\"孝感\",\"邢台\",\"新乡\",\"信阳\",\"新余\",\"忻州\",\"西双版纳\",\"宣城\",\"许昌\",\"徐州\",\"香港\",\"锡林郭勒\",\"兴安\"]},{\"title\":\"Y\",\"lists\":[\"银川\",\"雅安\",\"延安\",\"延边\",\"盐城\",\"阳江\",\"阳泉\",\"扬州\",\"烟台\",\"宜宾\",\"宜昌\",\"宜春\",\"营口\",\"益阳\",\"永州\",\"岳阳\",\"榆林\",\"运城\",\"云浮\",\"玉树\",\"玉溪\",\"玉林\"]},{\"title\":\"Z\",\"lists\":[\"杂多县\",\"赞皇县\",\"枣强县\",\"枣阳市\",\"枣庄\",\"泽库县\",\"曾都区\",\"泽普县\",\"泽州县\",\"札达县\",\"扎赉特旗\",\"扎兰屯市\",\"扎鲁特旗\",\"扎囊县\",\"张北县\",\"张店区\",\"章贡区\",\"张家港\",\"张家界\",\"张家口\",\"漳平市\",\"漳浦县\",\"章丘市\",\"樟树市\",\"张湾区\",\"彰武县\",\"漳县\",\"张掖\",\"漳州\",\"长子县\",\"湛河区\",\"湛江\",\"站前区\",\"沾益县\",\"诏安县\",\"召陵区\",\"昭平县\",\"肇庆\",\"昭通\",\"赵县\",\"昭阳区\",\"招远市\",\"肇源县\",\"肇州县\",\"柞水县\",\"柘城县\",\"浙江\",\"镇安县\",\"振安区\",\"镇巴县\",\"正安县\",\"正定县\",\"正蓝旗\",\"正宁县\",\"蒸湘区\",\"正镶白旗\",\"正阳县\",\"郑州\",\"镇海区\",\"镇江\",\"浈江区\",\"镇康县\",\"镇赉县\",\"镇平县\",\"振兴区\",\"镇雄县\",\"镇原县\",\"志丹县\",\"治多县\",\"芝罘区\",\"枝江市\",\"芷江侗族自治县\",\"织金县\",\"中方县\",\"中江县\",\"钟楼区\",\"中牟县\",\"中宁县\",\"中山\",\"中山区\",\"钟山区\",\"钟山县\",\"中卫\",\"钟祥市\",\"中阳县\",\"中原区\",\"周村区\",\"周口\",\"周宁县\",\"舟曲县\",\"舟山\",\"周至县\",\"庄河市\",\"诸城市\",\"珠海\",\"珠晖区\",\"诸暨市\",\"驻马店\",\"准格尔旗\",\"涿鹿县\",\"卓尼\",\"涿州市\",\"卓资县\",\"珠山区\",\"竹山县\",\"竹溪县\",\"株洲\",\"株洲县\",\"淄博\",\"子长县\",\"淄川区\",\"自贡\",\"秭归县\",\"紫金县\",\"自流井区\",\"资溪县\",\"资兴市\",\"资阳\"]}]}";
+        //City city = JSONObject.parseObject
+        City city = JSONUtil.toBean(jsonstr, City.class);
+        NewCity newCity = new NewCity();
+        newCity.setCity(new ArrayList<NewTitle>());
+        for(Title title : city.getCity()) {
+            NewTitle newTitle = new NewTitle();
+            newTitle.setTitle(title.getTitle());
+            newTitle.setLists(new ArrayList<NewData>());
+            for(String str : title.getLists()) {
+                TableResultResponse<SysRegion> sysRegionTableResultResponse = sysRegionBiz.selectByQuery(new Query(new HashMap<String, Object>(){{
+                    put("name", str);
+                }}));
+                NewData newData = new NewData(){{
+                    setId(sysRegionTableResultResponse.getData().getRows().get(0).getId());
+                    setName(sysRegionTableResultResponse.getData().getRows().get(0).getName());
+                }};
+//                        builder()
+//                        .id(sysRegionTableResultResponse.getData().getRows().get(0).getId()).name(sysRegionTableResultResponse.getData().getRows().get(0).getName()).build();
+                newTitle.getLists().add(newData);
+            }
+            newCity.getCity().add(newTitle);
+        }
+
+        String  strs = "A,阿里,阿尔山,安庆,阿勒泰,安康,鞍山,安顺,阿克苏,阿拉善左旗,阿拉善右旗,中国澳门,B,包头,北海,北京,百色,保山,博乐,毕节,巴彦淖尔,C,长治,池州,长春,常州,昌都,朝阳,常德,长白山,成都,重庆,长沙,赤峰,D,大同,大连,东营,大庆,丹东,大理,敦煌,达州,稻城,E,恩施,鄂尔多斯,二连浩特,额济纳旗,F,佛山,福州,阜阳,抚远,G,贵阳,桂林,广州,广元,格尔木,赣州,固原,高雄,格林岛,H,哈密,呼和浩特,黑河,海拉尔,哈尔滨,海口,黄山,杭州,邯郸,合肥,黄龙,汉中,和田,淮安,花莲,J,鸡西,晋江,锦州,景德镇,嘉峪关,井冈山,济宁,九江,佳木斯,济南,加格达奇,金昌,揭阳,金门,嘉义,K,喀什,昆明,康定,克拉玛依,库尔勒,库车,喀纳斯,凯里,L,兰州,洛阳,丽江,荔波,林芝,柳州,泸州,连云港,黎平,连城,拉萨,临沧,临沂,吕梁,M,芒市,牡丹江,满洲里,绵阳,梅县,漠河,遵义(茅台),马公,马祖,N,南京,南充,南宁,南阳,南通,南昌,那拉提,宁波,南竿,P,攀枝花,普洱,Q,衢州,黔江,秦皇岛,庆阳,且末,齐齐哈尔,青岛,七美,祁连,R,日喀则,S,深圳,石家庄,三亚,沈阳,上海,神农架,T,唐山,铜仁,塔城,腾冲,台州,天水,天津,通辽,吐鲁番,太原,泰州,台北,台中,台南,台东,W,威海,武汉,梧州,文山,无锡,潍坊,武夷山,乌兰浩特,温州,乌鲁木齐,万州,乌海,X,兴义,西昌,厦门,香格里拉,西安,西宁,襄阳(中国),锡林浩特,西双版纳,徐州,中国香港,Y,义乌,永州,榆林,扬州,延安,运城,烟台,银川,宜昌,宜宾,宜春,盐城,延吉,玉树,伊宁,伊春,Z,珠海,昭通,张家界,舟山,郑州,中卫,芷江,湛江,遵义(新舟),遵义(茅台),张掖,张家口";
+
+//        String customRedisTemplaterentTitle;
+        NewCity newCity2 = new NewCity();
+        newCity2.setCity(new ArrayList<NewTitle>());
+        NewTitle currentTitle = null;
+        for(String str : strs.split(",")) {
+            char c = str.charAt(0);
+            if(c >= 'A' && c <= 'Z') {
+                if(null != currentTitle) {
+                    newCity2.getCity().add(currentTitle);
+                }
+                currentTitle = new NewTitle();
+                currentTitle.setTitle(str);
+                currentTitle.setLists(new ArrayList<NewData>());
+                continue;
+            }else {
+                TableResultResponse<SysRegion> sysRegionTableResultResponse = sysRegionBiz.selectByQuery(new Query(new HashMap<String, Object>(){{
+                    put("name", str);
+                }}));
+                NewData newData = new NewData(){{
+                    setId(sysRegionTableResultResponse.getData().getRows().get(0).getId());
+                    setName(sysRegionTableResultResponse.getData().getRows().get(0).getName());
+                }};
+//                        builder()
+//                        .id(sysRegionTableResultResponse.getData().getRows().get(0).getId()).name(sysRegionTableResultResponse.getData().getRows().get(0).getName()).build();
+                currentTitle.getLists().add(newData);
+            }
+        }
+
+//
+//        List<SysRegion> sysRegions = sysRegionBiz.selectCity();
+//        String str = new String();
+//        str += "{ \n\"city\": [";
+//        for(int i = 1;i<=26;i++) {
+//            str += "\n{ \"title\": \""+(char)(64+i)+"\", \n";
+//            str += "\"lists\":[\n";
+//            Boolean flag = false;
+//                for(SysRegion sysRegion : sysRegions) {
+//                    if(PinyinHelper.getShortPinyin(sysRegion.getName()).substring(0,1).equals(String.valueOf((char)(96+i)))){
+//                            //(sysRegion.getName()))
+//                        String name = sysRegion.getName();
+//                        if("直辖县级".equals(name)) {
+//                            //获得父级
+//                            SysRegion sysRegionP = sysRegionBiz.selectOne(SysRegion.builder().id(sysRegion.getParentId()).build());
+//                            name = sysRegionP.getName();
+//                        }
+//                        str += "{\"id\":"+sysRegion.getId()+", \"name\":\""+name+"\"},\n";
+//                        flag = true;
+//                    }
+//                }
+//            if(flag) {
+//                str = StrUtil.sub(str, 0, str.length() - 2);
+//            }
+//            str += "]";
+//            str += "},\n";
+//        }
+//        str = StrUtil.sub(str, 0, str.length() - 2);
+//        str += "] \n }";
+        FileWriter writer = new FileWriter("D://"+ DateUtil.currentSeconds()+ "test.properties");
+        writer.write(JSONUtil.toJsonStr(newCity));
+        System.out.println("test");
+    }
+
+
+//    @Test
+//    public  void test1() {
+//        int i = DateTime.now().getMinuteOfDay() / 5;
+//        System.out.println("DateTime.now().getMinuteOfDay() / 5++++++++++++"+i);
+//        String redisLockKey = RedisKey.SYS_REGION_REFRESH_LOCK +i;//同一日每5分钟只刷新一次
+//        System.out.println("redisLockKey++++++++++++++++"+redisLockKey);
+//        String s = String.valueOf(DateTime.now().getMillis());
+//        System.out.println("s++++++++++++++++++"+s);
+//        Boolean suc = customRedisTemplate.opsForValue().setIfAbsent(redisLockKey, s);
+//        Boolean test1 = customRedisTemplate.opsForValue().setIfAbsent("1", "2");
+//        Boolean test2 = customRedisTemplate.opsForValue().setIfAbsent("1", "3");
+//        System.out.println("test1///////////////////////////////"+test1);
+//        System.out.println("test2///////////////////////////////"+test2);
+//        System.out.println("suc++++++++++++++++++++"+suc);
+//    }
+//
+//    @Test
+//    public  void testRedis() {
+//        SysRegion sysRegion = getSysRegion(1);
+//        System.out.println("sysRegion+++++++++"+sysRegion);
+//        System.out.println("TEST_REDIS_KEY+++++++++++" + TEST_REDIS_KEY);
+//    }
+//
+//    @Cache(key = TEST_REDIS_KEY)
+//    private SysRegion getSysRegion(int id){
+//        SysRegion sysRegion = sysRegionBiz.selectById(2);
+//        return sysRegion;
+//    }
+
+
+     @Test
+    public void testStream(){
+         List<Integer> integers = Arrays.asList(1, 3, 5, 7, 9,9);
+         HashSet<Integer> objects = new HashSet<>();
+         objects.addAll(integers);
+         System.out.println(objects);
+         System.out.println("获取最小值");
+         Optional<Integer> min = objects.parallelStream().min(Integer::compareTo);
+         if (min.isPresent()) {
+             System.out.println(min.get());
+         }
+         System.out.println("获取最大");
+         Optional<Integer> max = integers.parallelStream().max(Integer::compareTo);
+         if (max.isPresent()) {
+             System.out.println(max.get());
+         }
+         System.out.println("排序");
+         integers.stream().sorted().forEach(elem -> System.out.println(elem));
+
+         System.out.println("筛选");
+         integers.parallelStream().filter(e ->e>1).filter(e -> e<9).forEach(e -> System.out.println(e));
+         System.out.println("list的总和为");
+         integers.stream().reduce((a,b) -> a+b).ifPresent(System.out::println);
+
+     }
+
+
+}