diff --git a/logs/JIAL-ss.log b/logs/JIAL-ss.log index d1f5844..4f069fb 100644 --- a/logs/JIAL-ss.log +++ b/logs/JIAL-ss.log @@ -225,3 +225,198 @@ Identify and stop the process that's listening on port 3333 or configure this ap 2024-02-26 08:16:23.036 INFO 9468 --- [http-nio-3333-exec-4] com.JN.filter.LoginCheckFilter : 本次请求/zmquotation/regionList不需要处理 2024-02-26 08:16:23.234 INFO 9468 --- [http-nio-3333-exec-4] c.J.d.z.controller.ZMController : 查询到的地区列表结果是：[RegionDto(province=江苏省, city=常州市, district=天宁区, kilometers=62, price01=2.3800, price02=2.3800, price03=2.3800, price04=1.8000, price05=1.2000), RegionDto(province=江苏省, city=常州市, district=武进区, kilometers=47, price01=2.3800, price02=2.3800, price03=2.3800, price04=1.8000, price05=1.2000), RegionDto(province=江苏省, city=常州市, district=新北区, kilometers=66, price01=2.3800, price02=2.3800, price03=2.3800, price04=1.8000, price05=1.2000), RegionDto(province=江苏省, city=常州市, district=钟楼区, kilometers=56, price01=2.3800, price02=2.3800, price03=2.3800, price04=1.8000, price05=1.2000), RegionDto(province=江苏省, city=淮安市, district=洪泽区, kilometers=261, price01=1.2470, price02=1.0090, price03=0.8510, price04=0.7070, price05=0.6130), RegionDto(province=江苏省, city=淮安市, district=淮安经济技术开发区, kilometers=277, price01=1.2470, price02=1.0090, price03=0.8510, price04=0.7070, price05=0.6130), RegionDto(province=江苏省, city=淮安市, district=淮安区, kilometers=271, price01=1.2470, price02=1.0090, price03=0.8510, price04=0.7070, price05=0.6130), RegionDto(province=江苏省, city=淮安市, district=淮阴区, kilometers=292, price01=1.2470, price02=1.0090, price03=0.8510, price04=0.7070, price05=0.6130), RegionDto(province=江苏省, city=淮安市, district=金湖县, kilometers=246, price01=1.2470, price02=1.0090, price03=0.8510, price04=0.7070, price05=0.6130), RegionDto(province=江苏省, city=淮安市, district=涟水县, kilometers=312, price01=1.2470, price02=1.0090, price03=0.8510, price04=0.7070, price05=0.6130), RegionDto(province=江苏省, city=淮安市, district=清江浦区, kilometers=288, price01=1.2470, price02=1.0090, price03=0.8510, price04=0.7070, price05=0.6130), RegionDto(province=江苏省, city=淮安市, district=盱眙县, kilometers=232, price01=1.2470, price02=1.0090, price03=0.8510, price04=0.7070, price05=0.6130), RegionDto(province=江苏省, city=江阴市, district=长泾镇, kilometers=100, price01=1.3500, price02=1.3500, price03=1.3300, price04=1.3300, price05=1.3300), RegionDto(province=江苏省, city=江阴市, district=澄江街道, kilometers=101, price01=1.3500, price02=1.3500, price03=1.3300, price04=1.3300, price05=1.3300), RegionDto(province=江苏省, city=江阴市, district=顾山镇, kilometers=124, price01=1.3500, price02=1.3500, price03=1.3300, price04=1.3300, price05=1.3300), RegionDto(province=江苏省, city=江阴市, district=华士镇, kilometers=107, price01=1.3500, price02=1.3500, price03=1.3300, price04=1.3300, price05=1.3300), RegionDto(province=江苏省, city=江阴市, district=璜土镇, kilometers=73, price01=1.3500, price02=1.3500, price03=1.3300, price04=1.3300, price05=1.3300), RegionDto(province=江苏省, city=江阴市, district=江阴高新技术产业开发区, kilometers=102, price01=1.3500, price02=1.3500, price03=1.3300, price04=1.3300, price05=1.3300), RegionDto(province=江苏省, city=江阴市, district=利港街道, kilometers=83, price01=1.3500, price02=1.3500, price03=1.3300, price04=1.3300, price05=1.3300), RegionDto(province=江苏省, city=江阴市, district=临港经济开发区, kilometers=82, price01=1.3500, price02=1.3500, price03=1.3300, price04=1.3300, price05=1.3300), RegionDto(province=江苏省, city=江阴市, district=南闸街道, kilometers=90, price01=1.3500, price02=1.3500, price03=1.3300, price04=1.3300, price05=1.3300), RegionDto(province=江苏省, city=江阴市, district=青阳园区, kilometers=89, price01=1.3500, price02=1.3500, price03=1.3300, price04=1.3300, price05=1.3300), RegionDto(province=江苏省, city=江阴市, district=青阳镇, kilometers=82, price01=1.3500, price02=1.3500, price03=1.3300, price04=1.3300, price05=1.3300), RegionDto(province=江苏省, city=江阴市, district=申港街道, kilometers=82, price01=1.3500, price02=1.3500, price03=1.3300, price04=1.3300, price05=1.3300), RegionDto(province=江苏省, city=江阴市, district=夏港街道, kilometers=88, price01=1.3500, price02=1.3500, price03=1.3300, price04=1.3300, price05=1.3300), RegionDto(province=江苏省, city=江阴市, district=新桥镇, kilometers=108, price01=1.3500, price02=1.3500, price03=1.3300, price04=1.3300, price05=1.3300), RegionDto(province=江苏省, city=江阴市, district=徐霞客镇, kilometers=95, price01=1.3500, price02=1.3500, price03=1.3300, price04=1.3300, price05=1.3300), RegionDto(province=江苏省, city=江阴市, district=月城镇, kilometers=87, price01=1.3500, price02=1.3500, price03=1.3300, price04=1.3300, price05=1.3300), RegionDto(province=江苏省, city=江阴市, district=云亭街道, kilometers=99, price01=1.3500, price02=1.3500, price03=1.3300, price04=1.3300, price05=1.3300), RegionDto(province=江苏省, city=江阴市, district=周庄镇, kilometers=107, price01=1.3500, price02=1.3500, price03=1.3300, price04=1.3300, price05=1.3300), RegionDto(province=江苏省, city=江阴市, district=祝塘镇, kilometers=101, price01=1.3500, price02=1.3500, price03=1.3300, price04=1.3300, price05=1.3300), RegionDto(province=江苏省, city=金坛区, district=东城街道, kilometers=33, price01=2.5500, price02=2.4500, price03=1.7000, price04=1.6500, price05=1.2000), RegionDto(province=江苏省, city=金坛区, district=金城镇, kilometers=40, price01=2.5500, price02=2.4500, price03=1.7000, price04=1.6500, price05=1.2000), RegionDto(province=江苏省, city=金坛区, district=儒林镇, kilometers=17, price01=2.5500, price02=2.4500, price03=1.7000, price04=1.6500, price05=1.2000), RegionDto(province=江苏省, city=金坛区, district=西城街道, kilometers=37, price01=2.5500, price02=2.4500, price03=1.7000, price04=1.6500, price05=1.2000), RegionDto(province=江苏省, city=金坛区, district=薛埠镇, kilometers=54, price01=2.5500, price02=2.4500, price03=1.7000, price04=1.6500, price05=1.2000), RegionDto(province=江苏省, city=金坛区, district=尧塘街道, kilometers=34, price01=2.5500, price02=2.4500, price03=1.7000, price04=1.6500, price05=1.2000), RegionDto(province=江苏省, city=金坛区, district=直溪镇, kilometers=53, price01=2.5500, price02=2.4500, price03=1.7000, price04=1.6500, price05=1.2000), RegionDto(province=江苏省, city=金坛区, district=指前镇, kilometers=42, price01=2.5500, price02=2.4500, price03=1.7000, price04=1.6500, price05=1.2000), RegionDto(province=江苏省, city=金坛区, district=朱林镇, kilometers=46, price01=2.5500, price02=2.4500, price03=1.7000, price04=1.6500, price05=1.2000), RegionDto(province=江苏省, city=溧阳市, district=别桥镇, kilometers=39, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=溧阳市, district=埭头镇, kilometers=25, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=溧阳市, district=戴埠镇, kilometers=37, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=溧阳市, district=古县街道, kilometers=29, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=溧阳市, district=昆仑街道, kilometers=30, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=溧阳市, district=溧城街道, kilometers=28, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=溧阳市, district=南渡镇, kilometers=41, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=溧阳市, district=上黄镇, kilometers=21, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=溧阳市, district=上兴镇, kilometers=63, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=溧阳市, district=社渚镇, kilometers=56, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=溧阳市, district=天目湖镇, kilometers=39, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=溧阳市, district=竹箦镇, kilometers=47, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=连云港市, district=东海县, kilometers=431, price01=1.1150, price02=0.9940, price03=0.8850, price04=0.7510, price05=0.5940), RegionDto(province=江苏省, city=连云港市, district=赣榆区, kilometers=431, price01=1.1150, price02=0.9940, price03=0.8850, price04=0.7510, price05=0.5940), RegionDto(province=江苏省, city=连云港市, district=灌南县, kilometers=343, price01=1.1150, price02=0.9940, price03=0.8850, price04=0.7510, price05=0.5940), RegionDto(province=江苏省, city=连云港市, district=灌云县, kilometers=363, price01=1.1150, price02=0.9940, price03=0.8850, price04=0.7510, price05=0.5940), RegionDto(province=江苏省, city=连云港市, district=海州区, kilometers=403, price01=1.1150, price02=0.9940, price03=0.8850, price04=0.7510, price05=0.5940), RegionDto(province=江苏省, city=连云港市, district=连云区, kilometers=423, price01=1.1150, price02=0.9940, price03=0.8850, price04=0.7510, price05=0.5940), RegionDto(province=江苏省, city=南京市, district=高淳区, kilometers=105, price01=1.2300, price02=1.2200, price03=1.2100, price04=1.2000, price05=1.2000), RegionDto(province=江苏省, city=南京市, district=鼓楼区, kilometers=142, price01=1.2300, price02=1.2200, price03=1.2100, price04=1.2000, price05=1.2000), RegionDto(province=江苏省, city=南京市, district=建邺区, kilometers=134, price01=1.2300, price02=1.2200, price03=1.2100, price04=1.2000, price05=1.2000), RegionDto(province=江苏省, city=南京市, district=江宁区, kilometers=128, price01=1.2300, price02=1.2200, price03=1.2100, price04=1.2000, price05=1.2000), RegionDto(province=江苏省, city=南京市, district=溧水区, kilometers=90, price01=1.2300, price02=1.2200, price03=1.2100, price04=1.2000, price05=1.2000), RegionDto(province=江苏省, city=南京市, district=六合区, kilometers=168, price01=1.2300, price02=1.2200, price03=1.2100, price04=1.2000, price05=1.2000), RegionDto(province=江苏省, city=南京市, district=浦口区, kilometers=149, price01=1.2300, price02=1.2200, price03=1.2100, price04=1.2000, price05=1.2000), RegionDto(province=江苏省, city=南京市, district=栖霞区, kilometers=144, price01=1.2300, price02=1.2200, price03=1.2100, price04=1.2000, price05=1.2000), RegionDto(province=江苏省, city=南京市, district=秦淮区, kilometers=137, price01=1.2300, price02=1.2200, price03=1.2100, price04=1.2000, price05=1.2000), RegionDto(province=江苏省, city=南京市, district=玄武区, kilometers=137, price01=1.2300, price02=1.2200, price03=1.2100, price04=1.2000, price05=1.2000), RegionDto(province=江苏省, city=南京市, district=雨花台区, kilometers=135, price01=1.2300, price02=1.2200, price03=1.2100, price04=1.2000, price05=1.2000), RegionDto(province=江苏省, city=南通市, district=崇川区, kilometers=166, price01=1.4500, price02=1.4450, price03=1.1560, price04=0.9820, price05=0.8100), RegionDto(province=江苏省, city=南通市, district=港闸区, kilometers=161, price01=1.4500, price02=1.4450, price03=1.1560, price04=0.9820, price05=0.8100), RegionDto(province=江苏省, city=南通市, district=海安市, kilometers=208, price01=1.4500, price02=1.4450, price03=1.1560, price04=0.9820, price05=0.8100), RegionDto(province=江苏省, city=南通市, district=海门市, kilometers=196, price01=1.4500, price02=1.4450, price03=1.1560, price04=0.9820, price05=0.8100), RegionDto(province=江苏省, city=南通市, district=启东市, kilometers=256, price01=1.4500, price02=1.4450, price03=1.1560, price04=0.9820, price05=0.8100), RegionDto(province=江苏省, city=南通市, district=如东县, kilometers=216, price01=1.4500, price02=1.4450, price03=1.1560, price04=0.9820, price05=0.8100), RegionDto(province=江苏省, city=南通市, district=如皋市, kilometers=180, price01=1.4500, price02=1.4450, price03=1.1560, price04=0.9820, price05=0.8100), RegionDto(province=江苏省, city=南通市, district=通州区, kilometers=188, price01=1.4500, price02=1.4450, price03=1.1560, price04=0.9820, price05=0.8100), RegionDto(province=江苏省, city=苏州市, district=常熟市, kilometers=144, price01=1.2880, price02=1.2880, price03=1.2800, price04=1.2800, price05=1.2800), RegionDto(province=江苏省, city=苏州市, district=姑苏区, kilometers=115, price01=1.2880, price02=1.2880, price03=1.2800, price04=1.2800, price05=1.2800), RegionDto(province=江苏省, city=苏州市, district=虎丘区, kilometers=113, price01=1.2880, price02=1.2880, price03=1.2800, price04=1.2800, price05=1.2800), RegionDto(province=江苏省, city=苏州市, district=昆山市, kilometers=155, price01=1.2880, price02=1.2880, price03=1.2800, price04=1.2800, price05=1.2800), RegionDto(province=江苏省, city=苏州市, district=太仓市, kilometers=163, price01=1.2880, price02=1.2880, price03=1.2800, price04=1.2800, price05=1.2800), RegionDto(province=江苏省, city=苏州市, district=吴江区, kilometers=138, price01=1.2880, price02=1.2880, price03=1.2800, price04=1.2800, price05=1.2800), RegionDto(province=江苏省, city=苏州市, district=吴中区, kilometers=130, price01=1.2880, price02=1.2880, price03=1.2800, price04=1.2800, price05=1.2800), RegionDto(province=江苏省, city=苏州市, district=相城区, kilometers=115, price01=1.2880, price02=1.2880, price03=1.2800, price04=1.2800, price05=1.2800), RegionDto(province=江苏省, city=苏州市, district=张家港市, kilometers=121, price01=1.2880, price02=1.2880, price03=1.2800, price04=1.2800, price05=1.2800), RegionDto(province=江苏省, city=宿迁市, district=沭阳县, kilometers=350, price01=1.2640, price02=1.0130, price03=0.8090, price04=0.7820, price05=0.7000), RegionDto(province=江苏省, city=宿迁市, district=泗洪县, kilometers=301, price01=1.2640, price02=1.0130, price03=0.8090, price04=0.7820, price05=0.7000), RegionDto(province=江苏省, city=宿迁市, district=泗阳县, kilometers=334, price01=1.2640, price02=1.0130, price03=0.8090, price04=0.7820, price05=0.7000), RegionDto(province=江苏省, city=宿迁市, district=宿城区, kilometers=356, price01=1.2640, price02=1.0130, price03=0.8090, price04=0.7820, price05=0.7000), RegionDto(province=江苏省, city=宿迁市, district=宿豫区, kilometers=360, price01=1.2640, price02=1.0130, price03=0.8090, price04=0.7820, price05=0.7000), RegionDto(province=江苏省, city=泰州市, district=高港区, kilometers=129, price01=1.8000, price02=1.4500, price03=1.2800, price04=1.1500, price05=0.8800), RegionDto(province=江苏省, city=泰州市, district=海陵区, kilometers=155, price01=1.8000, price02=1.4500, price03=1.2800, price04=1.1500, price05=0.8800), RegionDto(province=江苏省, city=泰州市, district=姜堰区, kilometers=158, price01=1.8000, price02=1.4500, price03=1.2800, price04=1.1500, price05=0.8800), RegionDto(province=江苏省, city=泰州市, district=靖江市, kilometers=112, price01=1.8000, price02=1.4500, price03=1.2800, price04=1.1500, price05=0.8800), RegionDto(province=江苏省, city=泰州市, district=泰兴市, kilometers=145, price01=1.8000, price02=1.4500, price03=1.2800, price04=1.1500, price05=0.8800), RegionDto(province=江苏省, city=泰州市, district=兴化市, kilometers=199, price01=1.8000, price02=1.4500, price03=1.2800, price04=1.1500, price05=0.8800), RegionDto(province=江苏省, city=无锡市, district=滨湖区, kilometers=86, price01=1.4600, price02=1.4600, price03=1.4600, price04=1.4600, price05=1.4600), RegionDto(province=江苏省, city=无锡市, district=惠山区, kilometers=76, price01=1.4600, price02=1.4600, price03=1.4600, price04=1.4600, price05=1.4600), RegionDto(province=江苏省, city=无锡市, district=梁溪区, kilometers=75, price01=1.4600, price02=1.4600, price03=1.4600, price04=1.4600, price05=1.4600), RegionDto(province=江苏省, city=无锡市, district=锡山区, kilometers=79, price01=1.4600, price02=1.4600, price03=1.4600, price04=1.4600, price05=1.4600), RegionDto(province=江苏省, city=无锡市, district=新吴区, kilometers=91, price01=1.4600, price02=1.4600, price03=1.4600, price04=1.4600, price05=1.4600), RegionDto(province=江苏省, city=徐州市, district=丰县, kilometers=535, price01=0.8740, price02=0.7630, price03=0.7000, price04=0.6300, price05=0.5940), RegionDto(province=江苏省, city=徐州市, district=鼓楼区, kilometers=460, price01=0.8740, price02=0.7630, price03=0.7000, price04=0.6300, price05=0.5940), RegionDto(province=江苏省, city=徐州市, district=贾汪区, kilometers=472, price01=0.8740, price02=0.7630, price03=0.7000, price04=0.6300, price05=0.5940), RegionDto(province=江苏省, city=徐州市, district=沛县, kilometers=527, price01=0.8740, price02=0.7630, price03=0.7000, price04=0.6300, price05=0.5940), RegionDto(province=江苏省, city=徐州市, district=邳州市, kilometers=438, price01=0.8740, price02=0.7630, price03=0.7000, price04=0.6300, price05=0.5940), RegionDto(province=江苏省, city=徐州市, district=泉山区, kilometers=454, price01=0.8740, price02=0.7630, price03=0.7000, price04=0.6300, price05=0.5940), RegionDto(province=江苏省, city=徐州市, district=睢宁县, kilometers=378, price01=0.8740, price02=0.7630, price03=0.7000, price04=0.6300, price05=0.5940), RegionDto(province=江苏省, city=徐州市, district=铜山区, kilometers=458, price01=0.8740, price02=0.7630, price03=0.7000, price04=0.6300, price05=0.5940), RegionDto(province=江苏省, city=徐州市, district=新沂市, kilometers=409, price01=0.8740, price02=0.7630, price03=0.7000, price04=0.6300, price05=0.5940), RegionDto(province=江苏省, city=徐州市, district=云龙区, kilometers=453, price01=0.8740, price02=0.7630, price03=0.7000, price04=0.6300, price05=0.5940), RegionDto(province=江苏省, city=盐城市, district=滨海县, kilometers=363, price01=1.4260, price02=1.3250, price03=1.2320, price04=1.1000, price05=1.0190), RegionDto(province=江苏省, city=盐城市, district=大丰区, kilometers=296, price01=1.4260, price02=1.3250, price03=1.2320, price04=1.1000, price05=1.0190), RegionDto(province=江苏省, city=盐城市, district=东台市, kilometers=218, price01=1.4260, price02=1.3250, price03=1.2320, price04=1.1000, price05=1.0190), RegionDto(province=江苏省, city=盐城市, district=阜宁县, kilometers=320, price01=1.4260, price02=1.3250, price03=1.2320, price04=1.1000, price05=1.0190), RegionDto(province=江苏省, city=盐城市, district=建湖县, kilometers=296, price01=1.4260, price02=1.3250, price03=1.2320, price04=1.1000, price05=1.0190), RegionDto(province=江苏省, city=盐城市, district=射阳县, kilometers=321, price01=1.4260, price02=1.3250, price03=1.2320, price04=1.1000, price05=1.0190), RegionDto(province=江苏省, city=盐城市, district=亭湖区, kilometers=269, price01=1.4260, price02=1.3250, price03=1.2320, price04=1.1000, price05=1.0190), RegionDto(province=江苏省, city=盐城市, district=响水县, kilometers=390, price01=1.4260, price02=1.3250, price03=1.2320, price04=1.1000, price05=1.0190), RegionDto(province=江苏省, city=盐城市, district=盐城经济技术开发区, kilometers=267, price01=1.4260, price02=1.3250, price03=1.2320, price04=1.1000, price05=1.0190), RegionDto(province=江苏省, city=盐城市, district=盐都区, kilometers=256, price01=1.4260, price02=1.3250, price03=1.2320, price04=1.1000, price05=1.0190), RegionDto(province=江苏省, city=扬州市, district=宝应县, kilometers=239, price01=1.8300, price02=1.1500, price03=0.9600, price04=0.8000, price05=0.8000), RegionDto(province=江苏省, city=扬州市, district=高邮市, kilometers=192, price01=1.8300, price02=1.1500, price03=0.9600, price04=0.8000, price05=0.8000), RegionDto(province=江苏省, city=扬州市, district=广陵区, kilometers=128, price01=1.8300, price02=1.1500, price03=0.9600, price04=0.8000, price05=0.8000), RegionDto(province=江苏省, city=扬州市, district=邗江区, kilometers=127, price01=1.8300, price02=1.1500, price03=0.9600, price04=0.8000, price05=0.8000), RegionDto(province=江苏省, city=扬州市, district=江都区, kilometers=143, price01=1.8300, price02=1.1500, price03=0.9600, price04=0.8000, price05=0.8000), RegionDto(province=江苏省, city=扬州市, district=仪征市, kilometers=127, price01=1.8300, price02=1.1500, price03=0.9600, price04=0.8000, price05=0.8000), RegionDto(province=江苏省, city=宜兴市, district=丁蜀镇, kilometers=32, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=宜兴市, district=芳桥街道, kilometers=25, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=宜兴市, district=高塍镇, kilometers=12, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=宜兴市, district=官林镇, kilometers=5, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=宜兴市, district=和桥镇, kilometers=22, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=宜兴市, district=湖㳇镇, kilometers=38, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=宜兴市, district=屺亭街道, kilometers=17, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=宜兴市, district=太华镇, kilometers=39, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=宜兴市, district=万石镇, kilometers=27, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=宜兴市, district=西渚镇, kilometers=29, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=宜兴市, district=新建镇, kilometers=11, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=宜兴市, district=新街街道, kilometers=18, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=宜兴市, district=新庄街道, kilometers=27, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=宜兴市, district=徐舍镇, kilometers=12, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=宜兴市, district=杨巷镇, kilometers=15, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=宜兴市, district=宜城街道, kilometers=21, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=宜兴市, district=张渚镇, kilometers=27, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=宜兴市, district=周铁镇, kilometers=32, price01=3.8000, price02=3.8000, price03=3.6000, price04=3.5000, price05=3.5000), RegionDto(province=江苏省, city=镇江市, district=丹徒区, kilometers=94, price01=1.8300, price02=1.3500, price03=1.1500, price04=0.9500, price05=0.9000), RegionDto(province=江苏省, city=镇江市, district=丹阳市, kilometers=69, price01=1.8300, price02=1.3500, price03=1.1500, price04=0.9500, price05=0.9000), RegionDto(province=江苏省, city=镇江市, district=京口区, kilometers=106, price01=1.8300, price02=1.3500, price03=1.1500, price04=0.9500, price05=0.9000), RegionDto(province=江苏省, city=镇江市, district=句容市, kilometers=91, price01=1.8300, price02=1.3500, price03=1.1500, price04=0.9500, price05=0.9000), RegionDto(province=江苏省, city=镇江市, district=润州区, kilometers=99, price01=1.8300, price02=1.3500, price03=1.1500, price04=0.9500, price05=0.9000), RegionDto(province=江苏省, city=镇江市, district=扬中市, kilometers=119, price01=1.8300, price02=1.3500, price03=1.1500, price04=0.9500, price05=0.9000)] >>>>>>> b799dee5eb9dbd6d64f1a081a00d51cfb21ef419 +2024-02-26 08:41:41.861 INFO 9132 --- [main] com.JN.JNApplication : Starting JNApplication using Java 1.8.0_171 on xudong with PID 9132 (E:\myproject\JNDemo\target\classes started by Administrator in E:\myproject\JNDemo) +2024-02-26 08:41:41.870 INFO 9132 --- [main] com.JN.JNApplication : The following profiles are active: ZM +2024-02-26 08:41:42.252 WARN 9132 --- [main] ConfigServletWebServerApplicationContext : Exception encountered during context initialization - cancelling refresh attempt: org.springframework.beans.factory.BeanDefinitionStoreException: Failed to parse configuration class [com.JN.JNApplication]; nested exception is org.springframework.context.annotation.ConflictingBeanDefinitionException: Annotation-specified bean name 'inventoryServiceImpl' for bean class [com.JN.demo.zmquotation.service.impl.InventoryServiceImpl] conflicts with existing, non-compatible bean definition of same name and class [com.JN.demo.jnzmquatation.service.impl.InventoryServiceImpl] +2024-02-26 08:41:42.285 ERROR 9132 --- [main] o.s.boot.SpringApplication : Application run failed + +org.springframework.beans.factory.BeanDefinitionStoreException: Failed to parse configuration class [com.JN.JNApplication]; nested exception is org.springframework.context.annotation.ConflictingBeanDefinitionException: Annotation-specified bean name 'inventoryServiceImpl' for bean class [com.JN.demo.zmquotation.service.impl.InventoryServiceImpl] conflicts with existing, non-compatible bean definition of same name and class [com.JN.demo.jnzmquatation.service.impl.InventoryServiceImpl] + at org.springframework.context.annotation.ConfigurationClassParser.parse(ConfigurationClassParser.java:189) + at org.springframework.context.annotation.ConfigurationClassPostProcessor.processConfigBeanDefinitions(ConfigurationClassPostProcessor.java:331) + at org.springframework.context.annotation.ConfigurationClassPostProcessor.postProcessBeanDefinitionRegistry(ConfigurationClassPostProcessor.java:247) + at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanDefinitionRegistryPostProcessors(PostProcessorRegistrationDelegate.java:311) + at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanFactoryPostProcessors(PostProcessorRegistrationDelegate.java:112) + at org.springframework.context.support.AbstractApplicationContext.invokeBeanFactoryPostProcessors(AbstractApplicationContext.java:746) + at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:564) + at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:144) + at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:782) + at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:774) + at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:439) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:339) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:1340) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:1329) + at com.JN.JNApplication.main(JNApplication.java:15) +Caused by: org.springframework.context.annotation.ConflictingBeanDefinitionException: Annotation-specified bean name 'inventoryServiceImpl' for bean class [com.JN.demo.zmquotation.service.impl.InventoryServiceImpl] conflicts with existing, non-compatible bean definition of same name and class [com.JN.demo.jnzmquatation.service.impl.InventoryServiceImpl] + at org.springframework.context.annotation.ClassPathBeanDefinitionScanner.checkCandidate(ClassPathBeanDefinitionScanner.java:349) + at org.springframework.context.annotation.ClassPathBeanDefinitionScanner.doScan(ClassPathBeanDefinitionScanner.java:287) + at org.springframework.context.annotation.ComponentScanAnnotationParser.parse(ComponentScanAnnotationParser.java:132) + at org.springframework.context.annotation.ConfigurationClassParser.doProcessConfigurationClass(ConfigurationClassParser.java:296) + at org.springframework.context.annotation.ConfigurationClassParser.processConfigurationClass(ConfigurationClassParser.java:250) + at org.springframework.context.annotation.ConfigurationClassParser.parse(ConfigurationClassParser.java:207) + at org.springframework.context.annotation.ConfigurationClassParser.parse(ConfigurationClassParser.java:175) + ... 14 common frames omitted + +2024-02-26 08:44:33.213 INFO 9348 --- [main] com.JN.JNApplication : Starting JNApplication using Java 1.8.0_171 on xudong with PID 9348 (E:\myproject\JNDemo\target\classes started by Administrator in E:\myproject\JNDemo) +2024-02-26 08:44:33.225 INFO 9348 --- [main] com.JN.JNApplication : The following profiles are active: ZM +2024-02-26 08:44:33.574 WARN 9348 --- [main] ConfigServletWebServerApplicationContext : Exception encountered during context initialization - cancelling refresh attempt: org.springframework.beans.factory.BeanDefinitionStoreException: Failed to parse configuration class [com.JN.JNApplication]; nested exception is org.springframework.context.annotation.ConflictingBeanDefinitionException: Annotation-specified bean name 'inventoryServiceImpl' for bean class [com.JN.demo.zmquotation.service.impl.InventoryServiceImpl] conflicts with existing, non-compatible bean definition of same name and class [com.JN.demo.jnzmquatation.service.impl.InventoryServiceImpl] +2024-02-26 08:44:33.607 ERROR 9348 --- [main] o.s.boot.SpringApplication : Application run failed + +org.springframework.beans.factory.BeanDefinitionStoreException: Failed to parse configuration class [com.JN.JNApplication]; nested exception is org.springframework.context.annotation.ConflictingBeanDefinitionException: Annotation-specified bean name 'inventoryServiceImpl' for bean class [com.JN.demo.zmquotation.service.impl.InventoryServiceImpl] conflicts with existing, non-compatible bean definition of same name and class [com.JN.demo.jnzmquatation.service.impl.InventoryServiceImpl] + at org.springframework.context.annotation.ConfigurationClassParser.parse(ConfigurationClassParser.java:189) + at org.springframework.context.annotation.ConfigurationClassPostProcessor.processConfigBeanDefinitions(ConfigurationClassPostProcessor.java:331) + at org.springframework.context.annotation.ConfigurationClassPostProcessor.postProcessBeanDefinitionRegistry(ConfigurationClassPostProcessor.java:247) + at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanDefinitionRegistryPostProcessors(PostProcessorRegistrationDelegate.java:311) + at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanFactoryPostProcessors(PostProcessorRegistrationDelegate.java:112) + at org.springframework.context.support.AbstractApplicationContext.invokeBeanFactoryPostProcessors(AbstractApplicationContext.java:746) + at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:564) + at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:144) + at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:782) + at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:774) + at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:439) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:339) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:1340) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:1329) + at com.JN.JNApplication.main(JNApplication.java:15) +Caused by: org.springframework.context.annotation.ConflictingBeanDefinitionException: Annotation-specified bean name 'inventoryServiceImpl' for bean class [com.JN.demo.zmquotation.service.impl.InventoryServiceImpl] conflicts with existing, non-compatible bean definition of same name and class [com.JN.demo.jnzmquatation.service.impl.InventoryServiceImpl] + at org.springframework.context.annotation.ClassPathBeanDefinitionScanner.checkCandidate(ClassPathBeanDefinitionScanner.java:349) + at org.springframework.context.annotation.ClassPathBeanDefinitionScanner.doScan(ClassPathBeanDefinitionScanner.java:287) + at org.springframework.context.annotation.ComponentScanAnnotationParser.parse(ComponentScanAnnotationParser.java:132) + at org.springframework.context.annotation.ConfigurationClassParser.doProcessConfigurationClass(ConfigurationClassParser.java:296) + at org.springframework.context.annotation.ConfigurationClassParser.processConfigurationClass(ConfigurationClassParser.java:250) + at org.springframework.context.annotation.ConfigurationClassParser.parse(ConfigurationClassParser.java:207) + at org.springframework.context.annotation.ConfigurationClassParser.parse(ConfigurationClassParser.java:175) + ... 14 common frames omitted + +2024-02-26 08:50:05.340 INFO 7668 --- [main] com.JN.JNApplication : Starting JNApplication using Java 1.8.0_171 on xudong with PID 7668 (E:\myproject\JNDemo\target\classes started by Administrator in E:\myproject\JNDemo) +2024-02-26 08:50:05.352 INFO 7668 --- [main] com.JN.JNApplication : The following profiles are active: ZM +2024-02-26 08:50:09.153 WARN 7668 --- [Druid-ConnectionPool-Create-1181947538] c.m.s.jdbc.internals.TDS.Channel : TLSv1 was negotiated. Please update server and client to use TLSv1.2 at minimum. +2024-02-26 08:50:12.036 INFO 7668 --- [main] com.JN.config.WebMvcConfig : 扩展消息转换器... +2024-02-26 08:50:12.051 INFO 7668 --- [main] com.JN.config.WebMvcConfig : 开始进行静态资源映射... +2024-02-26 08:50:12.328 WARN 7668 --- [main] JpaBaseConfiguration$JpaWebConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning +2024-02-26 08:50:12.837 INFO 7668 --- [main] com.JN.JNApplication : Started JNApplication in 8.623 seconds (JVM running for 10.676) +2024-02-26 08:50:12.855 INFO 7668 --- [main] com.JN.JNApplication : 项目启动成功... +2024-02-26 08:52:17.420 INFO 8100 --- [main] com.JN.JNApplication : Starting JNApplication using Java 1.8.0_171 on xudong with PID 8100 (E:\myproject\JNDemo\target\classes started by Administrator in E:\myproject\JNDemo) +2024-02-26 08:52:17.423 INFO 8100 --- [main] com.JN.JNApplication : The following profiles are active: ZM +2024-02-26 08:52:21.439 WARN 8100 --- [Druid-ConnectionPool-Create-750795985] c.m.s.jdbc.internals.TDS.Channel : TLSv1 was negotiated. Please update server and client to use TLSv1.2 at minimum. +2024-02-26 08:52:23.540 INFO 8100 --- [main] com.JN.config.WebMvcConfig : 扩展消息转换器... +2024-02-26 08:52:23.546 INFO 8100 --- [main] com.JN.config.WebMvcConfig : 开始进行静态资源映射... +2024-02-26 08:52:24.414 WARN 8100 --- [main] JpaBaseConfiguration$JpaWebConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning +2024-02-26 08:52:24.936 INFO 8100 --- [main] com.JN.JNApplication : Started JNApplication in 8.629 seconds (JVM running for 11.155) +2024-02-26 08:52:24.942 INFO 8100 --- [main] com.JN.JNApplication : 项目启动成功... +2024-02-26 08:52:42.366 INFO 8100 --- [http-nio-3333-exec-1] com.JN.filter.LoginCheckFilter : 拦截到请求：/ +2024-02-26 08:52:42.367 INFO 8100 --- [http-nio-3333-exec-1] com.JN.filter.LoginCheckFilter : 本次请求/不需要处理 +2024-02-26 08:52:42.379 WARN 8100 --- [http-nio-3333-exec-1] o.s.web.servlet.PageNotFound : No mapping for GET / +2024-02-26 08:52:42.712 INFO 8100 --- [http-nio-3333-exec-2] com.JN.filter.LoginCheckFilter : 拦截到请求：/favicon.ico +2024-02-26 08:52:42.712 INFO 8100 --- [http-nio-3333-exec-2] com.JN.filter.LoginCheckFilter : 本次请求/favicon.ico不需要处理 +2024-02-26 08:52:42.712 WARN 8100 --- [http-nio-3333-exec-2] o.s.web.servlet.PageNotFound : No mapping for GET /favicon.ico +2024-02-26 08:52:52.705 INFO 8100 --- [http-nio-3333-exec-5] com.JN.filter.LoginCheckFilter : 拦截到请求：/ZM +2024-02-26 08:52:52.706 INFO 8100 --- [http-nio-3333-exec-5] com.JN.filter.LoginCheckFilter : 本次请求/ZM不需要处理 +2024-02-26 08:52:53.010 INFO 8100 --- [http-nio-3333-exec-6] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/element-ui/index.css +2024-02-26 08:52:53.010 INFO 8100 --- [http-nio-3333-exec-6] com.JN.filter.LoginCheckFilter : 本次请求/plugins/element-ui/index.css不需要处理 +2024-02-26 08:52:53.014 INFO 8100 --- [http-nio-3333-exec-7] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/zmquotation/css/index.css +2024-02-26 08:52:53.014 INFO 8100 --- [http-nio-3333-exec-7] com.JN.filter.LoginCheckFilter : 本次请求/static/zmquotation/css/index.css不需要处理 +2024-02-26 08:52:53.018 INFO 8100 --- [http-nio-3333-exec-10] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/calendar/calendar.js +2024-02-26 08:52:53.019 INFO 8100 --- [http-nio-3333-exec-10] com.JN.filter.LoginCheckFilter : 本次请求/plugins/calendar/calendar.js不需要处理 +2024-02-26 08:52:53.021 INFO 8100 --- [http-nio-3333-exec-9] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/element-ui/index.js +2024-02-26 08:52:53.022 INFO 8100 --- [http-nio-3333-exec-9] com.JN.filter.LoginCheckFilter : 本次请求/plugins/element-ui/index.js不需要处理 +2024-02-26 08:52:53.025 INFO 8100 --- [http-nio-3333-exec-7] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/axios/request.js +2024-02-26 08:52:53.025 INFO 8100 --- [http-nio-3333-exec-7] com.JN.filter.LoginCheckFilter : 本次请求/plugins/axios/request.js不需要处理 +2024-02-26 08:52:53.027 INFO 8100 --- [http-nio-3333-exec-1] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/axios/axios.min.js +2024-02-26 08:52:53.027 INFO 8100 --- [http-nio-3333-exec-1] com.JN.filter.LoginCheckFilter : 本次请求/plugins/axios/axios.min.js不需要处理 +2024-02-26 08:52:53.029 INFO 8100 --- [http-nio-3333-exec-7] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/zmquotation/js/index.js +2024-02-26 08:52:53.029 INFO 8100 --- [http-nio-3333-exec-7] com.JN.filter.LoginCheckFilter : 本次请求/static/zmquotation/js/index.js不需要处理 +2024-02-26 08:52:53.017 INFO 8100 --- [http-nio-3333-exec-8] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/vue/vue.js +2024-02-26 08:52:53.033 INFO 8100 --- [http-nio-3333-exec-8] com.JN.filter.LoginCheckFilter : 本次请求/plugins/vue/vue.js不需要处理 +2024-02-26 08:52:53.413 INFO 8100 --- [http-nio-3333-exec-4] com.JN.filter.LoginCheckFilter : 拦截到请求：/zmquotation/inventoryList +2024-02-26 08:52:53.413 INFO 8100 --- [http-nio-3333-exec-4] com.JN.filter.LoginCheckFilter : 本次请求/zmquotation/inventoryList不需要处理 +2024-02-26 08:52:53.486 INFO 8100 --- [http-nio-3333-exec-5] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/image/JNlogo.png +2024-02-26 08:52:53.488 INFO 8100 --- [http-nio-3333-exec-5] com.JN.filter.LoginCheckFilter : 本次请求/static/image/JNlogo.png不需要处理 +2024-02-26 08:52:55.522 INFO 8100 --- [http-nio-3333-exec-7] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/element-ui/fonts/element-icons.woff +2024-02-26 08:52:55.522 INFO 8100 --- [http-nio-3333-exec-7] com.JN.filter.LoginCheckFilter : 本次请求/plugins/element-ui/fonts/element-icons.woff不需要处理 +2024-02-26 08:54:21.765 INFO 10636 --- [main] com.JN.JNApplication : Starting JNApplication using Java 1.8.0_171 on xudong with PID 10636 (E:\myproject\JNDemo\target\classes started by Administrator in E:\myproject\JNDemo) +2024-02-26 08:54:21.767 INFO 10636 --- [main] com.JN.JNApplication : The following profiles are active: ZM +2024-02-26 08:54:23.432 WARN 10636 --- [Druid-ConnectionPool-Create-1232792716] c.m.s.jdbc.internals.TDS.Channel : TLSv1 was negotiated. Please update server and client to use TLSv1.2 at minimum. +2024-02-26 08:54:24.396 INFO 10636 --- [main] com.JN.config.WebMvcConfig : 扩展消息转换器... +2024-02-26 08:54:24.402 INFO 10636 --- [main] com.JN.config.WebMvcConfig : 开始进行静态资源映射... +2024-02-26 08:54:24.519 WARN 10636 --- [main] JpaBaseConfiguration$JpaWebConfiguration : spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning +2024-02-26 08:54:24.712 INFO 10636 --- [main] com.JN.JNApplication : Started JNApplication in 3.365 seconds (JVM running for 4.137) +2024-02-26 08:54:24.717 INFO 10636 --- [main] com.JN.JNApplication : 项目启动成功... +2024-02-26 08:54:34.341 INFO 10636 --- [http-nio-3333-exec-1] com.JN.filter.LoginCheckFilter : 拦截到请求：/JN +2024-02-26 08:54:34.342 INFO 10636 --- [http-nio-3333-exec-1] com.JN.filter.LoginCheckFilter : 本次请求/JN不需要处理 +2024-02-26 08:54:34.589 INFO 10636 --- [http-nio-3333-exec-2] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/jnquotation/css/index.css +2024-02-26 08:54:34.590 INFO 10636 --- [http-nio-3333-exec-2] com.JN.filter.LoginCheckFilter : 本次请求/static/jnquotation/css/index.css不需要处理 +2024-02-26 08:54:34.590 INFO 10636 --- [http-nio-3333-exec-3] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/jnquotation/js/index.js +2024-02-26 08:54:34.595 INFO 10636 --- [http-nio-3333-exec-3] com.JN.filter.LoginCheckFilter : 本次请求/static/jnquotation/js/index.js不需要处理 +2024-02-26 08:54:34.792 INFO 10636 --- [http-nio-3333-exec-4] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/jnquotation/js/index.js +2024-02-26 08:54:34.792 INFO 10636 --- [http-nio-3333-exec-4] com.JN.filter.LoginCheckFilter : 本次请求/static/jnquotation/js/index.js不需要处理 +2024-02-26 08:54:54.174 INFO 10636 --- [http-nio-3333-exec-7] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/jnquotation/css/index.css +2024-02-26 08:54:54.175 INFO 10636 --- [http-nio-3333-exec-7] com.JN.filter.LoginCheckFilter : 本次请求/static/jnquotation/css/index.css不需要处理 +2024-02-26 08:54:54.756 INFO 10636 --- [http-nio-3333-exec-8] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/calendar/js-calendar-converter.js.map +2024-02-26 08:54:54.757 INFO 10636 --- [http-nio-3333-exec-8] com.JN.filter.LoginCheckFilter : 本次请求/plugins/calendar/js-calendar-converter.js.map不需要处理 +2024-02-26 08:54:54.758 INFO 10636 --- [http-nio-3333-exec-9] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/axios/axios.min.map +2024-02-26 08:54:54.758 INFO 10636 --- [http-nio-3333-exec-9] com.JN.filter.LoginCheckFilter : 本次请求/plugins/axios/axios.min.map不需要处理 +2024-02-26 08:55:09.562 INFO 10636 --- [http-nio-3333-exec-3] com.JN.filter.LoginCheckFilter : 拦截到请求：/zm +2024-02-26 08:55:09.562 INFO 10636 --- [http-nio-3333-exec-3] com.JN.filter.LoginCheckFilter : 本次请求/zm不需要处理 +2024-02-26 08:55:09.564 WARN 10636 --- [http-nio-3333-exec-3] o.s.web.servlet.PageNotFound : No mapping for GET /zm +2024-02-26 08:55:12.578 INFO 10636 --- [http-nio-3333-exec-5] com.JN.filter.LoginCheckFilter : 拦截到请求：/ZM +2024-02-26 08:55:12.579 INFO 10636 --- [http-nio-3333-exec-5] com.JN.filter.LoginCheckFilter : 本次请求/ZM不需要处理 +2024-02-26 08:55:12.856 INFO 10636 --- [http-nio-3333-exec-7] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/axios/axios.min.map +2024-02-26 08:55:12.856 INFO 10636 --- [http-nio-3333-exec-6] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/calendar/js-calendar-converter.js.map +2024-02-26 08:55:12.856 INFO 10636 --- [http-nio-3333-exec-7] com.JN.filter.LoginCheckFilter : 本次请求/plugins/axios/axios.min.map不需要处理 +2024-02-26 08:55:12.856 INFO 10636 --- [http-nio-3333-exec-6] com.JN.filter.LoginCheckFilter : 本次请求/plugins/calendar/js-calendar-converter.js.map不需要处理 +2024-02-26 08:55:13.033 INFO 10636 --- [http-nio-3333-exec-8] com.JN.filter.LoginCheckFilter : 拦截到请求：/zmquotation/inventoryList +2024-02-26 08:55:13.033 INFO 10636 --- [http-nio-3333-exec-8] com.JN.filter.LoginCheckFilter : 本次请求/zmquotation/inventoryList不需要处理 +2024-02-26 08:55:17.779 INFO 10636 --- [http-nio-3333-exec-9] com.JN.filter.LoginCheckFilter : 拦截到请求：/JN +2024-02-26 08:55:17.779 INFO 10636 --- [http-nio-3333-exec-9] com.JN.filter.LoginCheckFilter : 本次请求/JN不需要处理 +2024-02-26 08:55:17.854 INFO 10636 --- [http-nio-3333-exec-1] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/jnquotation/css/index.css +2024-02-26 08:55:17.854 INFO 10636 --- [http-nio-3333-exec-1] com.JN.filter.LoginCheckFilter : 本次请求/static/jnquotation/css/index.css不需要处理 +2024-02-26 08:55:17.862 INFO 10636 --- [http-nio-3333-exec-1] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/jnquotation/js/index.js +2024-02-26 08:55:17.863 INFO 10636 --- [http-nio-3333-exec-1] com.JN.filter.LoginCheckFilter : 本次请求/static/jnquotation/js/index.js不需要处理 +2024-02-26 08:55:18.052 INFO 10636 --- [http-nio-3333-exec-3] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/jnquotation/js/index.js +2024-02-26 08:55:18.052 INFO 10636 --- [http-nio-3333-exec-3] com.JN.filter.LoginCheckFilter : 本次请求/static/jnquotation/js/index.js不需要处理 +2024-02-26 08:55:18.056 INFO 10636 --- [http-nio-3333-exec-3] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/calendar/js-calendar-converter.js.map +2024-02-26 08:55:18.056 INFO 10636 --- [http-nio-3333-exec-3] com.JN.filter.LoginCheckFilter : 本次请求/plugins/calendar/js-calendar-converter.js.map不需要处理 +2024-02-26 08:55:18.059 INFO 10636 --- [http-nio-3333-exec-4] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/axios/axios.min.map +2024-02-26 08:55:18.059 INFO 10636 --- [http-nio-3333-exec-4] com.JN.filter.LoginCheckFilter : 本次请求/plugins/axios/axios.min.map不需要处理 +2024-02-26 08:56:17.742 INFO 10636 --- [http-nio-3333-exec-8] com.JN.filter.LoginCheckFilter : 拦截到请求：/JN +2024-02-26 08:56:17.742 INFO 10636 --- [http-nio-3333-exec-8] com.JN.filter.LoginCheckFilter : 本次请求/JN不需要处理 +2024-02-26 08:56:17.857 INFO 10636 --- [http-nio-3333-exec-9] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/jnquotation/css/index.css +2024-02-26 08:56:17.858 INFO 10636 --- [http-nio-3333-exec-9] com.JN.filter.LoginCheckFilter : 本次请求/static/jnquotation/css/index.css不需要处理 +2024-02-26 08:56:17.909 INFO 10636 --- [http-nio-3333-exec-1] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/jnquotation/js/index.js +2024-02-26 08:56:17.910 INFO 10636 --- [http-nio-3333-exec-1] com.JN.filter.LoginCheckFilter : 本次请求/static/jnquotation/js/index.js不需要处理 +2024-02-26 08:56:18.193 INFO 10636 --- [http-nio-3333-exec-10] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/jnquotation/js/index.js +2024-02-26 08:56:18.193 INFO 10636 --- [http-nio-3333-exec-10] com.JN.filter.LoginCheckFilter : 本次请求/static/jnquotation/js/index.js不需要处理 +2024-02-26 08:56:18.196 INFO 10636 --- [http-nio-3333-exec-2] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/calendar/js-calendar-converter.js.map +2024-02-26 08:56:18.196 INFO 10636 --- [http-nio-3333-exec-2] com.JN.filter.LoginCheckFilter : 本次请求/plugins/calendar/js-calendar-converter.js.map不需要处理 +2024-02-26 08:56:18.204 INFO 10636 --- [http-nio-3333-exec-3] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/axios/axios.min.map +2024-02-26 08:56:18.205 INFO 10636 --- [http-nio-3333-exec-3] com.JN.filter.LoginCheckFilter : 本次请求/plugins/axios/axios.min.map不需要处理 +2024-02-26 08:56:18.539 INFO 10636 --- [http-nio-3333-exec-4] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/image/JNlogo.png +2024-02-26 08:56:18.539 INFO 10636 --- [http-nio-3333-exec-4] com.JN.filter.LoginCheckFilter : 本次请求/static/image/JNlogo.png不需要处理 +2024-02-26 08:56:19.364 INFO 10636 --- [http-nio-3333-exec-6] com.JN.filter.LoginCheckFilter : 拦截到请求：/JN +2024-02-26 08:56:19.365 INFO 10636 --- [http-nio-3333-exec-6] com.JN.filter.LoginCheckFilter : 本次请求/JN不需要处理 +2024-02-26 08:56:19.559 INFO 10636 --- [http-nio-3333-exec-7] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/jnquotation/css/index.css +2024-02-26 08:56:19.560 INFO 10636 --- [http-nio-3333-exec-7] com.JN.filter.LoginCheckFilter : 本次请求/static/jnquotation/css/index.css不需要处理 +2024-02-26 08:56:19.575 INFO 10636 --- [http-nio-3333-exec-5] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/jnquotation/js/index.js +2024-02-26 08:56:19.575 INFO 10636 --- [http-nio-3333-exec-5] com.JN.filter.LoginCheckFilter : 本次请求/static/jnquotation/js/index.js不需要处理 +2024-02-26 08:56:19.793 INFO 10636 --- [http-nio-3333-exec-8] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/jnquotation/js/index.js +2024-02-26 08:56:19.793 INFO 10636 --- [http-nio-3333-exec-8] com.JN.filter.LoginCheckFilter : 本次请求/static/jnquotation/js/index.js不需要处理 +2024-02-26 08:56:19.800 INFO 10636 --- [http-nio-3333-exec-9] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/calendar/js-calendar-converter.js.map +2024-02-26 08:56:19.801 INFO 10636 --- [http-nio-3333-exec-9] com.JN.filter.LoginCheckFilter : 本次请求/plugins/calendar/js-calendar-converter.js.map不需要处理 +2024-02-26 08:56:19.801 INFO 10636 --- [http-nio-3333-exec-1] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/axios/axios.min.map +2024-02-26 08:56:19.801 INFO 10636 --- [http-nio-3333-exec-1] com.JN.filter.LoginCheckFilter : 本次请求/plugins/axios/axios.min.map不需要处理 +2024-02-26 08:56:20.134 INFO 10636 --- [http-nio-3333-exec-2] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/image/JNlogo.png +2024-02-26 08:56:20.134 INFO 10636 --- [http-nio-3333-exec-2] com.JN.filter.LoginCheckFilter : 本次请求/static/image/JNlogo.png不需要处理 +2024-02-26 08:56:20.951 INFO 10636 --- [http-nio-3333-exec-10] com.JN.filter.LoginCheckFilter : 拦截到请求：/JN +2024-02-26 08:56:20.954 INFO 10636 --- [http-nio-3333-exec-10] com.JN.filter.LoginCheckFilter : 本次请求/JN不需要处理 +2024-02-26 08:56:21.012 INFO 10636 --- [http-nio-3333-exec-3] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/jnquotation/css/index.css +2024-02-26 08:56:21.012 INFO 10636 --- [http-nio-3333-exec-3] com.JN.filter.LoginCheckFilter : 本次请求/static/jnquotation/css/index.css不需要处理 +2024-02-26 08:56:21.015 INFO 10636 --- [http-nio-3333-exec-3] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/jnquotation/js/index.js +2024-02-26 08:56:21.016 INFO 10636 --- [http-nio-3333-exec-3] com.JN.filter.LoginCheckFilter : 本次请求/static/jnquotation/js/index.js不需要处理 +2024-02-26 08:56:21.197 INFO 10636 --- [http-nio-3333-exec-6] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/jnquotation/js/index.js +2024-02-26 08:56:21.197 INFO 10636 --- [http-nio-3333-exec-6] com.JN.filter.LoginCheckFilter : 本次请求/static/jnquotation/js/index.js不需要处理 +2024-02-26 08:56:21.201 INFO 10636 --- [http-nio-3333-exec-7] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/calendar/js-calendar-converter.js.map +2024-02-26 08:56:21.201 INFO 10636 --- [http-nio-3333-exec-7] com.JN.filter.LoginCheckFilter : 本次请求/plugins/calendar/js-calendar-converter.js.map不需要处理 +2024-02-26 08:56:21.202 INFO 10636 --- [http-nio-3333-exec-6] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/axios/axios.min.map +2024-02-26 08:56:21.203 INFO 10636 --- [http-nio-3333-exec-6] com.JN.filter.LoginCheckFilter : 本次请求/plugins/axios/axios.min.map不需要处理 +2024-02-26 08:56:21.461 INFO 10636 --- [http-nio-3333-exec-8] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/image/JNlogo.png +2024-02-26 08:56:21.461 INFO 10636 --- [http-nio-3333-exec-8] com.JN.filter.LoginCheckFilter : 本次请求/static/image/JNlogo.png不需要处理 diff --git a/src/main/java/com/JN/controller/PageRedirectController.java b/src/main/java/com/JN/controller/PageRedirectController.java index c7fe0dc..7b787b7 100644 --- a/src/main/java/com/JN/controller/PageRedirectController.java +++ b/src/main/java/com/JN/controller/PageRedirectController.java @@ -48,4 +48,9 @@ public class PageRedirectController { public String redirectZM(){ return "zmquotation/index"; } + + @GetMapping("/JN") + public String redirectJN(){ + return "jnquotation/index"; + } } diff --git a/src/main/java/com/JN/demo/jnzmquatation/controller/JNController.java b/src/main/java/com/JN/demo/jnzmquatation/controller/JNController.java index b850ac2..7b02560 100644 --- a/src/main/java/com/JN/demo/jnzmquatation/controller/JNController.java +++ b/src/main/java/com/JN/demo/jnzmquatation/controller/JNController.java @@ -1,7 +1,12 @@ package com.JN.demo.jnzmquatation.controller; import com.JN.common.R; - +import com.JN.demo.jnzmquatation.dto.JnInventoryDto; +import com.JN.demo.jnzmquatation.dto.JnMaterialDto; +import com.JN.demo.jnzmquatation.dto.JnRegionDto; +import com.JN.demo.jnzmquatation.service.JnInventoryService; +import com.JN.demo.jnzmquatation.service.JnMaterialService; +import com.JN.demo.jnzmquatation.service.JnRegionService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -12,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; /** - * @ClassName ZMController + * @ClassName JNController * @Description TODO * @Author JIAL * @Date 2024/2/19 8:47 @@ -22,7 +27,69 @@ import java.util.List; @Slf4j @RequestMapping("/jnquotation") public class JNController { + @Autowired + JnRegionService regionService; + @Autowired + JnMaterialService materialService; + + @Autowired + JnInventoryService inventoryService; + + /** + * @title queryRegionList + * @description 查询地区列表信息 + * @author JIAL + * @param: regionName + * @updateTime 2024/2/20 16:54 + * @return: com.JN.common.R> + */ + @PostMapping("/regionList") + public R queryRegionList(@RequestParam("regionName") String regionName){ + + List regionList = regionService.queryRegionListByName(regionName); + + log.info("查询到的地区列表结果是：{}", regionList); + + return R.success(regionList); + } + + /** + * @title queryMaterialList + * @description 查询物料信息 + * @author JIAL + * @param: precMaterialName + * @param: vagueMaterialName + * @param: vagueModel + * @updateTime 2024/2/20 16:54 + * @return: com.JN.common.R> + */ + @PostMapping("/materialList") + public R queryMaterialList(@RequestParam("precMaterialName") String precMaterialName, + @RequestParam("vagueMaterialName") String vagueMaterialName, + @RequestParam("vagueModel") String vagueModel) { + List materialList = materialService.queryMaterialListByParam(precMaterialName, vagueMaterialName, vagueModel); + + /* Map result = new HashMap<>(); + result.put("rows", materialList); + result.put("total", materialNum);*/ + + return R.success(materialList); + } + + /** + * @title queryInventoryList + * @description 获取盘具列表 + * @author JIAL + * @updateTime 2024/2/22 10:09 + * @return: com.JN.common.R> + */ + @PostMapping("/inventoryList") + public R queryInventoryList() { + List inventoryList = inventoryService.queryInventoryList(); + + return R.success(inventoryList); + } } diff --git a/src/main/java/com/JN/demo/jnzmquatation/dto/JnInventoryDto.java b/src/main/java/com/JN/demo/jnzmquatation/dto/JnInventoryDto.java new file mode 100644 index 0000000..2a3b16c --- /dev/null +++ b/src/main/java/com/JN/demo/jnzmquatation/dto/JnInventoryDto.java @@ -0,0 +1,23 @@ +package com.JN.demo.jnzmquatation.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @ClassName InventoryDto + * @Description TODO + * @Author JIAL + * @Date 2024/2/22 9:48 + * @Version 1.0 + */ +@Data +public class JnInventoryDto implements Serializable { + private static final long serialVersionUID = 1L; + + private String inventory; //盘具名称 + + private String invDesc; //盘具描述 + + private String weighInv; //盘重 +} diff --git a/src/main/java/com/JN/demo/jnzmquatation/dto/JnMaterialDto.java b/src/main/java/com/JN/demo/jnzmquatation/dto/JnMaterialDto.java new file mode 100644 index 0000000..af10c68 --- /dev/null +++ b/src/main/java/com/JN/demo/jnzmquatation/dto/JnMaterialDto.java @@ -0,0 +1,51 @@ +package com.JN.demo.jnzmquatation.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @ClassName MaterialDto + * @Description TODO + * @Author JIAL + * @Date 2024/2/20 16:42 + * @Version 1.0 + */ +@Data +public class JnMaterialDto implements Serializable { + private static final long serialVersionUID = 1L; + + private String materialName; //物料名称 + + private String model; //型号 + + private String specification; //规格 + + private String voltage; //电压 + + private String standard; //标准 + + private String costPrice; //成本价 + + private String factoryPrice; //厂价 + + private String netVolume; //净种量(物料重量) + + private String inventory; //盘具 + + private String weighInv; //盘重 + + private String matPrice; //材料价格(去掉铜铝后的价格) + + private String totalCopperConsume; //铜导体总消耗 + + private String totalAluminumConsume; //铝导体总消耗 + + private String totalLHCost; //人工水电费合计 + + private String steamFee; //蒸汽费 + + private int quantity = 1; //数量默认为1 + + private int invItemCount = 1; //盘具数量默认1 +} diff --git a/src/main/java/com/JN/demo/jnzmquatation/dto/JnRegionDto.java b/src/main/java/com/JN/demo/jnzmquatation/dto/JnRegionDto.java new file mode 100644 index 0000000..9f390e1 --- /dev/null +++ b/src/main/java/com/JN/demo/jnzmquatation/dto/JnRegionDto.java @@ -0,0 +1,36 @@ +package com.JN.demo.jnzmquatation.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @ClassName RegionDto + * @Description TODO + * @Author JIAL + * @Date 2024/2/19 10:40 + * @Version 1.0 + */ +@Data +public class JnRegionDto implements Serializable { + private static final long serialVersionUID = 1L; + + private String province; + + private String city; + + private String district; + + private Integer kilometers; + + private BigDecimal price01; + + private BigDecimal price02; + + private BigDecimal price03; + + private BigDecimal price04; + + private BigDecimal price05; +} diff --git a/src/main/java/com/JN/demo/jnzmquatation/mapper/JnInventoryMapper.java b/src/main/java/com/JN/demo/jnzmquatation/mapper/JnInventoryMapper.java new file mode 100644 index 0000000..eec98c7 --- /dev/null +++ b/src/main/java/com/JN/demo/jnzmquatation/mapper/JnInventoryMapper.java @@ -0,0 +1,24 @@ +package com.JN.demo.jnzmquatation.mapper; + +import com.JN.demo.jnzmquatation.dto.JnInventoryDto; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @ClassName InventoryMapper + * @Description TODO + * @Author JIAL + * @Date 2024/2/22 9:56 + * @Version 1.0 + */ +@Mapper +public interface JnInventoryMapper { + + @Select("SELECT [cbpj_mc] as inventory,\n" + + " [cbpj_pzjd1] as inv_desc,\n" + + " [cbpj_zl] as weigh_inv\n" + + "FROM [zm_erp2].[dbo].[cb_cbpj]") + List queryInventoryList(); +} diff --git a/src/main/java/com/JN/demo/jnzmquatation/mapper/JnMaterialMapper.java b/src/main/java/com/JN/demo/jnzmquatation/mapper/JnMaterialMapper.java new file mode 100644 index 0000000..671e386 --- /dev/null +++ b/src/main/java/com/JN/demo/jnzmquatation/mapper/JnMaterialMapper.java @@ -0,0 +1,44 @@ +package com.JN.demo.jnzmquatation.mapper; + +import com.JN.demo.jnzmquatation.dto.JnMaterialDto; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @ClassName MaterialMapper + * @Description TODO + * @Author JIAL + * @Date 2024/2/21 8:16 + * @Version 1.0 + */ +@Mapper +public interface JnMaterialMapper { + @Select(" SELECT [cb_name] as material_name\n" + + " ,[cb_cj] as factory_price\n" + + " ,[cb_cbj] as cost_price\n" + + " ,[cb_zl] as net_volume\n" + + " ,[cb_gspj] as inventory\n" + + " ,[cbpj_zl] as weigh_inv\n" + + " ,[CB_bz] as standard\n" + + " ,[cb_xx] as model\n" + + " ,[cb_gg] as specification\n" + + " ,[cb_dy] as voltage\n" + + " ,[cb_cljg] as mat_price\n" + + " ,[tdtjg] as total_copper_consume\n" + + " ,[ldtjg] as total_aluminum_consume\n" + + " ,[rgsdf] as total_l_h_cost\n" + + " ,[cb_zqf]as steam_fee\n" + + " ,ROW_NUMBER() OVER(Order by [cb_name]) AS RowId\n" + + " FROM [zm_erp2].[dbo].[view_cb_material]\n" + + " WHERE [cb_name] like '${precMaterialName}%' and [cb_name] like '%${vagueMaterialName}%' and [cb_gg] like '%${vagueModel}%'") + List queryMaterialListByParam(String precMaterialName, String vagueMaterialName, String vagueModel); + + + @Select(" SELECT \n" + + "\tCOUNT(*) AS total\n" + + " FROM [zm_erp2].[dbo].[view_cb_material]\n" + + " WHERE [cb_name] like '${precMaterialName}%' and [cb_name] like '%${vagueMaterialName}%' and [cb_gg] like '%${vagueModel}%'") + Integer queryMaterialListCount(String precMaterialName, String vagueMaterialName, String vagueModel); +} diff --git a/src/main/java/com/JN/demo/jnzmquatation/mapper/JnRegionMapper.java b/src/main/java/com/JN/demo/jnzmquatation/mapper/JnRegionMapper.java new file mode 100644 index 0000000..7164ad1 --- /dev/null +++ b/src/main/java/com/JN/demo/jnzmquatation/mapper/JnRegionMapper.java @@ -0,0 +1,25 @@ +package com.JN.demo.jnzmquatation.mapper; + +import com.JN.demo.jnzmquatation.dto.JnRegionDto; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @ClassName RegionMapper + * @Description TODO + * @Author JIAL + * @Date 2024/2/19 10:47 + * @Version 1.0 + */ +@Mapper +public interface JnRegionMapper { + @Select("with temp as(\n" + + "select pz_place_uid_0,price_0t_5t,price_5t_10t,price_10t_25t,price_25t_100t,price_100t from c_pz_price where date_0=(select max(date_0) from c_pz_price) \n" + + ") select distinct a.sheng_0 as province,a.shi_0 as city,a.qu_0 as district,a.km_0 as kilometers,\n" + + "b.price_0t_5t as price_01,b.price_5t_10t as price_02,b.price_10t_25t as price_03,b.price_25t_100t as price_04,b.price_100t as price_05\n" + + "from c_pz_place2019 a left join temp b on a.id_0 = b.pz_place_uid_0 where a.qu_0 not in \n" + + "('江阴市','金坛区','溧阳市','宜兴市') and (sheng_0 like '%${regionName}%' or shi_0 like '%${regionName}%' or qu_0 like '%${regionName}%')") + List queryRegionListByName(String regionName); +} diff --git a/src/main/java/com/JN/demo/jnzmquatation/service/JnInventoryService.java b/src/main/java/com/JN/demo/jnzmquatation/service/JnInventoryService.java new file mode 100644 index 0000000..c9e0bbb --- /dev/null +++ b/src/main/java/com/JN/demo/jnzmquatation/service/JnInventoryService.java @@ -0,0 +1,16 @@ +package com.JN.demo.jnzmquatation.service; + +import com.JN.demo.jnzmquatation.dto.JnInventoryDto; + +import java.util.List; + +/** + * @ClassName InventoryService + * @Description TODO + * @Author JIAL + * @Date 2024/2/22 9:55 + * @Version 1.0 + */ +public interface JnInventoryService { + List queryInventoryList(); +} diff --git a/src/main/java/com/JN/demo/jnzmquatation/service/JnMaterialService.java b/src/main/java/com/JN/demo/jnzmquatation/service/JnMaterialService.java new file mode 100644 index 0000000..54735d5 --- /dev/null +++ b/src/main/java/com/JN/demo/jnzmquatation/service/JnMaterialService.java @@ -0,0 +1,19 @@ +package com.JN.demo.jnzmquatation.service; + +import com.JN.demo.jnzmquatation.dto.JnMaterialDto; + +import java.util.List; + +/** + * @ClassName MaterialService + * @Description TODO + * @Author JIAL + * @Date 2024/2/21 8:15 + * @Version 1.0 + */ +public interface JnMaterialService { + + List queryMaterialListByParam(String precMaterialName, String vagueMaterialName, String vagueModel); + + Integer queryMaterialListCount(String precMaterialName, String vagueMaterialName, String vagueModel); +} diff --git a/src/main/java/com/JN/demo/jnzmquatation/service/JnRegionService.java b/src/main/java/com/JN/demo/jnzmquatation/service/JnRegionService.java new file mode 100644 index 0000000..bfa2ee7 --- /dev/null +++ b/src/main/java/com/JN/demo/jnzmquatation/service/JnRegionService.java @@ -0,0 +1,17 @@ +package com.JN.demo.jnzmquatation.service; + +import com.JN.demo.jnzmquatation.dto.JnRegionDto; + +import java.util.List; + +/** + * @ClassName RegionService + * @Description TODO + * @Author JIAL + * @Date 2024/2/19 10:46 + * @Version 1.0 + */ +public interface JnRegionService { + + List queryRegionListByName(String regionName); +} diff --git a/src/main/java/com/JN/demo/jnzmquatation/service/impl/JnInventoryServiceImpl.java b/src/main/java/com/JN/demo/jnzmquatation/service/impl/JnInventoryServiceImpl.java new file mode 100644 index 0000000..3ae326b --- /dev/null +++ b/src/main/java/com/JN/demo/jnzmquatation/service/impl/JnInventoryServiceImpl.java @@ -0,0 +1,35 @@ +package com.JN.demo.jnzmquatation.service.impl; + +import com.JN.demo.jnzmquatation.dto.JnInventoryDto; +import com.JN.demo.jnzmquatation.mapper.JnInventoryMapper; +import com.JN.demo.jnzmquatation.service.JnInventoryService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @ClassName InventoryServiceImpl + * @Description TODO + * @Author JIAL + * @Date 2024/2/22 9:55 + * @Version 1.0 + */ +@Service +public class JnInventoryServiceImpl implements JnInventoryService { + + @Autowired + JnInventoryMapper inventoryMapper; + + /** + * @title queryInventoryList + * @description 获取盘具列表 + * @author JIAL + * @updateTime 2024/2/22 10:06 + * @return: java.util.List + */ + @Override + public List queryInventoryList() { + return inventoryMapper.queryInventoryList(); + } +} diff --git a/src/main/java/com/JN/demo/jnzmquatation/service/impl/JnMaterialServiceImpl.java b/src/main/java/com/JN/demo/jnzmquatation/service/impl/JnMaterialServiceImpl.java new file mode 100644 index 0000000..4798e4b --- /dev/null +++ b/src/main/java/com/JN/demo/jnzmquatation/service/impl/JnMaterialServiceImpl.java @@ -0,0 +1,52 @@ +package com.JN.demo.jnzmquatation.service.impl; + +import com.JN.demo.jnzmquatation.dto.JnMaterialDto; +import com.JN.demo.jnzmquatation.mapper.JnMaterialMapper; +import com.JN.demo.jnzmquatation.service.JnMaterialService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @ClassName MaterialServiceImpl + * @Description TODO + * @Author JIAL + * @Date 2024/2/21 8:15 + * @Version 1.0 + */ +@Service +public class JnMaterialServiceImpl implements JnMaterialService { + @Autowired + JnMaterialMapper materialMapper; + + /** + * @title queryMaterialListByParam + * @description 通过开头精确、模糊查询、型号三个参数来查询物料列表 + * @author JIAL + * @param: precMaterialName + * @param: vagueMaterialName + * @param: vagueModel + * @updateTime 2024/2/21 8:23 + * @return: java.util.List + */ + @Override + public List queryMaterialListByParam(String precMaterialName, String vagueMaterialName, String vagueModel) { + return materialMapper.queryMaterialListByParam(precMaterialName, vagueMaterialName, vagueModel); + } + + /** + * @title queryMaterialListCount + * @description 计算搜索的总数 + * @author JIAL + * @param: precMaterialName + * @param: vagueMaterialName + * @param: vagueModel + * @updateTime 2024/2/24 14:36 + * @return: java.lang.Integer + */ + @Override + public Integer queryMaterialListCount(String precMaterialName, String vagueMaterialName, String vagueModel) { + return materialMapper.queryMaterialListCount(precMaterialName, vagueMaterialName, vagueModel); + } +} diff --git a/src/main/java/com/JN/demo/jnzmquatation/service/impl/JnRegionServiceImpl.java b/src/main/java/com/JN/demo/jnzmquatation/service/impl/JnRegionServiceImpl.java new file mode 100644 index 0000000..dc316b6 --- /dev/null +++ b/src/main/java/com/JN/demo/jnzmquatation/service/impl/JnRegionServiceImpl.java @@ -0,0 +1,36 @@ +package com.JN.demo.jnzmquatation.service.impl; + +import com.JN.demo.jnzmquatation.dto.JnRegionDto; +import com.JN.demo.jnzmquatation.mapper.JnRegionMapper; +import com.JN.demo.jnzmquatation.service.JnRegionService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @ClassName RegionServiceImpl + * @Description TODO + * @Author JIAL + * @Date 2024/2/19 10:46 + * @Version 1.0 + */ +@Service +public class JnRegionServiceImpl implements JnRegionService { + + @Autowired + JnRegionMapper regionMapper; + + /** + * @title queryRegionListByName + * @description 根据输入的地区名称查询地区列表 + * @author JIAL + * @param: regionName + * @updateTime 2024/2/19 10:59 + * @return: java.util.List + */ + @Override + public List queryRegionListByName(String regionName){ + return regionMapper.queryRegionListByName(regionName); + } +} diff --git a/src/main/resources/static/jnquotation/css/index.css b/src/main/resources/static/jnquotation/css/index.css new file mode 100644 index 0000000..161c8f1 --- /dev/null +++ b/src/main/resources/static/jnquotation/css/index.css @@ -0,0 +1,152 @@ +.container { + +} + +.center-container { + text-align: center; + margin: auto; + padding: 10px; + min-width: 1100px; +} + +.el-input { + +} + +/**找到表头那一行，然后把里面的复选框隐藏掉**/ +.regionTable .el-table__header-wrapper .el-table__header .el-checkbox { + display: none; +} + +.el-input__inner { + height: 30px; + /*font-family: Roboto, serif;*/ + font-size: 12px; + line-height: 14px; +} +/**宽度修改 */ +.el-select { + width: 129px; +} +/* 下面设置右侧按钮居中 */ +.el-input__suffix { + top: 6px; +} +.el-input__icon { + line-height: inherit; +} +.el-input__suffix-inner { + margin-top: 10px; + +} + + +.el-form-item__label { + min-width: 100px; + text-align: justify; + font-size: 12px; +} + +.el-input-group{ + margin-top: 6px; +} + +.el-input-group__append { + width: 0px; + +} + +.el-form-item__label::after { + content: ""; + display: inline-block; + width: 100%; + +} + +.form-box .el-form-item { + margin: 0px 15px 0px 15px; + +} + +.regionDialogTable .el-dialog__header{ + padding-bottom: 0px; + +} +.regionDialogTable .el-dialog__body{ + padding-top: 0px; + +} + +.materialDialogTable .el-dialog__header{ + padding-bottom: 0px; + +} +.materialDialogTable .el-dialog__body{ + padding-top: 0px; + +} + +.inventoryDialogTable .el-dialog__header{ + padding-bottom: 0px; + +} +.inventoryDialogTable .el-dialog__body{ + padding-top: 0px; + +} + + + + +.materialDialogTable .el-table__header-wrapper .el-table__header .el-checkbox { + display: none; +} + +.el-table .cell { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + + +.el-col { + height: 42px; +} + +.button-box .el-button { + margin: 10px 80px 10px 0px; +} + +.form-box { + background-color: #f0f0f0; /* 浅灰色背景 */ + border-radius: 10px; /* 可以根据需要调整边框圆角 */ + backdrop-filter: blur(10px); /* 调整模糊度 */ + -webkit-backdrop-filter: blur(10px); /* 兼容性处理，适用于一些WebKit浏览器 */ +} + +.button-box { + margin: 10px 0px 10px 0px; + background-color: #f0f0f0; /* 浅灰色背景 */ + border-radius: 10px; /* 可以根据需要调整边框圆角 */ + backdrop-filter: blur(10px); /* 调整模糊度 */ + -webkit-backdrop-filter: blur(10px); /* 兼容性处理，适用于一些WebKit浏览器 */ +} + +.table-box { + +} + +.selected-item { + background-color: #f0f0f0; + border: 1px solid #ccc; + border-radius: 5px; + padding: 5px; + margin-bottom: 5px; + display: flex; + justify-content: space-between; +} + +.remove-btn { + padding: 0px; + color: red; +} \ No newline at end of file diff --git a/src/main/resources/static/jnquotation/js/index.js b/src/main/resources/static/jnquotation/js/index.js new file mode 100644 index 0000000..340ca0a --- /dev/null +++ b/src/main/resources/static/jnquotation/js/index.js @@ -0,0 +1,22 @@ +const queryRegionListByName = (params) => { + return $axios({ + url: '/zmquotation/regionList', + method: 'post', + params + }) +} + +const queryMaterialListByParam = (params) => { + return $axios({ + url: '/zmquotation/materialList', + method: 'post', + params + }) +} + +const queryInventoryList = () => { + return $axios({ + url: '/zmquotation/inventoryList', + method: 'post', + }) +} \ No newline at end of file diff --git a/target/classes/META-INF/JNDemo.kotlin_module b/target/classes/META-INF/JNDemo.kotlin_module new file mode 100644 index 0000000..a49347a Binary files /dev/null and b/target/classes/META-INF/JNDemo.kotlin_module differ diff --git a/target/classes/com/JN/controller/PageRedirectController.class b/target/classes/com/JN/controller/PageRedirectController.class index d667159..22d1240 100644 Binary files a/target/classes/com/JN/controller/PageRedirectController.class and b/target/classes/com/JN/controller/PageRedirectController.class differ diff --git a/target/classes/com/JN/demo/jnzmquatation/controller/JNController.class b/target/classes/com/JN/demo/jnzmquatation/controller/JNController.class index fe8b058..9174e6b 100644 Binary files a/target/classes/com/JN/demo/jnzmquatation/controller/JNController.class and b/target/classes/com/JN/demo/jnzmquatation/controller/JNController.class differ diff --git a/target/classes/com/JN/demo/jnzmquatation/dto/JnInventoryDto.class b/target/classes/com/JN/demo/jnzmquatation/dto/JnInventoryDto.class new file mode 100644 index 0000000..e09c215 Binary files /dev/null and b/target/classes/com/JN/demo/jnzmquatation/dto/JnInventoryDto.class differ diff --git a/target/classes/com/JN/demo/jnzmquatation/dto/JnMaterialDto.class b/target/classes/com/JN/demo/jnzmquatation/dto/JnMaterialDto.class new file mode 100644 index 0000000..45867fb Binary files /dev/null and b/target/classes/com/JN/demo/jnzmquatation/dto/JnMaterialDto.class differ diff --git a/target/classes/com/JN/demo/jnzmquatation/dto/JnRegionDto.class b/target/classes/com/JN/demo/jnzmquatation/dto/JnRegionDto.class new file mode 100644 index 0000000..003edf0 Binary files /dev/null and b/target/classes/com/JN/demo/jnzmquatation/dto/JnRegionDto.class differ diff --git a/target/classes/com/JN/demo/jnzmquatation/mapper/JnInventoryMapper.class b/target/classes/com/JN/demo/jnzmquatation/mapper/JnInventoryMapper.class new file mode 100644 index 0000000..5bb34a3 Binary files /dev/null and b/target/classes/com/JN/demo/jnzmquatation/mapper/JnInventoryMapper.class differ diff --git a/target/classes/com/JN/demo/jnzmquatation/mapper/JnMaterialMapper.class b/target/classes/com/JN/demo/jnzmquatation/mapper/JnMaterialMapper.class new file mode 100644 index 0000000..7b1562c Binary files /dev/null and b/target/classes/com/JN/demo/jnzmquatation/mapper/JnMaterialMapper.class differ diff --git a/target/classes/com/JN/demo/jnzmquatation/mapper/JnRegionMapper.class b/target/classes/com/JN/demo/jnzmquatation/mapper/JnRegionMapper.class new file mode 100644 index 0000000..bb72422 Binary files /dev/null and b/target/classes/com/JN/demo/jnzmquatation/mapper/JnRegionMapper.class differ diff --git a/target/classes/com/JN/demo/jnzmquatation/service/JnInventoryService.class b/target/classes/com/JN/demo/jnzmquatation/service/JnInventoryService.class new file mode 100644 index 0000000..57523f1 Binary files /dev/null and b/target/classes/com/JN/demo/jnzmquatation/service/JnInventoryService.class differ diff --git a/target/classes/com/JN/demo/jnzmquatation/service/JnMaterialService.class b/target/classes/com/JN/demo/jnzmquatation/service/JnMaterialService.class new file mode 100644 index 0000000..e4e5654 Binary files /dev/null and b/target/classes/com/JN/demo/jnzmquatation/service/JnMaterialService.class differ diff --git a/target/classes/com/JN/demo/jnzmquatation/service/JnRegionService.class b/target/classes/com/JN/demo/jnzmquatation/service/JnRegionService.class new file mode 100644 index 0000000..33198d1 Binary files /dev/null and b/target/classes/com/JN/demo/jnzmquatation/service/JnRegionService.class differ diff --git a/target/classes/com/JN/demo/jnzmquatation/service/impl/JnInventoryServiceImpl.class b/target/classes/com/JN/demo/jnzmquatation/service/impl/JnInventoryServiceImpl.class new file mode 100644 index 0000000..132ca29 Binary files /dev/null and b/target/classes/com/JN/demo/jnzmquatation/service/impl/JnInventoryServiceImpl.class differ diff --git a/target/classes/com/JN/demo/jnzmquatation/service/impl/JnMaterialServiceImpl.class b/target/classes/com/JN/demo/jnzmquatation/service/impl/JnMaterialServiceImpl.class new file mode 100644 index 0000000..662f482 Binary files /dev/null and b/target/classes/com/JN/demo/jnzmquatation/service/impl/JnMaterialServiceImpl.class differ diff --git a/target/classes/com/JN/demo/jnzmquatation/service/impl/JnRegionServiceImpl.class b/target/classes/com/JN/demo/jnzmquatation/service/impl/JnRegionServiceImpl.class new file mode 100644 index 0000000..ed148af Binary files /dev/null and b/target/classes/com/JN/demo/jnzmquatation/service/impl/JnRegionServiceImpl.class differ diff --git a/target/classes/templates/zmquotation/index.html b/target/classes/templates/zmquotation/index.html index e9a3258..8a08f77 100644 --- a/target/classes/templates/zmquotation/index.html +++ b/target/classes/templates/zmquotation/index.html @@ -519,10 +519,7 @@ dialogInventoryVisible: false, inventoryTableData: [], clickedRowIndex: null, // 用于记录点击的行的索引 -<<<<<<< HEAD materialTotalRows: 0, -======= ->>>>>>> df9601da10f7db0d8609eddc1505f4a6f7a1f427 } }, computed: { @@ -706,7 +703,7 @@ this.$set(this.materialData, this.clickedRowIndex, updatedRow); } this.dialogInventoryVisible = false; // 打开选择盘具的 dialog - // 其他逻辑...23123123 + // 其他逻辑... }, },