角色、用户、菜单等，部分代码写法修改。

README.md

@@ -39,6 +39,7 @@
 * 
 * 任务池功能上线
 * 已知BUG修复
+* 中煤报价改为API方式
 
 
 

src/main/java/com/ydtech/components/OrderComponents.java

@@ -326,7 +326,7 @@ public class OrderComponents {
     public InsOrder geneOrder(YaQuoteInfoVo record, String insCompany, String authComCode) {
         checkEmpty(record);
 
-        SysUser user = sysUserService.selectByPk(record.getUserId());
+        SysUser user = sysUserService.getById(record.getUserId());
         if (user == null) {
             throw new SystemException("userId不存在");
         }

src/main/java/com/ydtech/constants/enums/City.java

@@ -1,500 +1,500 @@
-package com.ydtech.constants.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-/**
- * @description: 城市
- * @author: lig
- * @date: 2023-02-13
- */
-@Getter
-@AllArgsConstructor
-public enum City {
-
-    龙岩市("350800", "龙岩市"),
-    宁德市("350900", "宁德市"),
-    南昌市("360100", "南昌市"),
-    景德镇市("360200", "景德镇市"),
-    萍乡市("360300", "萍乡市"),
-    九江市("360400", "九江市"),
-    新余市("360500", "新余市"),
-    鹰潭市("360600", "鹰潭市"),
-    赣州市("360700", "赣州市"),
-    吉安市("360800", "吉安市"),
-    潍坊市("370700", "潍坊市"),
-    泉州市("350500", "泉州市"),
-    漳州市("350600", "漳州市"),
-    吴忠市("640300", "吴忠市"),
-    温州市("330300", "温州市"),
-    湖州市("330500", "湖州市"),
-    绍兴市("330600", "绍兴市"),
-    金华市("330700", "金华市"),
-    滁州市("341100", "滁州市"),
-    阜阳市("341200", "阜阳市"),
-    宿州市("341300", "宿州市"),
-    益阳市("430900", "益阳市"),
-    郴州市("431000", "郴州市"),
-    永州市("431100", "永州市"),
-    怀化市("431200", "怀化市"),
-    临夏回族自治州("622900", "临夏回族自治州"),
-    马鞍山市("340500", "马鞍山市"),
-    淮北市("340600", "淮北市"),
-    铜陵市("340700", "铜陵市"),
-    安庆市("340800", "安庆市"),
-    黄山市("341000", "黄山市"),
-    汕头市("440500", "汕头市"),
-    梧州市("450400", "梧州市"),
-    固原市("640400", "固原市"),
-    中卫市("640500", "中卫市"),
-    乌鲁木齐市("650100", "乌鲁木齐市"),
-    克拉玛依市("650200", "克拉玛依市"),
-    吐鲁番地区("652100", "吐鲁番地区"),
-    哈密地区("652200", "哈密地区"),
-    昌吉回族自治州("652300", "昌吉回族自治州"),
-    宁波市("330200", "宁波市"),
-    哈尔滨市("230100", "哈尔滨市"),
-    齐齐哈尔市("230200", "齐齐哈尔市"),
-    濮阳市("410900", "濮阳市"),
-    许昌市("411000", "许昌市"),
-    东城区("110101", "东城区"),
-    西城区("110102", "西城区"),
-    巢湖市("341400", "巢湖市"),
-    六安市("341500", "六安市"),
-    亳州市("341600", "亳州市"),
-    池州市("341700", "池州市"),
-    宣城市("341800", "宣城市"),
-    安康市("610900", "安康市"),
-    沧州市("130900", "沧州市"),
-    钦州市("450700", "钦州市"),
-    贵港市("450800", "贵港市"),
-    玉林市("450900", "玉林市"),
-    百色市("451000", "百色市"),
-    贺州市("451100", "贺州市"),
-    河池市("451200", "河池市"),
-    来宾市("451300", "来宾市"),
-    崇左市("451400", "崇左市"),
-    海口市("460100", "海口市"),
-    三亚市("460200", "三亚市"),
-    五指山市("469001", "五指山市"),
-    琼海市("469002", "琼海市"),
-    儋州市("469003", "儋州市"),
-    文昌市("469005", "文昌市"),
-    万宁市("469006", "万宁市"),
-    东方市("469007", "东方市"),
-    定安县("469021", "定安县"),
-    屯昌县("469022", "屯昌县"),
-    澄迈县("469023", "澄迈县"),
-    临高县("469024", "临高县"),
-    白沙黎族自治县("469025", "白沙黎族自治县"),
-    昌江黎族自治县("469026", "昌江黎族自治县"),
-    乐东黎族自治县("469027", "乐东黎族自治县"),
-    阿克苏地区("652900", "阿克苏地区"),
-    蚌埠市("340300", "蚌埠市"),
-    淮南市("340400", "淮南市"),
-    防城港市("450600", "防城港市"),
-    泰安市("370900", "泰安市"),
-    威海市("371000", "威海市"),
-    日照市("371100", "日照市"),
-    莱芜市("371200", "莱芜市"),
-    临沂市("371300", "临沂市"),
-    德州市("371400", "德州市"),
-    聊城市("371500", "聊城市"),
-    滨州市("371600", "滨州市"),
-    菏泽市("371700", "菏泽市"),
-    郑州市("410100", "郑州市"),
-    克孜勒苏柯尔克孜自治州("653000", "克孜勒苏柯尔克孜自治州"),
-    喀什地区("653100", "喀什地区"),
-    汕尾市("441500", "汕尾市"),
-    河源市("441600", "河源市"),
-    阳江市("441700", "阳江市"),
-    清远市("441800", "清远市"),
-    东莞市("441900", "东莞市"),
-    中山市("442000", "中山市"),
-    潮州市("445100", "潮州市"),
-    揭阳市("445200", "揭阳市"),
-    云浮市("445300", "云浮市"),
-    南宁市("450100", "南宁市"),
-    柳州市("450200", "柳州市"),
-    桂林市("450300", "桂林市"),
-    绥化市("231200", "绥化市"),
-    大兴安岭地区("232700", "大兴安岭地区"),
-    静安区("310106", "静安区"),
-    普陀区("310107", "普陀区"),
-    闸北区("310108", "闸北区"),
-    虹口区("310109", "虹口区"),
-    杨浦区("310110", "杨浦区"),
-    闵行区("310112", "闵行区"),
-    宝山区("310113", "宝山区"),
-    嘉定区("310114", "嘉定区"),
-    浦东新区("310115", "浦东新区"),
-    金山区("310116", "金山区"),
-    松江区("310117", "松江区"),
-    青浦区("310118", "青浦区"),
-    驻马店市("411700", "驻马店市"),
-    济源市("419001", "济源市"),
-    武汉市("420100", "武汉市"),
-    黄石市("420200", "黄石市"),
-    十堰市("420300", "十堰市"),
-    宜昌市("420500", "宜昌市"),
-    襄樊市("420600", "襄樊市"),
-    秦皇岛市("130300", "秦皇岛市"),
-    邯郸市("130400", "邯郸市"),
-    邢台市("130500", "邢台市"),
-    保定市("130600", "保定市"),
-    张家口市("130700", "张家口市"),
-    北海市("450500", "北海市"),
-    娄底市("431300", "娄底市"),
-    湘西土家族苗族自治州("433100", "湘西土家族苗族自治州"),
-    广州市("440100", "广州市"),
-    韶关市("440200", "韶关市"),
-    深圳市("440300", "深圳市"),
-    珠海市("440400", "珠海市"),
-    佛山市("440600", "佛山市"),
-    江门市("440700", "江门市"),
-    湛江市("440800", "湛江市"),
-    茂名市("440900", "茂名市"),
-    肇庆市("441200", "肇庆市"),
-    惠州市("441300", "惠州市"),
-    梅州市("441400", "梅州市"),
-    乌海市("150300", "乌海市"),
-    赤峰市("150400", "赤峰市"),
-    巴彦淖尔市("150800", "巴彦淖尔市"),
-    大连市("210200", "大连市"),
-    鞍山市("210300", "鞍山市"),
-    抚顺市("210400", "抚顺市"),
-    本溪市("210500", "本溪市"),
-    丹东市("210600", "丹东市"),
-    通辽市("150500", "通辽市"),
-    鄂尔多斯市("150600", "鄂尔多斯市"),
-    呼伦贝尔市("150700", "呼伦贝尔市"),
-    济宁市("370800", "济宁市"),
-    株洲市("430200", "株洲市"),
-    湘潭市("430300", "湘潭市"),
-    衡阳市("430400", "衡阳市"),
-    邵阳市("430500", "邵阳市"),
-    嘉兴市("330400", "嘉兴市"),
-    衢州市("330800", "衢州市"),
-    舟山市("330900", "舟山市"),
-    台州市("331000", "台州市"),
-    丽水市("331100", "丽水市"),
-    合肥市("340100", "合肥市"),
-    芜湖市("340200", "芜湖市"),
-    信阳市("411500", "信阳市"),
-    周口市("411600", "周口市"),
-    乌兰察布市("150900", "乌兰察布市"),
-    渭南市("610500", "渭南市"),
-    延安市("610600", "延安市"),
-    大石桥市("211500", "大石桥市"),
-    香港特别行政区("810100", "香港特别行政区"),
-    邳州市("321400", "邳州市"),
-    兴安盟("152200", "兴安盟"),
-    锡林郭勒盟("152500", "锡林郭勒盟"),
-    阿拉善盟("152900", "阿拉善盟"),
-    沈阳市("210100", "沈阳市"),
-    福州市("350100", "福州市"),
-    厦门市("350200", "厦门市"),
-    甘南藏族自治州("623000", "甘南藏族自治州"),
-    西宁市("630100", "西宁市"),
-    海东地区("632100", "海东地区"),
-    海北藏族自治州("632200", "海北藏族自治州"),
-    博尔塔拉蒙古自治州("652700", "博尔塔拉蒙古自治州"),
-    巴音郭楞蒙古自治州("652800", "巴音郭楞蒙古自治州"),
-    黄南藏族自治州("632300", "黄南藏族自治州"),
-    海南藏族自治州("632500", "海南藏族自治州"),
-    德宏傣族景颇族自治州("533100", "德宏傣族景颇族自治州"),
-    怒江傈僳族自治州("533300", "怒江傈僳族自治州"),
-    迪庆藏族自治州("533400", "迪庆藏族自治州"),
-    拉萨市("540100", "拉萨市"),
-    黔东南苗族侗族自治州("522600", "黔东南苗族侗族自治州"),
-    双鸭山市("230500", "双鸭山市"),
-    大庆市("230600", "大庆市"),
-    伊春市("230700", "伊春市"),
-    佳木斯市("230800", "佳木斯市"),
-    七台河市("230900", "七台河市"),
-    牡丹江市("231000", "牡丹江市"),
-    黑河市("231100", "黑河市"),
-    黄浦区("310101", "黄浦区"),
-    卢湾区("310103", "卢湾区"),
-    徐汇区("310104", "徐汇区"),
-    长宁区("310105", "长宁区"),
-    鄂州市("420700", "鄂州市"),
-    荆门市("420800", "荆门市"),
-    孝感市("420900", "孝感市"),
-    昌都地区("542100", "昌都地区"),
-    山南地区("542200", "山南地区"),
-    三明市("350400", "三明市"),
-    宜春市("360900", "宜春市"),
-    抚州市("361000", "抚州市"),
-    上饶市("361100", "上饶市"),
-    济南市("370100", "济南市"),
-    凉山彝族自治州("513400", "凉山彝族自治州"),
-    贵阳市("520100", "贵阳市"),
-    六盘水市("520200", "六盘水市"),
-    遵义市("520300", "遵义市"),
-    安顺市("520400", "安顺市"),
-    铜仁地区("522200", "铜仁地区"),
-    黔西南布依族苗族自治州("522300", "黔西南布依族苗族自治州"),
-    毕节地区("522400", "毕节地区"),
-    陵水黎族自治县("469028", "陵水黎族自治县"),
-    保亭黎族苗族自治县("469029", "保亭黎族苗族自治县"),
-    琼中黎族苗族自治县("469030", "琼中黎族苗族自治县"),
-    西沙群岛("469031", "西沙群岛"),
-    南沙群岛("469032", "南沙群岛"),
-    中沙群岛的岛礁及其海域("469033", "中沙群岛的岛礁及其海域"),
-    万州区("500101", "万州区"),
-    涪陵区("500102", "涪陵区"),
-    渝中区("500103", "渝中区"),
-    大渡口区("500104", "大渡口区"),
-    江北区("500105", "江北区"),
-    沙坪坝区("500106", "沙坪坝区"),
-    九龙坡区("500107", "九龙坡区"),
-    南岸区("500108", "南岸区"),
-    青岛市("370200", "青岛市"),
-    淄博市("370300", "淄博市"),
-    枣庄市("370400", "枣庄市"),
-    东营市("370500", "东营市"),
-    烟台市("370600", "烟台市"),
-    临汾市("141000", "临汾市"),
-    吕梁市("141100", "吕梁市"),
-    呼和浩特市("150100", "呼和浩特市"),
-    包头市("150200", "包头市"),
-    和田地区("653200", "和田地区"),
-    伊犁哈萨克自治州("654000", "伊犁哈萨克自治州"),
-    塔城地区("654200", "塔城地区"),
-    阿勒泰地区("654300", "阿勒泰地区"),
-    石河子市("659001", "石河子市"),
-    阿拉尔市("659002", "阿拉尔市"),
-    图木舒克市("659003", "图木舒克市"),
-    五家渠市("659004", "五家渠市"),
-    漯河市("411100", "漯河市"),
-    三门峡市("411200", "三门峡市"),
-    南阳市("411300", "南阳市"),
-    商丘市("411400", "商丘市"),
-    焦作市("410800", "焦作市"),
-    南平市("350700", "南平市"),
-    辽阳市("211000", "辽阳市"),
-    盘锦市("211100", "盘锦市"),
-    铁岭市("211200", "铁岭市"),
-    朝阳市("211300", "朝阳市"),
-    葫芦岛市("211400", "葫芦岛市"),
-    长春市("220100", "长春市"),
-    吉林市("220200", "吉林市"),
-    四平市("220300", "四平市"),
-    辽源市("220400", "辽源市"),
-    通化市("220500", "通化市"),
-    忻州市("140900", "忻州市"),
-    鸡西市("230300", "鸡西市"),
-    鹤岗市("230400", "鹤岗市"),
-    开封市("410200", "开封市"),
-    洛阳市("410300", "洛阳市"),
-    平顶山市("410400", "平顶山市"),
-    安阳市("410500", "安阳市"),
-    鹤壁市("410600", "鹤壁市"),
-    新乡市("410700", "新乡市"),
-    荆州市("421000", "荆州市"),
-    黄冈市("421100", "黄冈市"),
-    日喀则地区("542300", "日喀则地区"),
-    那曲地区("542400", "那曲地区"),
-    阿里地区("542500", "阿里地区"),
-    林芝地区("542600", "林芝地区"),
-    西安市("610100", "西安市"),
-    铜川市("610200", "铜川市"),
-    自贡市("510300", "自贡市"),
-    攀枝花市("510400", "攀枝花市"),
-    泸州市("510500", "泸州市"),
-    德阳市("510600", "德阳市"),
-    莆田市("350300", "莆田市"),
-    宝鸡市("610300", "宝鸡市"),
-    廊坊市("131000", "廊坊市"),
-    衡水市("131100", "衡水市"),
-    太原市("140100", "太原市"),
-    大同市("140200", "大同市"),
-    阳泉市("140300", "阳泉市"),
-    长治市("140400", "长治市"),
-    晋城市("140500", "晋城市"),
-    朔州市("140600", "朔州市"),
-    黔南布依族苗族自治州("522700", "黔南布依族苗族自治州"),
-    普洱市("530800", "普洱市"),
-    临沧市("530900", "临沧市"),
-    楚雄彝族自治州("532300", "楚雄彝族自治州"),
-    红河哈尼族彝族自治州("532500", "红河哈尼族彝族自治州"),
-    文山壮族苗族自治州("532600", "文山壮族苗族自治州"),
-    西双版纳傣族自治州("532800", "西双版纳傣族自治州"),
-    大理白族自治州("532900", "大理白族自治州"),
-    锦州市("210700", "锦州市"),
-    营口市("210800", "营口市"),
-    延边朝鲜族自治州("222400", "延边朝鲜族自治州"),
-    晋中市("140700", "晋中市"),
-    常州市("320400", "常州市"),
-    苏州市("320500", "苏州市"),
-    南通市("320600", "南通市"),
-    连云港市("320700", "连云港市"),
-    淮安市("320800", "淮安市"),
-    盐城市("320900", "盐城市"),
-    扬州市("321000", "扬州市"),
-    镇江市("321100", "镇江市"),
-    泰州市("321200", "泰州市"),
-    宿迁市("321300", "宿迁市"),
-    咸阳市("610400", "咸阳市"),
-    汉中市("610700", "汉中市"),
-    榆林市("610800", "榆林市"),
-    商洛市("611000", "商洛市"),
-    兰州市("620100", "兰州市"),
-    嘉峪关市("620200", "嘉峪关市"),
-    金昌市("620300", "金昌市"),
-    白银市("620400", "白银市"),
-    天水市("620500", "天水市"),
-    武威市("620600", "武威市"),
-    张掖市("620700", "张掖市"),
-    杭州市("330100", "杭州市"),
-    昆明市("530100", "昆明市"),
-    曲靖市("530300", "曲靖市"),
-    玉溪市("530400", "玉溪市"),
-    保山市("530500", "保山市"),
-    昭通市("530600", "昭通市"),
-    丽江市("530700", "丽江市"),
-    运城市("140800", "运城市"),
-    咸宁市("421200", "咸宁市"),
-    随州市("421300", "随州市"),
-    恩施土家族苗族自治州("422800", "恩施土家族苗族自治州"),
-    仙桃市("429004", "仙桃市"),
-    潜江市("429005", "潜江市"),
-    天门市("429006", "天门市"),
-    神农架林区("429021", "神农架林区"),
-    长沙市("430100", "长沙市"),
-    岳阳市("430600", "岳阳市"),
-    常德市("430700", "常德市"),
-    张家界市("430800", "张家界市"),
-    奉贤区("310120", "奉贤区"),
-    崇明县("310230", "崇明县"),
-    南京市("320100", "南京市"),
-    无锡市("320200", "无锡市"),
-    徐州市("320300", "徐州市"),
-    甘孜藏族自治州("513300", "甘孜藏族自治州"),
-    北碚区("500109", "北碚区"),
-    万盛区("500110", "万盛区"),
-    双桥区("500111", "双桥区"),
-    渝北区("500112", "渝北区"),
-    巴南区("500113", "巴南区"),
-    黔江区("500114", "黔江区"),
-    长寿区("500115", "长寿区"),
-    江津区("500116", "江津区"),
-    合川区("500117", "合川区"),
-    永川区("500118", "永川区"),
-    南川区("500119", "南川区"),
-    綦江县("500222", "綦江县"),
-    潼南县("500223", "潼南县"),
-    铜梁县("500224", "铜梁县"),
-    大足县("500225", "大足县"),
-    荣昌县("500226", "荣昌县"),
-    璧山县("500227", "璧山县"),
-    梁平县("500228", "梁平县"),
-    城口县("500229", "城口县"),
-    丰都县("500230", "丰都县"),
-    垫江县("500231", "垫江县"),
-    武隆县("500232", "武隆县"),
-    忠县("500233", "忠县"),
-    开县("500234", "开县"),
-    云阳县("500235", "云阳县"),
-    奉节县("500236", "奉节县"),
-    巫山县("500237", "巫山县"),
-    巫溪县("500238", "巫溪县"),
-    石柱土家族自治县("500240", "石柱土家族自治县"),
-    秀山土家族苗族自治县("500241", "秀山土家族苗族自治县"),
-    酉阳土家族苗族自治县("500242", "酉阳土家族苗族自治县"),
-    彭水苗族土家族自治县("500243", "彭水苗族土家族自治县"),
-    成都市("510100", "成都市"),
-    果洛藏族自治州("632600", "果洛藏族自治州"),
-    玉树藏族自治州("632700", "玉树藏族自治州"),
-    海西蒙古族藏族自治州("632800", "海西蒙古族藏族自治州"),
-    银川市("640100", "银川市"),
-    石嘴山市("640200", "石嘴山市"),
-    白山市("220600", "白山市"),
-    松原市("220700", "松原市"),
-    平凉市("620800", "平凉市"),
-    崇文区("110103", "崇文区"),
-    宣武区("110104", "宣武区"),
-    朝阳区("110105", "朝阳区"),
-    丰台区("110106", "丰台区"),
-    石景山区("110107", "石景山区"),
-    海淀区("110108", "海淀区"),
-    门头沟区("110109", "门头沟区"),
-    房山区("110111", "房山区"),
-    通州区("110112", "通州区"),
-    顺义区("110113", "顺义区"),
-    昌平区("110114", "昌平区"),
-    大兴区("110115", "大兴区"),
-    怀柔区("110116", "怀柔区"),
-    平谷区("110117", "平谷区"),
-    密云县("110228", "密云县"),
-    延庆县("110229", "延庆县"),
-    和平区("120101", "和平区"),
-    河东区("120102", "河东区"),
-    河西区("120103", "河西区"),
-    南开区("120104", "南开区"),
-    河北区("120105", "河北区"),
-    红桥区("120106", "红桥区"),
-    东丽区("120110", "东丽区"),
-    西青区("120111", "西青区"),
-    津南区("120112", "津南区"),
-    北辰区("120113", "北辰区"),
-    武清区("120114", "武清区"),
-    宝坻区("120115", "宝坻区"),
-    滨海新区("120116", "滨海新区"),
-    宁河县("120221", "宁河县"),
-    静海县("120223", "静海县"),
-    蓟县("120225", "蓟县"),
-    石家庄市("130100", "石家庄市"),
-    唐山市("130200", "唐山市"),
-    承德市("130800", "承德市"),
-    白城市("220800", "白城市"),
-    酒泉市("620900", "酒泉市"),
-    庆阳市("621000", "庆阳市"),
-    定西市("621100", "定西市"),
-    陇南市("621200", "陇南市"),
-    广安市("511600", "广安市"),
-    达州市("511700", "达州市"),
-    雅安市("511800", "雅安市"),
-    巴中市("511900", "巴中市"),
-    资阳市("512000", "资阳市"),
-    阿坝藏族羌族自治州("513200", "阿坝藏族羌族自治州"),
-    绵阳市("510700", "绵阳市"),
-    广元市("510800", "广元市"),
-    遂宁市("510900", "遂宁市"),
-    内江市("511000", "内江市"),
-    乐山市("511100", "乐山市"),
-    南充市("511300", "南充市"),
-    眉山市("511400", "眉山市"),
-    宜宾市("511500", "宜宾市"),
-    阜新市("210900", "阜新市"),
-
-
-    ;
-
-
-    @Getter
-    private String code;
-
-    @Getter
-    private String desc;
-
-
-    public static String buildCity(String addr) {
-        if (StringUtils.isNotEmpty(addr)) {
-            List<City> citys = Arrays.stream(City.values()).filter(a -> addr.contains(a.name())).collect(Collectors.toList());
-            if (null != citys && citys.size() > 0) {
-                return citys.get(0).getCode();
-            }
-        }
-        return "141000";
-    }
-
-
-}
+//package com.ydtech.constants.enums;
+//
+//import lombok.AllArgsConstructor;
+//import lombok.Getter;
+//import org.apache.commons.lang3.StringUtils;
+//
+//import java.util.Arrays;
+//import java.util.List;
+//import java.util.stream.Collectors;
+//
+//
+///**
+// * @description: 城市
+// * @author: lig
+// * @date: 2023-02-13
+// */
+//@Getter
+//@AllArgsConstructor
+//public enum City {
+//
+//    龙岩市("350800", "龙岩市"),
+//    宁德市("350900", "宁德市"),
+//    南昌市("360100", "南昌市"),
+//    景德镇市("360200", "景德镇市"),
+//    萍乡市("360300", "萍乡市"),
+//    九江市("360400", "九江市"),
+//    新余市("360500", "新余市"),
+//    鹰潭市("360600", "鹰潭市"),
+//    赣州市("360700", "赣州市"),
+//    吉安市("360800", "吉安市"),
+//    潍坊市("370700", "潍坊市"),
+//    泉州市("350500", "泉州市"),
+//    漳州市("350600", "漳州市"),
+//    吴忠市("640300", "吴忠市"),
+//    温州市("330300", "温州市"),
+//    湖州市("330500", "湖州市"),
+//    绍兴市("330600", "绍兴市"),
+//    金华市("330700", "金华市"),
+//    滁州市("341100", "滁州市"),
+//    阜阳市("341200", "阜阳市"),
+//    宿州市("341300", "宿州市"),
+//    益阳市("430900", "益阳市"),
+//    郴州市("431000", "郴州市"),
+//    永州市("431100", "永州市"),
+//    怀化市("431200", "怀化市"),
+//    临夏回族自治州("622900", "临夏回族自治州"),
+//    马鞍山市("340500", "马鞍山市"),
+//    淮北市("340600", "淮北市"),
+//    铜陵市("340700", "铜陵市"),
+//    安庆市("340800", "安庆市"),
+//    黄山市("341000", "黄山市"),
+//    汕头市("440500", "汕头市"),
+//    梧州市("450400", "梧州市"),
+//    固原市("640400", "固原市"),
+//    中卫市("640500", "中卫市"),
+//    乌鲁木齐市("650100", "乌鲁木齐市"),
+//    克拉玛依市("650200", "克拉玛依市"),
+//    吐鲁番地区("652100", "吐鲁番地区"),
+//    哈密地区("652200", "哈密地区"),
+//    昌吉回族自治州("652300", "昌吉回族自治州"),
+//    宁波市("330200", "宁波市"),
+//    哈尔滨市("230100", "哈尔滨市"),
+//    齐齐哈尔市("230200", "齐齐哈尔市"),
+//    濮阳市("410900", "濮阳市"),
+//    许昌市("411000", "许昌市"),
+//    东城区("110101", "东城区"),
+//    西城区("110102", "西城区"),
+//    巢湖市("341400", "巢湖市"),
+//    六安市("341500", "六安市"),
+//    亳州市("341600", "亳州市"),
+//    池州市("341700", "池州市"),
+//    宣城市("341800", "宣城市"),
+//    安康市("610900", "安康市"),
+//    沧州市("130900", "沧州市"),
+//    钦州市("450700", "钦州市"),
+//    贵港市("450800", "贵港市"),
+//    玉林市("450900", "玉林市"),
+//    百色市("451000", "百色市"),
+//    贺州市("451100", "贺州市"),
+//    河池市("451200", "河池市"),
+//    来宾市("451300", "来宾市"),
+//    崇左市("451400", "崇左市"),
+//    海口市("460100", "海口市"),
+//    三亚市("460200", "三亚市"),
+//    五指山市("469001", "五指山市"),
+//    琼海市("469002", "琼海市"),
+//    儋州市("469003", "儋州市"),
+//    文昌市("469005", "文昌市"),
+//    万宁市("469006", "万宁市"),
+//    东方市("469007", "东方市"),
+//    定安县("469021", "定安县"),
+//    屯昌县("469022", "屯昌县"),
+//    澄迈县("469023", "澄迈县"),
+//    临高县("469024", "临高县"),
+//    白沙黎族自治县("469025", "白沙黎族自治县"),
+//    昌江黎族自治县("469026", "昌江黎族自治县"),
+//    乐东黎族自治县("469027", "乐东黎族自治县"),
+//    阿克苏地区("652900", "阿克苏地区"),
+//    蚌埠市("340300", "蚌埠市"),
+//    淮南市("340400", "淮南市"),
+//    防城港市("450600", "防城港市"),
+//    泰安市("370900", "泰安市"),
+//    威海市("371000", "威海市"),
+//    日照市("371100", "日照市"),
+//    莱芜市("371200", "莱芜市"),
+//    临沂市("371300", "临沂市"),
+//    德州市("371400", "德州市"),
+//    聊城市("371500", "聊城市"),
+//    滨州市("371600", "滨州市"),
+//    菏泽市("371700", "菏泽市"),
+//    郑州市("410100", "郑州市"),
+//    克孜勒苏柯尔克孜自治州("653000", "克孜勒苏柯尔克孜自治州"),
+//    喀什地区("653100", "喀什地区"),
+//    汕尾市("441500", "汕尾市"),
+//    河源市("441600", "河源市"),
+//    阳江市("441700", "阳江市"),
+//    清远市("441800", "清远市"),
+//    东莞市("441900", "东莞市"),
+//    中山市("442000", "中山市"),
+//    潮州市("445100", "潮州市"),
+//    揭阳市("445200", "揭阳市"),
+//    云浮市("445300", "云浮市"),
+//    南宁市("450100", "南宁市"),
+//    柳州市("450200", "柳州市"),
+//    桂林市("450300", "桂林市"),
+//    绥化市("231200", "绥化市"),
+//    大兴安岭地区("232700", "大兴安岭地区"),
+//    静安区("310106", "静安区"),
+//    普陀区("310107", "普陀区"),
+//    闸北区("310108", "闸北区"),
+//    虹口区("310109", "虹口区"),
+//    杨浦区("310110", "杨浦区"),
+//    闵行区("310112", "闵行区"),
+//    宝山区("310113", "宝山区"),
+//    嘉定区("310114", "嘉定区"),
+//    浦东新区("310115", "浦东新区"),
+//    金山区("310116", "金山区"),
+//    松江区("310117", "松江区"),
+//    青浦区("310118", "青浦区"),
+//    驻马店市("411700", "驻马店市"),
+//    济源市("419001", "济源市"),
+//    武汉市("420100", "武汉市"),
+//    黄石市("420200", "黄石市"),
+//    十堰市("420300", "十堰市"),
+//    宜昌市("420500", "宜昌市"),
+//    襄樊市("420600", "襄樊市"),
+//    秦皇岛市("130300", "秦皇岛市"),
+//    邯郸市("130400", "邯郸市"),
+//    邢台市("130500", "邢台市"),
+//    保定市("130600", "保定市"),
+//    张家口市("130700", "张家口市"),
+//    北海市("450500", "北海市"),
+//    娄底市("431300", "娄底市"),
+//    湘西土家族苗族自治州("433100", "湘西土家族苗族自治州"),
+//    广州市("440100", "广州市"),
+//    韶关市("440200", "韶关市"),
+//    深圳市("440300", "深圳市"),
+//    珠海市("440400", "珠海市"),
+//    佛山市("440600", "佛山市"),
+//    江门市("440700", "江门市"),
+//    湛江市("440800", "湛江市"),
+//    茂名市("440900", "茂名市"),
+//    肇庆市("441200", "肇庆市"),
+//    惠州市("441300", "惠州市"),
+//    梅州市("441400", "梅州市"),
+//    乌海市("150300", "乌海市"),
+//    赤峰市("150400", "赤峰市"),
+//    巴彦淖尔市("150800", "巴彦淖尔市"),
+//    大连市("210200", "大连市"),
+//    鞍山市("210300", "鞍山市"),
+//    抚顺市("210400", "抚顺市"),
+//    本溪市("210500", "本溪市"),
+//    丹东市("210600", "丹东市"),
+//    通辽市("150500", "通辽市"),
+//    鄂尔多斯市("150600", "鄂尔多斯市"),
+//    呼伦贝尔市("150700", "呼伦贝尔市"),
+//    济宁市("370800", "济宁市"),
+//    株洲市("430200", "株洲市"),
+//    湘潭市("430300", "湘潭市"),
+//    衡阳市("430400", "衡阳市"),
+//    邵阳市("430500", "邵阳市"),
+//    嘉兴市("330400", "嘉兴市"),
+//    衢州市("330800", "衢州市"),
+//    舟山市("330900", "舟山市"),
+//    台州市("331000", "台州市"),
+//    丽水市("331100", "丽水市"),
+//    合肥市("340100", "合肥市"),
+//    芜湖市("340200", "芜湖市"),
+//    信阳市("411500", "信阳市"),
+//    周口市("411600", "周口市"),
+//    乌兰察布市("150900", "乌兰察布市"),
+//    渭南市("610500", "渭南市"),
+//    延安市("610600", "延安市"),
+//    大石桥市("211500", "大石桥市"),
+//    香港特别行政区("810100", "香港特别行政区"),
+//    邳州市("321400", "邳州市"),
+//    兴安盟("152200", "兴安盟"),
+//    锡林郭勒盟("152500", "锡林郭勒盟"),
+//    阿拉善盟("152900", "阿拉善盟"),
+//    沈阳市("210100", "沈阳市"),
+//    福州市("350100", "福州市"),
+//    厦门市("350200", "厦门市"),
+//    甘南藏族自治州("623000", "甘南藏族自治州"),
+//    西宁市("630100", "西宁市"),
+//    海东地区("632100", "海东地区"),
+//    海北藏族自治州("632200", "海北藏族自治州"),
+//    博尔塔拉蒙古自治州("652700", "博尔塔拉蒙古自治州"),
+//    巴音郭楞蒙古自治州("652800", "巴音郭楞蒙古自治州"),
+//    黄南藏族自治州("632300", "黄南藏族自治州"),
+//    海南藏族自治州("632500", "海南藏族自治州"),
+//    德宏傣族景颇族自治州("533100", "德宏傣族景颇族自治州"),
+//    怒江傈僳族自治州("533300", "怒江傈僳族自治州"),
+//    迪庆藏族自治州("533400", "迪庆藏族自治州"),
+//    拉萨市("540100", "拉萨市"),
+//    黔东南苗族侗族自治州("522600", "黔东南苗族侗族自治州"),
+//    双鸭山市("230500", "双鸭山市"),
+//    大庆市("230600", "大庆市"),
+//    伊春市("230700", "伊春市"),
+//    佳木斯市("230800", "佳木斯市"),
+//    七台河市("230900", "七台河市"),
+//    牡丹江市("231000", "牡丹江市"),
+//    黑河市("231100", "黑河市"),
+//    黄浦区("310101", "黄浦区"),
+//    卢湾区("310103", "卢湾区"),
+//    徐汇区("310104", "徐汇区"),
+//    长宁区("310105", "长宁区"),
+//    鄂州市("420700", "鄂州市"),
+//    荆门市("420800", "荆门市"),
+//    孝感市("420900", "孝感市"),
+//    昌都地区("542100", "昌都地区"),
+//    山南地区("542200", "山南地区"),
+//    三明市("350400", "三明市"),
+//    宜春市("360900", "宜春市"),
+//    抚州市("361000", "抚州市"),
+//    上饶市("361100", "上饶市"),
+//    济南市("370100", "济南市"),
+//    凉山彝族自治州("513400", "凉山彝族自治州"),
+//    贵阳市("520100", "贵阳市"),
+//    六盘水市("520200", "六盘水市"),
+//    遵义市("520300", "遵义市"),
+//    安顺市("520400", "安顺市"),
+//    铜仁地区("522200", "铜仁地区"),
+//    黔西南布依族苗族自治州("522300", "黔西南布依族苗族自治州"),
+//    毕节地区("522400", "毕节地区"),
+//    陵水黎族自治县("469028", "陵水黎族自治县"),
+//    保亭黎族苗族自治县("469029", "保亭黎族苗族自治县"),
+//    琼中黎族苗族自治县("469030", "琼中黎族苗族自治县"),
+//    西沙群岛("469031", "西沙群岛"),
+//    南沙群岛("469032", "南沙群岛"),
+//    中沙群岛的岛礁及其海域("469033", "中沙群岛的岛礁及其海域"),
+//    万州区("500101", "万州区"),
+//    涪陵区("500102", "涪陵区"),
+//    渝中区("500103", "渝中区"),
+//    大渡口区("500104", "大渡口区"),
+//    江北区("500105", "江北区"),
+//    沙坪坝区("500106", "沙坪坝区"),
+//    九龙坡区("500107", "九龙坡区"),
+//    南岸区("500108", "南岸区"),
+//    青岛市("370200", "青岛市"),
+//    淄博市("370300", "淄博市"),
+//    枣庄市("370400", "枣庄市"),
+//    东营市("370500", "东营市"),
+//    烟台市("370600", "烟台市"),
+//    临汾市("141000", "临汾市"),
+//    吕梁市("141100", "吕梁市"),
+//    呼和浩特市("150100", "呼和浩特市"),
+//    包头市("150200", "包头市"),
+//    和田地区("653200", "和田地区"),
+//    伊犁哈萨克自治州("654000", "伊犁哈萨克自治州"),
+//    塔城地区("654200", "塔城地区"),
+//    阿勒泰地区("654300", "阿勒泰地区"),
+//    石河子市("659001", "石河子市"),
+//    阿拉尔市("659002", "阿拉尔市"),
+//    图木舒克市("659003", "图木舒克市"),
+//    五家渠市("659004", "五家渠市"),
+//    漯河市("411100", "漯河市"),
+//    三门峡市("411200", "三门峡市"),
+//    南阳市("411300", "南阳市"),
+//    商丘市("411400", "商丘市"),
+//    焦作市("410800", "焦作市"),
+//    南平市("350700", "南平市"),
+//    辽阳市("211000", "辽阳市"),
+//    盘锦市("211100", "盘锦市"),
+//    铁岭市("211200", "铁岭市"),
+//    朝阳市("211300", "朝阳市"),
+//    葫芦岛市("211400", "葫芦岛市"),
+//    长春市("220100", "长春市"),
+//    吉林市("220200", "吉林市"),
+//    四平市("220300", "四平市"),
+//    辽源市("220400", "辽源市"),
+//    通化市("220500", "通化市"),
+//    忻州市("140900", "忻州市"),
+//    鸡西市("230300", "鸡西市"),
+//    鹤岗市("230400", "鹤岗市"),
+//    开封市("410200", "开封市"),
+//    洛阳市("410300", "洛阳市"),
+//    平顶山市("410400", "平顶山市"),
+//    安阳市("410500", "安阳市"),
+//    鹤壁市("410600", "鹤壁市"),
+//    新乡市("410700", "新乡市"),
+//    荆州市("421000", "荆州市"),
+//    黄冈市("421100", "黄冈市"),
+//    日喀则地区("542300", "日喀则地区"),
+//    那曲地区("542400", "那曲地区"),
+//    阿里地区("542500", "阿里地区"),
+//    林芝地区("542600", "林芝地区"),
+//    西安市("610100", "西安市"),
+//    铜川市("610200", "铜川市"),
+//    自贡市("510300", "自贡市"),
+//    攀枝花市("510400", "攀枝花市"),
+//    泸州市("510500", "泸州市"),
+//    德阳市("510600", "德阳市"),
+//    莆田市("350300", "莆田市"),
+//    宝鸡市("610300", "宝鸡市"),
+//    廊坊市("131000", "廊坊市"),
+//    衡水市("131100", "衡水市"),
+//    太原市("140100", "太原市"),
+//    大同市("140200", "大同市"),
+//    阳泉市("140300", "阳泉市"),
+//    长治市("140400", "长治市"),
+//    晋城市("140500", "晋城市"),
+//    朔州市("140600", "朔州市"),
+//    黔南布依族苗族自治州("522700", "黔南布依族苗族自治州"),
+//    普洱市("530800", "普洱市"),
+//    临沧市("530900", "临沧市"),
+//    楚雄彝族自治州("532300", "楚雄彝族自治州"),
+//    红河哈尼族彝族自治州("532500", "红河哈尼族彝族自治州"),
+//    文山壮族苗族自治州("532600", "文山壮族苗族自治州"),
+//    西双版纳傣族自治州("532800", "西双版纳傣族自治州"),
+//    大理白族自治州("532900", "大理白族自治州"),
+//    锦州市("210700", "锦州市"),
+//    营口市("210800", "营口市"),
+//    延边朝鲜族自治州("222400", "延边朝鲜族自治州"),
+//    晋中市("140700", "晋中市"),
+//    常州市("320400", "常州市"),
+//    苏州市("320500", "苏州市"),
+//    南通市("320600", "南通市"),
+//    连云港市("320700", "连云港市"),
+//    淮安市("320800", "淮安市"),
+//    盐城市("320900", "盐城市"),
+//    扬州市("321000", "扬州市"),
+//    镇江市("321100", "镇江市"),
+//    泰州市("321200", "泰州市"),
+//    宿迁市("321300", "宿迁市"),
+//    咸阳市("610400", "咸阳市"),
+//    汉中市("610700", "汉中市"),
+//    榆林市("610800", "榆林市"),
+//    商洛市("611000", "商洛市"),
+//    兰州市("620100", "兰州市"),
+//    嘉峪关市("620200", "嘉峪关市"),
+//    金昌市("620300", "金昌市"),
+//    白银市("620400", "白银市"),
+//    天水市("620500", "天水市"),
+//    武威市("620600", "武威市"),
+//    张掖市("620700", "张掖市"),
+//    杭州市("330100", "杭州市"),
+//    昆明市("530100", "昆明市"),
+//    曲靖市("530300", "曲靖市"),
+//    玉溪市("530400", "玉溪市"),
+//    保山市("530500", "保山市"),
+//    昭通市("530600", "昭通市"),
+//    丽江市("530700", "丽江市"),
+//    运城市("140800", "运城市"),
+//    咸宁市("421200", "咸宁市"),
+//    随州市("421300", "随州市"),
+//    恩施土家族苗族自治州("422800", "恩施土家族苗族自治州"),
+//    仙桃市("429004", "仙桃市"),
+//    潜江市("429005", "潜江市"),
+//    天门市("429006", "天门市"),
+//    神农架林区("429021", "神农架林区"),
+//    长沙市("430100", "长沙市"),
+//    岳阳市("430600", "岳阳市"),
+//    常德市("430700", "常德市"),
+//    张家界市("430800", "张家界市"),
+//    奉贤区("310120", "奉贤区"),
+//    崇明县("310230", "崇明县"),
+//    南京市("320100", "南京市"),
+//    无锡市("320200", "无锡市"),
+//    徐州市("320300", "徐州市"),
+//    甘孜藏族自治州("513300", "甘孜藏族自治州"),
+//    北碚区("500109", "北碚区"),
+//    万盛区("500110", "万盛区"),
+//    双桥区("500111", "双桥区"),
+//    渝北区("500112", "渝北区"),
+//    巴南区("500113", "巴南区"),
+//    黔江区("500114", "黔江区"),
+//    长寿区("500115", "长寿区"),
+//    江津区("500116", "江津区"),
+//    合川区("500117", "合川区"),
+//    永川区("500118", "永川区"),
+//    南川区("500119", "南川区"),
+//    綦江县("500222", "綦江县"),
+//    潼南县("500223", "潼南县"),
+//    铜梁县("500224", "铜梁县"),
+//    大足县("500225", "大足县"),
+//    荣昌县("500226", "荣昌县"),
+//    璧山县("500227", "璧山县"),
+//    梁平县("500228", "梁平县"),
+//    城口县("500229", "城口县"),
+//    丰都县("500230", "丰都县"),
+//    垫江县("500231", "垫江县"),
+//    武隆县("500232", "武隆县"),
+//    忠县("500233", "忠县"),
+//    开县("500234", "开县"),
+//    云阳县("500235", "云阳县"),
+//    奉节县("500236", "奉节县"),
+//    巫山县("500237", "巫山县"),
+//    巫溪县("500238", "巫溪县"),
+//    石柱土家族自治县("500240", "石柱土家族自治县"),
+//    秀山土家族苗族自治县("500241", "秀山土家族苗族自治县"),
+//    酉阳土家族苗族自治县("500242", "酉阳土家族苗族自治县"),
+//    彭水苗族土家族自治县("500243", "彭水苗族土家族自治县"),
+//    成都市("510100", "成都市"),
+//    果洛藏族自治州("632600", "果洛藏族自治州"),
+//    玉树藏族自治州("632700", "玉树藏族自治州"),
+//    海西蒙古族藏族自治州("632800", "海西蒙古族藏族自治州"),
+//    银川市("640100", "银川市"),
+//    石嘴山市("640200", "石嘴山市"),
+//    白山市("220600", "白山市"),
+//    松原市("220700", "松原市"),
+//    平凉市("620800", "平凉市"),
+//    崇文区("110103", "崇文区"),
+//    宣武区("110104", "宣武区"),
+//    朝阳区("110105", "朝阳区"),
+//    丰台区("110106", "丰台区"),
+//    石景山区("110107", "石景山区"),
+//    海淀区("110108", "海淀区"),
+//    门头沟区("110109", "门头沟区"),
+//    房山区("110111", "房山区"),
+//    通州区("110112", "通州区"),
+//    顺义区("110113", "顺义区"),
+//    昌平区("110114", "昌平区"),
+//    大兴区("110115", "大兴区"),
+//    怀柔区("110116", "怀柔区"),
+//    平谷区("110117", "平谷区"),
+//    密云县("110228", "密云县"),
+//    延庆县("110229", "延庆县"),
+//    和平区("120101", "和平区"),
+//    河东区("120102", "河东区"),
+//    河西区("120103", "河西区"),
+//    南开区("120104", "南开区"),
+//    河北区("120105", "河北区"),
+//    红桥区("120106", "红桥区"),
+//    东丽区("120110", "东丽区"),
+//    西青区("120111", "西青区"),
+//    津南区("120112", "津南区"),
+//    北辰区("120113", "北辰区"),
+//    武清区("120114", "武清区"),
+//    宝坻区("120115", "宝坻区"),
+//    滨海新区("120116", "滨海新区"),
+//    宁河县("120221", "宁河县"),
+//    静海县("120223", "静海县"),
+//    蓟县("120225", "蓟县"),
+//    石家庄市("130100", "石家庄市"),
+//    唐山市("130200", "唐山市"),
+//    承德市("130800", "承德市"),
+//    白城市("220800", "白城市"),
+//    酒泉市("620900", "酒泉市"),
+//    庆阳市("621000", "庆阳市"),
+//    定西市("621100", "定西市"),
+//    陇南市("621200", "陇南市"),
+//    广安市("511600", "广安市"),
+//    达州市("511700", "达州市"),
+//    雅安市("511800", "雅安市"),
+//    巴中市("511900", "巴中市"),
+//    资阳市("512000", "资阳市"),
+//    阿坝藏族羌族自治州("513200", "阿坝藏族羌族自治州"),
+//    绵阳市("510700", "绵阳市"),
+//    广元市("510800", "广元市"),
+//    遂宁市("510900", "遂宁市"),
+//    内江市("511000", "内江市"),
+//    乐山市("511100", "乐山市"),
+//    南充市("511300", "南充市"),
+//    眉山市("511400", "眉山市"),
+//    宜宾市("511500", "宜宾市"),
+//    阜新市("210900", "阜新市"),
+//
+//
+//    ;
+//
+//
+//    @Getter
+//    private String code;
+//
+//    @Getter
+//    private String desc;
+//
+//
+//    public static String buildCity(String addr) {
+//        if (StringUtils.isNotEmpty(addr)) {
+//            List<City> citys = Arrays.stream(City.values()).filter(a -> addr.contains(a.name())).collect(Collectors.toList());
+//            if (null != citys && citys.size() > 0) {
+//                return citys.get(0).getCode();
+//            }
+//        }
+//        return "141000";
+//    }
+//
+//
+//}

src/main/java/com/ydtech/constants/enums/InsYcAccident.java

@@ -1,107 +1,107 @@
-package com.ydtech.constants.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * 保险  永诚意外险
- *
- * @author: lig
- * @date: 2023-02-16
- */
-@Getter
-@AllArgsConstructor
-public enum InsYcAccident {
-
-    A100("100", "A - 5座车方案"),
-    A101("101", "B - 7座车方案"),
-    A102("102", "C - 人员意外伤害"),
-    A103("103", "A-1- 5座车方案"),
-    A104("104", "A - 5座车方案"),
-    A105("105", "B - 7座车方案"),
-    A106("106", "智和诚车商专属方案——5座车300元档"),
-    A107("107", "嘉诚车商专属方案——5座车200元档"),
-    A108("108", "驾乘无忧标准版 - 5座车方案"),
-    A109("109", "驾乘无忧标准版 - 6座车方案"),
-    A110("110", "驾乘无忧标准版 - 7座车方案"),
-    A111("111", "驾乘无忧豪华版 –5座车方案"),
-    A112("112", "驾乘无忧尊享版 –5座车方案"),
-    A113("113", "全车驾乘险高端版: –5座车方案"),
-    A114("114", "摩托车驾意险方案"),
-    A115("115", "A - 5座车低保额方案"),
-    A116("116", "B - 7座车低保额方案"),
-    A117("117", "智和诚车商专属方案-通用版"),
-    A118("118", "驾驶人交通意外方案"),
-    A119("119", "5座车交强险方案"),
-    A120("120", "7座车交强险方案"),
-    A121("121", "A - 5座车方案 常规版"),
-    A122("122", "A - 5座车方案 标准版"),
-    A123("123", "B- 7座车方案 – 标准版"),
-    A132("132", "嘉诚专属方案-5座豪华版"),
-    A133("133", "嘉诚专属方案-7座豪华版"),
-    A134("134", "嘉诚专属方案-5座尊享版"),
-    A135("135", "嘉诚专属方案-7座尊享版"),
-    A136("136", "嘉诚专属方案-非营运货车5座豪华版"),
-    A137("137", "嘉诚专属方案-非营运货车5座尊享版"),
-    A138("138", "全国版C-4座车方案"),
-    A139("139", "全国版D-5座车方案"),
-    A140("140", "全国版E-6座车方案"),
-    A141("141", "全国版F-7座车方案"),
-    A142("142", "A - 5座车协诚专用方案"),
-    A143("143", "B - 7座车协诚专用方案"),
-    A144("144", "C - 5座车协诚专用方案"),
-    A145("145", "D - 7座车协诚专用方案"),
-    A146("146", "E - 5座车协诚专用方案"),
-    A147("147", "E - 7座车协诚专用方案"),
-    A148("148", "嘉诚专属方案（非新）-5座20万档"),
-    A149("149", "嘉诚专属方案（非新）-5座25万档"),
-    A150("150", "嘉诚专属方案（非新）-5座40万档"),
-    A151("151", "嘉诚专属方案（非新）-7座20万档"),
-    A152("152", "嘉诚专属方案（非新）-7座25万档"),
-    A153("153", "嘉诚专属方案（非新）-7座40万档"),
-    A154("154", "诚意行驾乘险-5座"),
-
-    ;
-
-    public static InsYcAccident matchKey(String key) {
-        InsYcAccident result = null;
-        for (InsYcAccident e : values()) {
-            if (e.getCode() == key) {
-                result = e;
-                break;
-            }
-        }
-        return result;
-    }
-
-
-    /**
-     * 转为数据
-     * @return 枚举对象数组
-     */
-    public static List<Map<String, String>> toList() {
-        List<Map<String, String>> list = new ArrayList<>();
-        for (InsYcAccident item : InsYcAccident.values()) {
-            Map<String, String> map = new HashMap<>();
-            map.put("code", item.getCode());
-            map.put("name", item.getDesc());
-            list.add(map);
-        }
-        return list;
-    }
-
-
-    @Getter
-    private String code;
-
-    @Getter
-    private String desc;
-
-
-}
+//package com.ydtech.constants.enums;
+//
+//import lombok.AllArgsConstructor;
+//import lombok.Getter;
+//
+//import java.util.ArrayList;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+//
+///**
+// * 保险  永诚意外险
+// *
+// * @author: lig
+// * @date: 2023-02-16
+// */
+//@Getter
+//@AllArgsConstructor
+//public enum InsYcAccident {
+//
+//    A100("100", "A - 5座车方案"),
+//    A101("101", "B - 7座车方案"),
+//    A102("102", "C - 人员意外伤害"),
+//    A103("103", "A-1- 5座车方案"),
+//    A104("104", "A - 5座车方案"),
+//    A105("105", "B - 7座车方案"),
+//    A106("106", "智和诚车商专属方案——5座车300元档"),
+//    A107("107", "嘉诚车商专属方案——5座车200元档"),
+//    A108("108", "驾乘无忧标准版 - 5座车方案"),
+//    A109("109", "驾乘无忧标准版 - 6座车方案"),
+//    A110("110", "驾乘无忧标准版 - 7座车方案"),
+//    A111("111", "驾乘无忧豪华版 –5座车方案"),
+//    A112("112", "驾乘无忧尊享版 –5座车方案"),
+//    A113("113", "全车驾乘险高端版: –5座车方案"),
+//    A114("114", "摩托车驾意险方案"),
+//    A115("115", "A - 5座车低保额方案"),
+//    A116("116", "B - 7座车低保额方案"),
+//    A117("117", "智和诚车商专属方案-通用版"),
+//    A118("118", "驾驶人交通意外方案"),
+//    A119("119", "5座车交强险方案"),
+//    A120("120", "7座车交强险方案"),
+//    A121("121", "A - 5座车方案 常规版"),
+//    A122("122", "A - 5座车方案 标准版"),
+//    A123("123", "B- 7座车方案 – 标准版"),
+//    A132("132", "嘉诚专属方案-5座豪华版"),
+//    A133("133", "嘉诚专属方案-7座豪华版"),
+//    A134("134", "嘉诚专属方案-5座尊享版"),
+//    A135("135", "嘉诚专属方案-7座尊享版"),
+//    A136("136", "嘉诚专属方案-非营运货车5座豪华版"),
+//    A137("137", "嘉诚专属方案-非营运货车5座尊享版"),
+//    A138("138", "全国版C-4座车方案"),
+//    A139("139", "全国版D-5座车方案"),
+//    A140("140", "全国版E-6座车方案"),
+//    A141("141", "全国版F-7座车方案"),
+//    A142("142", "A - 5座车协诚专用方案"),
+//    A143("143", "B - 7座车协诚专用方案"),
+//    A144("144", "C - 5座车协诚专用方案"),
+//    A145("145", "D - 7座车协诚专用方案"),
+//    A146("146", "E - 5座车协诚专用方案"),
+//    A147("147", "E - 7座车协诚专用方案"),
+//    A148("148", "嘉诚专属方案（非新）-5座20万档"),
+//    A149("149", "嘉诚专属方案（非新）-5座25万档"),
+//    A150("150", "嘉诚专属方案（非新）-5座40万档"),
+//    A151("151", "嘉诚专属方案（非新）-7座20万档"),
+//    A152("152", "嘉诚专属方案（非新）-7座25万档"),
+//    A153("153", "嘉诚专属方案（非新）-7座40万档"),
+//    A154("154", "诚意行驾乘险-5座"),
+//
+//    ;
+//
+//    public static InsYcAccident matchKey(String key) {
+//        InsYcAccident result = null;
+//        for (InsYcAccident e : values()) {
+//            if (e.getCode() == key) {
+//                result = e;
+//                break;
+//            }
+//        }
+//        return result;
+//    }
+//
+//
+//    /**
+//     * 转为数据
+//     * @return 枚举对象数组
+//     */
+//    public static List<Map<String, String>> toList() {
+//        List<Map<String, String>> list = new ArrayList<>();
+//        for (InsYcAccident item : InsYcAccident.values()) {
+//            Map<String, String> map = new HashMap<>();
+//            map.put("code", item.getCode());
+//            map.put("name", item.getDesc());
+//            list.add(map);
+//        }
+//        return list;
+//    }
+//
+//
+//    @Getter
+//    private String code;
+//
+//    @Getter
+//    private String desc;
+//
+//
+//}

src/main/java/com/ydtech/constants/enums/Province.java

@@ -1,87 +1,87 @@
-package com.ydtech.constants.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-/**
- * @description: 省份
- * @author: lig
- * @date: 2023-02-13
- */
-@Getter
-@AllArgsConstructor
-public enum Province {
-
-    江西省("360000", "江西省"),
-    新疆维吾尔自治区("650000", "新疆维吾尔自治区"),
-    黑龙江省("230000", "黑龙江省"),
-    北京市("110000", "北京市"),
-    海南省("460000", "海南省"),
-    河南省("410000", "河南省"),
-    广西壮族自治区("450000", "广西壮族自治区"),
-    湖北省("420000", "湖北省"),
-    广东省("440000", "广东省"),
-    安徽省("340000", "安徽省"),
-    辽宁省("210000", "辽宁省"),
-    福建省("350000", "福建省"),
-    青海省("630000", "青海省"),
-    西藏自治区("540000", "西藏自治区"),
-    上海市("310000", "上海市"),
-    山东省("370000", "山东省"),
-    贵州省("520000", "贵州省"),
-    重庆市("500000", "重庆市"),
-    内蒙古自治区("150000", "内蒙古自治区"),
-    台湾省("710000", "台湾省"),
-    香港特别行政区("810000", "香港特别行政区"),
-    澳门特别行政区("820000", "澳门特别行政区"),
-    吉林省("220000", "吉林省"),
-    陕西省("610000", "陕西省"),
-    山西省("140000", "山西省"),
-    甘肃省("620000", "甘肃省"),
-    浙江省("330000", "浙江省"),
-    云南省("530000", "云南省"),
-    湖南省("430000", "湖南省"),
-    江苏省("320000", "江苏省"),
-    四川省("510000", "四川省"),
-    宁夏回族自治区("640000", "宁夏回族自治区"),
-    天津市("120000", "天津市"),
-    河北省("130000", "河北省"),
-
-
-    ;
-
-
-    @Getter
-    private String code;
-
-    @Getter
-    private String desc;
-
-
-
-    public static String buildProvince(String addr){
-        if(StringUtils.isNotEmpty(addr)){
-            List<Province> provinces = Arrays.stream(Province.values()).filter(a -> addr.contains(a.name())).collect(Collectors.toList());
-            if(null != provinces && provinces.size() > 0){
-                return provinces.get(0).getCode();
-            }
-        }
-        return "";
-    }
-
-
-
-
-
-
-
-
-
-
-}
+//package com.ydtech.constants.enums;
+//
+//import lombok.AllArgsConstructor;
+//import lombok.Getter;
+//import org.apache.commons.lang3.StringUtils;
+//
+//import java.util.Arrays;
+//import java.util.List;
+//import java.util.stream.Collectors;
+//
+//
+///**
+// * @description: 省份
+// * @author: lig
+// * @date: 2023-02-13
+// */
+//@Getter
+//@AllArgsConstructor
+//public enum Province {
+//
+//    江西省("360000", "江西省"),
+//    新疆维吾尔自治区("650000", "新疆维吾尔自治区"),
+//    黑龙江省("230000", "黑龙江省"),
+//    北京市("110000", "北京市"),
+//    海南省("460000", "海南省"),
+//    河南省("410000", "河南省"),
+//    广西壮族自治区("450000", "广西壮族自治区"),
+//    湖北省("420000", "湖北省"),
+//    广东省("440000", "广东省"),
+//    安徽省("340000", "安徽省"),
+//    辽宁省("210000", "辽宁省"),
+//    福建省("350000", "福建省"),
+//    青海省("630000", "青海省"),
+//    西藏自治区("540000", "西藏自治区"),
+//    上海市("310000", "上海市"),
+//    山东省("370000", "山东省"),
+//    贵州省("520000", "贵州省"),
+//    重庆市("500000", "重庆市"),
+//    内蒙古自治区("150000", "内蒙古自治区"),
+//    台湾省("710000", "台湾省"),
+//    香港特别行政区("810000", "香港特别行政区"),
+//    澳门特别行政区("820000", "澳门特别行政区"),
+//    吉林省("220000", "吉林省"),
+//    陕西省("610000", "陕西省"),
+//    山西省("140000", "山西省"),
+//    甘肃省("620000", "甘肃省"),
+//    浙江省("330000", "浙江省"),
+//    云南省("530000", "云南省"),
+//    湖南省("430000", "湖南省"),
+//    江苏省("320000", "江苏省"),
+//    四川省("510000", "四川省"),
+//    宁夏回族自治区("640000", "宁夏回族自治区"),
+//    天津市("120000", "天津市"),
+//    河北省("130000", "河北省"),
+//
+//
+//    ;
+//
+//
+//    @Getter
+//    private String code;
+//
+//    @Getter
+//    private String desc;
+//
+//
+//
+//    public static String buildProvince(String addr){
+//        if(StringUtils.isNotEmpty(addr)){
+//            List<Province> provinces = Arrays.stream(Province.values()).filter(a -> addr.contains(a.name())).collect(Collectors.toList());
+//            if(null != provinces && provinces.size() > 0){
+//                return provinces.get(0).getCode();
+//            }
+//        }
+//        return "";
+//    }
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//}

src/main/java/com/ydtech/constants/enums/dict/AttachInsureEnum.java

@@ -0,0 +1,31 @@
+package com.ydtech.constants.enums.dict;
+
+import com.ydtech.aop.request.DictEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+/**
+ * 保险  附加险
+ *
+ * @author: lig
+ * @date: 2023-05-04
+ */
+@Getter
+@AllArgsConstructor
+@DictEnum(key = "attach_insure", desc = "保险 - 附加险类型")
+public enum AttachInsureEnum implements IBaseEnum {
+
+    AI001("1", "驾驶员意外险",1,0),
+    ;
+
+    private String code;
+    private String desc;
+    //排序
+    private Integer sort;
+    //状态  0 启用  1 不启用
+    private Integer status;
+
+
+
+}

src/main/java/com/ydtech/constants/enums/dict/WhetherEnum.java

@@ -0,0 +1,32 @@
+package com.ydtech.constants.enums.dict;
+
+import com.ydtech.aop.request.DictEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+/**
+ * 是否
+ *
+ * @author: lig
+ * @date: 2023-05-04
+ */
+@Getter
+@AllArgsConstructor
+@DictEnum(key = "whether", desc = "是否")
+public enum WhetherEnum implements IBaseEnum {
+
+    NO("0", "否",1,0),
+    YES("1", "是",2,0),
+    ;
+
+    private String code;
+    private String desc;
+    //排序
+    private Integer sort;
+    //状态  0 启用  1 不启用
+    private Integer status;
+
+
+
+}

src/main/java/com/ydtech/modules/admin/controller/AppLoginController.java

@@ -88,11 +88,11 @@ public class AppLoginController{
         sysUserCheck1.setCheckid(sysUserCheck.getCheckid());
         Integer integer2 = sysUserCheckService.updateSelective(sysUserCheck1);
         // 新注册的信息提交
-        Integer integer = sysUserService.updateSelective(sysUser);
+        boolean integer = sysUserService.updateById(sysUser);
         internalCheck.setCheckid(sysUserCheck.getCheckid());
         Integer insert = esmUserInternalCheckService.insertSelective(internalCheck);
         Integer integer1 = esmUserInternalService.insertSelective(internal);
-        if (insert == 1 && integer == 1 && integer1 == 1 && integer2 == 1) {
+        if (insert == 1 && integer == true && integer1 == 1 && integer2 == 1) {
             return HttpResult.ok("保存成功");
         }
         throw new SystemException("修改失败");
@@ -114,7 +114,7 @@ public class AppLoginController{
         EsmUserInternalCheck esmUserInternalCheck = esmUserInternalCheckService.selectByPk(jobNumber);
         if (esmUserInternalCheck != null) {
             EsmUserInternalVo esmUserInternalVo = EsmUserInternalCheckConvert.INSTANCE.dto2Vo(esmUserInternalCheck);
-            SysUser sysUser = sysUserService.selectByPk(jobNumber);
+            SysUser sysUser = sysUserService.getById(jobNumber);
             esmUserInternalVo.setSex(sysUser.getSex());
             esmUserInternalVo.setName(sysUser.getName());
             return HttpResult.ok("成功", esmUserInternalVo);

src/main/java/com/ydtech/modules/admin/controller/SysLoginController.java

@@ -105,7 +105,7 @@ public class SysLoginController {
         }
 
         // 用户信息
-        SysUser user = sysUserService.selectByPk(username);
+        SysUser user = sysUserService.getById(username);
 
         // 账号不存在、密码错误
         if (user == null) {

src/main/java/com/ydtech/modules/admin/controller/SysMenuController.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.admin.controller;
 
 import com.ydtech.modules.admin.model.SysMenu;
+import com.ydtech.modules.admin.model.SysRole;
 import com.ydtech.modules.admin.service.SysMenuService;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.core.page.HttpResult;
@@ -9,6 +10,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 菜单控制器
@@ -27,16 +29,20 @@ public class SysMenuController {
     @PostMapping(value = "/save")
     public HttpResult save(@RequestBody SysMenu record) {
         if (StringUtils.isNullOrEmpty(record.getId()) || record.getId().equalsIgnoreCase("0")) {
-            return HttpResult.ok(sysMenuService.insertSelective(record));
+            return HttpResult.ok(sysMenuService.save(record));
+//            return HttpResult.ok(sysMenuService.insertSelective(record));
         } else {
-            return HttpResult.ok(sysMenuService.updateSelective(record));
+            return HttpResult.ok(sysMenuService.updateById(record));
+//            return HttpResult.ok(sysMenuService.updateSelective(record));
         }
     }
 
     @PreAuthorize("hasAuthority('sys:menu:delete')")
     @PostMapping(value = "/delete")
     public HttpResult delete(@RequestBody List<SysMenu> records) {
-        return HttpResult.ok(sysMenuService.delete(records));
+        List<String> ids = records.stream().map(SysMenu::getId).collect(Collectors.toList());
+        return HttpResult.ok(sysMenuService.removeBatchByIds(ids));
+//        return HttpResult.ok(sysMenuService.delete(records));
     }
 
     //    @PreAuthorize("hasAuthority('sys:menu:view')")
@@ -45,7 +51,7 @@ public class SysMenuController {
         return HttpResult.ok(sysMenuService.findTree(userName, 1));
     }
 
-    @PreAuthorize("hasAuthority('sys:menu:view')")
+//    @PreAuthorize("hasAuthority('sys:menu:view')")
     @GetMapping(value = "/findMenuTree")
     public HttpResult findMenuTree() {
         return HttpResult.ok(sysMenuService.findTree(null, 0));

src/main/java/com/ydtech/modules/admin/controller/SysRoleController.java

@@ -9,9 +9,11 @@ import com.ydtech.modules.admin.service.SysRoleMenuService;
 import com.ydtech.modules.admin.service.SysRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -33,7 +35,8 @@ public class SysRoleController {
     @PreAuthorize("hasAuthority('sys:role:add') AND hasAuthority('sys:role:edit')")
     @PostMapping(value = "/save")
     public HttpResult save(@RequestBody SysRole record) {
-        SysRole role = sysRoleService.selectByPk(record.getId());
+        SysRole role = sysRoleService.getById(record.getId());
+//        SysRole role = sysRoleService.selectByPk(record.getId());
         if (role != null) {
             if (SysConstants.ADMIN.equalsIgnoreCase(role.getName())) {
                 return HttpResult.error("超级管理员不允许修改!");
@@ -43,14 +46,18 @@ public class SysRoleController {
         if ((record.getId() == null || record.getId() == 0) && sysRoleService.findByName(record.getName()) != null) {
             return HttpResult.error("角色名已存在!");
         }
-        return HttpResult.ok(sysRoleService.save(record));
+        return HttpResult.ok(sysRoleService.saveOrUpdate(record));
     }
 
     @PreAuthorize("hasAuthority('sys:role:delete')")
     @PostMapping(value = "/delete")
+    @Transactional
     public HttpResult delete(@RequestBody List<SysRole> records) {
+
+        List<Long> sysRoleIds = records.stream().map(SysRole::getId).collect(Collectors.toList());
         //TODO 应该做级联删除，暂时未做
-        return HttpResult.ok(sysRoleService.delete(records));
+        return HttpResult.ok(sysRoleService.removeBatchByIds(sysRoleIds));
+//        return HttpResult.ok(sysRoleService.delete(records));
     }
 
     @PreAuthorize("hasAuthority('sys:role:view')")
@@ -62,7 +69,8 @@ public class SysRoleController {
     @PreAuthorize("hasAuthority('sys:role:view')")
     @GetMapping(value = "/findAll")
     public HttpResult findAll() {
-        return HttpResult.ok(sysRoleService.selectAll());
+        return HttpResult.ok(sysRoleService.list());
+//        return HttpResult.ok(sysRoleService.selectAll());
     }
 
     @PreAuthorize("hasAuthority('sys:role:view')")
@@ -75,7 +83,8 @@ public class SysRoleController {
     @PostMapping(value = "/saveRoleMenus")
     public HttpResult saveRoleMenus(@RequestBody List<SysRoleMenu> records) {
         for (SysRoleMenu record : records) {
-            SysRole sysRole = sysRoleService.selectByPk(record.getRoleId());
+            SysRole sysRole = sysRoleService.getById(record.getRoleId());
+//            SysRole sysRole = sysRoleService.selectByPk(record.getRoleId());
             if (SysConstants.ADMIN.equalsIgnoreCase(sysRole.getName())) {
                 // 如果是超级管理员，不允许修改
                 return HttpResult.error("超级管理员拥有所有菜单权限，不允许修改！");

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -1,6 +1,9 @@
 package com.ydtech.modules.admin.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.constants.SysConstants;
 import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
@@ -12,11 +15,12 @@ import com.ydtech.modules.admin.model.SysUserRole;
 import com.ydtech.modules.admin.service.SysUserRoleService;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.admin.vo.SysUserVO;
+import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.security.utils.PasswordUtils;
+import com.ydtech.utils.StringUtils;
 import org.apache.commons.codec.language.bm.Lang;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
@@ -94,7 +98,7 @@ public class SysUserController extends BaseController {
     @PostMapping(value = "/deleteFlag")
     public HttpResult deleteFlag(@RequestBody List<SysUser> records) {
         for (SysUser record : records) {
-            SysUser sysUser = sysUserService.selectByPk(record.getId());
+            SysUser sysUser = sysUserService.getById(record.getId());
             if (sysUser != null && SysConstants.ADMIN.equalsIgnoreCase(sysUser.getName())) {
                 return HttpResult.error("超级管理员不允许删除!");
             }
@@ -105,7 +109,7 @@ public class SysUserController extends BaseController {
     //	@PreAuthorize("hasAuthority('sys:user:view')")
     @GetMapping(value = "/findByName")
     public HttpResult findByUserName(@RequestParam String name) {
-        return HttpResult.ok(sysUserService.selectById(name));
+        return HttpResult.ok(sysUserService.getById(name));
     }
 
     //	@PreAuthorize("hasAuthority('sys:user:view')")
@@ -138,27 +142,67 @@ public class SysUserController extends BaseController {
         String mobile = pageRequest.getColumnFilterValue(pageRequest, "mobile");
         StringBuffer whereStr = new StringBuffer(" where 1=1");
         ArrayList array = new ArrayList();
+        LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper();
         if (!StringUtils.isEmpty(deptid) && !StringUtils.isEmpty(containsSubDept) && "1".equals(containsSubDept)) {
-            whereStr.append(" and dept_id like ?");
-            array.add(deptid + "%");
+            lqw.likeRight(SysUser::getDeptId,deptid);
+//            whereStr.append(" and dept_id like ?");
+//            array.add(deptid + "%");
         } else if (!StringUtils.isEmpty(deptid)) {
-            whereStr.append(" and dept_id = ?");
-            array.add(deptid);
+            lqw.eq(SysUser::getDeptId,deptid);
+//            whereStr.append(" and dept_id = ?");
+//            array.add(deptid);
         }
         if (!StringUtils.isEmpty(name)) {
-            whereStr.append(" and name = ?");
-            array.add(name);
+            lqw.eq(SysUser::getName,name);
+//            whereStr.append(" and name = ?");
+//            array.add(name);
         }
         if (!StringUtils.isEmpty(mobile)) {
-            whereStr.append(" and mobile = ?");
-            array.add(mobile);
+            lqw.eq(SysUser::getMobile,mobile);
+//            whereStr.append(" and mobile = ?");
+//            array.add(mobile);
         }
 
+        Page p = PageRequest.buildPageRequest(pageRequest);
+        IPage<SysUser> pResult = sysUserService.page(p,lqw);
+        //传入查询条件
+        PageResult pageResult = PageResult.buildPageResult(pResult);
+        return HttpResult.ok(pageResult);
+
 
-        PageResult pageResult = sysUserRoleService.queryPaging(pageNum, pageSize, whereStr.toString(), array.toArray());
 
-        return HttpResult.ok(pageResult);
     }
+//    @PostMapping(value = "/queryPage")
+//    public HttpResult queryPage(@RequestBody PageRequest pageRequest) {
+//        int pageNum = pageRequest.getPageNum();
+//        int pageSize = pageRequest.getPageSize();
+//        String deptid = pageRequest.getColumnFilterValue(pageRequest, "deptid");
+//        String name = pageRequest.getColumnFilterValue(pageRequest, "name");
+//        String containsSubDept = pageRequest.getColumnFilterValue(pageRequest, "containsSubDept");
+//        String mobile = pageRequest.getColumnFilterValue(pageRequest, "mobile");
+//        StringBuffer whereStr = new StringBuffer(" where 1=1");
+//        ArrayList array = new ArrayList();
+//        if (!StringUtils.isEmpty(deptid) && !StringUtils.isEmpty(containsSubDept) && "1".equals(containsSubDept)) {
+//            whereStr.append(" and dept_id like ?");
+//            array.add(deptid + "%");
+//        } else if (!StringUtils.isEmpty(deptid)) {
+//            whereStr.append(" and dept_id = ?");
+//            array.add(deptid);
+//        }
+//        if (!StringUtils.isEmpty(name)) {
+//            whereStr.append(" and name = ?");
+//            array.add(name);
+//        }
+//        if (!StringUtils.isEmpty(mobile)) {
+//            whereStr.append(" and mobile = ?");
+//            array.add(mobile);
+//        }
+//
+//
+//        PageResult pageResult = sysUserRoleService.queryPaging(pageNum, pageSize, whereStr.toString(), array.toArray());
+//
+//        return HttpResult.ok(pageResult);
+//    }
 
     /**
      * 配置用户角色
@@ -170,19 +214,19 @@ public class SysUserController extends BaseController {
     @PostMapping(value = "/saveUserRole")
     public HttpResult saveUserRole(@RequestParam String userId, @RequestParam String roleId) {
         SysUserRole userRole = new SysUserRole();
-        List<SysUserRole> list = sysUserRoleService.selectList(" where user_id=?", new Object[]{userId});
-        if (list.size() > 0) {
-            userRole = list.get(0);
+//        List<SysUserRole> list = sysUserRoleService.selectList(" where user_id=?", new Object[]{userId});
+        userRole = sysUserRoleService.getById(roleId);
+        if (null != userRole) {
             userRole.setRoleId(Long.parseLong(roleId));
             userRole.setLastUpdateBy(getUserName());
             userRole.setLastUpdateTime(new Date());
-            sysUserRoleService.updateSelective(userRole);
+            sysUserRoleService.updateById(userRole);
         } else {
             userRole.setUserId(userId);
             userRole.setRoleId(Long.parseLong(roleId));
             userRole.setCreateBy(getUserName());
             userRole.setCreateTime(new Date());
-            sysUserRoleService.insertSelective(userRole);
+            sysUserRoleService.save(userRole);
         }
         return HttpResult.ok();
     }
@@ -214,7 +258,7 @@ public class SysUserController extends BaseController {
         if (StringUtils.isEmpty(id) || StringUtils.isEmpty(password)) {
             return HttpResult.error("ID和密码不能为空");
         }
-        SysUser sysUser = sysUserService.selectByPk(id);
+        SysUser sysUser = sysUserService.getById(id);
         if (sysUser == null) {
             return HttpResult.error("ID不存在");
         }
@@ -222,7 +266,7 @@ public class SysUserController extends BaseController {
         String salt = PasswordUtils.getSalt();
         String pwd = PasswordUtils.encode(password, sysUser.getSalt());
         sysUser.setPassword(pwd);
-        sysUserService.updateSelective(sysUser);
+        sysUserService.updateById(sysUser);
         return HttpResult.ok("修改成功");
     }
 
@@ -238,17 +282,23 @@ public class SysUserController extends BaseController {
         if (StringUtils.isEmpty(id) || StringUtils.isEmpty(mobile)) {
             return HttpResult.error("ID和手机号不能为空");
         }
-        SysUser sysUser = sysUserService.selectByPk(id);
+        SysUser sysUser = sysUserService.getById(id);
         if (sysUser == null) {
             return HttpResult.error("ID不存在");
         }
-        List<SysUser> users = sysUserService.selectList(" where id != ? and mobile=?", new Object[]{id, mobile});
+
+        LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
+        lqw.ne(SysUser::getId,id);
+        lqw.eq(SysUser::getMobile,mobile);
+
+        List<SysUser> users = sysUserService.list(lqw);
+//        List<SysUser> users = sysUserService.selectList(" where id != ? and mobile=?", new Object[]{id, mobile});
         if (users != null && users.size() > 0) {
             return HttpResult.error("手机号已存在");
         }
 
         sysUser.setMobile(mobile);
-        sysUserService.updateSelective(sysUser);
+        sysUserService.updateById(sysUser);
         return HttpResult.ok("修改成功");
     }
 
@@ -260,7 +310,11 @@ public class SysUserController extends BaseController {
      */
     @GetMapping(value = "/findById")
     public HttpResult findByUserId(@RequestParam String id) {
-        SysUserVO sysUserVO = sysUserService.selectById(id);
+        SysUser sysUser = sysUserService.getById(id);
+        SysUserVO sysUserVO = new SysUserVO();
+
+        sysUserVO = sysUserService.gainUserInternal(id);
+//        SysUserVO sysUserVO = sysUserService.selectById(id);
         if (sysUserVO != null) {
             return HttpResult.ok(sysUserVO);
         }
@@ -275,6 +329,7 @@ public class SysUserController extends BaseController {
      */
     @GetMapping(value = "/selectByDeptId")
     public HttpResult selectByDeptId(String deptId) {
-        return HttpResult.ok(sysUserService.selectByDeptId(deptId));
+        return HttpResult.ok(sysUserService.gainUserInternalByDeptId(deptId));
+//        return HttpResult.ok(sysUserService.selectByDeptId(deptId));
     }
 }

src/main/java/com/ydtech/modules/admin/dao/SysMenuMapper.java

@@ -0,0 +1,12 @@
+package com.ydtech.modules.admin.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.admin.model.SysMenu;
+
+public interface SysMenuMapper extends BaseMapper<SysMenu> {
+
+}
+
+
+

src/main/java/com/ydtech/modules/admin/dao/SysRoleDao.java

@@ -1,36 +1,36 @@
-package com.ydtech.modules.admin.dao;
-
-import com.ydtech.core.page.PageResult;
-import com.ydtech.modules.admin.model.SysRole;
-
-import java.util.List;
-
-public interface SysRoleDao {
-
-    public SysRole selectByPk(Long id);
-
-    public List<SysRole> selectAll();
-
-    public List<SysRole> selectList(String whereCase, Object[] paramValues);
-
-    public Integer count(String whereCase, Object[] paramValues);
-
-    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues);
-
-    public Integer insert(SysRole model);
-
-    public Integer insertReturnPk(SysRole model);
-
-    public Integer insertSelective(SysRole model);
-
-    public Integer update(SysRole model);
-
-    public Integer updateSelective(SysRole model);
-
-    public Integer delete(Long id);
-
-    public Integer delete(List<SysRole> lsSysRole);
-}
-
-
-
+//package com.ydtech.modules.admin.dao;
+//
+//import com.ydtech.core.page.PageResult;
+//import com.ydtech.modules.admin.model.SysRole;
+//
+//import java.util.List;
+//
+//public interface SysRoleDao {
+//
+//    public SysRole selectByPk(Long id);
+//
+//    public List<SysRole> selectAll();
+//
+//    public List<SysRole> selectList(String whereCase, Object[] paramValues);
+//
+//    public Integer count(String whereCase, Object[] paramValues);
+//
+//    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues);
+//
+//    public Integer insert(SysRole model);
+//
+//    public Integer insertReturnPk(SysRole model);
+//
+//    public Integer insertSelective(SysRole model);
+//
+//    public Integer update(SysRole model);
+//
+//    public Integer updateSelective(SysRole model);
+//
+//    public Integer delete(Long id);
+//
+//    public Integer delete(List<SysRole> lsSysRole);
+//}
+//
+//
+//

src/main/java/com/ydtech/modules/admin/dao/SysRoleMapper.java

@@ -0,0 +1,38 @@
+package com.ydtech.modules.admin.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.admin.model.SysDept;
+import com.ydtech.modules.admin.model.SysRole;
+
+import java.util.List;
+
+public interface SysRoleMapper extends BaseMapper<SysRole> {
+
+//    public SysRole selectByPk(Long id);
+//
+//    public List<SysRole> selectAll();
+//
+//    public List<SysRole> selectList(String whereCase, Object[] paramValues);
+//
+//    public Integer count(String whereCase, Object[] paramValues);
+//
+//    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues);
+//
+//    public Integer insert(SysRole model);
+//
+//    public Integer insertReturnPk(SysRole model);
+//
+//    public Integer insertSelective(SysRole model);
+//
+//    public Integer update(SysRole model);
+//
+//    public Integer updateSelective(SysRole model);
+//
+//    public Integer delete(Long id);
+//
+//    public Integer delete(List<SysRole> lsSysRole);
+}
+
+
+

src/main/java/com/ydtech/modules/admin/dao/SysRoleMenuMapper.java

@@ -0,0 +1,28 @@
+package com.ydtech.modules.admin.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.admin.model.SysMenu;
+import com.ydtech.modules.admin.model.SysRoleMenu;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
+
+    String SysMenuSql = "select t.id, t.name, t.parent_id, t.url, t.perms, t.type, t.icon, t.order_num, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag from sys_menu t ";
+    String sysRoleMenuIdSql = " where t.id in (select menu_id from sys_role_menu t1 left join sys_user_role t2 on t1.role_id=t2.role_id where t2.user_id='${userId}') and del_flag=0 ";
+    String SysMenuSqlT1 = SysMenuSql + sysRoleMenuIdSql;
+
+
+
+    /**
+     * 获取菜单id集
+     */
+    @Select(SysMenuSqlT1)
+    List<SysMenu> gainSysMenuIds(@Param("userId") String userId);
+
+}
+
+
+

src/main/java/com/ydtech/modules/admin/dao/SysUserMapper.java

@@ -1,9 +1,16 @@
 package com.ydtech.modules.admin.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.admin.model.SysMenu;
 import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.vo.SysUserVO;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author Administrator
  * @description 针对表【sys_user(用户管理)】的数据库操作Mapper
@@ -13,6 +20,25 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
+    String internalUserSql = "select t.id,t.name,t.dept_id deptid,t2.name deptname,t3.id comid,t3.name comname,t.status " +
+            "from sys_user t left join sys_dept t2 on t.dept_id=t2.id " +
+            "left join sys_dept t3 on t2.parent_id=t3.id " +
+            "left join esm_user_internal a on t.id=a.id " +
+            "where t.id='${userId}'";
+
+    String internalUserByDeptIdSql = "select t1.id,t1.name,t1.dept_id deptid,sd.name deptname,sd2.id comid,sd2.name comname,t2.status " +
+            "from sys_user t1 left join esm_user_internal t2 on t1.id=t2.id " +
+            "LEFT JOIN sys_dept sd ON t1.dept_id=sd.id " +
+            "LEFT JOIN sys_dept sd2 ON sd2.id=sd.parent_id " +
+            "where 1=1  and t2.isteamleader = '1' and t1.dept_id='${deptId}'";
+
+    @Select(internalUserSql)
+    SysUserVO gainInternalUser(@Param("userId") String userId);
+
+
+    @Select(internalUserByDeptIdSql)
+    SysUserVO gainInternalUserByDeptId(@Param("deptId") String deptId);
+
 }
 
 

src/main/java/com/ydtech/modules/admin/dao/impl/SysRoleDaoImpl.java

@@ -1,319 +1,319 @@
-
-
-
-package com.ydtech.modules.admin.dao.impl;
-
-import com.github.drinkjava2.jdialects.Dialect;
-import com.ydtech.core.page.PageResult;
-import com.ydtech.modules.admin.dao.SysRoleDao;
-import com.ydtech.modules.admin.model.SysRole;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.support.DataAccessUtils;
-import org.springframework.jdbc.core.*;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
-import org.springframework.stereotype.Repository;
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-
-@Repository
-public class SysRoleDaoImpl implements SysRoleDao {
-
-    @Autowired
-    public DataSource dataSource;
-
-    public static class SysRoleRowMapper implements RowMapper {
-        public SysRole mapRow(ResultSet resultSet, int rowNum) throws SQLException {
-            SysRole model = new SysRole();
-
-            model.setId(resultSet.getLong("id"));
-            model.setName(resultSet.getString("name"));
-            model.setRemark(resultSet.getString("remark"));
-            model.setCreateBy(resultSet.getString("create_by"));
-            model.setCreateTime(resultSet.getDate("create_time"));
-            model.setLastUpdateBy(resultSet.getString("last_update_by"));
-            model.setLastUpdateTime(resultSet.getDate("last_update_time"));
-            model.setDelFlag(resultSet.getInt("del_flag"));
-            return model;
-        }
-    }
-
-    @Override
-    public SysRole selectByPk(Long id) {
-        String sql = "select t.id, t.name, t.remark, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag from sys_role t  where id=?";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        List<SysRole> query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<SysRole>(SysRole.class), new Object[]{id});
-
-        return DataAccessUtils.uniqueResult(query);
-    }
-
-    @Override
-    public List<SysRole> selectAll() {
-        String sql = "select t.id, t.name, t.remark, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag from sys_role t  ";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        return jdbcTemplate.query(sql, new SysRoleRowMapper());
-    }
-
-    public List<SysRole> selectList(String whereCase, Object[] paramValues) {
-        String sql = "select t.id, t.name, t.remark, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag from sys_role t  " + whereCase;
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        return jdbcTemplate.query(sql, paramValues, new SysRoleRowMapper());
-    }
-
-    public Integer count(String whereCase, Object[] paramValues) {
-        String sql = "select count(1) from sys_role t " + whereCase;
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        return jdbcTemplate.queryForObject(sql, paramValues, Integer.class);
-    }
-
-    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues) {
-
-        Dialect dialect = Dialect.guessDialect(dataSource);
-        String sql = dialect.pagin(pageNumber, pageSize, "select t.id, t.name, t.remark, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag from sys_role t  " + whereCase);
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-        List<SysRole> recordList = jdbcTemplate.query(sql, paramValues, new SysRoleRowMapper());
-
-        int totalCount = count(whereCase, paramValues);
-
-        PageResult PageResult = new PageResult(pageNumber, pageSize, totalCount, recordList);
-
-        return PageResult;
-    }
-
-
-    @Override
-    public Integer insert(SysRole model) {
-
-        String sql = "insert into sys_role ( id, name, remark, create_by, create_time, last_update_by, last_update_time, del_flag) values ( ?, ?, ?, ?, ?, ?, ?, ?) ";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        Object[] params = new Object[]{model.getId(), model.getName(), model.getRemark(), model.getCreateBy(), model.getCreateTime(), model.getLastUpdateBy(), model.getLastUpdateTime(), model.getDelFlag()};
-
-        int out = jdbcTemplate.update(sql, params);
-
-        return out;
-    }
-
-    @Override
-    public Integer insertReturnPk(SysRole model) {
-
-        String sql = "insert into sys_role ( id, name, remark, create_by, create_time, last_update_by, last_update_time, del_flag) values ( ?, ?, ?, ?, ?, ?, ?, ?) ";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        KeyHolder keyHolder = new GeneratedKeyHolder();
-        jdbcTemplate.update(new PreparedStatementCreator() {
-            @Override
-            public PreparedStatement createPreparedStatement(Connection conn) throws SQLException {
-                PreparedStatement ps = conn.prepareStatement(sql, PreparedStatement.RETURN_GENERATED_KEYS);
-                ps.setObject(1, model.getId());
-                ps.setObject(2, model.getName());
-                ps.setObject(3, model.getRemark());
-                ps.setObject(4, model.getCreateBy());
-                ps.setObject(5, model.getCreateTime());
-                ps.setObject(6, model.getLastUpdateBy());
-                ps.setObject(7, model.getLastUpdateTime());
-                ps.setObject(8, model.getDelFlag());
-                return ps;
-            }
-        }, keyHolder);
-
-        return keyHolder.getKey().intValue();
-    }
-
-
-    @Override
-    public Integer insertSelective(SysRole model) {
-
-        StringBuffer sbSql = new StringBuffer();
-        StringBuffer sbParams = new StringBuffer();
-        ArrayList<Object> alParamsValues = new ArrayList<Object>();
-
-        String pre = "";
-
-        if (model.getId() != null) {
-            sbSql.append(pre + "id");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getId());
-            pre = ",";
-        }
-        if (model.getName() != null) {
-            sbSql.append(pre + "name");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getName());
-            pre = ",";
-        }
-        if (model.getRemark() != null) {
-            sbSql.append(pre + "remark");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getRemark());
-            pre = ",";
-        }
-        if (model.getCreateBy() != null) {
-            sbSql.append(pre + "create_by");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getCreateBy());
-            pre = ",";
-        }
-        if (model.getCreateTime() != null) {
-            sbSql.append(pre + "create_time");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getCreateTime());
-            pre = ",";
-        }
-        if (model.getLastUpdateBy() != null) {
-            sbSql.append(pre + "last_update_by");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getLastUpdateBy());
-            pre = ",";
-        }
-        if (model.getLastUpdateTime() != null) {
-            sbSql.append(pre + "last_update_time");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getLastUpdateTime());
-            pre = ",";
-        }
-        if (model.getDelFlag() != null) {
-            sbSql.append(pre + "del_flag");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getDelFlag());
-            pre = ",";
-        }
-
-
-        String sql = "INSERT INTO sys_role (" + sbSql.toString() + ") VALUES (" + sbParams.toString() + ")";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        Object[] params = alParamsValues.toArray();
-
-        int out = jdbcTemplate.update(sql, params);
-
-        return out;
-    }
-
-    @Override
-    public Integer update(SysRole model) {
-
-        String sql = "update sys_role set name=?, remark=?, create_by=?, create_time=?, last_update_by=?, last_update_time=?, del_flag=? where id=?";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        Object[] params = new Object[]{model.getName(), model.getRemark(), model.getCreateBy(), model.getCreateTime(), model.getLastUpdateBy(), model.getLastUpdateTime(), model.getDelFlag(), model.getId()};
-
-        return jdbcTemplate.update(sql, params);
-    }
-
-    @Override
-    public Integer updateSelective(SysRole model) {
-
-        StringBuffer sbSql = new StringBuffer();
-        StringBuffer sbParams = new StringBuffer();
-        ArrayList<Object> alParamsValues = new ArrayList<Object>();
-
-        String pre = "";
-        String preWhere = "";
-
-        if (model.getName() != null) {
-            sbSql.append(pre + "name=?");
-            alParamsValues.add(model.getName());
-            pre = ",";
-        }
-        if (model.getRemark() != null) {
-            sbSql.append(pre + "remark=?");
-            alParamsValues.add(model.getRemark());
-            pre = ",";
-        }
-        if (model.getCreateBy() != null) {
-            sbSql.append(pre + "create_by=?");
-            alParamsValues.add(model.getCreateBy());
-            pre = ",";
-        }
-        if (model.getCreateTime() != null) {
-            sbSql.append(pre + "create_time=?");
-            alParamsValues.add(model.getCreateTime());
-            pre = ",";
-        }
-        if (model.getLastUpdateBy() != null) {
-            sbSql.append(pre + "last_update_by=?");
-            alParamsValues.add(model.getLastUpdateBy());
-            pre = ",";
-        }
-        if (model.getLastUpdateTime() != null) {
-            sbSql.append(pre + "last_update_time=?");
-            alParamsValues.add(model.getLastUpdateTime());
-            pre = ",";
-        }
-        if (model.getDelFlag() != null) {
-            sbSql.append(pre + "del_flag=?");
-            alParamsValues.add(model.getDelFlag());
-            pre = ",";
-        }
-        if (model.getId() != null) {
-            sbParams.append(preWhere + "id=?");
-            alParamsValues.add(model.getId());
-            preWhere = ",";
-        }
-
-
-        if (!sbSql.toString().equalsIgnoreCase("")) {
-            String sql = "update sys_role set " + sbSql.toString() + " where " + sbParams.toString();
-
-            JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-            Object[] params = alParamsValues.toArray();
-
-            return jdbcTemplate.update(sql, params);
-        }
-
-        return 0;
-    }
-
-    @Override
-    public Integer delete(Long id) {
-
-        String sql = "delete from sys_role where id=?";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        return jdbcTemplate.update(sql, id);
-    }
-
-    @Override
-    public Integer delete(List<SysRole> lsSysRole) {
-        String sql = "delete from sys_role where id=?";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        return jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
-            @Override
-            public void setValues(PreparedStatement preparedStatement, int i) throws SQLException {
-                preparedStatement.setLong(1, lsSysRole.get(i).getId());
-            }
-
-            @Override
-            public int getBatchSize() {
-                return lsSysRole.size();
-            }
-        }).length;
-    }
-}
-
-
+//
+//
+//
+//package com.ydtech.modules.admin.dao.impl;
+//
+//import com.github.drinkjava2.jdialects.Dialect;
+//import com.ydtech.core.page.PageResult;
+//import com.ydtech.modules.admin.dao.SysRoleDao;
+//import com.ydtech.modules.admin.model.SysRole;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.dao.support.DataAccessUtils;
+//import org.springframework.jdbc.core.*;
+//import org.springframework.jdbc.support.GeneratedKeyHolder;
+//import org.springframework.jdbc.support.KeyHolder;
+//import org.springframework.stereotype.Repository;
+//
+//import javax.sql.DataSource;
+//import java.sql.Connection;
+//import java.sql.PreparedStatement;
+//import java.sql.ResultSet;
+//import java.sql.SQLException;
+//import java.util.ArrayList;
+//import java.util.List;
+//
+//
+//@Repository
+//public class SysRoleDaoImpl implements SysRoleDao {
+//
+//    @Autowired
+//    public DataSource dataSource;
+//
+//    public static class SysRoleRowMapper implements RowMapper {
+//        public SysRole mapRow(ResultSet resultSet, int rowNum) throws SQLException {
+//            SysRole model = new SysRole();
+//
+//            model.setId(resultSet.getLong("id"));
+//            model.setName(resultSet.getString("name"));
+//            model.setRemark(resultSet.getString("remark"));
+//            model.setCreateBy(resultSet.getString("create_by"));
+//            model.setCreateTime(resultSet.getDate("create_time"));
+//            model.setLastUpdateBy(resultSet.getString("last_update_by"));
+//            model.setLastUpdateTime(resultSet.getDate("last_update_time"));
+//            model.setDelFlag(resultSet.getInt("del_flag"));
+//            return model;
+//        }
+//    }
+//
+//    @Override
+//    public SysRole selectByPk(Long id) {
+//        String sql = "select t.id, t.name, t.remark, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag from sys_role t  where id=?";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        List<SysRole> query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<SysRole>(SysRole.class), new Object[]{id});
+//
+//        return DataAccessUtils.uniqueResult(query);
+//    }
+//
+//    @Override
+//    public List<SysRole> selectAll() {
+//        String sql = "select t.id, t.name, t.remark, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag from sys_role t  ";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        return jdbcTemplate.query(sql, new SysRoleRowMapper());
+//    }
+//
+//    public List<SysRole> selectList(String whereCase, Object[] paramValues) {
+//        String sql = "select t.id, t.name, t.remark, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag from sys_role t  " + whereCase;
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        return jdbcTemplate.query(sql, paramValues, new SysRoleRowMapper());
+//    }
+//
+//    public Integer count(String whereCase, Object[] paramValues) {
+//        String sql = "select count(1) from sys_role t " + whereCase;
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        return jdbcTemplate.queryForObject(sql, paramValues, Integer.class);
+//    }
+//
+//    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues) {
+//
+//        Dialect dialect = Dialect.guessDialect(dataSource);
+//        String sql = dialect.pagin(pageNumber, pageSize, "select t.id, t.name, t.remark, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag from sys_role t  " + whereCase);
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//        List<SysRole> recordList = jdbcTemplate.query(sql, paramValues, new SysRoleRowMapper());
+//
+//        int totalCount = count(whereCase, paramValues);
+//
+//        PageResult PageResult = new PageResult(pageNumber, pageSize, totalCount, recordList);
+//
+//        return PageResult;
+//    }
+//
+//
+//    @Override
+//    public Integer insert(SysRole model) {
+//
+//        String sql = "insert into sys_role ( id, name, remark, create_by, create_time, last_update_by, last_update_time, del_flag) values ( ?, ?, ?, ?, ?, ?, ?, ?) ";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        Object[] params = new Object[]{model.getId(), model.getName(), model.getRemark(), model.getCreateBy(), model.getCreateTime(), model.getLastUpdateBy(), model.getLastUpdateTime(), model.getDelFlag()};
+//
+//        int out = jdbcTemplate.update(sql, params);
+//
+//        return out;
+//    }
+//
+//    @Override
+//    public Integer insertReturnPk(SysRole model) {
+//
+//        String sql = "insert into sys_role ( id, name, remark, create_by, create_time, last_update_by, last_update_time, del_flag) values ( ?, ?, ?, ?, ?, ?, ?, ?) ";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        KeyHolder keyHolder = new GeneratedKeyHolder();
+//        jdbcTemplate.update(new PreparedStatementCreator() {
+//            @Override
+//            public PreparedStatement createPreparedStatement(Connection conn) throws SQLException {
+//                PreparedStatement ps = conn.prepareStatement(sql, PreparedStatement.RETURN_GENERATED_KEYS);
+//                ps.setObject(1, model.getId());
+//                ps.setObject(2, model.getName());
+//                ps.setObject(3, model.getRemark());
+//                ps.setObject(4, model.getCreateBy());
+//                ps.setObject(5, model.getCreateTime());
+//                ps.setObject(6, model.getLastUpdateBy());
+//                ps.setObject(7, model.getLastUpdateTime());
+//                ps.setObject(8, model.getDelFlag());
+//                return ps;
+//            }
+//        }, keyHolder);
+//
+//        return keyHolder.getKey().intValue();
+//    }
+//
+//
+//    @Override
+//    public Integer insertSelective(SysRole model) {
+//
+//        StringBuffer sbSql = new StringBuffer();
+//        StringBuffer sbParams = new StringBuffer();
+//        ArrayList<Object> alParamsValues = new ArrayList<Object>();
+//
+//        String pre = "";
+//
+//        if (model.getId() != null) {
+//            sbSql.append(pre + "id");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getId());
+//            pre = ",";
+//        }
+//        if (model.getName() != null) {
+//            sbSql.append(pre + "name");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getName());
+//            pre = ",";
+//        }
+//        if (model.getRemark() != null) {
+//            sbSql.append(pre + "remark");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getRemark());
+//            pre = ",";
+//        }
+//        if (model.getCreateBy() != null) {
+//            sbSql.append(pre + "create_by");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getCreateBy());
+//            pre = ",";
+//        }
+//        if (model.getCreateTime() != null) {
+//            sbSql.append(pre + "create_time");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getCreateTime());
+//            pre = ",";
+//        }
+//        if (model.getLastUpdateBy() != null) {
+//            sbSql.append(pre + "last_update_by");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getLastUpdateBy());
+//            pre = ",";
+//        }
+//        if (model.getLastUpdateTime() != null) {
+//            sbSql.append(pre + "last_update_time");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getLastUpdateTime());
+//            pre = ",";
+//        }
+//        if (model.getDelFlag() != null) {
+//            sbSql.append(pre + "del_flag");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getDelFlag());
+//            pre = ",";
+//        }
+//
+//
+//        String sql = "INSERT INTO sys_role (" + sbSql.toString() + ") VALUES (" + sbParams.toString() + ")";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        Object[] params = alParamsValues.toArray();
+//
+//        int out = jdbcTemplate.update(sql, params);
+//
+//        return out;
+//    }
+//
+//    @Override
+//    public Integer update(SysRole model) {
+//
+//        String sql = "update sys_role set name=?, remark=?, create_by=?, create_time=?, last_update_by=?, last_update_time=?, del_flag=? where id=?";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        Object[] params = new Object[]{model.getName(), model.getRemark(), model.getCreateBy(), model.getCreateTime(), model.getLastUpdateBy(), model.getLastUpdateTime(), model.getDelFlag(), model.getId()};
+//
+//        return jdbcTemplate.update(sql, params);
+//    }
+//
+//    @Override
+//    public Integer updateSelective(SysRole model) {
+//
+//        StringBuffer sbSql = new StringBuffer();
+//        StringBuffer sbParams = new StringBuffer();
+//        ArrayList<Object> alParamsValues = new ArrayList<Object>();
+//
+//        String pre = "";
+//        String preWhere = "";
+//
+//        if (model.getName() != null) {
+//            sbSql.append(pre + "name=?");
+//            alParamsValues.add(model.getName());
+//            pre = ",";
+//        }
+//        if (model.getRemark() != null) {
+//            sbSql.append(pre + "remark=?");
+//            alParamsValues.add(model.getRemark());
+//            pre = ",";
+//        }
+//        if (model.getCreateBy() != null) {
+//            sbSql.append(pre + "create_by=?");
+//            alParamsValues.add(model.getCreateBy());
+//            pre = ",";
+//        }
+//        if (model.getCreateTime() != null) {
+//            sbSql.append(pre + "create_time=?");
+//            alParamsValues.add(model.getCreateTime());
+//            pre = ",";
+//        }
+//        if (model.getLastUpdateBy() != null) {
+//            sbSql.append(pre + "last_update_by=?");
+//            alParamsValues.add(model.getLastUpdateBy());
+//            pre = ",";
+//        }
+//        if (model.getLastUpdateTime() != null) {
+//            sbSql.append(pre + "last_update_time=?");
+//            alParamsValues.add(model.getLastUpdateTime());
+//            pre = ",";
+//        }
+//        if (model.getDelFlag() != null) {
+//            sbSql.append(pre + "del_flag=?");
+//            alParamsValues.add(model.getDelFlag());
+//            pre = ",";
+//        }
+//        if (model.getId() != null) {
+//            sbParams.append(preWhere + "id=?");
+//            alParamsValues.add(model.getId());
+//            preWhere = ",";
+//        }
+//
+//
+//        if (!sbSql.toString().equalsIgnoreCase("")) {
+//            String sql = "update sys_role set " + sbSql.toString() + " where " + sbParams.toString();
+//
+//            JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//            Object[] params = alParamsValues.toArray();
+//
+//            return jdbcTemplate.update(sql, params);
+//        }
+//
+//        return 0;
+//    }
+//
+//    @Override
+//    public Integer delete(Long id) {
+//
+//        String sql = "delete from sys_role where id=?";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        return jdbcTemplate.update(sql, id);
+//    }
+//
+//    @Override
+//    public Integer delete(List<SysRole> lsSysRole) {
+//        String sql = "delete from sys_role where id=?";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        return jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
+//            @Override
+//            public void setValues(PreparedStatement preparedStatement, int i) throws SQLException {
+//                preparedStatement.setLong(1, lsSysRole.get(i).getId());
+//            }
+//
+//            @Override
+//            public int getBatchSize() {
+//                return lsSysRole.size();
+//            }
+//        }).length;
+//    }
+//}
+//
+//

src/main/java/com/ydtech/modules/admin/model/SysMenu.java

@@ -1,160 +1,53 @@
 package com.ydtech.modules.admin.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
+@Data
 public class SysMenu implements Serializable {
 
     private static final long serialVersionUID = 5450672001691053638L;
 
+    @TableId(value = "id")
     private String id;
+
+    @TableField(value = "name")
     private String name;
+    @TableField(value = "parent_id")
     private String parentId;
     private String url;
     private String perms;
     private Integer type;
     private String icon;
-    private Integer orderNum;
+    @TableField(value = "order_num")
+    private Integer orderNum = 0;
+    @TableField(value = "create_by")
     private String createBy;
+    @TableField(value = "create_time")
     private Date createTime;
+    @TableField(value = "last_update_by")
     private String lastUpdateBy;
+    @TableField(value = "last_update_time")
     private Date lastUpdateTime;
+    @TableField(value = "del_flag")
     private Integer delFlag;
     // 非数据库字段
+    @TableField(exist = false)
     private String parentName;
     // 非数据库字段
+    @TableField(exist = false)
     private Integer level;
     // 非数据库字段
+    @TableField(exist = false)
     private List<SysMenu> children;
 
-    public List<SysMenu> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<SysMenu> children) {
-        this.children = children;
-    }
-
-    public Integer getLevel() {
-        return level;
-    }
-
-    public void setLevel(Integer level) {
-        this.level = level;
-    }
-
-    public String getParentName() {
-        return parentName;
-    }
-
-    public void setParentName(String parentName) {
-        this.parentName = parentName;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(String parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getPerms() {
-        return perms;
-    }
-
-    public void setPerms(String perms) {
-        this.perms = perms;
-    }
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public String getIcon() {
-        return icon;
-    }
-
-    public void setIcon(String icon) {
-        this.icon = icon;
-    }
-
-    public Integer getOrderNum() {
-        return orderNum;
-    }
-
-    public void setOrderNum(Integer orderNum) {
-        this.orderNum = orderNum;
-    }
-
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getLastUpdateBy() {
-        return lastUpdateBy;
-    }
-
-    public void setLastUpdateBy(String lastUpdateBy) {
-        this.lastUpdateBy = lastUpdateBy;
-    }
-
-    public Date getLastUpdateTime() {
-        return lastUpdateTime;
-    }
-
-    public void setLastUpdateTime(Date lastUpdateTime) {
-        this.lastUpdateTime = lastUpdateTime;
-    }
 
-    public Integer getDelFlag() {
-        return delFlag;
-    }
 
-    public void setDelFlag(Integer delFlag) {
-        this.delFlag = delFlag;
-    }
 
 }
 

src/main/java/com/ydtech/modules/admin/service/SysMenuService.java

@@ -1,12 +1,14 @@
 package com.ydtech.modules.admin.service;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.admin.dao.SysMenuDao;
 import com.ydtech.modules.admin.model.SysMenu;
+import com.ydtech.modules.admin.model.SysRole;
 
 import java.util.List;
 
-public interface SysMenuService extends SysMenuDao {
+public interface SysMenuService extends IService<SysMenu> {
     public List<SysMenu> findTree(String userName, int menuType);
 
     public List<SysMenu> findByUser(String userName);

src/main/java/com/ydtech/modules/admin/service/SysRoleMenuService.java

@@ -1,14 +1,19 @@
 package com.ydtech.modules.admin.service;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.admin.dao.SysRoleMenuDao;
+import com.ydtech.modules.admin.model.SysMenu;
 import com.ydtech.modules.admin.model.SysRoleMenu;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-public interface SysRoleMenuService extends SysRoleMenuDao {
+public interface SysRoleMenuService extends IService<SysRoleMenu> {
 
     public Integer saveRoleMenus(List<SysRoleMenu> records);
+
+    List<SysMenu> gainMenuIds(String userId);
 }
 
 

src/main/java/com/ydtech/modules/admin/service/SysRoleService.java

@@ -1,15 +1,15 @@
 package com.ydtech.modules.admin.service;
 
 
-import com.ydtech.modules.admin.dao.SysRoleDao;
-import com.ydtech.modules.admin.model.SysMenu;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.admin.model.SysMenu;
 import com.ydtech.modules.admin.model.SysRole;
 
 import java.util.List;
 
-public interface SysRoleService extends SysRoleDao {
+public interface SysRoleService extends IService<SysRole> {
 
     SysRole findByName(String name);
 
@@ -17,10 +17,22 @@ public interface SysRoleService extends SysRoleDao {
 
     List<SysMenu> findRoleMenus(Long roleId);
 
-    Integer save(SysRole record);
+//    Integer save(SysRole record);
 
 
 }
+//public interface SysRoleService extends SysRoleDao {
+//
+//    SysRole findByName(String name);
+//
+//    PageResult findPage(PageRequest pageRequest);
+//
+//    List<SysMenu> findRoleMenus(Long roleId);
+//
+//    Integer save(SysRole record);
+//
+//
+//}
 
 
 

src/main/java/com/ydtech/modules/admin/service/SysUserRoleService.java

@@ -1,9 +1,15 @@
 package com.ydtech.modules.admin.service;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.admin.dao.SysUserRoleDao;
+import com.ydtech.modules.admin.model.SysRole;
+import com.ydtech.modules.admin.model.SysUserRole;
 
-public interface SysUserRoleService extends SysUserRoleDao {
+public interface SysUserRoleService extends IService<SysUserRole> {
+//public interface SysUserRoleService extends SysUserRoleDao {
+
+    SysUserRole selectByUserId(String userId);
 
 }
 

src/main/java/com/ydtech/modules/admin/service/SysUserService.java

@@ -1,15 +1,18 @@
 package com.ydtech.modules.admin.service;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.admin.dao.SysUserDao;
+import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.SysUserRole;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.admin.vo.SysUserVO;
 
 import java.util.List;
 import java.util.Set;
 
-public interface SysUserService extends SysUserDao {
+public interface SysUserService extends IService<SysUser> {
     SysUser findByUsername(String username);
 
     SysUser findByPhone(String phone);
@@ -40,7 +43,44 @@ public interface SysUserService extends SysUserDao {
     SysUser findById(String handlercode);
 
     SysUser findByUserId(String handlercode);
+
+    SysUserVO gainUserInternal(String userId);
+
+    SysUserVO gainUserInternalByDeptId(String deptId);
+
 }
+//public interface SysUserService extends SysUserDao {
+//    SysUser findByUsername(String username);
+//
+//    SysUser findByPhone(String phone);
+//
+//    /**
+//     * 查找用户的菜单权限标识集合
+//     *
+//     * @param sysUser
+//     * @return
+//     */
+////    Set<String> findPermissions(String userName);
+//    Set<String> findPermissions(SysUser sysUser);
+//
+//    /**
+//     * 查找用户的角色集合
+//     *
+//     * @param userId
+//     * @return
+//     */
+//    List<SysUserRole> findUserRoles(Long userId);
+//
+//    public PageResult selectPagingCustom(int pageNumber, int pageSize, String name, String deptCode);
+//
+//    public void findSysUseresmUserInternalVORoles(PageResult pageResult);
+//
+//    public Integer deleteFlag(List<SysUser> lsSysUser);
+//
+//    SysUser findById(String handlercode);
+//
+//    SysUser findByUserId(String handlercode);
+//}
 
 
 

src/main/java/com/ydtech/modules/admin/service/impl/SysMenuServiceImpl.java

@@ -1,20 +1,34 @@
 package com.ydtech.modules.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.constants.SysConstants;
+import com.ydtech.modules.admin.dao.SysMenuMapper;
+import com.ydtech.modules.admin.dao.SysRoleMapper;
 import com.ydtech.modules.admin.dao.impl.SysMenuDaoImpl;
 import com.ydtech.modules.admin.model.SysMenu;
+import com.ydtech.modules.admin.model.SysRole;
+import com.ydtech.modules.admin.model.SysRoleMenu;
+import com.ydtech.modules.admin.model.SysUserRole;
 import com.ydtech.modules.admin.service.SysMenuService;
+import com.ydtech.modules.admin.service.SysRoleMenuService;
+import com.ydtech.modules.admin.service.SysRoleService;
+import com.ydtech.modules.admin.service.SysUserRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Function;
 
 
 @Service
-public class SysMenuServiceImpl extends SysMenuDaoImpl
+public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu>
         implements SysMenuService {
 
+    @Autowired
+    private SysRoleMenuService sysRoleMenuService;
 
     @Override
     public List<SysMenu> findTree(String userName, int menuType) {
@@ -35,23 +49,47 @@ public class SysMenuServiceImpl extends SysMenuDaoImpl
 
     @Override
     public List<SysMenu> findByUser(String userName) {
+        LambdaQueryWrapper<SysMenu> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(SysMenu::getDelFlag, 0);
         if (userName == null || "".equals(userName) || SysConstants.ADMIN.equalsIgnoreCase(userName)) {
-//			return selectAll();
-            return selectList(" where 1=1 and del_flag=0", null);
+//            return selectList(" where 1=1 and del_flag=0", null);
+            return list(lqw);
         }
-        return selectList(" where t.id in (select menu_id from sys_role_menu t1 left join sys_user_role t2 on t1.role_id=t2.role_id where t2.user_id=?) and del_flag=0", new Object[]{userName});
+
+        return sysRoleMenuService.gainMenuIds(userName);
+
+//        return selectList(" where t.id in (select menu_id from sys_role_menu t1 left join sys_user_role t2 on t1.role_id=t2.role_id where t2.user_id=?) and del_flag=0", new Object[]{userName});
     }
 
     @Override
     public List<SysMenu> findRoleMenus(Long roleId) {
-        String sql = "select m.* from sys_menu m, sys_role_menu rm " +
-                "    where rm.role_id=" + roleId +
-                "    and m.id = rm.menu_id " +
-                "    and m.del_flag=0";
+        LambdaQueryWrapper<SysRoleMenu> srmLqw = new LambdaQueryWrapper<>();
+        srmLqw.select(SysRoleMenu::getMenuId);
+        srmLqw.eq(SysRoleMenu::getRoleId, roleId);
+        //查询获取对象具体字段的集合
+        List<Long> longs = sysRoleMenuService.listObjs(srmLqw, new Function<Object, Long>() {
+            @Override
+            public Long apply(Object id) {
+                //进行一系列转换操作 ，最终返回我们所需要的类型V ， 这里只做简单演示。
+                return Long.valueOf(id.toString());
+            }
+        });
+
+
+        LambdaQueryWrapper<SysMenu> smlqw = new LambdaQueryWrapper<>();
+        smlqw.eq(SysMenu::getDelFlag, 0);
+        smlqw.in(SysMenu::getId, longs);
+        return list(smlqw);
 
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
 
-        return jdbcTemplate.query(sql, new SysMenuRowMapper());
+//        String sql = "select m.* from sys_menu m, sys_role_menu rm " +
+//                "    where rm.role_id=" + roleId +
+//                "    and m.id = rm.menu_id " +
+//                "    and m.del_flag=0";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        return jdbcTemplate.query(sql, new SysMenuRowMapper());
     }
 
     private void findChildren(List<SysMenu> SysMenus, List<SysMenu> menus, int menuType) {

src/main/java/com/ydtech/modules/admin/service/impl/SysRoleMenuServiceImpl.java

@@ -1,7 +1,12 @@
 package com.ydtech.modules.admin.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.admin.dao.SysMenuMapper;
+import com.ydtech.modules.admin.dao.SysRoleMenuMapper;
 import com.ydtech.modules.admin.dao.impl.SysRoleMenuDaoImpl;
+import com.ydtech.modules.admin.model.SysMenu;
 import com.ydtech.modules.admin.model.SysRoleMenu;
+import com.ydtech.modules.admin.service.SysMenuService;
 import com.ydtech.modules.admin.service.SysRoleMenuService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -10,7 +15,7 @@ import java.util.List;
 
 
 @Service
-public class SysRoleMenuServiceImpl extends SysRoleMenuDaoImpl
+public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRoleMenu>
         implements SysRoleMenuService {
 
     @Transactional
@@ -20,13 +25,18 @@ public class SysRoleMenuServiceImpl extends SysRoleMenuDaoImpl
             return 1;
         }
         Long roleId = records.get(0).getRoleId();
-        delete(roleId);
+        removeById(roleId);
         for (SysRoleMenu record : records) {
-            insertSelective(record);
+            save(record);
         }
         return 1;
     }
 
+    @Override
+    public List<SysMenu> gainMenuIds(String userId) {
+        return super.baseMapper.gainSysMenuIds(userId);
+    }
+
 }
 
 

src/main/java/com/ydtech/modules/admin/service/impl/SysRoleServiceImpl.java

@@ -1,10 +1,14 @@
 package com.ydtech.modules.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.constants.SysConstants;
 import com.ydtech.core.page.ColumnFilter;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
-import com.ydtech.modules.admin.dao.impl.SysRoleDaoImpl;
+import com.ydtech.modules.admin.dao.SysRoleMapper;
 import com.ydtech.modules.admin.model.SysMenu;
 import com.ydtech.modules.admin.model.SysRole;
 import com.ydtech.modules.admin.service.SysMenuService;
@@ -17,15 +21,19 @@ import java.util.List;
 
 
 @Service
-public class SysRoleServiceImpl extends SysRoleDaoImpl
+public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole>
         implements SysRoleService {
 
+
     @Autowired
     private SysMenuService sysMenuService;
 
     @Override
     public SysRole findByName(String name) {
-        List<SysRole> sysRoles = selectList(" where name=?", new Object[]{name.trim()});
+        LambdaQueryWrapper<SysRole> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(SysRole::getName,name);
+        List<SysRole> sysRoles = list(lqw);
+//        List<SysRole> sysRoles = selectList(" where name=?", new Object[]{name.trim()});
         if (sysRoles != null && sysRoles.size() > 0) {
             return sysRoles.get(0);
         }
@@ -36,38 +44,101 @@ public class SysRoleServiceImpl extends SysRoleDaoImpl
     @Override
     public PageResult findPage(PageRequest pageRequest) {
         ColumnFilter columnFilter = pageRequest.getColumnFilter("name");
-        if (columnFilter != null && columnFilter.getValue() != null) {
-            String name = columnFilter.getValue();
-            return selectPaging(pageRequest.getPageNum(), pageRequest.getPageSize(), " where name like ?", new Object[]{"%" + name + "%"});
-        }
-        return selectPaging(pageRequest.getPageNum(), pageRequest.getPageSize(), "", null);
+        String name = columnFilter.getValue();
+
+        Page p = PageRequest.buildPageRequest(pageRequest);
+        LambdaQueryWrapper<SysRole> lqw = new LambdaQueryWrapper<>();
+        lqw.like(StringUtils.isNotEmpty(name),SysRole::getName,name);
+        IPage<SysRole> pageList = page(p,lqw);
+        return PageResult.buildPageResult(pageList);
+
+
+//        if (columnFilter != null && columnFilter.getValue() != null) {
+//            String name = columnFilter.getValue();
+//
+//            return selectPaging(pageRequest.getPageNum(), pageRequest.getPageSize(), " where name like ?", new Object[]{"%" + name + "%"});
+//        }
+//        return selectPaging(pageRequest.getPageNum(), pageRequest.getPageSize(), "", null);
 
     }
 
     @Override
     public List<SysMenu> findRoleMenus(Long roleId) {
-        SysRole sysRole = selectByPk(roleId);
+        SysRole sysRole = getById(roleId);
+//        SysRole sysRole = selectByPk(roleId);
         if (SysConstants.ADMIN.equalsIgnoreCase(sysRole.getName())) {
             // 如果是超级管理员，返回全部
-            return sysMenuService.selectAll();
+            return sysMenuService.list();
         }
         return sysMenuService.findRoleMenus(roleId);
     }
 
-    @Override
-    public Integer save(SysRole record) {
-        Integer result = 0;
-        if (record != null && (StringUtils.isNullOrEmpty(record.getId()) || record.getId() == 0)) {
-            result = insertSelective(record);
-        } else {
-            result = updateSelective(record);
-        }
-
-        return result;
-    }
+//    @Override
+//    public Integer save(SysRole record) {
+//        Integer result = 0;
+//        if (record != null && (StringUtils.isNullOrEmpty(record.getId()) || record.getId() == 0)) {
+//            result = insertSelective(record);
+//        } else {
+//            result = updateSelective(record);
+//        }
+//
+//        return result;
+//    }
 
 
 }
+//@Service
+//public class SysRoleServiceImpl extends SysRoleDaoImpl
+//        implements SysRoleService {
+//
+//    @Autowired
+//    private SysMenuService sysMenuService;
+//
+//    @Override
+//    public SysRole findByName(String name) {
+//        List<SysRole> sysRoles = selectList(" where name=?", new Object[]{name.trim()});
+//        if (sysRoles != null && sysRoles.size() > 0) {
+//            return sysRoles.get(0);
+//        }
+//
+//        return null;
+//    }
+//
+//    @Override
+//    public PageResult findPage(PageRequest pageRequest) {
+//        ColumnFilter columnFilter = pageRequest.getColumnFilter("name");
+//        if (columnFilter != null && columnFilter.getValue() != null) {
+//            String name = columnFilter.getValue();
+//            return selectPaging(pageRequest.getPageNum(), pageRequest.getPageSize(), " where name like ?", new Object[]{"%" + name + "%"});
+//        }
+//        return selectPaging(pageRequest.getPageNum(), pageRequest.getPageSize(), "", null);
+//
+//    }
+//
+//    @Override
+//    public List<SysMenu> findRoleMenus(Long roleId) {
+//        SysRole sysRole = selectByPk(roleId);
+//        if (SysConstants.ADMIN.equalsIgnoreCase(sysRole.getName())) {
+//            // 如果是超级管理员，返回全部
+//            return sysMenuService.selectAll();
+//        }
+//        return sysMenuService.findRoleMenus(roleId);
+//    }
+//
+//    @Override
+//    public Integer save(SysRole record) {
+//        Integer result = 0;
+//        if (record != null && (StringUtils.isNullOrEmpty(record.getId()) || record.getId() == 0)) {
+//            result = insertSelective(record);
+//        } else {
+//            result = updateSelective(record);
+//        }
+//
+//        return result;
+//    }
+//
+//
+//}
 
 
 

src/main/java/com/ydtech/modules/admin/service/impl/SysUserRoleServiceImpl.java

@@ -1,15 +1,25 @@
 package com.ydtech.modules.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.admin.dao.SysUserRoleMapper;
 import com.ydtech.modules.admin.dao.impl.SysUserRoleDaoImpl;
+import com.ydtech.modules.admin.model.SysUserRole;
 import com.ydtech.modules.admin.service.SysUserRoleService;
 import org.springframework.stereotype.Service;
 
 
 @Service
-public class SysUserRoleServiceImpl extends SysUserRoleDaoImpl
+public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUserRole>
         implements SysUserRoleService {
 
 
+    @Override
+    public SysUserRole selectByUserId(String userId) {
+        LambdaQueryWrapper<SysUserRole> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(SysUserRole::getUserId,userId);
+        return getOne(lqw);
+    }
 }
 
 

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -1,11 +1,20 @@
 package com.ydtech.modules.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.core.page.PageResult;
-import com.ydtech.modules.admin.dao.impl.SysUserDaoImpl;
+import com.ydtech.modules.admin.dao.SysUserMapper;
+import com.ydtech.modules.admin.model.SysMenu;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.SysUserRole;
+import com.ydtech.modules.admin.service.SysMenuService;
+import com.ydtech.modules.admin.service.SysRoleMenuService;
 import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.admin.vo.SysUserVO;
 import com.ydtech.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
@@ -15,22 +24,25 @@ import java.sql.SQLException;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 
 @Service
-public class SysUserServiceImpl extends SysUserDaoImpl
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         implements SysUserService {
 
+    @Autowired
+    private SysMenuService sysMenuService;
+    @Autowired
+    private SysRoleMenuService sysRoleMenuService;
 
     @Override
     public SysUser findByUsername(String username) {
         SysUser sysUser = null;
-        if (!StringUtils.isNullOrEmpty(username)) {
-//			List<SysUser> lst = selectList(" where name=? ", new Object[]{username});
-            List<SysUser> lst = selectList(" where id=? ", new Object[]{username});
-            if (lst.size() > 0) {
-                sysUser = lst.get(0);
-            }
+        if (StringUtils.isNotEmpty(username)) {
+
+            sysUser = getById(username);
         }
 
         return sysUser;
@@ -39,12 +51,12 @@ public class SysUserServiceImpl extends SysUserDaoImpl
     @Override
     public SysUser findByPhone(String phone) {
         SysUser sysUser = null;
-        if (!StringUtils.isNullOrEmpty(phone)) {
-//			List<SysUser> lst = selectList(" where name=? ", new Object[]{username});
-            List<SysUser> lst = selectList(" where mobile=? ", new Object[]{phone});
-            if (lst.size() > 0) {
-                sysUser = lst.get(0);
-            }
+
+        LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(StringUtils.isNotEmpty(phone),SysUser::getMobile,phone);
+        List<SysUser> lst = list(lqw);
+        if (lst.size() > 0) {
+            sysUser = lst.get(0);
         }
 
         return sysUser;
@@ -54,22 +66,26 @@ public class SysUserServiceImpl extends SysUserDaoImpl
     public Set<String> findPermissions(SysUser sysUser) {
         Set<String> perms = new HashSet<>();
         String sql = "";
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
         List<String> lsPerms = null;
 
         if (sysUser.getId().equalsIgnoreCase("admin")) {
-            sql = "SELECT perms FROM sys_menu WHERE perms IS NOT NULL AND perms <> ''";
 
-            lsPerms = jdbcTemplate.queryForList(sql, String.class);
+            LambdaQueryWrapper<SysMenu> lqw = new LambdaQueryWrapper<>();
+            lqw.isNotNull(SysMenu::getPerms);
+            lqw.select(SysMenu::getPerms);
+            lsPerms = sysMenuService.listObjs(lqw, new Function<Object, String>() {
+                @Override
+                public String apply(Object id) {
+                    return id.toString();
+                }
+            });
+
         } else {
-            sql = "SELECT perms FROM sys_menu sm WHERE sm.id IN ( " +
-                    "SELECT menu_id FROM sys_role_menu srm, sys_user_role sur ,sys_user su " +
-                    "WHERE srm.role_id=sur.role_id " +
-                    "AND sur.user_id=su.id AND su.id=?) " +
-                    "AND perms IS NOT NULL AND perms <> ''"
-            ;
-
-            lsPerms = jdbcTemplate.queryForList(sql, String.class, sysUser.getId());
+
+            List<SysMenu> sysMenuList = sysRoleMenuService.gainMenuIds(sysUser.getId());
+
+            lsPerms = sysMenuList.stream().filter(a ->StringUtils.isNotEmpty(a.getPerms())).map(SysMenu::getPerms).collect(Collectors.toList());
+
         }
 
         if (lsPerms != null && lsPerms.size() > 0) {
@@ -82,6 +98,38 @@ public class SysUserServiceImpl extends SysUserDaoImpl
 
         return perms;
     }
+//    @Override
+//    public Set<String> findPermissions(SysUser sysUser) {
+//        Set<String> perms = new HashSet<>();
+//        String sql = "";
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//        List<String> lsPerms = null;
+//
+//        if (sysUser.getId().equalsIgnoreCase("admin")) {
+//            sql = "SELECT perms FROM sys_menu WHERE perms IS NOT NULL AND perms <> ''";
+//
+//            lsPerms = jdbcTemplate.queryForList(sql, String.class);
+//        } else {
+//            sql = "SELECT perms FROM sys_menu sm WHERE sm.id IN ( " +
+//                    "SELECT menu_id FROM sys_role_menu srm, sys_user_role sur ,sys_user su " +
+//                    "WHERE srm.role_id=sur.role_id " +
+//                    "AND sur.user_id=su.id AND su.id=?) " +
+//                    "AND perms IS NOT NULL AND perms <> ''"
+//            ;
+//
+//            lsPerms = jdbcTemplate.queryForList(sql, String.class, sysUser.getId());
+//        }
+//
+//        if (lsPerms != null && lsPerms.size() > 0) {
+//            for (String perm : lsPerms) {
+//                if (!StringUtils.isNullOrEmpty(perm)) {
+//                    perms.add(perm);
+//                }
+//            }
+//        }
+//
+//        return perms;
+//    }
 
     @Override
     public List<SysUserRole> findUserRoles(Long userId) {
@@ -100,27 +148,21 @@ public class SysUserServiceImpl extends SysUserDaoImpl
 
     @Override
     public Integer deleteFlag(List<SysUser> lsSysUser) {
-        String sql = "update sys_user set del_flag='1' where id=?";
 
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+        List<String> ids = lsSysUser.stream().map(SysUser::getId).collect(Collectors.toList());
+
+        LambdaUpdateWrapper<SysUser> lqw = new LambdaUpdateWrapper<>();
+        lqw.set(SysUser::getDelFlag,"1");
+        lqw.in(SysUser::getId,ids);
+        return update(lqw)==true?ids.size():0;
 
-        return jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
-            @Override
-            public void setValues(PreparedStatement preparedStatement, int i) throws SQLException {
-                preparedStatement.setString(1, lsSysUser.get(i).getId());
-            }
 
-            @Override
-            public int getBatchSize() {
-                return lsSysUser.size();
-            }
-        }).length;
     }
 
     @Override
     public SysUser findById(String id) {
         if (!StringUtils.isNullOrEmpty(id)) {
-            return selectByPk(id);
+            return getById(id);
         }
         return null;
     }
@@ -129,15 +171,143 @@ public class SysUserServiceImpl extends SysUserDaoImpl
     public SysUser findByUserId(String userId) {
         SysUser sysUser = null;
         if (!StringUtils.isNullOrEmpty(userId)) {
-            List<SysUser> lst = selectList(" where id=? ", new Object[]{userId});
-            if (lst.size() > 0) {
-                sysUser = lst.get(0);
-            }
+            sysUser = getById(userId);
         }
 
         return sysUser;
     }
+
+    @Override
+    public SysUserVO gainUserInternal(String userId) {
+        return super.baseMapper.gainInternalUser(userId);
+    }
+
+    @Override
+    public SysUserVO gainUserInternalByDeptId(String deptId) {
+        return super.baseMapper.gainInternalUserByDeptId(deptId);
+    }
 }
+//@Service
+//public class SysUserServiceImpl extends SysUserDaoImpl
+//        implements SysUserService {
+//
+//
+//    @Override
+//    public SysUser findByUsername(String username) {
+//        SysUser sysUser = null;
+//        if (!StringUtils.isNullOrEmpty(username)) {
+////			List<SysUser> lst = selectList(" where name=? ", new Object[]{username});
+//            List<SysUser> lst = selectList(" where id=? ", new Object[]{username});
+//            if (lst.size() > 0) {
+//                sysUser = lst.get(0);
+//            }
+//        }
+//
+//        return sysUser;
+//    }
+//
+//    @Override
+//    public SysUser findByPhone(String phone) {
+//        SysUser sysUser = null;
+//        if (!StringUtils.isNullOrEmpty(phone)) {
+////			List<SysUser> lst = selectList(" where name=? ", new Object[]{username});
+//            List<SysUser> lst = selectList(" where mobile=? ", new Object[]{phone});
+//            if (lst.size() > 0) {
+//                sysUser = lst.get(0);
+//            }
+//        }
+//
+//        return sysUser;
+//    }
+//
+//    @Override
+//    public Set<String> findPermissions(SysUser sysUser) {
+//        Set<String> perms = new HashSet<>();
+//        String sql = "";
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//        List<String> lsPerms = null;
+//
+//        if (sysUser.getId().equalsIgnoreCase("admin")) {
+//            sql = "SELECT perms FROM sys_menu WHERE perms IS NOT NULL AND perms <> ''";
+//
+//            lsPerms = jdbcTemplate.queryForList(sql, String.class);
+//        } else {
+//            sql = "SELECT perms FROM sys_menu sm WHERE sm.id IN ( " +
+//                    "SELECT menu_id FROM sys_role_menu srm, sys_user_role sur ,sys_user su " +
+//                    "WHERE srm.role_id=sur.role_id " +
+//                    "AND sur.user_id=su.id AND su.id=?) " +
+//                    "AND perms IS NOT NULL AND perms <> ''"
+//            ;
+//
+//            lsPerms = jdbcTemplate.queryForList(sql, String.class, sysUser.getId());
+//        }
+//
+//        if (lsPerms != null && lsPerms.size() > 0) {
+//            for (String perm : lsPerms) {
+//                if (!StringUtils.isNullOrEmpty(perm)) {
+//                    perms.add(perm);
+//                }
+//            }
+//        }
+//
+//        return perms;
+//    }
+//
+//    @Override
+//    public List<SysUserRole> findUserRoles(Long userId) {
+//        return null;
+//    }
+//
+//    @Override
+//    public PageResult selectPagingCustom(int pageNumber, int pageSize, String name, String deptCode) {
+//        return null;
+//    }
+//
+//    @Override
+//    public void findSysUseresmUserInternalVORoles(PageResult pageResult) {
+//
+//    }
+//
+//    @Override
+//    public Integer deleteFlag(List<SysUser> lsSysUser) {
+//        String sql = "update sys_user set del_flag='1' where id=?";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        return jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
+//            @Override
+//            public void setValues(PreparedStatement preparedStatement, int i) throws SQLException {
+//                preparedStatement.setString(1, lsSysUser.get(i).getId());
+//            }
+//
+//            @Override
+//            public int getBatchSize() {
+//                return lsSysUser.size();
+//            }
+//        }).length;
+//    }
+//
+//    @Override
+//    public SysUser findById(String id) {
+//        if (!StringUtils.isNullOrEmpty(id)) {
+//            return selectByPk(id);
+//        }
+//        return null;
+//    }
+//
+//    @Override
+//    public SysUser findByUserId(String userId) {
+//        SysUser sysUser = null;
+//        if (!StringUtils.isNullOrEmpty(userId)) {
+//            List<SysUser> lst = selectList(" where id=? ", new Object[]{userId});
+//            if (lst.size() > 0) {
+//                sysUser = lst.get(0);
+//            }
+//        }
+//
+//        return sysUser;
+//    }
+//}
 
 
 

src/main/java/com/ydtech/modules/esm/controller/EsmUserInternalCheckController.java

@@ -2,6 +2,7 @@ package com.ydtech.modules.esm.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
@@ -132,13 +133,13 @@ public class EsmUserInternalCheckController extends BaseController {
                 // 插入正式表
                 SysUser sysUser = new SysUser();
                 BeanUtils.copyProperties(sysUserCheck, sysUser);
-                result = sysUserService.insertSelective(sysUser);
+                result = sysUserService.save(sysUser)==true?1:0;
 
                 //角色配置
                 SysUserRole userRole = new SysUserRole();
                 userRole.setUserId(nextPK);
                 userRole.setRoleId(2L);
-                sysUserRoleService.insertSelective(userRole);
+                sysUserRoleService.save(userRole);
 
                 if (esmUserInternalCheck != null) {
                     esmUserInternalCheck.setCheckid(checkid);
@@ -154,7 +155,11 @@ public class EsmUserInternalCheckController extends BaseController {
                 }
             } else if (StringUtils.isNullOrEmpty(sysUserCheck.getCheckid())) { //修改正式信息后提交
                 if (!StringUtils.isNullOrEmpty(sysUserCheck.getMobile())) {
-                    List<SysUser> users = sysUserService.selectList(" where id != ? and mobile=?", new Object[]{sysUserCheck.getId(), sysUserCheck.getMobile()});
+//                    List<SysUser> users = sysUserService.selectList(" where id != ? and mobile=?", new Object[]{sysUserCheck.getId(), sysUserCheck.getMobile()});
+                    LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
+                    lqw.ne(SysUser::getId,sysUserCheck.getId());
+                    lqw.eq(SysUser::getMobile,sysUserCheck.getMobile());
+                    List<SysUser> users = sysUserService.list(lqw);
                     if (users != null && users.size() > 0) {
                         return HttpResult.error("手机号已存在");
                     }
@@ -189,7 +194,11 @@ public class EsmUserInternalCheckController extends BaseController {
                 }
             } else {// 退回修改后重新提交
                 if (!StringUtils.isNullOrEmpty(sysUserCheck.getMobile())) {
-                    List<SysUser> users = sysUserService.selectList(" where id != ? and mobile=?", new Object[]{sysUserCheck.getId(), sysUserCheck.getMobile()});
+                    LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
+                    lqw.ne(SysUser::getId,sysUserCheck.getId());
+                    lqw.eq(SysUser::getMobile,sysUserCheck.getMobile());
+                    List<SysUser> users = sysUserService.list(lqw);
+//                    List<SysUser> users = sysUserService.selectList(" where id != ? and mobile=?", new Object[]{sysUserCheck.getId(), sysUserCheck.getMobile()});
                     if (users != null && users.size() > 0) {
                         return HttpResult.error("手机号已存在");
                     }
@@ -387,7 +396,7 @@ public class EsmUserInternalCheckController extends BaseController {
         if (StringUtils.isNullOrEmpty(recommenderid)) {
             return HttpResult.error("推荐人ID不能为空");
         }
-        SysUser recommender = sysUserService.selectByPk(recommenderid);
+        SysUser recommender = sysUserService.getById(recommenderid);
         if (recommender == null) {
             return HttpResult.error("推荐人信息不存在");
         }
@@ -441,13 +450,13 @@ public class EsmUserInternalCheckController extends BaseController {
         // 插入正式表
         sysUser = new SysUser();
         BeanUtils.copyProperties(sysUserCheck, sysUser);
-        result = sysUserService.insertSelective(sysUser);
+        result = sysUserService.save(sysUser)==true?1:0;
 
         //角色配置
         SysUserRole userRole = new SysUserRole();
         userRole.setUserId(nextPK);
         userRole.setRoleId(2L);
-        sysUserRoleService.insertSelective(userRole);
+        sysUserRoleService.save(userRole);
 
         esmUserInternalCheck.setCheckid(checkid);
         esmUserInternalCheck.setId(nextPK);
@@ -478,7 +487,7 @@ public class EsmUserInternalCheckController extends BaseController {
     public HttpResult updateName(HttpServletRequest request, @RequestBody EsmUserCheck record) {
         //得到操作用户
         String res = "更新成功";
-        SysUser sysUser = sysUserService.selectByPk(record.getId());
+        SysUser sysUser = sysUserService.getById(record.getId());
         EsmUserInternal esmUserInternal = new EsmUserInternal();
         esmUserInternal.setAddressnow(record.getAddressnow());
         esmUserInternal.setIdentity(record.getIdentity());
@@ -486,7 +495,7 @@ public class EsmUserInternalCheckController extends BaseController {
 
         sysUser.setName(record.getNamespecial());
         sysUser.setId(record.getId());
-        sysUserService.updateSelective(sysUser);
+        sysUserService.updateById(sysUser);
         Integer integer = esmUserInternalService.updateSelective(esmUserInternal);
         if (integer != 1) {
             res = "更新失败";

src/main/java/com/ydtech/modules/esm/controller/EsmUserInternalController.java

@@ -3,6 +3,7 @@ package com.ydtech.modules.esm.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.constants.SysConstants;
 import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
@@ -86,7 +87,7 @@ public class EsmUserInternalController extends BaseController {
         List<EsmUserAgentCheck> esmUserAgentChecks = new ArrayList<>();
 
         for (SysUser record : records) {
-            SysUser sysUser = sysUserService.selectByPk(record.getId());
+            SysUser sysUser = sysUserService.getById(record.getId());
             if (sysUser != null && SysConstants.ADMIN.equalsIgnoreCase(sysUser.getName())) {
                 return HttpResult.error("超级管理员不允许删除!");
             }
@@ -113,7 +114,10 @@ public class EsmUserInternalController extends BaseController {
         }
 
         //EsmUserInternal esmUserInternal = esmUserInternalService.selectByPk(record.getId());
-        sysUserService.delete(records);
+        records.stream().forEach(a ->{
+            sysUserService.removeById(a);
+        });
+//            sysUserService.delete(records);
 
         esmUserInternalService.delete(esmUserInternals);
 
@@ -219,14 +223,11 @@ public class EsmUserInternalController extends BaseController {
      */
     @PostMapping("/queryRecommender")
     public HttpResult queryRecommender(@RequestParam String comcode) {
-        StringBuffer whereStr = new StringBuffer(" where 1=1 ");
-        ArrayList<String> params = new ArrayList<>();
-        if (comcode != null) {
-            whereStr.append(" and dept_id = ?");
-            params.add(comcode);
-        }
+        LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(StringUtils.isNotEmpty(comcode),SysUser::getDeptId,comcode);
+        List<SysUser> list = sysUserService.list(lqw);
 
-        List<SysUser> list = sysUserService.selectList(whereStr.toString(), params.toArray());
+//        List<SysUser> list = sysUserService.selectList(whereStr.toString(), params.toArray());
         return HttpResult.ok(list);
     }
 
@@ -269,25 +270,30 @@ public class EsmUserInternalController extends BaseController {
         List<TeamUserVO> teamList = new ArrayList<TeamUserVO>();
         StringBuffer sbStr = new StringBuffer(" where 1=1 ");
         ArrayList<String> paramList = new ArrayList<String>();
-        if (!StringUtils.isNullOrEmpty(record.getId())) {
-            sbStr.append(" and id = ?");
-            paramList.add(record.getId());
-        }
-        if (!StringUtils.isNullOrEmpty(record.getName())) {
-            sbStr.append(" and name = ?");
-            paramList.add(record.getName());
-        }
-        if (!StringUtils.isNullOrEmpty(record.getMobile())) {
-            sbStr.append(" and mobile = ?");
-            paramList.add(record.getMobile());
-        }
+//        if (!StringUtils.isNullOrEmpty(record.getId())) {
+//            sbStr.append(" and id = ?");
+//            paramList.add(record.getId());
+//        }
+//        if (!StringUtils.isNullOrEmpty(record.getName())) {
+//            sbStr.append(" and name = ?");
+//            paramList.add(record.getName());
+//        }
+//        if (!StringUtils.isNullOrEmpty(record.getMobile())) {
+//            sbStr.append(" and mobile = ?");
+//            paramList.add(record.getMobile());
+//        }
 
         String dateStr = "";
         if (!StringUtils.isNullOrEmpty(record.getStartdate()) && !StringUtils.isNullOrEmpty(record.getEnddate())) {
 
         }
+        LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(StringUtils.isNotEmpty(record.getId()),SysUser::getId,record.getId());
+        lqw.eq(StringUtils.isNotEmpty(record.getName()),SysUser::getName,record.getName());
+        lqw.eq(StringUtils.isNotEmpty(record.getMobile()),SysUser::getMobile,record.getMobile());
 
-        List<SysUser> users = sysUserService.selectList(sbStr.toString(), paramList.toArray());
+        List<SysUser> users = sysUserService.list(lqw);
+//        List<SysUser> users = sysUserService.selectList(sbStr.toString(), paramList.toArray());
         for (SysUser user : users) {
             TeamUserVO teamUserVO = new TeamUserVO();
             teamUserVO.setId(user.getId());
@@ -436,7 +442,7 @@ public class EsmUserInternalController extends BaseController {
         List<VoEsmUserInternal> level2List = new ArrayList<VoEsmUserInternal>();
         List<VoEsmUserInternal> level3List = new ArrayList<VoEsmUserInternal>();
         List<VoEsmUserInternalCheck> tempList = new ArrayList<VoEsmUserInternalCheck>();
-        SysUser user = sysUserService.selectByPk(record.getId());
+        SysUser user = sysUserService.getById(record.getId());
         //一级人数
 //        List<EsmUserAgent> list = esmUserAgentService.selectList(" where recommenderid=?",new Object[]{id});
         StringBuffer whereStr = new StringBuffer();
@@ -536,7 +542,7 @@ public class EsmUserInternalController extends BaseController {
 
 
     public VoEsmUserInternal findUserById(String id) {
-        SysUser sysUser = sysUserService.selectByPk(id);
+        SysUser sysUser = sysUserService.getById(id);
         sysUser.setPassword("");
         sysUser.setSalt("");
         EsmUserInternal esmUserInternal = esmUserInternalService.selectByPk(id);
@@ -666,7 +672,7 @@ public class EsmUserInternalController extends BaseController {
     }
 
     public VoEsmUserInternal findUserBy(String id, TeamUserQryVO record, List<EsmUserAgent> list) {
-        SysUser sysUser = sysUserService.selectByPk(id);
+        SysUser sysUser = sysUserService.getById(id);
         sysUser.setPassword("");
         sysUser.setSalt("");
         EsmUserInternal esmUserInternal = esmUserInternalService.selectByPk(id);

src/main/java/com/ydtech/modules/esm/dao/EsmInsAttachInsureDetailsMapper.java

@@ -0,0 +1,13 @@
+package com.ydtech.modules.esm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.esm.model.EsmInsAttachInsure;
+import com.ydtech.modules.esm.model.EsmInsAttachInsureDetails;
+
+public interface EsmInsAttachInsureDetailsMapper extends BaseMapper<EsmInsAttachInsureDetails> {
+
+}
+
+
+
+

src/main/java/com/ydtech/modules/esm/dao/EsmInsAttachInsureMapper.java

@@ -0,0 +1,13 @@
+package com.ydtech.modules.esm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.esm.model.EsmInsAttachInsure;
+import com.ydtech.modules.esm.model.EsmInsCompany;
+
+public interface EsmInsAttachInsureMapper extends BaseMapper<EsmInsAttachInsure> {
+
+}
+
+
+
+

src/main/java/com/ydtech/modules/esm/model/EsmInsAttachInsure.java

@@ -0,0 +1,81 @@
+package com.ydtech.modules.esm.model;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ydtech.constants.enums.InsQuoteFlow;
+import com.ydtech.modules.order.entity.InsAreaCompany;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 保险公司 - 附加险
+ *
+ * @author: lig
+ * @date: 2023-05-04
+ */
+@TableName(value = "esm_ins_attach_insure")
+@Data
+public class EsmInsAttachInsure implements Serializable {
+
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 险种名称
+     */
+    @ApiModelProperty(value = "险种名称")
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     * 险种代码
+     */
+    @ApiModelProperty(value = "险种代码")
+    @TableField(value = "code")
+    private String code;
+
+    /**
+     * 座位数
+     */
+    @ApiModelProperty(value = "座位数")
+    @TableField(value = "seating")
+    private String seating;
+
+    /**
+     * 所属保险公司
+     */
+    @ApiModelProperty(value = "所属保险公司")
+    @TableField(value = "company_id")
+    private String companyId;
+
+    /**
+     * 险种类型（1：驾驶员意外险，）
+     * AttachInsureEnum
+     */
+    @ApiModelProperty(value = "险种类型（1：驾驶员意外险，")
+    @TableField(value = "type")
+    private String type;
+
+    /**
+     * 启用  1：启用   0：不启用
+     */
+    @ApiModelProperty(value = "启用  1：启用   0：不启用")
+    @TableField(value = "enable")
+    private String enable;
+
+    @ApiModelProperty(value = "限购份数")
+    @TableField(value = "restrict_num")
+    private int restrictNum;
+
+    @ApiModelProperty(value = "保费")
+    @TableField(value = "premium")
+    private String premium;
+
+
+
+}

src/main/java/com/ydtech/modules/esm/model/EsmInsAttachInsureDetails.java

@@ -0,0 +1,64 @@
+package com.ydtech.modules.esm.model;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 保险公司 - 附加险 - 详情
+ *
+ * @author: lig
+ * @date: 2023-05-05
+ */
+@TableName(value = "esm_ins_attach_insure_details")
+@Data
+public class EsmInsAttachInsureDetails implements Serializable {
+
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+    /**
+     * 附加险ID
+     */
+    @ApiModelProperty(value = "附加险ID")
+    @TableField(value = "attach_insure_id")
+    private String attachInsureId;
+
+    /**
+     * 险种名称
+     */
+    @ApiModelProperty(value = "险种名称")
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     * 每座保额（元）/每份
+     */
+    @ApiModelProperty(value = "每座保额（元）/每份")
+    @TableField(value = "seat_sum")
+    private String seatSum;
+
+    /**
+     * 每车保额（元）/每份
+     */
+    @ApiModelProperty(value = "每车保额（元）/每份 ")
+    @TableField(value = "car_sum")
+    private String carSum;
+
+    /**
+     * 责任保费（元）/每份
+     */
+    @ApiModelProperty(value = "责任保费（元）/每份 ")
+    @TableField(value = "premium")
+    private String premium;
+
+
+
+
+
+}

src/main/java/com/ydtech/modules/esm/service/impl/EsmUserInternalCheckServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.esm.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.drinkjava2.jdialects.Dialect;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.admin.model.SysUser;
@@ -88,7 +89,7 @@ public class EsmUserInternalCheckServiceImpl extends EsmUserInternalCheckDaoImpl
                 sysUser.setSalt(null);
                 sysUser.setPassword(null);
                 sysUser.setStatus(1);
-                sysUserService.updateSelective(sysUser);
+                sysUserService.updateById(sysUser);
 
                 if (esmUserInternalCheck.getIntime() == null) {
                     esmUserInternalCheck.setIntime(new Date());// 入司时间取审核通过时间
@@ -138,7 +139,7 @@ public class EsmUserInternalCheckServiceImpl extends EsmUserInternalCheckDaoImpl
                     SysUser sysUser = new SysUser();
                     sysUser.setId(id);
                     sysUser.setDeptId("1");
-                    sysUserService.updateSelective(sysUser);
+                    sysUserService.updateById(sysUser);
                 }
 //
 //                sql = " UPDATE sys_user SET STATUS=? WHERE id =? ";
@@ -163,16 +164,17 @@ public class EsmUserInternalCheckServiceImpl extends EsmUserInternalCheckDaoImpl
         try {
             EsmUserAgentCheck esmUserAgent = esmUserAgentCheckService.selectByPk(jobNumber);
             SysUserRole sysUserRole = sysUserRoleService.selectByUserId(esmUserAgent.getRecommenderid());
+
             if (sysUserRole.getRoleId().equals(20L)) {
                 SysUserRole sysUserRole1 = sysUserRoleService.selectByUserId(jobNumber);
                 if (sysUserRole1 != null) {
                     sysUserRole1.setRoleId(sysUserRole.getRoleId());
-                    sysUserRoleService.updateSelective(sysUserRole1);
+                    sysUserRoleService.updateById(sysUserRole1);
                 } else {
                     SysUserRole sysUserRole2 = new SysUserRole();
                     sysUserRole2.setUserId(jobNumber);
                     sysUserRole2.setRoleId(sysUserRole.getRoleId());
-                    sysUserRoleService.insertSelective(sysUserRole2);
+                    sysUserRoleService.save(sysUserRole2);
                 }
             }
         } catch (Exception e) {

src/main/java/com/ydtech/modules/esm/service/impl/EsmUserInternalServiceImpl.java

@@ -312,7 +312,7 @@ public class EsmUserInternalServiceImpl extends EsmUserInternalDaoImpl
                 if (StringUtils.isNullOrEmpty(id)) {
                     break;
                 }
-                SysUser user = sysUserService.selectByPk(id);
+                SysUser user = sysUserService.getById(id);
                 userList.add(user);
             }
         }

src/main/java/com/ydtech/modules/ins/controller/InsALY_CBITAPIController.java

@@ -673,7 +673,7 @@ public class InsALY_CBITAPIController extends BaseController {
         insOrder.setLicenseNo(quoteInfo.getCarInfo().getLicenseNo());
 
         insOrder.setCarinfo(JSONObject.parseObject(JSONObject.toJSONString(vehicleModel_QueRen)));
-        SysUser user = sysUserService.selectByPk(quoteInfo.getUserId());
+        SysUser user = sysUserService.getById(quoteInfo.getUserId());
         if (user == null) {
             throw new Exception("userId不存在");
         }

src/main/java/com/ydtech/modules/ins/controller/InsAlltrustApiController.java

@@ -1,17 +1,18 @@
 package com.ydtech.modules.ins.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.aop.request.MethodLogAnnotation;
 import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.esm.dao.EsmInsAttachInsureMapper;
+import com.ydtech.modules.esm.model.EsmInsAttachInsure;
 import com.ydtech.modules.esm.service.InsTaskImageService;
 import com.ydtech.modules.ins.model.ya.CarModel_Req;
 import com.ydtech.modules.ins.model.yc.CallBackRequest;
 import com.ydtech.modules.ins.service.InsAlltrustApiService;
 import com.ydtech.modules.order.components.InsOrdersComponents;
-import com.ydtech.modules.order.entity.vo.AccidentalDrivingVo;
-import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
-import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
+import com.ydtech.modules.order.entity.vo.*;
 import com.ydtech.utils.Base64Utils;
 import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.Api;
@@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
 
 /**
  * @description: 永诚API方式对接 控制类
@@ -48,6 +50,9 @@ public class InsAlltrustApiController {
     @Autowired
     InsTaskImageService insTaskImageService;
 
+    @Autowired
+    EsmInsAttachInsureMapper esmInsAttachInsureMapper;
+
     @ApiOperation(value = "车型查询")
     @PostMapping("/modelQuery")
     public HttpResult modelQueryAPI(@RequestBody CarModel_Req carModelReq) {
@@ -59,8 +64,8 @@ public class InsAlltrustApiController {
     @PostMapping("/quote")
     @MethodLogAnnotation(title = "永诚API方式 - 报价")
     public HttpResult quoteApi(@RequestBody BaseQuoteVo<AccidentalDrivingVo> quoteVo) {
-        BaseQuoteInfoVo quoteInfo = insOrdersComponents.getQuoteInfo(quoteVo.getOrderNo());
-        return insYongchengApiService.quoteApi(quoteInfo);
+//        BaseQuoteInfoVo quoteInfo = insOrdersComponents.getQuoteInfo(quoteVo.getOrderNo());
+        return insYongchengApiService.quoteApi(quoteVo);
     }
 
     @ApiOperation(value = "永诚API方式 - 核保")
@@ -78,11 +83,11 @@ public class InsAlltrustApiController {
     }
 
 
-    @ApiOperation(value = "永诚API方式 - 获取支付链接")
-    @PostMapping("/getPayUrl")
-    public HttpResult getPayUrl(@RequestSingleParam(value = "companyId") String companyId) {
-        return insYongchengApiService.getPayUrlApi(companyId);
-    }
+//    @ApiOperation(value = "永诚API方式 - 获取支付链接")
+//    @PostMapping("/getPayUrl")
+//    public HttpResult getPayUrl(@RequestSingleParam(value = "companyId") String companyId) {
+//        return insYongchengApiService.getPayUrlApi(companyId);
+//    }
 
 
     @ApiOperation(value = "永诚API方式 - 补传回调及订单信息查询接口")
@@ -131,6 +136,8 @@ public class InsAlltrustApiController {
                 cbr.setCiPolicyAppNo(StringUtils.toString(reqMap.get("ci_policy_app_no")));
                 cbr.setStatus(StringUtils.toString(reqMap.get("status")));
                 cbr.setRemark(StringUtils.toString(reqMap.get("remark")));
+                cbr.setJqstatus(StringUtils.toString(reqMap.get("jqstatus")));
+                cbr.setSystatus(StringUtils.toString(reqMap.get("systatus")));
 
                 return insYongchengApiService.callBackApi(cbr);
 
@@ -149,12 +156,9 @@ public class InsAlltrustApiController {
      */
     @ApiOperation(value = "永诚API方式 -电子保单")
     @PostMapping("/getPolicyPrint")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "companyId",required = true, value = "报价订单号"),
-            @ApiImplicitParam(name = "type", value = "类型，1交强，2商业")
-    })
-    public HttpResult getPolicyPrintApi(String companyId,String type) {
-        return insYongchengApiService.getPolicyPrintApi(companyId,StringUtils.toString(type,"1"));
+    public HttpResult getPolicyPrintApi(@RequestBody PolicyPrintVo policyPrintVo) {
+//    public HttpResult getPolicyPrintApi(String companyId,String type) {
+        return insYongchengApiService.getPolicyPrintApi(policyPrintVo.getCompanyId(),policyPrintVo.getRiskCode());
     }
 
     /**
@@ -162,11 +166,30 @@ public class InsAlltrustApiController {
      */
     @ApiOperation(value = "永诚API方式 -意外险列表")
     @PostMapping("/gainAccidentList")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "companyId",required = true, value = "报价订单号")
-    })
-    public HttpResult gainAccidentList(String companyId) {
-        return insYongchengApiService.gainAccidentList(companyId);
+    public HttpResult<List<EsmInsAttachInsure>> gainAccidentList(@RequestBody @Valid AccidentalDrivingQueryVo accidentalDrivingVo) {
+
+        LambdaQueryWrapper<EsmInsAttachInsure> lqw = new LambdaQueryWrapper<EsmInsAttachInsure>();
+        lqw.eq(EsmInsAttachInsure::getCompanyId,accidentalDrivingVo.getCompanyCode());
+        lqw.eq(accidentalDrivingVo.getSeatNum() > 0,EsmInsAttachInsure::getSeating,accidentalDrivingVo.getSeatNum());
+        List<EsmInsAttachInsure> eiaiList = esmInsAttachInsureMapper.selectList(lqw);
+        if(null != eiaiList && eiaiList.size()>0){
+            return HttpResult.ok(eiaiList);
+        }
+
+        return insYongchengApiService.gainAccidentList(accidentalDrivingVo);
+//        return insYongchengApiService.gainAccidentList(companyId);
+    }
+
+
+
+    /**
+     * 同步驾意险
+     */
+    @ApiOperation(value = "永诚API方式 - 同步驾意险")
+    @PostMapping("/syncAccidentInsure")
+    public HttpResult syncAccidentInsure(@RequestBody @Valid AccidentalDrivingQueryVo accidentalDrivingVo) {
+
+        return insYongchengApiService.syncAccidentInsure(accidentalDrivingVo);
     }
 
 

src/main/java/com/ydtech/modules/ins/controller/InsCBITAPIController.java

@@ -950,7 +950,7 @@ public class InsCBITAPIController extends BaseController {
         insOrder.setLicenseNo(quoteInfo.getCarInfo().getLicenseNo());
 
         insOrder.setCarinfo(JSONObject.parseObject(JSONObject.toJSONString(vehicleModel_QueRen)));
-        SysUser user = sysUserService.selectByPk(quoteInfo.getUserId());
+        SysUser user = sysUserService.getById(quoteInfo.getUserId());
         if (user == null) {
             throw new Exception("userId不存在");
         }

src/main/java/com/ydtech/modules/ins/controller/InsHengbangController.java

@@ -143,7 +143,7 @@ public class InsHengbangController {
         insOrder.setFrameNo(quoteInfo.getCarInfo().getFrameNo());
         insOrder.setLicenseNo(quoteInfo.getCarInfo().getLicenseNo());
         insOrder.setCarinfo(JSONObject.parseObject(JSONObject.toJSONString(quoteInfo.getCarInfo())));
-        SysUser user = sysUserService.selectByPk(quoteInfo.getUserId());
+        SysUser user = sysUserService.getById(quoteInfo.getUserId());
         if (user == null) {
             httpResult.setMsg("userId不存在");
             return httpResult;

src/main/java/com/ydtech/modules/ins/controller/InsHuanongController.java

@@ -146,7 +146,7 @@ public class InsHuanongController {
         insOrder.setFrameNo(quoteInfo.getCarInfo().getFrameNo());
         insOrder.setLicenseNo(quoteInfo.getCarInfo().getLicenseNo());
         insOrder.setCarinfo(JSONObject.parseObject(JSONObject.toJSONString(quoteInfo.getCarInfo())));
-        SysUser user = sysUserService.selectByPk(quoteInfo.getUserId());
+        SysUser user = sysUserService.getById(quoteInfo.getUserId());
         if (user == null) {
             httpResult.setMsg("userId不存在");
             return httpResult;

src/main/java/com/ydtech/modules/ins/controller/InsPayApplyController.java

@@ -2,6 +2,7 @@ package com.ydtech.modules.ins.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
@@ -23,12 +24,12 @@ import com.ydtech.modules.ins.service.*;
 import com.ydtech.modules.ins.vo.AccountVo;
 import com.ydtech.modules.ins.vo.ApplyVo;
 import com.ydtech.utils.DateMonthUtils;
+import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.idgen.IdGenerate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
@@ -320,7 +321,7 @@ public class InsPayApplyController extends BaseController {
         }
         InsPayApply apply = new InsPayApply();
         String applyno = IdGenerate.nextId();
-        SysUser user = sysUserService.selectByPk(userid);
+        SysUser user = sysUserService.getById(userid);
         if (user == null) {
             httpResult.setMsg("userId不存在");
             return httpResult;
@@ -404,7 +405,7 @@ public class InsPayApplyController extends BaseController {
         }
         InsPayApply apply = new InsPayApply();
         String applyno = IdGenerate.nextId();
-        SysUser user = sysUserService.selectByPk(userid);
+        SysUser user = sysUserService.getById(userid);
         if (user == null) {
             httpResult.setMsg("userId不存在");
             return httpResult;
@@ -469,16 +470,22 @@ public class InsPayApplyController extends BaseController {
         List<TeamUserVO> teamList = new ArrayList<TeamUserVO>();
         StringBuffer sbStr = new StringBuffer(" where 1=1 ");
         ArrayList<String> paramList = new ArrayList<String>();
-        if (!com.ydtech.utils.StringUtils.isNullOrEmpty(userid)) {
-            sbStr.append(" and id = ?");
-            paramList.add(userid);
-        }
+
+
+        LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(StringUtils.isNotEmpty(userid),SysUser::getId,userid);
+
+//        if (!StringUtils.isNullOrEmpty(userid)) {
+//            sbStr.append(" and id = ?");
+//            paramList.add(userid);
+//        }
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
 
         record.setStartdate(format.format(DateMonthUtils.getBeginDayOfMonth()));
         record.setEnddate(format.format(DateMonthUtils.getEndDayOfMonth()));
 
-        List<SysUser> users = sysUserService.selectList(sbStr.toString(), paramList.toArray());
+        List<SysUser> users = sysUserService.list(lqw);
+//        List<SysUser> users = sysUserService.selectList(sbStr.toString(), paramList.toArray());
         ExtensionVO extensionVO = queryUserPrice(record, users);
         Map map = new HashMap();
         map.put("monthCost", extensionVO.getMonthCost());

src/main/java/com/ydtech/modules/ins/controller/InsRenbaoController.java

@@ -90,7 +90,7 @@ public class InsRenbaoController {
         insOrder.setFrameNo(quoteInfo.getCarInfo().getFrameNo());
         insOrder.setLicenseNo(quoteInfo.getCarInfo().getLicenseNo());
         insOrder.setCarinfo(JSONObject.parseObject(JSONObject.toJSONString(quoteInfo.getCarInfo())));
-        SysUser user = sysUserService.selectByPk(quoteInfo.getUserId());
+        SysUser user = sysUserService.getById(quoteInfo.getUserId());
         if (user == null) {
             httpResult.setMsg("userId不存在");
             return httpResult;

src/main/java/com/ydtech/modules/ins/controller/InsTiananController.java

@@ -189,7 +189,7 @@ public class InsTiananController {
         insOrder.setFrameNo(quoteInfo.getCarInfo().getFrameNo());
         insOrder.setLicenseNo(quoteInfo.getCarInfo().getLicenseNo());
         insOrder.setCarinfo(JSONObject.parseObject(JSONObject.toJSONString(quoteInfo.getCarInfo())));
-        SysUser user = sysUserService.selectByPk(quoteInfo.getUserId());
+        SysUser user = sysUserService.getById(quoteInfo.getUserId());
         if (user == null) {
             httpResult.setMsg("userId不存在");
             return httpResult;

src/main/java/com/ydtech/modules/ins/model/yc/CallBackRequest.java

@@ -68,6 +68,16 @@ public class CallBackRequest implements Serializable {
      *    0待核保   5上报复核   9已核保未交费   3退回修改    1已核保且交费
      */
     private String status;
+    /**
+     * 交强 投保单状态
+     *    0待核保   5上报复核   9已核保未交费   3退回修改    1已核保且交费
+     */
+    private String jqstatus;
+    /**
+     * 商业 投保单状态
+     *    0待核保   5上报复核   9已核保未交费   3退回修改    1已核保且交费
+     */
+    private String systatus;
 
     /**
      * 备注

src/main/java/com/ydtech/modules/ins/model/yc/YcBuildData.java

@@ -236,11 +236,13 @@ public class YcBuildData {
         double sumPermium = StringUtils.toDouble(rd.getBase().getNPrm());;
 
         quoteRespVo.setCiSumPermium(jqPremium + sumTax);//交强险和车船税合计
-        quoteRespVo.setSumPermium(sumPermium);//保费合计
+        quoteRespVo.setSumPermium(sumPermium + sumTax);//保费合计
         quoteRespVo.setTaxAmount(sumTax);//车船税
         quoteRespVo.setTotalAdjustRate(1);
         quoteRespVo.setILogPreUdwMess("0");//评分
         quoteRespVo.setOrderno(insOrder.getOrderno()); //订单号
+        quoteRespVo.setJqPremium(jqPremium);
+        quoteRespVo.setSyPremium(syPremium);
 
 
         //@TODO 真假单交需要确认

src/main/java/com/ydtech/modules/ins/model/yc/accident/Accident.java

@@ -7,6 +7,8 @@ import com.ydtech.components.InsAlltrustRequestApiComponents;
 import com.ydtech.modules.ins.model.cbit.VehicleModel_QueRen;
 import com.ydtech.modules.ins.model.yc.AuthorityDataXml;
 import com.ydtech.modules.order.entity.InsOrders;
+import com.ydtech.modules.order.entity.vo.AccidentalDrivingQueryVo;
+import com.ydtech.utils.StringUtils;
 import lombok.Data;
 
 import javax.validation.Valid;
@@ -68,7 +70,7 @@ public class Accident {
      * @author: lig
      * @date: 2023-02-15
      */
-    public static Accident buildPayParam(InsOrders order, AuthorityDataXml authorityDataXml, InsAlltrustRequestApiComponents apiComponents) {
+    public static Accident buildPayParam(AccidentalDrivingQueryVo accidentalDrivingVo, AuthorityDataXml authorityDataXml, InsAlltrustRequestApiComponents apiComponents,String schemeNo) {
 
         Accident m = new Accident();
 //
@@ -76,11 +78,14 @@ public class Accident {
 
         r.setAuthorityData(authorityDataXml);
 
-        VehicleModel_QueRen vehicleModel_QueRen = JSON.parseObject(JSON.toJSONString(order.getCarinfo()), VehicleModel_QueRen.class);
-        vehicleModel_QueRen.getSeatCount();
+//        VehicleModel_QueRen vehicleModel_QueRen = JSON.parseObject(JSON.toJSONString(order.getCarinfo()), VehicleModel_QueRen.class);
+//        vehicleModel_QueRen.getSeatCount();
 
-        r.setDeptcde(apiComponents.getDptCde().substring(0,1));
-        r.setSeatsNum(vehicleModel_QueRen.getSeatCount());
+        r.setDeptcde(apiComponents.getDptCde().substring(0,2));
+        r.setSeatsNum(accidentalDrivingVo.getSeatNum() + "");
+        if(StringUtils.isNotEmpty(schemeNo)){
+            r.setSchemeNo(schemeNo);
+        }
 
         m.setRequestLabel(r);
 //

src/main/java/com/ydtech/modules/ins/model/yc/audit/Audit.java

@@ -1,19 +1,12 @@
 package com.ydtech.modules.ins.model.yc.audit;
 
 import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText;
-import com.ydtech.constants.enums.City;
-import com.ydtech.constants.enums.Province;
-import com.ydtech.modules.ins.model.InsOrder;
-import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
+import com.ydtech.components.InsAlltrustRequestApiComponents;
 import com.ydtech.modules.ins.model.yc.AuthorityDataXml;
 import com.ydtech.modules.ins.model.yc.YcBuildData;
-import com.ydtech.modules.ins.model.yc.ruote.*;
 import com.ydtech.modules.ins.vo.CustomerInfoVo;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
@@ -21,8 +14,7 @@ import com.ydtech.utils.IDCardUtils;
 import lombok.Data;
 
 import javax.validation.Valid;
-import java.math.BigDecimal;
-import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -231,14 +223,15 @@ public class Audit {
      * @author: lig
      * @date: 2023-02-15
      */
-    public static Audit buildAuditParam(InsOrders order, AuthorityDataXml authorityDataXml,InsAreaCompany iac) {
+    public static Audit buildAuditParam(CustomerInfoVo ownerInfo, CustomerInfoVo insureInfo, CustomerInfoVo applyInfo, AuthorityDataXml authorityDataXml, InsAreaCompany iac, InsAlltrustRequestApiComponents apiComponents) {
+//    public static Audit buildAuditParam(InsOrders order, AuthorityDataXml authorityDataXml,InsAreaCompany iac) {
 
-        //车主
-        CustomerInfoVo ownerInfo = JSONObject.parseObject(order.getOwnerinfo().toJSONString(), CustomerInfoVo.class);
-        //被保人
-        CustomerInfoVo insureInfo = JSONObject.parseObject(order.getInsureinfo().toJSONString(), CustomerInfoVo.class);
-        //投保人
-        CustomerInfoVo applyInfo = JSONObject.parseObject(order.getApplyinfo().toJSONString(), CustomerInfoVo.class);
+//        //车主
+//        CustomerInfoVo ownerInfo = JSONObject.parseObject(order.getOwnerinfo().toJSONString(), CustomerInfoVo.class);
+//        //被保人
+//        CustomerInfoVo insureInfo = JSONObject.parseObject(order.getInsureinfo().toJSONString(), CustomerInfoVo.class);
+//        //投保人
+//        CustomerInfoVo applyInfo = JSONObject.parseObject(order.getApplyinfo().toJSONString(), CustomerInfoVo.class);
 
         Audit m = new Audit();
 
@@ -246,8 +239,8 @@ public class Audit {
 
         Condition condition = new Condition();
 
-        //<condition>
-        condition.setDeptCode("14A4");
+        //<condition>  "14A4"
+        condition.setDeptCode(apiComponents.getDptCde());
         condition.setJqFlag(iac.getJqpremium().intValue() > 0?"1":"0");
         condition.setSyFlag(iac.getSypremium().intValue() > 0?"1":"0");
         condition.setCommissionPercentage("0");
@@ -274,10 +267,13 @@ public class Audit {
         customer.setBenefitSex(IDCardUtils.GetYcSex(insureInfo.getIdentifyNumber()));
         customer.setBenefitName(insureInfo.getName());
         customer.setBnfctcertfclsvalidate(YcBuildData.ID_CARD_INDATE);
-        customer.setCProvince(Province.buildProvince(insureInfo.getAddr()));
-        customer.setCCity(City.buildCity(insureInfo.getAddr()));
+//        customer.setCProvince(Province.buildProvince(insureInfo.getAddr()));
+//        customer.setCCity(City.buildCity(insureInfo.getAddr()));
 //        customer.setCCounty();
 
+
+
+
         //<taxATion>
         TaxATion taxATion = new TaxATion();
         taxATion.setCTaxType("338001");

src/main/java/com/ydtech/modules/ins/model/yc/callbackAnOrder/CallbackAnOrder.java

@@ -1,4 +1,5 @@
-package com.ydtech.modules.ins.model.yc.order;
+package com.ydtech.modules.ins.model.yc.callbackAnOrder;
+
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
@@ -46,13 +47,13 @@ public class CallbackAnOrder {
      * @author: lig
      * @date: 2023-04-06
      */
-    public static CallbackAnOrder buildCallbackAnOrderParam(InsAreaCompany iac, AuthorityDataXml authorityDataXml) {
+    public static CallbackAnOrder buildCallbackAnOrderParam(InsAreaCompany iac, AuthorityDataXml authorityDataXml,String type) {
 
         CallbackAnOrder m = new CallbackAnOrder();
 
         m.setOrdercode(iac.getInsOrderNo());
 
-        m.setType("0");
+        m.setType(type);
 
         m.setCreator(authorityDataXml.getUserName());
 

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Applicant.java

@@ -1,22 +1,10 @@
 package com.ydtech.modules.ins.model.yc.ruote;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.ydtech.constants.enums.City;
-import com.ydtech.constants.enums.Province;
-import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
 import com.ydtech.modules.ins.vo.CustomerInfoVo;
 import com.ydtech.utils.IDCardUtils;
-import com.ydtech.utils.StringUtils;
 import lombok.Data;
 
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
 
 /**
  * 投保人信息

src/main/java/com/ydtech/modules/ins/model/yc/ruote/CvrgYW.java

@@ -2,10 +2,6 @@ package com.ydtech.modules.ins.model.yc.ruote;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.ydtech.constants.enums.City;
-import com.ydtech.constants.enums.Province;
-import com.ydtech.modules.ins.vo.CustomerInfoVo;
-import com.ydtech.utils.IDCardUtils;
 import lombok.Data;
 
 

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Insured.java

@@ -1,8 +1,6 @@
 package com.ydtech.modules.ins.model.yc.ruote;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.ydtech.constants.enums.City;
-import com.ydtech.constants.enums.Province;
 import com.ydtech.modules.ins.vo.CustomerInfoVo;
 import com.ydtech.utils.IDCardUtils;
 import lombok.Data;

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Ruote.java

@@ -7,9 +7,13 @@ import com.ydtech.components.InsAlltrustRequestApiComponents;
 import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
 import com.ydtech.modules.ins.model.yc.AuthorityDataXml;
 import com.ydtech.modules.ins.model.yc.YcBuildData;
+import com.ydtech.modules.ins.vo.CarInfoVo;
 import com.ydtech.modules.ins.vo.CustomerInfoVo;
+import com.ydtech.modules.order.entity.vo.AccidentalDrivingVo;
+import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import com.ydtech.utils.StringUtils;
 import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.validation.Valid;
 import java.math.BigDecimal;
@@ -151,7 +155,7 @@ public class Ruote {
      * @author: lig
      * @date: 2023年02月08日 0008
      */
-    public static Ruote buildQuoteParam(YaQuoteInfoVo yaQuoteInfoVo, AuthorityDataXml authorityDataXml, Agent agent, InsAlltrustRequestApiComponents apiComponents) {
+    public static Ruote buildQuoteParam(YaQuoteInfoVo yaQuoteInfoVo, AuthorityDataXml authorityDataXml, Agent agent, InsAlltrustRequestApiComponents apiComponents,AccidentalDrivingVo adVo) {
 //    public static Ruote buildQuoteParam(YaQuoteInfoVo yaQuoteInfoVo, AuthorityDataXml authorityDataXml,Agent agent) {
 
         Ruote m = new Ruote();
@@ -165,6 +169,8 @@ public class Ruote {
         CustomerInfoVo insuredPersonInfo = yaQuoteInfoVo.getInsuredPersonInfo();
         //车主
         CustomerInfoVo ownerInfo = yaQuoteInfoVo.getOwnerInfo();
+
+        CarInfoVo carInfo = yaQuoteInfoVo.getCarInfo();
         /**
          * 基本信息 base
          */
@@ -258,7 +264,7 @@ public class Ruote {
          * 交强险车船税
          * 车船税tax
          */
-        condition.setTax(Tax.buildTax(policyHolderInfo));
+        condition.setTax(Tax.buildTax(policyHolderInfo,carInfo));
 
         /**
          * 渠道及费用信息
@@ -280,11 +286,17 @@ public class Ruote {
         Insured insured = Insured.buildApplicant(ownerInfo,insuredPersonInfo);
         condition.setInsured(insured);
 
-//        /**
-//         * 意外险信息方案
-//         * 代码：cvrgYW
-//         */
-//        CvrgYW cvrgYW = new CvrgYW();
+        /**
+         * 意外险信息方案
+         * 代码：cvrgYW
+         */
+        if(null != adVo && StringUtils.isNotEmpty(adVo.getRideRiskCode())&& adVo.getQuantity() > 0){
+            CvrgYW cvrgYW = new CvrgYW();
+            cvrgYW.setCInsuranceCode(adVo.getRideRiskCode().toString());
+            cvrgYW.setNInsuranceQuantity(adVo.getQuantity() + "");
+            condition.setCvrgYW(cvrgYW);
+        }
+
 //        //@TODO 临时测试
 //        cvrgYW.setCInsuranceCode("100");
 //        cvrgYW.setNInsuranceQuantity("1");

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Tax.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.ins.model.yc.ruote;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.ydtech.modules.ins.vo.CarInfoVo;
 import com.ydtech.modules.ins.vo.CustomerInfoVo;
 import lombok.Data;
 
@@ -128,7 +129,7 @@ public class Tax {
      * @author: lig
      * @date: 2023年04月13日 0013
      */
-    public static Tax buildTax(CustomerInfoVo policyHolderInfo){
+    public static Tax buildTax(CustomerInfoVo policyHolderInfo, CarInfoVo carInfo){
         Tax tax = new Tax();
         tax.setTaxCurrentType("349002001");
         tax.setVehicleCategory("K33");
@@ -147,8 +148,7 @@ public class Tax {
         tax.setTaxpayerType("338001");
         tax.setConruty("156");
         tax.setTel(policyHolderInfo.getMobile());
-        //@TODO 不确定
-        tax.setExhaust("1.5");
+        tax.setExhaust(carInfo.getEnginedesc());
         return tax;
     }
 

src/main/java/com/ydtech/modules/ins/model/yc/ruote/response/BaseResponse.java

@@ -1,14 +1,8 @@
 package com.ydtech.modules.ins.model.yc.ruote.response;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.ydtech.constants.enums.City;
-import com.ydtech.constants.enums.Province;
 import lombok.Data;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
 
 /**
  * @description: 基本信息 base  响应
@@ -498,10 +492,10 @@ public class BaseResponse {
     public static void main(String[] args) {
 
 
-        String str = "山西师傅山西省太原市万柏林区士大夫大山西师傅";
-
-
-        System.err.println("4444："+City.buildCity(str));
+//        String str = "山西师傅山西省太原市万柏林区士大夫大山西师傅";
+//
+//
+//        System.err.println("4444："+City.buildCity(str));
 
 
 //        List<Province> sss = Arrays.stream(Province.values()).filter(a -> str.contains(a.name())).collect(Collectors.toList());

src/main/java/com/ydtech/modules/ins/model/yc/ruote/response/CvrgListJQResponse.java

@@ -20,10 +20,10 @@ import java.util.List;
 public class CvrgListJQResponse {
 
 
-    @JsonProperty("CvrgJQ")
+//    @JsonProperty("cvrgJQ")
     @JacksonXmlElementWrapper(useWrapping = false)
-    @JacksonXmlProperty(localName = "CvrgJQ")
-    private List<CvrgJQ> CvrgJQ;
+    @JacksonXmlProperty(localName = "cvrgJQ")
+    private List<CvrgJQ> cvrgJQ;
 
 
     @Data

src/main/java/com/ydtech/modules/ins/model/yc/ruote/response/FeeListSYResponse.java

@@ -20,10 +20,10 @@ import java.util.List;
 public class FeeListSYResponse {
 
 
-    @JsonProperty("FeeSY")
+//    @JsonProperty("FeeSY")
     @JacksonXmlElementWrapper(useWrapping = false)
-    @JacksonXmlProperty(localName = "FeeSY")
-    private List<FeeSY> FeeSY;
+    @JacksonXmlProperty(localName = "feeSY")
+    private List<FeeSY> feeSY;
 
 
     @Data

src/main/java/com/ydtech/modules/ins/model/yc/ruote/response/TaxResponse.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.ins.model.yc.ruote.response;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.ydtech.constants.enums.City;
 import lombok.Data;
 
 
@@ -20,212 +19,212 @@ public class TaxResponse {
      * 收费方式
      *
      */
-    @JacksonXmlProperty(localName = "TaxCurrentType")
-    private String TaxCurrentType;
+    @JacksonXmlProperty(localName = "taxCurrentType")
+    private String taxCurrentType;
     /**
      * 滞纳金
      * 平台返回
      */
-    @JacksonXmlProperty(localName = "LateFee")
-    private String LateFee;
+    @JacksonXmlProperty(localName = "lateFee")
+    private String lateFee;
     /**
      * 当年应缴
      * 平台返回
      */
-    @JacksonXmlProperty(localName = "CurrentTax")
-    private String CurrentTax;
+    @JacksonXmlProperty(localName = "currentTax")
+    private String currentTax;
     /**
      * 上年应缴
      * 平台返回
      */
-    @JacksonXmlProperty(localName = "FormerTax")
-    private String FormerTax;
+    @JacksonXmlProperty(localName = "formerTax")
+    private String formerTax;
     /**
      * 合计应缴
      * 平台返回
      */
-    @JacksonXmlProperty(localName = "SumUpTax")
-    private String SumUpTax;
+    @JacksonXmlProperty(localName = "sumUpTax")
+    private String sumUpTax;
     /**
      * 车辆类型
      *
      */
-    @JacksonXmlProperty(localName = "VehicleCategory")
-    private String VehicleCategory;
+    @JacksonXmlProperty(localName = "vehicleCategory")
+    private String vehicleCategory;
     /**
      * 纳税人名称
      *
      */
-    @JacksonXmlProperty(localName = "TaxPayerName")
-    private String TaxPayerName;
+    @JacksonXmlProperty(localName = "taxPayerName")
+    private String taxPayerName;
     /**
      * 补交上年
      *
      */
-    @JacksonXmlProperty(localName = "PayLastYear")
-    private String PayLastYear;
+    @JacksonXmlProperty(localName = "payLastYear")
+    private String payLastYear;
     /**
      * 当年缴税起期
      *
      */
-    @JacksonXmlProperty(localName = "TaxBeginDateCurrentYear")
-    private String TaxBeginDateCurrentYear;
+    @JacksonXmlProperty(localName = "taxBeginDateCurrentYear")
+    private String taxBeginDateCurrentYear;
     /**
      * 证照类型
      *
      */
-    @JacksonXmlProperty(localName = "IdType")
-    private String IdType;
+    @JacksonXmlProperty(localName = "idType")
+    private String idType;
     /**
      * 上年计算类型
      *
      */
-    @JacksonXmlProperty(localName = "CalculatedTypeLastYear")
-    private String CalculatedTypeLastYear;
+    @JacksonXmlProperty(localName = "calculatedTypeLastYear")
+    private String calculatedTypeLastYear;
     /**
      * 当年缴税止期
      *
      */
-    @JacksonXmlProperty(localName = "TaxEndDateCurrentYear")
-    private String TaxEndDateCurrentYear;
+    @JacksonXmlProperty(localName = "taxEndDateCurrentYear")
+    private String taxEndDateCurrentYear;
     /**
      * 计算类型
      * 年缴：001
      */
-    @JacksonXmlProperty(localName = "CalculatedType")
-    private String CalculatedType;
+    @JacksonXmlProperty(localName = "calculatedType")
+    private String calculatedType;
     /**
      * 车辆细分
      *
      */
-    @JacksonXmlProperty(localName = "VehecleTypeDetail")
-    private String VehecleTypeDetail;
+    @JacksonXmlProperty(localName = "vehecleTypeDetail")
+    private String vehecleTypeDetail;
     /**
      * 上年缴税止期
      *
      */
-    @JacksonXmlProperty(localName = "TaxEndDateLastYear")
-    private String TaxEndDateLastYear;
+    @JacksonXmlProperty(localName = "taxEndDateLastYear")
+    private String taxEndDateLastYear;
     /**
      * 牌照类型
      *
      */
-    @JacksonXmlProperty(localName = "LicenceType")
-    private String LicenceType;
+    @JacksonXmlProperty(localName = "licenceType")
+    private String licenceType;
     /**
      * 整备质量
      *
      */
-    @JacksonXmlProperty(localName = "VehicleQuality")
-    private String VehicleQuality;
+    @JacksonXmlProperty(localName = "vehicleQuality")
+    private String vehicleQuality;
     /**
      * 上年缴税起期
      *
      */
-    @JacksonXmlProperty(localName = "TaxBeginDateLastYear")
-    private String TaxBeginDateLastYear;
+    @JacksonXmlProperty(localName = "taxBeginDateLastYear")
+    private String taxBeginDateLastYear;
     /**
      * 纳税人识别号
      *
      */
-    @JacksonXmlProperty(localName = "TaxpayerNo")
-    private String TaxpayerNo;
+    @JacksonXmlProperty(localName = "taxpayerNo")
+    private String taxpayerNo;
     /**
      * 缴税日期
      *
      */
-    @JacksonXmlProperty(localName = "TaxPaidDate")
-    private String TaxPaidDate;
+    @JacksonXmlProperty(localName = "taxPaidDate")
+    private String taxPaidDate;
     /**
      * 上次缴税年度
      *
      */
-    @JacksonXmlProperty(localName = "LastPaidYear")
-    private String LastPaidYear;
+    @JacksonXmlProperty(localName = "lastPaidYear")
+    private String lastPaidYear;
     /**
      * 税款所属期
      *
      */
-    @JacksonXmlProperty(localName = "TaxPeriod")
-    private String TaxPeriod;
+    @JacksonXmlProperty(localName = "taxPeriod")
+    private String taxPeriod;
     /**
      * 座落区县
      *
      */
-    @JacksonXmlProperty(localName = "PositionCode")
-    private String PositionCode;
+    @JacksonXmlProperty(localName = "positionCode")
+    private String positionCode;
     /**
      * 上年保险起期
      *
      */
-    @JacksonXmlProperty(localName = "StartDateLastYear")
-    private String StartDateLastYear;
+    @JacksonXmlProperty(localName = "startDateLastYear")
+    private String startDateLastYear;
     /**
      * 上年保险止期
      *
      */
-    @JacksonXmlProperty(localName = "EndDateLastYear")
-    private String EndDateLastYear;
+    @JacksonXmlProperty(localName = "endDateLastYear")
+    private String endDateLastYear;
     /**
      * 完税凭证字轨号
      *
      */
-    @JacksonXmlProperty(localName = "PayEvidenceNo")
-    private String PayEvidenceNo;
+    @JacksonXmlProperty(localName = "payEvidenceNo")
+    private String payEvidenceNo;
     /**
      * 税务机关名称
      *
      */
-    @JacksonXmlProperty(localName = "TaxDepartmentName")
-    private String TaxDepartmentName;
+    @JacksonXmlProperty(localName = "taxDepartmentName")
+    private String taxDepartmentName;
     /**
      * 税票号码类型
      *
      */
-    @JacksonXmlProperty(localName = "TaxBillType")
-    private String TaxBillType;
+    @JacksonXmlProperty(localName = "taxBillType")
+    private String taxBillType;
     /**
      * 完税凭证号
      *
      */
-    @JacksonXmlProperty(localName = "PayNo")
-    private String PayNo;
+    @JacksonXmlProperty(localName = "payNo")
+    private String payNo;
     /**
      * 减税凭证号
      *
      */
-    @JacksonXmlProperty(localName = "ReduceNo")
-    private String ReduceNo;
+    @JacksonXmlProperty(localName = "reduceNo")
+    private String reduceNo;
     /**
      * 开具税务机关
      *
      */
-    @JacksonXmlProperty(localName = "Department")
-    private String Department;
+    @JacksonXmlProperty(localName = "department")
+    private String department;
     /**
      * 未税单号
      *
      */
-    @JacksonXmlProperty(localName = "UntaxedPolicyNo")
-    private String UntaxedPolicyNo;
+    @JacksonXmlProperty(localName = "untaxedPolicyNo")
+    private String untaxedPolicyNo;
     /**
      * 上年应缴现值
      *
      */
-    @JacksonXmlProperty(localName = "PayValueLastYear")
-    private String PayValueLastYear;
+    @JacksonXmlProperty(localName = "payValueLastYear")
+    private String payValueLastYear;
     /**
      * 使用状态
      *
      */
-    @JacksonXmlProperty(localName = "UseStatus")
-    private String UseStatus;
+    @JacksonXmlProperty(localName = "useStatus")
+    private String useStatus;
     /**
      * 免征税额
      *
      */
-    @JacksonXmlProperty(localName = "TaxFreeAmount")
-    private String TaxFreeAmount;
+    @JacksonXmlProperty(localName = "taxFreeAmount")
+    private String taxFreeAmount;
     /**
      * 计税标准
      *

src/main/java/com/ydtech/modules/ins/service/InsAlltrustApiService.java

@@ -3,7 +3,12 @@ package com.ydtech.modules.ins.service;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.ins.model.ya.CarModel_Req;
 import com.ydtech.modules.ins.model.yc.CallBackRequest;
+import com.ydtech.modules.ins.model.yc.pay.response.AccidentResponse;
+import com.ydtech.modules.order.entity.InsAreaCompany;
+import com.ydtech.modules.order.entity.vo.AccidentalDrivingQueryVo;
+import com.ydtech.modules.order.entity.vo.AccidentalDrivingVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
+import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 
 import java.util.Map;
 
@@ -21,7 +26,8 @@ public interface InsAlltrustApiService {
     /**
      * 2 报价
      */
-    HttpResult quoteApi(BaseQuoteInfoVo yaQuoteInfoVo);
+    HttpResult quoteApi(BaseQuoteVo<AccidentalDrivingVo> quoteVo);
+//    HttpResult quoteApi(BaseQuoteInfoVo yaQuoteInfoVo);
 //
     /**
      * 3 核保
@@ -51,7 +57,8 @@ public interface InsAlltrustApiService {
     /**  包含发送短信
      * 5 获取支付url(提交短信验证码)
      */
-    HttpResult getPayUrlApi(String quoteOrderNo);
+//    HttpResult getPayUrlApi(String quoteOrderNo);
+    InsAreaCompany getPayUrlApi(InsAreaCompany iac);
 
     /**
      *  补传回调
@@ -62,7 +69,18 @@ public interface InsAlltrustApiService {
     /**
      * （驾意险）意健险方案及险种查询接口
      */
-    public HttpResult gainAccidentList(String quoteOrderNo);
+    public HttpResult gainAccidentList(AccidentalDrivingQueryVo accidentalDrivingVo);
+
+    /**
+     * （驾意险）同步驾意险
+     */
+    HttpResult syncAccidentInsure(AccidentalDrivingQueryVo accidentalDrivingVo);
+
+    /**
+     * （驾意险）意健险方案及险种查询接口
+     * @param schemeNo 方案号
+     */
+    AccidentResponse gainAccidentInsure(AccidentalDrivingQueryVo accidentalDrivingVo,String schemeNo);
 
 
     /**
@@ -76,7 +94,7 @@ public interface InsAlltrustApiService {
     /**
      * 7 电子投保单获取
      */
-    HttpResult getPolicyPrintApi(String orderNo,String type);
+    HttpResult getPolicyPrintApi(String orderNo,String riskCode);
 
 
     /**

src/main/java/com/ydtech/modules/ins/service/impl/InsAlltrustApiServiceImpl.java

@@ -10,13 +10,16 @@ import com.ydtech.components.InsAlltrustRequestApiComponents;
 import com.ydtech.constants.InsTaskHistoryEnum;
 import com.ydtech.constants.enums.InsOrderStatus;
 import com.ydtech.constants.enums.InsQuoteFlow;
+import com.ydtech.constants.enums.dict.AttachInsureEnum;
+import com.ydtech.constants.enums.dict.WhetherEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.admin.service.SysUserService;
-import com.ydtech.modules.esm.model.EsmRetail;
-import com.ydtech.modules.esm.model.InsTaskImage;
+import com.ydtech.modules.esm.dao.EsmInsAttachInsureDetailsMapper;
+import com.ydtech.modules.esm.dao.EsmInsAttachInsureMapper;
+import com.ydtech.modules.esm.model.*;
 import com.ydtech.modules.esm.service.*;
 import com.ydtech.modules.ins.dao.InsAlltrustRegionMapper;
 import com.ydtech.modules.ins.model.InsApiLog;
@@ -24,13 +27,14 @@ import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import com.ydtech.modules.ins.model.ya.CarModel_Req;
 import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
 import com.ydtech.modules.ins.model.yc.*;
+import com.ydtech.modules.ins.model.yc.accident.response.ResponseYwCvrg;
 import com.ydtech.modules.ins.model.yc.audit.Audit;
 import com.ydtech.modules.ins.model.yc.audit.response.AuditResponse;
+import com.ydtech.modules.ins.model.yc.callbackAnOrder.CallbackAnOrder;
 import com.ydtech.modules.ins.model.yc.imageUp.ImageUp;
 import com.ydtech.modules.ins.model.yc.imageUp.response.ImageUpResponse;
 import com.ydtech.modules.ins.model.yc.modelsQuery.ModelsQueryResponse;
 import com.ydtech.modules.ins.model.yc.modelsQuery.ModelsQueryXml;
-import com.ydtech.modules.ins.model.yc.order.CallbackAnOrder;
 import com.ydtech.modules.ins.model.yc.accident.Accident;
 import com.ydtech.modules.ins.model.yc.pay.Pay;
 import com.ydtech.modules.ins.model.yc.pay.response.AccidentResponse;
@@ -41,9 +45,13 @@ import com.ydtech.modules.ins.model.yc.ruote.*;
 import com.ydtech.modules.ins.model.yc.ruote.response.RuoteResponse;
 import com.ydtech.modules.ins.service.*;
 import com.ydtech.modules.ins.vo.*;
+import com.ydtech.modules.order.components.InsOrdersComponents;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
+import com.ydtech.modules.order.entity.vo.AccidentalDrivingQueryVo;
+import com.ydtech.modules.order.entity.vo.AccidentalDrivingVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
+import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.utils.HttpXmlUtil;
@@ -63,6 +71,7 @@ import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 
 
 @Service
@@ -76,6 +85,8 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
 
     @Autowired
     private InsAlltrustRegionMapper insAlltrustRegionMapper;
+    @Autowired
+    private InsOrdersComponents insOrdersComponents;
 
 
     private AuthorityDataXml authorityDataXml = null;
@@ -106,6 +117,12 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
     private InsOrdersService insOrdersService;
     @Autowired
     private InsTaskImageService insTaskImageService;
+    @Autowired
+    private EsmInsAttachInsureMapper esmInsAttachInsureMapper;
+    @Autowired
+    private EsmInsAttachInsureDetailsMapper esmInsAttachInsureDetailsMapper;
+    @Autowired
+    private EsmInsCompanyService esmInsCompanyService;
 
     @Autowired
     InsApiLogService insApiLogService;
@@ -152,13 +169,12 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
             xmlMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
             xmlMapper.setPropertyNamingStrategy(PropertyNamingStrategy.UPPER_CAMEL_CASE);
             xmlMapper.enable(MapperFeature.USE_STD_BEAN_NAMING);
+            xmlMapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true);
         }
         return xmlMapper;
     }
 
 
-
-
     //
     //==============================API 方式
     //
@@ -183,7 +199,7 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
         try {
             String cleanStr = YcBuildData.cleanResponseStr(responseData);
             ModelsQueryResponse rd = xmlMapper.readValue(cleanStr, ModelsQueryResponse.class);
-            if(rd.getReturnCode().equals("E0001")){
+            if (rd.getReturnCode().equals("E0001")) {
                 return HttpResult.ok(rd.getMsg());
             }
             return HttpResult.ok(buildCarModel(rd));
@@ -197,7 +213,9 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
      * 2 报价
      */
     @Override
-    public HttpResult quoteApi(BaseQuoteInfoVo yaQuoteInfoVo) {
+    public HttpResult quoteApi(BaseQuoteVo<AccidentalDrivingVo> quoteVo) {
+//    public HttpResult quoteApi(BaseQuoteInfoVo yaQuoteInfoVo) {
+        BaseQuoteInfoVo yaQuoteInfoVo = insOrdersComponents.getQuoteInfo(quoteVo.getOrderNo());
         HttpResult httpResult = new HttpResult();
         ObjectMapper xmlMapper = this.gainXmlMapper();
 
@@ -205,12 +223,14 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
 
         InsOrders order = insOrdersService.getById(yaQuoteInfoVo.getOrderNo());
 
+        AccidentalDrivingVo adVo = quoteVo.getAccidentalDrivingVo();
+
 
         //1.1必填校验
         checkEmpty(yaQuoteInfoVo);
 
         //组装参数
-        Ruote m = Ruote.buildQuoteParam(yaQuoteInfoVo, gainAuthorityDataXml(), apiComponents.gainAgent(),apiComponents);
+        Ruote m = Ruote.buildQuoteParam(yaQuoteInfoVo, gainAuthorityDataXml(), apiComponents.gainAgent(), apiComponents, adVo);
         //构造地区
         buildRegion(m);
 
@@ -231,11 +251,11 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
             }
             QuoteRespVo quoteRespVo = YcBuildData.buildQuoteRespVo(order, rd, yaQuoteInfoVo);
             //8 生成订单
-            iac = response_order(order, quoteRespVo, m, rd);
+            iac = response_order(order, quoteRespVo, m, rd,quoteVo);
 //            updateApiLog(apiLog, iac);
-
             quoteRespVo.setCompanyId(iac.getId());
 
+
             httpResult.setData(quoteRespVo);
             httpResult.setMsg("成功");
 
@@ -270,8 +290,29 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
 //                return HttpResult.ok(InsOrderStatus.matchKey(iac.getOrderstatus()).getDesc());
 //            }
 
+
+            //车主
+            CustomerInfoVo ownerInfo = JSONObject.parseObject(order.getOwnerinfo().toJSONString(), CustomerInfoVo.class);
+            //被保人
+            CustomerInfoVo insureInfo = JSONObject.parseObject(order.getInsureinfo().toJSONString(), CustomerInfoVo.class);
+            //投保人
+            CustomerInfoVo applyInfo = JSONObject.parseObject(order.getApplyinfo().toJSONString(), CustomerInfoVo.class);
+
+
             //组装参数
-            Audit m = Audit.buildAuditParam(order, this.gainAuthorityDataXml(), iac);
+            Audit m = Audit.buildAuditParam(ownerInfo, insureInfo, applyInfo, this.gainAuthorityDataXml(), iac, apiComponents);
+
+            //处理地区
+            Map<String, String> insureMap = gainRegionCode(insureInfo.getAddr());
+            if (null != insureMap && insureMap.size() > 0) {
+                m.getRequestLabel().getCondition().getCustomer().setCProvince(insureMap.get("provinceCode"));
+                m.getRequestLabel().getCondition().getCustomer().setCCity(insureMap.get("cityCode"));
+                m.getRequestLabel().getCondition().getCustomer().setCCounty(insureMap.get("areaCode"));
+            } else {
+                throw new SystemException("永诚 - 被保人地区获取失败，请联系管理员");
+            }
+
+
             log.debug("=========永诚API方式 - xml请求 - 核保开始======");
             //接口请求
             InsApiLog apiLog = httpPost(xmlMapper, m, YcBuildData.API_AUDIT);
@@ -284,8 +325,8 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
 
             if (rd.getResponseHead().getReturnCode().equals("0000")) {
 //            if (rd.getResponseHead().getReturnCode().equals("E0000")) {
-                String statusJq = StringUtils.toString(rd.getStatusJq(),"");
-                String statusSy = StringUtils.toString(rd.getStatusSY(),"");
+                String statusJq = StringUtils.toString(rd.getStatusJq(), "");
+                String statusSy = StringUtils.toString(rd.getStatusSY(), "");
                 if (statusJq.equals("0") || statusSy.equals("0")) {
                     iac.setOrderstatus(InsOrderStatus.S_1.getCode());
                 } else if (statusJq.equals("3") || statusSy.equals("3")) {
@@ -295,7 +336,7 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
                 }
             } else {
                 msg = rd.getResponseHead().getReturnMessage();
-                return HttpResult.ok("核保失败" + msg);
+                return HttpResult.error("核保失败" + msg);
             }
 
             iac.setAuditid(order.getUserid());
@@ -311,9 +352,9 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
             iac.setSyappoint(""); //商业特别约定
 
             insAreaCompanyService.updateById(iac);
-            if(InsOrderStatus.S_2.getCode().equals(InsOrderStatus.matchKey(iac.getOrderstatus()).getCode())){
+            if (InsOrderStatus.S_2.getCode().equals(InsOrderStatus.matchKey(iac.getOrderstatus()).getCode())) {
                 return HttpResult.ok(msg);
-            }else{
+            } else {
                 return HttpResult.error(msg + "状态：" + InsOrderStatus.matchKey(iac.getOrderstatus()).getDesc());
             }
 
@@ -378,16 +419,9 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
      * 5 支付
      */
     @Override
-    public HttpResult getPayUrlApi(String quoteOrderNo) {
-        HttpResult httpResult = new HttpResult();
+    public InsAreaCompany getPayUrlApi(InsAreaCompany iac) {
 
         try {
-            InsAreaCompany iac = insAreaCompanyService.getById(quoteOrderNo);
-            InsOrders order = insOrdersService.getById(iac.getOrderno());
-//            InsOrders order = insOrderService.selectByPk(orderno);
-            if (iac == null) {
-                return HttpResult.error("报价订单不存在");
-            }
             //组装参数
             Pay pay = Pay.buildPayParam(iac, gainAuthorityDataXml(), apiComponents.getPayCallBack());
 
@@ -405,20 +439,63 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
 
             if (payResp.getReturnCode().equals("E0000")) {
                 iac.setPaymentLink(payResp.getPayTransUrl());
-                insAreaCompanyService.updateById(iac);
-                httpResult.setMsg(payResp.getPayTransUrl());
+//                insAreaCompanyService.updateById(iac);
             } else {
-                httpResult.setMsg(payResp.getReturnMessage());
+                log.error("永诚API方式 - 获取支付连接失败：" + payResp.getReturnMessage());
             }
 
-        } catch (SystemException e) {
-            return HttpResult.error(e.getMessage());
         } catch (Exception e) {
             e.printStackTrace();
-            return HttpResult.error("系统错误，请联系管理员");
+            throw new SystemException("获取支付连接失败");
         }
-        return httpResult;
+        return iac;
     }
+//    /**
+//     * 5 支付
+//     */
+//    @Override
+//    public HttpResult getPayUrlApi(String quoteOrderNo) {
+//        HttpResult httpResult = new HttpResult();
+//
+//        try {
+//            InsAreaCompany iac = insAreaCompanyService.getById(quoteOrderNo);
+//            InsOrders order = insOrdersService.getById(iac.getOrderno());
+////            InsOrders order = insOrderService.selectByPk(orderno);
+//            if (iac == null) {
+//                return HttpResult.error("报价订单不存在");
+//            }
+//            //组装参数
+//            Pay pay = Pay.buildPayParam(iac, gainAuthorityDataXml(), apiComponents.getPayCallBack());
+//
+//            ObjectMapper xmlMapper = gainXmlMapper();
+//            //接口请求
+//            log.debug("=========永诚API方式 - xml请求 - 获取缴费链接开始======");
+//            InsApiLog apiLog = httpPost(xmlMapper, pay, YcBuildData.API_PAY);
+//            log.debug("=========永诚API方式 - xml请求 - 获取缴费链接结束！======");
+//            verifyRequest(apiLog, iac, InsQuoteFlow.Q_S_3);
+//            String responseData = apiLog.getResponseData();
+//
+//
+//            String cleanStr = YcBuildData.cleanResponseStr(responseData);
+//            PayResponse payResp = xmlMapper.readValue(cleanStr, PayResponse.class);
+//
+//            if (payResp.getReturnCode().equals("E0000")) {
+//                iac.setPaymentLink(payResp.getPayTransUrl());
+//                insAreaCompanyService.updateById(iac);
+//                httpResult.setMsg(payResp.getPayTransUrl());
+//            } else {
+//                httpResult.setMsg(payResp.getReturnMessage());
+//            }
+//
+//        } catch (SystemException e) {
+//            return HttpResult.error(e.getMessage());
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            return HttpResult.error("系统错误，请联系管理员");
+//        }
+//        return httpResult;
+//    }
+
     /**
      * 补传回调
      */
@@ -432,8 +509,11 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
             if (iac == null) {
                 return HttpResult.error("报价订单不存在");
             }
+            //0 支付回调 1核保回调 5直接返回字符串信息
+            String type = "0";
+            if(iac.getOrderstatus().equals(InsOrderStatus.S_1.getCode())) type = "1";
             //组装参数
-            CallbackAnOrder o = CallbackAnOrder.buildCallbackAnOrderParam(iac, gainAuthorityDataXml());
+            CallbackAnOrder o = CallbackAnOrder.buildCallbackAnOrderParam(iac, gainAuthorityDataXml(), type);
 
             ObjectMapper xmlMapper = gainXmlMapper();
             //接口请求
@@ -467,15 +547,15 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
      * 6 电子保单
      */
     @Override
-    public HttpResult getPolicyPrintApi(String orderNo,String type) {
+    public HttpResult getPolicyPrintApi(String quoteOrderNo, String riskCode) {
         HttpResult httpResult = new HttpResult();
         try {
-            InsAreaCompany iac = insAreaCompanyService.getById(orderNo);
+            InsAreaCompany iac = insAreaCompanyService.getById(quoteOrderNo);
 //            InsOrder order = insOrderService.selectByPk(orderno);
             if (iac == null) {
                 return HttpResult.error("报价订单不存在");
             }
-            String policyNo = type.equals("1")?iac.getJqpolicyno():iac.getSypolicyno();
+            String policyNo = riskCode.equals("0507") ? iac.getJqpolicyno() : iac.getSypolicyno();
 
 
             //组装参数
@@ -494,41 +574,37 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
 
             if (pResp.getHead().getResponseCompleteMessageStatus().getMessageStatusCode().equals("E0000")) {
                 Map m = new HashMap();
-                m.put("url",StringUtils.isNotEmpty(pResp.getJqpolicyUrl())?pResp.getJqpolicyUrl():pResp.getSypolicyUrl());
-//                m.put("syPolicyUrl", pResp.getSypolicyUrl());
-//                m.put("jqPolicyUrl", pResp.getJqpolicyUrl());
-//                m.put("policyBZUrl", pResp.getPolicyBZUrl());
-                httpResult.setData(m);
-                httpResult.setMsg(pResp.getHead().getResponseCompleteMessageStatus().getMessageStatusDescription());
+                m.put("url", StringUtils.isNotEmpty(pResp.getJqpolicyUrl()) ? pResp.getJqpolicyUrl() : pResp.getSypolicyUrl());
+//                httpResult.setData(m);
+//                httpResult.setMsg(pResp.getHead().getResponseCompleteMessageStatus().getMessageStatusDescription());
+                return HttpResult.ok(pResp.getHead().getResponseCompleteMessageStatus().getMessageStatusDescription(),m);
 
             } else {
-                httpResult.setMsg(pResp.getHead().getResponseCompleteMessageStatus().getMessageStatusDescription());
+                return HttpResult.error(pResp.getHead().getResponseCompleteMessageStatus().getMessageStatusDescription());
             }
 
         } catch (Exception e) {
             e.printStackTrace();
             return HttpResult.error("系统错误，请联系管理员");
         }
-        return httpResult;
     }
 
 
-
     /**
-     *  意外险
+     * 驾意外险
      */
     @Override
-    public HttpResult gainAccidentList(String quoteOrderNo) {
+    public HttpResult gainAccidentList(AccidentalDrivingQueryVo accidentalDrivingVo) {
         HttpResult httpResult = new HttpResult();
 
         try {
-            InsAreaCompany iac = insAreaCompanyService.getById(quoteOrderNo);
-            InsOrders order = insOrdersService.getById(iac.getOrderno());
-            if (iac == null) {
-                return HttpResult.error("报价订单不存在");
-            }
+//            InsAreaCompany iac = insAreaCompanyService.getById(quoteOrderNo);
+//            InsOrders order = insOrdersService.getById(iac.getOrderno());
+//            if (iac == null) {
+//                return HttpResult.error("报价订单不存在");
+//            }
             //组装参数
-            Accident accident = Accident.buildPayParam(order, gainAuthorityDataXml(), apiComponents);
+            Accident accident = Accident.buildPayParam(accidentalDrivingVo, gainAuthorityDataXml(), apiComponents, null);
 
             ObjectMapper xmlMapper = gainXmlMapper();
             //接口请求
@@ -544,7 +620,32 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
 
 
             if (accidentResp.getHead().getResponseCompleteMessageStatus().getMessageStatusCode().equals("E0000")) {
-                httpResult.setData(accidentResp.getResponseYwCvrg());
+                //清空旧的存入表
+                LambdaQueryWrapper<EsmInsAttachInsure> lqw = new LambdaQueryWrapper<EsmInsAttachInsure>();
+                lqw.eq(EsmInsAttachInsure::getCompanyId, accidentalDrivingVo.getCompanyCode());
+                lqw.eq(EsmInsAttachInsure::getSeating, accidentalDrivingVo.getSeatNum());
+                esmInsAttachInsureMapper.delete(lqw);
+
+                List<ResponseYwCvrg.CvrgList> cList = accidentResp.getResponseYwCvrg().getCvrgList();
+
+                List<EsmInsAttachInsure> eiaiList = new ArrayList<>();
+                cList.stream().forEach(a -> {
+                    EsmInsAttachInsure ati = new EsmInsAttachInsure();
+                    ati.setCode(a.getCInsuranceTypeCode());
+                    ati.setName(a.getCInsuranceType());
+                    ati.setSeating(accidentalDrivingVo.getSeatNum() + "");
+                    ati.setCompanyId(accidentalDrivingVo.getCompanyCode());
+                    ati.setType(AttachInsureEnum.AI001.getCode());
+                    ati.setEnable(WhetherEnum.YES.getCode());
+                    ati.setRestrictNum(StringUtils.toInt(a.getNPurchaseLimitsNum()));
+
+                    esmInsAttachInsureMapper.insert(ati);
+                    eiaiList.add(ati);
+                });
+
+
+                httpResult.setData(eiaiList);
+//                httpResult.setData(accidentResp.getResponseYwCvrg().getCvrgList());
                 httpResult.setMsg(accidentResp.getHead().getResponseCompleteMessageStatus().getMessageStatusDescription());
             } else {
                 httpResult.setMsg(accidentResp.getHead().getResponseCompleteMessageStatus().getMessageStatusDescription());
@@ -559,6 +660,157 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
         return httpResult;
     }
 
+
+    /**
+     * 驾意外险  同步
+     */
+    @Override
+    public HttpResult syncAccidentInsure(AccidentalDrivingQueryVo accidentalDrivingVo) {
+
+
+        AccidentResponse ar = gainAccidentInsure(accidentalDrivingVo, null);
+//        List<EsmInsAttachInsure> eiaiList = new ArrayList<>();
+
+        if (ar.getHead().getResponseCompleteMessageStatus().getMessageStatusCode().equals("E0000")) {
+            //清空旧的存入表
+            LambdaQueryWrapper<EsmInsAttachInsure> lqw = new LambdaQueryWrapper<EsmInsAttachInsure>();
+            lqw.eq(EsmInsAttachInsure::getCompanyId, accidentalDrivingVo.getCompanyCode());
+            lqw.eq(EsmInsAttachInsure::getSeating, accidentalDrivingVo.getSeatNum());
+            lqw.select(EsmInsAttachInsure::getId);
+            List<EsmInsAttachInsure> eiaiList = esmInsAttachInsureMapper.selectList(lqw);
+
+            //删除已经存在的数据
+            if (null != eiaiList && eiaiList.size() > 0) {
+
+                List<String> ids = new ArrayList<>();
+                eiaiList.stream().forEach(i -> {
+                    ids.add(i.getId());
+                });
+                LambdaQueryWrapper<EsmInsAttachInsureDetails> lqwDetails = new LambdaQueryWrapper<>();
+                lqwDetails.in(EsmInsAttachInsureDetails::getAttachInsureId, ids);
+                //详情删除
+                esmInsAttachInsureDetailsMapper.delete(lqwDetails);
+
+                //            esmInsAttachInsureMapper.delete(lqw);
+                esmInsAttachInsureMapper.deleteBatchIds(ids);
+            }
+
+            List<ResponseYwCvrg.CvrgList> cList = ar.getResponseYwCvrg().getCvrgList();
+
+
+            cList.stream().forEach(a -> {
+                EsmInsAttachInsure ati = new EsmInsAttachInsure();
+                ati.setCode(a.getCInsuranceTypeCode());
+                ati.setName(a.getCInsuranceType());
+                ati.setSeating(accidentalDrivingVo.getSeatNum() + "");
+                ati.setCompanyId(accidentalDrivingVo.getCompanyCode());
+                ati.setType(AttachInsureEnum.AI001.getCode());
+                ati.setEnable(WhetherEnum.YES.getCode());
+                ati.setRestrictNum(StringUtils.toInt(a.getNPurchaseLimitsNum()));
+
+                esmInsAttachInsureMapper.insert(ati);
+
+
+                //具体方案信息
+                AccidentResponse arCode = gainAccidentInsure(accidentalDrivingVo, a.getCInsuranceTypeCode());
+                if (arCode.getHead().getResponseCompleteMessageStatus().getMessageStatusCode().equals("E0000")) {
+
+                    AtomicInteger total = new AtomicInteger(0);
+                    List<ResponseYwCvrg.CvrgList> cListDetails = arCode.getResponseYwCvrg().getCvrgList();
+                    cListDetails.stream().forEach(d -> {
+
+                        EsmInsAttachInsureDetails atiDetails = new EsmInsAttachInsureDetails();
+                        atiDetails.setAttachInsureId(ati.getId());
+                        atiDetails.setName(d.getCInsuranceLiability());
+                        atiDetails.setCarSum(d.getNInsuranceAmountCar());
+                        atiDetails.setSeatSum(d.getNInsuranceAmountSeat());
+                        atiDetails.setPremium(d.getNLiabilityPremium());
+                        total.addAndGet(StringUtils.toInt(d.getNLiabilityPremium()));
+                        esmInsAttachInsureDetailsMapper.insert(atiDetails);
+                    });
+
+                    ati.setPremium(total.get() + "");
+                    esmInsAttachInsureMapper.updateById(ati);
+
+                }
+
+
+//                eiaiList.add(ati);
+            });
+        }
+
+
+        return HttpResult.ok("同步成功");
+    }
+
+
+    /**
+     * 驾意外险
+     */
+    @Override
+    public AccidentResponse gainAccidentInsure(AccidentalDrivingQueryVo accidentalDrivingVo, String schemeNo) {
+        HttpResult httpResult = new HttpResult();
+
+        //组装参数
+        Accident accident = Accident.buildPayParam(accidentalDrivingVo, gainAuthorityDataXml(), apiComponents, schemeNo);
+
+        ObjectMapper xmlMapper = gainXmlMapper();
+        //接口请求
+        log.debug("=========永诚API方式 - xml请求 - 获取意健险方案及险种查询开始======");
+        InsApiLog apiLog = httpPost(xmlMapper, accident, YcBuildData.API_ACCIDENT);
+        log.debug("=========永诚API方式 - xml请求 - 获取意健险方案及险种查询结束！======");
+//            verifyRequest(apiLog, iac,InsQuoteFlow.);
+        String responseData = apiLog.getResponseData();
+
+
+        String cleanStr = YcBuildData.cleanResponseStr(responseData);
+        AccidentResponse accidentResp = null;
+        try {
+            accidentResp = xmlMapper.readValue(cleanStr, AccidentResponse.class);
+        } catch (JsonProcessingException e) {
+            log.error("转换错误 方法：gainAccidentInsure  类：AccidentResponse");
+            throw new RuntimeException(e);
+        }
+        return accidentResp;
+
+
+//            if (accidentResp.getHead().getResponseCompleteMessageStatus().getMessageStatusCode().equals("E0000")) {
+//                //清空旧的存入表
+//                LambdaQueryWrapper<EsmInsAttachInsure> lqw = new LambdaQueryWrapper<EsmInsAttachInsure>();
+//                lqw.eq(EsmInsAttachInsure::getCompanyId,accidentalDrivingVo.getCompanyCode());
+//                lqw.eq(EsmInsAttachInsure::getSeating,accidentalDrivingVo.getSeatNum());
+//                esmInsAttachInsureMapper.delete(lqw);
+//
+//                List<ResponseYwCvrg.CvrgList> cList = accidentResp.getResponseYwCvrg().getCvrgList();
+//
+//                List<EsmInsAttachInsure> eiaiList = new ArrayList<>();
+//                cList.stream().forEach(a ->{
+//                    EsmInsAttachInsure ati = new EsmInsAttachInsure();
+//                    ati.setCode(a.getCInsuranceTypeCode());
+//                    ati.setName(a.getCInsuranceType());
+//                    ati.setSeating(accidentalDrivingVo.getSeatNum() + "");
+//                    ati.setCompanyId(accidentalDrivingVo.getCompanyCode());
+//                    ati.setType(AttachInsureEnum.AI001.getCode());
+//                    ati.setEnable(WhetherEnum.YES.getCode());
+//                    ati.setRestrictNum(StringUtils.toInt(a.getNPurchaseLimitsNum()));
+//
+//                    esmInsAttachInsureMapper.insert(ati);
+//                    eiaiList.add(ati);
+//                });
+//
+//
+//
+//
+//                httpResult.setData(eiaiList);
+////                httpResult.setData(accidentResp.getResponseYwCvrg().getCvrgList());
+//                httpResult.setMsg(accidentResp.getHead().getResponseCompleteMessageStatus().getMessageStatusDescription());
+//            } else {
+//                httpResult.setMsg(accidentResp.getHead().getResponseCompleteMessageStatus().getMessageStatusDescription());
+//            }
+
+    }
+
+
     @Override
     public HttpResult callBackApi(CallBackRequest param) {
 
@@ -567,37 +819,37 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
         //成功
         if (param.getResult().equals("0")) {
             LambdaQueryWrapper<InsAreaCompany> lqw = new LambdaQueryWrapper();
-            //交强保单号查询
-            lqw.eq(StringUtils.isNotEmpty(param.getCiPolicyAppNo()),InsAreaCompany::getJqapplyno,param.getCiPolicyAppNo());
-            //商业保单号查询
-            lqw.eq(StringUtils.isNotEmpty(param.getBizPolicyAppNo()),InsAreaCompany::getSyapplyno,param.getBizPolicyAppNo());
+            //交强投保单号查询
+            lqw.eq(StringUtils.isNotEmpty(param.getCiPolicyAppNo()), InsAreaCompany::getJqapplyno, param.getCiPolicyAppNo());
+            //商业投保单号查询
+            lqw.eq(StringUtils.isNotEmpty(param.getBizPolicyAppNo()), InsAreaCompany::getSyapplyno, param.getBizPolicyAppNo());
             InsAreaCompany iac = insAreaCompanyService.getOne(lqw);
 
 
-            if(null != iac){
-                if(StringUtils.isNotEmpty(param.getCiPolicyNo())) iac.setJqpolicyno(param.getCiPolicyNo());
-                if(StringUtils.isNotEmpty(param.getBizPolicyNo())) iac.setSypolicyno(param.getBizPolicyNo());
-//                if(param.getType().equals("0")) iac.setOrderstatus(InsOrderStatus.S_3.getCode());
-//                if(param.getType().equals("1")) iac.setOrderstatus(InsOrderStatus.S_7.getCode());
-                iac.setOrderstatus(InsOrderStatus.S_3.getCode());
+            if (null != iac) {
+                if (StringUtils.isNotEmpty(param.getBizPolicyNo())) iac.setSypolicyno(param.getBizPolicyNo());
+                if (StringUtils.isNotEmpty(param.getCiPolicyNo())) iac.setJqpolicyno(param.getCiPolicyNo());
+
+                iac = buildCallBack(iac,param);
+
                 insAreaCompanyService.updateById(iac);
 
+
+
                 //支付后 手工确认意外险
-            }else{
-                log.info(String.format("永诚API方式 - 回调 - 信息，订单不存在，交强保单号：{} ，商业保单号：{}",param.getCiPolicyNo(),param.getBizPolicyNo()));
+            } else {
+                log.info(String.format("永诚API方式 - 回调 - 信息，订单不存在，交强保单号：{} ，商业保单号：{}", param.getCiPolicyNo(), param.getBizPolicyNo()));
             }
 
         } else {
             //失败原因
             param.getMessage();
-            log.info(String.format("永诚API方式 - 回调 - 失败，交强保单号：{} ，商业保单号：{}，类型：{}",param.getCiPolicyNo(),param.getBizPolicyNo(),param.getType()));
+            log.info(String.format("永诚API方式 - 回调 - 失败，交强保单号：{} ，商业保单号：{}，类型：{}", param.getCiPolicyNo(), param.getBizPolicyNo(), param.getType()));
         }
         return HttpResult.ok(param);
     }
 
 
-
-
     /**
      * @description:构造车型查询参数
      * @author: lig
@@ -880,7 +1132,7 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
      * @author: lig
      * @date: 2023年02月16日 0016
      */
-    private InsAreaCompany response_order(InsOrders insOrder, QuoteRespVo quoteRespVo, Ruote requestData, RuoteResponse responseData) {
+    private InsAreaCompany response_order(InsOrders insOrder, QuoteRespVo quoteRespVo, Ruote requestData, RuoteResponse responseData,BaseQuoteVo<AccidentalDrivingVo> quoteVo) {
 
 
         //交强保费 含税
@@ -895,6 +1147,8 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
         //查询码商业
         String queryCodeSy = responseData.getVhl().getCQryCdeSY();
 
+        EsmInsCompany eic = esmInsCompanyService.getById(quoteVo.getCompanyId());
+
 
         boolean jq_falg = jqPremium > 0 ? true : false;
         //保存订单信息
@@ -913,7 +1167,8 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
         insAreaCompany.setInsOrderNo(insOrderNo);
         insAreaCompany.setJqapplyno(queryCodeJq);
         insAreaCompany.setSyapplyno(queryCodeSy);
-        insAreaCompany.setInscompany("永诚API");
+        insAreaCompany.setCompanyId(eic.getId());
+        insAreaCompany.setInscompany(eic.getNamesimple());
         insAreaCompanyService.save(insAreaCompany);
         return insAreaCompany;
 
@@ -968,7 +1223,8 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
         //增加api日志
         insApiLogService.insertAsync(new InsApiLog(insAreaCompany, apiLog, iqf));
         if (StringUtils.isNotEmpty(apiLog.getExceptionMsg())) {
-            throw new RuntimeException("远程接口调用异常");
+            throw new SystemException("远程接口调用异常");
+//            throw new RuntimeException("远程接口调用异常");
         }
 
     }
@@ -1004,10 +1260,10 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
 
 
     @Override
-    public Map<String,String> gainRegionCode(String address) {
+    public Map<String, String> gainRegionCode(String address) {
 
         log.debug("*********永诚API方式 - 身份证地址解析 参数：" + address);
-        Map<String,String> m = IDCardUtils.addressResolution(address);
+        Map<String, String> m = IDCardUtils.addressResolution(address);
         String city = m.get("city");
         String district = m.get("district");
 //        if(StringUtils.isNullOrEmpty(district)){
@@ -1015,25 +1271,25 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
 //            district = city;
 //        }
 
-        if(StringUtils.isNullOrEmpty(district)){
+        if (StringUtils.isNullOrEmpty(district)) {
             return null;
         }
 
         //查询
         LambdaQueryWrapper<InsAlltrustRegion> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(InsAlltrustRegion::getArea,district);
+        lqw.eq(InsAlltrustRegion::getArea, district);
         List<InsAlltrustRegion> list = insAlltrustRegionMapper.selectList(lqw);
         //如果地区查不到
-        if(null == list || list.size() < 1){
+        if (null == list || list.size() < 1) {
             lqw = new LambdaQueryWrapper<>();
-            lqw.eq(InsAlltrustRegion::getArea,city);
+            lqw.eq(InsAlltrustRegion::getArea, city);
             list = insAlltrustRegionMapper.selectList(lqw);
         }
-        if(null != list && list.size() > 0){
+        if (null != list && list.size() > 0) {
             Map rMap = new HashMap();
-            rMap.put("provinceCode",list.get(0).getProvinceCode());
-            rMap.put("cityCode",list.get(0).getCityCode());
-            rMap.put("areaCode",list.get(0).getAreaCode());
+            rMap.put("provinceCode", list.get(0).getProvinceCode());
+            rMap.put("cityCode", list.get(0).getCityCode());
+            rMap.put("areaCode", list.get(0).getAreaCode());
             return rMap;
         }
         return null;
@@ -1054,35 +1310,82 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
         String areaCode = "areaCode";
 //        owner.getCAreaCde()
 
-        Map<String,String> ownerMap = gainRegionCode(owner.getCWaddress());
-        if(null != ownerMap && ownerMap.size() > 0){
+        Map<String, String> ownerMap = gainRegionCode(owner.getCWaddress());
+        if (null != ownerMap && ownerMap.size() > 0) {
             owner.setCProvince(ownerMap.get(provinceCode));
             owner.setCCity(ownerMap.get(cityCode));
             owner.setCCounty(ownerMap.get(areaCode));
-            //禁止格式化自建数据
+            //清空格式化 自建数据
             owner.setCWaddress(null);
-        }else{
+        } else {
             throw new SystemException("永诚 - 车主地区获取失败，请联系管理员");
         }
 
-        Map<String,String> iMap = gainRegionCode(i.getCClntAddr());
-        if(null != iMap && iMap.size() > 0){
+        Map<String, String> iMap = gainRegionCode(i.getCClntAddr());
+        if (null != iMap && iMap.size() > 0) {
             i.setCProvince(iMap.get(provinceCode));
             i.setCCity(iMap.get(cityCode));
             i.setCCounty(iMap.get(areaCode));
-        }else{
+        } else {
             throw new SystemException("永诚 - 被保人地区获取失败，请联系管理员");
         }
 
-        Map<String,String> aMap = gainRegionCode(a.getCClntAddr());
-        if(null != aMap && aMap.size() > 0){
+        Map<String, String> aMap = gainRegionCode(a.getCClntAddr());
+        if (null != aMap && aMap.size() > 0) {
             a.setCProvince(aMap.get(provinceCode));
             a.setCCity(aMap.get(cityCode));
             a.setCCounty(aMap.get(areaCode));
-        }else{
+        } else {
             throw new SystemException("永诚 - 投保人地区获取失败，请联系管理员");
         }
     }
 
+    /**
+     *  构造回调
+     *  依赖 buildCallBack
+     *
+     * @author: lig
+     * @date: 2023-05-06
+     */
+    private InsAreaCompany buildCallBack(InsAreaCompany iac,CallBackRequest param){
+        //正常回调 与 补传回调
+        if(StringUtils.isNotEmpty(param.getStatus())){
+            iac = buildCallBackStatus(iac, param.getStatus());
+        }else {
+            if(StringUtils.isNotEmpty(param.getJqstatus())){
+                iac = buildCallBackStatus(iac, param.getJqstatus());
+            }
+            if(StringUtils.isNotEmpty(param.getSystatus())){
+                iac = buildCallBackStatus(iac, param.getSystatus());
+            }
+
+        }
+        return iac;
+    }
+
+    /**
+     *  构造回调状态
+     *
+     *
+     * @author: lig
+     * @date: 2023-05-06
+     */
+    private InsAreaCompany buildCallBackStatus(InsAreaCompany iac,String status){
+        if (status.equals("9")) {
+            iac.setOrderstatus(InsOrderStatus.S_2.getCode());
+            //更新支付连接
+            log.debug("准备进入获取支付连接######################");
+            iac = getPayUrlApi(iac);
+            log.debug("结束 - 准备进入获取支付连接######################");
+        }
+        if (status.equals("3")) {
+            iac.setOrderstatus(InsOrderStatus.S_4.getCode());
+        }
+        if (status.equals("1")) {
+            iac.setOrderstatus(InsOrderStatus.S_3.getCode());
+        }
+        return iac;
+    }
+
 
 }

src/main/java/com/ydtech/modules/ins/service/impl/InsRenbaoServiceImpl.java

@@ -217,7 +217,7 @@ public class InsRenbaoServiceImpl implements InsRenbaoService {
         insOrder.setLicenseNo(record.getCarInfo().getLicenseNo());
 
         insOrder.setCarinfo(JSONObject.parseObject(JSONObject.toJSONString(record.getCarInfo())));
-        SysUser user = sysUserService.selectByPk(record.getUserId());
+        SysUser user = sysUserService.getById(record.getUserId());
         if (user == null) {
             throw new SystemException("userId不存在");
         }

src/main/java/com/ydtech/modules/ins/service/impl/YongAnServiceImpl.java

@@ -959,7 +959,7 @@ public class YongAnServiceImpl implements YongAnService {
         insOrder.setLicenseNo(record.getCarInfo().getLicenseNo());
 
         insOrder.setCarinfo(JSONObject.parseObject(JSONObject.toJSONString(record.getCarInfo())));
-        SysUser user = sysUserService.selectByPk(record.getUserId());
+        SysUser user = sysUserService.getById(record.getUserId());
         if (user == null) {
             throw new SystemException("userId不存在");
         }

src/main/java/com/ydtech/modules/ins/vo/QuoteRespVo.java

@@ -26,14 +26,10 @@ public class QuoteRespVo {
     private String orderno; //订单号
     private String iszdj; //是否真单交
 
-    //添加  lig  2023-02-16  ，无人使用一段时间后将删除  2023-04-07
-    @Deprecated
     private double jqPremium; //交强险保费
-    @Deprecated
     private double syPremium; //商业险保费
-    //添加  end
 
-    private String companyId;
+    private String companyId;   //子订单ID
 
     /**
      * 驾意险信息

src/main/java/com/ydtech/modules/order/entity/vo/PolicyPrintVo.java

@@ -22,7 +22,7 @@ public class PolicyPrintVo implements Serializable {
     @ApiModelProperty("子订单")
     String companyId;
 
-    @ApiModelProperty("保险编号")
+    @ApiModelProperty("保险编号  0507交强  0510商业")
     String riskCode;
 
     @ApiModelProperty("1 标志 2 保单")

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -119,7 +119,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         // 1. 验证订单参数
         orderComponents.checkEmpty(quoteInfoVo);
         InsOrders insOrders = new InsOrders();
-        SysUser user = sysUserService.selectByPk(quoteInfoVo.getUserId());
+        SysUser user = sysUserService.getById(quoteInfoVo.getUserId());
         if (user == null) {
             throw new SystemException("userId不存在");
         }

src/main/java/com/ydtech/modules/order/service/impl/OrderTaskPoolsServiceImpl.java

@@ -67,7 +67,7 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
     @Override
     @Transactional
     public HttpResult forwarding(TaskForwardingVo taskForwardingVo) {
-        SysUser sysUser = sysUserService.selectByPk(taskForwardingVo.getAuditId());
+        SysUser sysUser = sysUserService.getById(taskForwardingVo.getAuditId());
         InsOrders insOrders = insOrdersService.existOrder(taskForwardingVo.getOrderNo());
         //插入轨迹表
         InsTaskHistory history = new InsTaskHistory();

src/main/java/com/ydtech/modules/order/service/impl/ZhongMeiOrderServiceImpl.java

@@ -101,7 +101,7 @@ public class ZhongMeiOrderServiceImpl implements ZhongMeiOrderService {
     @Override
     public HttpResult quote(BaseQuoteInfoVo quoteInfoVo, BaseQuoteVo<AccidentalDrivingVo> quoteVo) {
         EsmInsCompany esmInsCompany = esmInsCompanyService.isOpen(quoteVo.getCompanyId());
-        SysUser sysUser = sysUserService.selectByPk(quoteInfoVo.getUserId());
+        SysUser sysUser = sysUserService.getById(quoteInfoVo.getUserId());
         // 保险公司是否授权
         EsmInsAttribution esmInsAttribution = esmInsAttributionService.gainAuthorizeAffiliation(sysUser, quoteVo.getCompanyId());
 //        if (ObjectUtils.isEmpty(esmInsAttribution)) {

src/main/java/com/ydtech/nai/controller/ChinaCoalInterface.java

@@ -317,7 +317,7 @@ public class ChinaCoalInterface {
         insOrder.setLicenseNo(record.getCarInfo().getLicenseNo());
 
         insOrder.setCarinfo(JSONObject.parseObject(JSONObject.toJSONString(record.getCarInfo())));
-        SysUser user = sysUserService.selectByPk(record.getUserId());
+        SysUser user = sysUserService.getById(record.getUserId());
         if (user == null) {
             httpResult.setMsg("userId不存在");
             return httpResult;

src/main/java/com/ydtech/utils/HttpXmlUtil.java

@@ -7,9 +7,11 @@ import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.ins.model.InsApiLog;
 import com.ydtech.modules.ins.model.yc.YcBuildData;
+import com.ydtech.modules.ins.model.yc.accident.response.ResponseYwCvrg;
 import com.ydtech.modules.ins.model.yc.audit.response.AuditResponse;
 import com.ydtech.modules.ins.model.yc.imageUp.response.ImageUpResponse;
 import com.ydtech.modules.ins.model.yc.order.response.CallbackAnOrderResponse;
+import com.ydtech.modules.ins.model.yc.pay.response.AccidentResponse;
 import com.ydtech.modules.ins.model.yc.policy.response.PolicyResponse;
 import com.ydtech.modules.ins.model.yc.ruote.response.RuoteResponse;
 import com.ydtech.modules.ins.vo.QuoteKindRespVo;
@@ -210,7 +212,497 @@ public class HttpXmlUtil {
 
 
     //报价返回
-    private static String AAA = "....";
+    private static String AAA = "<?xml version=\"1.0\" ?><S:Envelope xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\"><S:Body><ns2:queryVehicleXnyQuotationServiceResponse xmlns:ns2=\"http://newWS.front.app.echannel.ebiz.alltrust.com/\"><response>&lt;?xml version='1.0' encoding='UTF-8'?&gt;\n" +
+            "&lt;responseMessage&gt;\n" +
+            "    &lt;Applicant&gt;\n" +
+            "        &lt;CAppNme&gt;李刚&lt;/CAppNme&gt;\n" +
+            "        &lt;CAreaCde&gt;103132&lt;/CAreaCde&gt;\n" +
+            "        &lt;CCertfCde&gt;140109198901052538&lt;/CCertfCde&gt;\n" +
+            "        &lt;CCertfCls&gt;120001&lt;/CCertfCls&gt;\n" +
+            "        &lt;CCity&gt;140100&lt;/CCity&gt;\n" +
+            "        &lt;CClntAddr&gt;山西省太原市万柏林区下元街办后王村中街27号2户&lt;/CClntAddr&gt;\n" +
+            "        &lt;CClntMrk&gt;1&lt;/CClntMrk&gt;\n" +
+            "        &lt;CCntrNme&gt;李刚&lt;/CCntrNme&gt;\n" +
+            "        &lt;CCounty&gt;140109&lt;/CCounty&gt;\n" +
+            "        &lt;CMobile&gt;15034070105&lt;/CMobile&gt;\n" +
+            "        &lt;CProvince&gt;140000&lt;/CProvince&gt;\n" +
+            "        &lt;CRelCde&gt;601005&lt;/CRelCde&gt;\n" +
+            "        &lt;CResvTxt5&gt;000&lt;/CResvTxt5&gt;\n" +
+            "        &lt;CSex&gt;106001&lt;/CSex&gt;\n" +
+            "        &lt;TBirthday&gt;1989-01-05&lt;/TBirthday&gt;\n" +
+            "        &lt;TCertfClsValiDate&gt;2037-03-03&lt;/TCertfClsValiDate&gt;\n" +
+            "        &lt;cAppCustRiskRank&gt;&lt;/cAppCustRiskRank&gt;\n" +
+            "        &lt;cAppHighRiskReason&gt;&lt;/cAppHighRiskReason&gt;\n" +
+            "    &lt;/Applicant&gt;\n" +
+            "    &lt;Insured&gt;\n" +
+            "        &lt;CAreaCde&gt;103132&lt;/CAreaCde&gt;\n" +
+            "        &lt;CCertfCde&gt;140109198901052538&lt;/CCertfCde&gt;\n" +
+            "        &lt;CCertfCls&gt;120001&lt;/CCertfCls&gt;\n" +
+            "        &lt;CCity&gt;140100&lt;/CCity&gt;\n" +
+            "        &lt;CClntAddr&gt;山西省太原市万柏林区下元街办后王村中街27号2户&lt;/CClntAddr&gt;\n" +
+            "        &lt;CClntMrk&gt;1&lt;/CClntMrk&gt;\n" +
+            "        &lt;CCounty&gt;140109&lt;/CCounty&gt;\n" +
+            "        &lt;CInsuredNme&gt;李刚&lt;/CInsuredNme&gt;\n" +
+            "        &lt;CMobile&gt;15034070105&lt;/CMobile&gt;\n" +
+            "        &lt;CProvince&gt;140000&lt;/CProvince&gt;\n" +
+            "        &lt;CRelCdes&gt;601005&lt;/CRelCdes&gt;\n" +
+            "        &lt;CSex&gt;106001&lt;/CSex&gt;\n" +
+            "        &lt;TBirthday&gt;1989-01-05&lt;/TBirthday&gt;\n" +
+            "        &lt;TCertfClsValiDate&gt;2037-03-03&lt;/TCertfClsValiDate&gt;\n" +
+            "        &lt;TEffectedDate&gt;&lt;/TEffectedDate&gt;\n" +
+            "        &lt;cInsuredCustRiskRank&gt;&lt;/cInsuredCustRiskRank&gt;\n" +
+            "        &lt;cInsuredHighRiskReason&gt;&lt;/cInsuredHighRiskReason&gt;\n" +
+            "    &lt;/Insured&gt;\n" +
+            "    &lt;Head&gt;\n" +
+            "        &lt;errorCode&gt;000000&lt;/errorCode&gt;\n" +
+            "        &lt;errorMessage&gt;交易成功&lt;/errorMessage&gt;\n" +
+            "    &lt;/Head&gt;\n" +
+            "    &lt;Base&gt;\n" +
+            "        &lt;CAgrSlsBsns&gt;&lt;/CAgrSlsBsns&gt;\n" +
+            "        &lt;CAgtAgrSeqNO&gt;250000P0000401&lt;/CAgtAgrSeqNO&gt;\n" +
+            "        &lt;CAgtZgNo&gt;2752454675645&lt;/CAgtZgNo&gt;\n" +
+            "        &lt;CBankCde&gt;&lt;/CBankCde&gt;\n" +
+            "        &lt;CBrkrNme&gt;永鑫保险销售服务有限公司山西分公司&lt;/CBrkrNme&gt;\n" +
+            "        &lt;CChaClassCde&gt;&lt;/CChaClassCde&gt;\n" +
+            "        &lt;CChaClassNme&gt;&lt;/CChaClassNme&gt;\n" +
+            "        &lt;CChaNme&gt;专业代理&lt;/CChaNme&gt;\n" +
+            "        &lt;CChaSpecail&gt;&lt;/CChaSpecail&gt;\n" +
+            "        &lt;CClientQuality&gt;192099&lt;/CClientQuality&gt;\n" +
+            "        &lt;CDataSrc&gt;iBusi&lt;/CDataSrc&gt;\n" +
+            "        &lt;CDptCde&gt;14A4&lt;/CDptCde&gt;\n" +
+            "        &lt;CDutyNme&gt;&lt;/CDutyNme&gt;\n" +
+            "        &lt;CProdNoJQ&gt;0326&lt;/CProdNoJQ&gt;\n" +
+            "        &lt;CRatioTyp&gt;340001&lt;/CRatioTyp&gt;\n" +
+            "        &lt;CServiceProvider&gt;&lt;/CServiceProvider&gt;\n" +
+            "        &lt;CShareSlsTyp&gt;199008&lt;/CShareSlsTyp&gt;\n" +
+            "        &lt;CSlsTyp&gt;189008&lt;/CSlsTyp&gt;\n" +
+            "        &lt;CWeRisk&gt;单交-B&lt;/CWeRisk&gt;\n" +
+            "        &lt;cprmCur&gt;01&lt;/cprmCur&gt;\n" +
+            "        &lt;NAppTaxAmtJQ&gt;53.77&lt;/NAppTaxAmtJQ&gt;\n" +
+            "        &lt;NBefTaxPrmJQ&gt;896.23&lt;/NBefTaxPrmJQ&gt;\n" +
+            "        &lt;NCommRateJQ&gt;0.04&lt;/NCommRateJQ&gt;\n" +
+            "        &lt;NCommissionRateUpperJQ&gt;0.04&lt;/NCommissionRateUpperJQ&gt;\n" +
+            "        &lt;NPrm&gt;950.0&lt;/NPrm&gt;\n" +
+            "        &lt;NRatioCoef&gt;1.0&lt;/NRatioCoef&gt;\n" +
+            "        &lt;namt&gt;200000.0&lt;/namt&gt;\n" +
+            "        &lt;TInsrncBgnTmJQ&gt;2023-05-05 00:00:00&lt;/TInsrncBgnTmJQ&gt;\n" +
+            "        &lt;TInsrncEndTmJQ&gt;2024-05-05 00:00:00&lt;/TInsrncEndTmJQ&gt;\n" +
+            "        &lt;cExceptionTyp&gt;Typ004&lt;/cExceptionTyp&gt;\n" +
+            "    &lt;/Base&gt;\n" +
+            "    &lt;Vhl&gt;\n" +
+            "        &lt;CAppointAreaCode&gt;&lt;/CAppointAreaCode&gt;\n" +
+            "        &lt;CBizMrk&gt;338001&lt;/CBizMrk&gt;\n" +
+            "        &lt;CBusType&gt;0&lt;/CBusType&gt;\n" +
+            "        &lt;CCheckCodeJQ&gt;&lt;/CCheckCodeJQ&gt;\n" +
+            "        &lt;CCheckCodeSY&gt;&lt;/CCheckCodeSY&gt;\n" +
+            "        &lt;CChgOwnerFlag&gt;0&lt;/CChgOwnerFlag&gt;\n" +
+            "        &lt;CDevice8Mrk&gt;0&lt;/CDevice8Mrk&gt;\n" +
+            "        &lt;CDisplacementLvl&gt;128.5&lt;/CDisplacementLvl&gt;\n" +
+            "        &lt;CEcdemicMrk&gt;0&lt;/CEcdemicMrk&gt;\n" +
+            "        &lt;CEngNo&gt;03560051&lt;/CEngNo&gt;\n" +
+            "        &lt;CFrmNo&gt;LWVCAFM63GA032651&lt;/CFrmNo&gt;\n" +
+            "        &lt;CFstRegYm&gt;2016-04-20&lt;/CFstRegYm&gt;\n" +
+            "        &lt;CGlassTyp&gt;303011001&lt;/CGlassTyp&gt;\n" +
+            "        &lt;CInspectRec&gt;&lt;/CInspectRec&gt;\n" +
+            "        &lt;CInspectTm&gt;&lt;/CInspectTm&gt;\n" +
+            "        &lt;CInspectionCde&gt;305005003&lt;/CInspectionCde&gt;\n" +
+            "        &lt;CInspectorNme&gt;&lt;/CInspectorNme&gt;\n" +
+            "        &lt;CModelCde&gt;JPAAAD0058&lt;/CModelCde&gt;\n" +
+            "        &lt;CModelNme&gt;吉普GFA6460CTCB多用途乘用车&lt;/CModelNme&gt;\n" +
+            "        &lt;CMortgageMrk&gt;0&lt;/CMortgageMrk&gt;\n" +
+            "        &lt;CNewMrk&gt;1&lt;/CNewMrk&gt;\n" +
+            "        &lt;CPlateColor&gt;&lt;/CPlateColor&gt;\n" +
+            "        &lt;CPlateModelCde&gt;BJPIZAUC0002&lt;/CPlateModelCde&gt;\n" +
+            "        &lt;CPlateNo&gt;晋A12551&lt;/CPlateNo&gt;\n" +
+            "        &lt;CPlateTyp&gt;02&lt;/CPlateTyp&gt;\n" +
+            "        &lt;CQryCdeJQ&gt;01AICS140023050083186549383373&lt;/CQryCdeJQ&gt;\n" +
+            "        &lt;CQryCdeSY&gt;&lt;/CQryCdeSY&gt;\n" +
+            "        &lt;CQuestionJQ&gt;&lt;/CQuestionJQ&gt;\n" +
+            "        &lt;CQuestionSY&gt;&lt;/CQuestionSY&gt;\n" +
+            "        &lt;CRegOwner&gt;李刚&lt;/CRegOwner&gt;\n" +
+            "        &lt;CRegVhlTyp&gt;K33&lt;/CRegVhlTyp&gt;\n" +
+            "        &lt;CResvTxt11&gt;&lt;/CResvTxt11&gt;\n" +
+            "        &lt;CResvTxt2&gt;&lt;/CResvTxt2&gt;\n" +
+            "        &lt;CResvTxt7&gt;&lt;/CResvTxt7&gt;\n" +
+            "        &lt;CUsageCde&gt;336001&lt;/CUsageCde&gt;\n" +
+            "        &lt;CUseYear&gt;324003&lt;/CUseYear&gt;\n" +
+            "        &lt;CVhlCheck&gt;&lt;/CVhlCheck&gt;\n" +
+            "        &lt;CVhlTyp&gt;337001&lt;/CVhlTyp&gt;\n" +
+            "        &lt;fuelType&gt;32773001&lt;/fuelType&gt;\n" +
+            "        &lt;NActualValue&gt;128861&lt;/NActualValue&gt;\n" +
+            "        &lt;NDisplacement&gt;2.36&lt;/NDisplacement&gt;\n" +
+            "        &lt;NIlogUuid&gt;&lt;/NIlogUuid&gt;\n" +
+            "        &lt;NMonDespRate&gt;0&lt;/NMonDespRate&gt;\n" +
+            "        &lt;NNewPriceValue&gt;259800&lt;/NNewPriceValue&gt;\n" +
+            "        &lt;NNewPurchaseValue&gt;128861&lt;/NNewPurchaseValue&gt;\n" +
+            "        &lt;NPoWeight&gt;0&lt;/NPoWeight&gt;\n" +
+            "        &lt;NResvNum1&gt;4&lt;/NResvNum1&gt;\n" +
+            "        &lt;NSeatNum&gt;5&lt;/NSeatNum&gt;\n" +
+            "        &lt;NTonage&gt;0&lt;/NTonage&gt;\n" +
+            "        &lt;TTransferDate&gt;&lt;/TTransferDate&gt;\n" +
+            "        &lt;TTransferTm&gt;&lt;/TTransferTm&gt;\n" +
+            "        &lt;cBrand&gt;广汽菲克&lt;/cBrand&gt;\n" +
+            "        &lt;cBuiResultFlag&gt;&lt;/cBuiResultFlag&gt;\n" +
+            "        &lt;cChdUbiData&gt;&lt;/cChdUbiData&gt;\n" +
+            "        &lt;cOperationVehicleProba&gt;&lt;/cOperationVehicleProba&gt;\n" +
+            "        &lt;cRiskScore&gt;&lt;/cRiskScore&gt;\n" +
+            "        &lt;cSuspectOperationVehicle&gt;&lt;/cSuspectOperationVehicle&gt;\n" +
+            "    &lt;/Vhl&gt;\n" +
+            "    &lt;CarModel/&gt;\n" +
+            "    &lt;Vhlowner&gt;\n" +
+            "        &lt;CAreaCde&gt;103132&lt;/CAreaCde&gt;\n" +
+            "        &lt;CCity&gt;140100&lt;/CCity&gt;\n" +
+            "        &lt;CCounty&gt;140109&lt;/CCounty&gt;\n" +
+            "        &lt;CMobile&gt;15034070105&lt;/CMobile&gt;\n" +
+            "        &lt;COwnerCls&gt;1&lt;/COwnerCls&gt;\n" +
+            "        &lt;COwnerNme&gt;李刚&lt;/COwnerNme&gt;\n" +
+            "        &lt;CProvince&gt;140000&lt;/CProvince&gt;\n" +
+            "        &lt;CSex&gt;106001&lt;/CSex&gt;\n" +
+            "        &lt;TBirthday&gt;1989-01-05&lt;/TBirthday&gt;\n" +
+            "    &lt;/Vhlowner&gt;\n" +
+            "    &lt;CvrgListJQ&gt;\n" +
+            "        &lt;cvrgJQ&gt;\n" +
+            "            &lt;appTaxAmt&gt;53.77&lt;/appTaxAmt&gt;\n" +
+            "            &lt;basicPremium&gt;950.0&lt;/basicPremium&gt;\n" +
+            "            &lt;befTaxPrm&gt;896.23&lt;/befTaxPrm&gt;\n" +
+            "            &lt;beforeDiscountPremium&gt;950.0&lt;/beforeDiscountPremium&gt;\n" +
+            "            &lt;beforeDiscountYearPremium&gt;950.0&lt;/beforeDiscountYearPremium&gt;\n" +
+            "            &lt;coverageAmount&gt;200000.0&lt;/coverageAmount&gt;\n" +
+            "            &lt;coverageCode&gt;030050&lt;/coverageCode&gt;\n" +
+            "            &lt;coverageNumber&gt;0&lt;/coverageNumber&gt;\n" +
+            "            &lt;coveragePremium&gt;950.0&lt;/coveragePremium&gt;\n" +
+            "            &lt;coverageRate&gt;0.0&lt;/coverageRate&gt;\n" +
+            "            &lt;coverageSeq&gt;1&lt;/coverageSeq&gt;\n" +
+            "            &lt;cvrgTaxRate&gt;0.06&lt;/cvrgTaxRate&gt;\n" +
+            "            &lt;maxAmount&gt;896.23&lt;/maxAmount&gt;\n" +
+            "            &lt;minAmount&gt;53.77&lt;/minAmount&gt;\n" +
+            "            &lt;originalPremium&gt;950.0&lt;/originalPremium&gt;\n" +
+            "            &lt;taxFree&gt;1&lt;/taxFree&gt;\n" +
+            "        &lt;/cvrgJQ&gt;\n" +
+            "    &lt;/CvrgListJQ&gt;\n" +
+            "    &lt;Tax&gt;\n" +
+            "        &lt;address&gt;山西省太原市万柏林区下元街办后王村中街27号2户&lt;/address&gt;\n" +
+            "        &lt;annualTaxamt&gt;300&lt;/annualTaxamt&gt;\n" +
+            "        &lt;calcFlag&gt;2&lt;/calcFlag&gt;\n" +
+            "        &lt;calculatedType&gt;349003001&lt;/calculatedType&gt;\n" +
+            "        &lt;calculatedTypeLastYear&gt;&lt;/calculatedTypeLastYear&gt;\n" +
+            "        &lt;conruty&gt;&lt;/conruty&gt;\n" +
+            "        &lt;currentTax&gt;300&lt;/currentTax&gt;\n" +
+            "        &lt;decStatus&gt;0&lt;/decStatus&gt;\n" +
+            "        &lt;declareDate&gt;&lt;/declareDate&gt;\n" +
+            "        &lt;department&gt;&lt;/department&gt;\n" +
+            "        &lt;endDateLastYear&gt;&lt;/endDateLastYear&gt;\n" +
+            "        &lt;exhaust&gt;1.5&lt;/exhaust&gt;\n" +
+            "        &lt;formerTax&gt;0&lt;/formerTax&gt;\n" +
+            "        &lt;idType&gt;120001&lt;/idType&gt;\n" +
+            "        &lt;lastCompany&gt;&lt;/lastCompany&gt;\n" +
+            "        &lt;lastPaidYear&gt;&lt;/lastPaidYear&gt;\n" +
+            "        &lt;lateFee&gt;0&lt;/lateFee&gt;\n" +
+            "        &lt;lateFeeChange&gt;0.00&lt;/lateFeeChange&gt;\n" +
+            "        &lt;lateFeeValue&gt;0.00&lt;/lateFeeValue&gt;\n" +
+            "        &lt;licenceType&gt;&lt;/licenceType&gt;\n" +
+            "        &lt;locationCode&gt;&lt;/locationCode&gt;\n" +
+            "        &lt;payChange&gt;0.00&lt;/payChange&gt;\n" +
+            "        &lt;payChangeLastYear&gt;0.00&lt;/payChangeLastYear&gt;\n" +
+            "        &lt;payEvidenceNo&gt;&lt;/payEvidenceNo&gt;\n" +
+            "        &lt;payLastYear&gt;1&lt;/payLastYear&gt;\n" +
+            "        &lt;payNo&gt;&lt;/payNo&gt;\n" +
+            "        &lt;payValueCurrent&gt;0.00&lt;/payValueCurrent&gt;\n" +
+            "        &lt;payValueLastYear&gt;0.00&lt;/payValueLastYear&gt;\n" +
+            "        &lt;pcCode&gt;&lt;/pcCode&gt;\n" +
+            "        &lt;poCategory&gt;&lt;/poCategory&gt;\n" +
+            "        &lt;positionCode&gt;&lt;/positionCode&gt;\n" +
+            "        &lt;reduceNo&gt;&lt;/reduceNo&gt;\n" +
+            "        &lt;remark&gt;&lt;/remark&gt;\n" +
+            "        &lt;returnTaxFlag&gt;&lt;/returnTaxFlag&gt;\n" +
+            "        &lt;startDateLastYear&gt;&lt;/startDateLastYear&gt;\n" +
+            "        &lt;sumUpTax&gt;300.0&lt;/sumUpTax&gt;\n" +
+            "        &lt;taxBeginDateCurrentYear&gt;2023-01-01 00:00:00&lt;/taxBeginDateCurrentYear&gt;\n" +
+            "        &lt;taxBeginDateLastYear&gt;&lt;/taxBeginDateLastYear&gt;\n" +
+            "        &lt;taxBillType&gt;&lt;/taxBillType&gt;\n" +
+            "        &lt;taxBillingNo&gt;&lt;/taxBillingNo&gt;\n" +
+            "        &lt;taxCurrentType&gt;349002001&lt;/taxCurrentType&gt;\n" +
+            "        &lt;taxDocumentDate&gt;&lt;/taxDocumentDate&gt;\n" +
+            "        &lt;taxEndDateCurrentYear&gt;2023-12-31 00:00:00&lt;/taxEndDateCurrentYear&gt;\n" +
+            "        &lt;taxFreeAmount&gt;&lt;/taxFreeAmount&gt;\n" +
+            "        &lt;taxPaidAreaCode&gt;&lt;/taxPaidAreaCode&gt;\n" +
+            "        &lt;taxPaidDate&gt;2023-05-04&lt;/taxPaidDate&gt;\n" +
+            "        &lt;taxPayerName&gt;李刚&lt;/taxPayerName&gt;\n" +
+            "        &lt;taxPeriod&gt;&lt;/taxPeriod&gt;\n" +
+            "        &lt;taxPrintNo&gt;&lt;/taxPrintNo&gt;\n" +
+            "        &lt;taxReduceProp&gt;&lt;/taxReduceProp&gt;\n" +
+            "        &lt;taxReduceRsn&gt;&lt;/taxReduceRsn&gt;\n" +
+            "        &lt;taxReduceType&gt;&lt;/taxReduceType&gt;\n" +
+            "        &lt;taxStandard&gt;0&lt;/taxStandard&gt;\n" +
+            "        &lt;taxerCode&gt;&lt;/taxerCode&gt;\n" +
+            "        &lt;taxpayerAddress&gt;山西省太原市万柏林区下元街办后王村中街27号2户&lt;/taxpayerAddress&gt;\n" +
+            "        &lt;taxpayerNo&gt;140109198901052538&lt;/taxpayerNo&gt;\n" +
+            "        &lt;taxpayerType&gt;338001&lt;/taxpayerType&gt;\n" +
+            "        &lt;tel&gt;15034070105&lt;/tel&gt;\n" +
+            "        &lt;ticketType&gt;&lt;/ticketType&gt;\n" +
+            "        &lt;totalChange&gt;0&lt;/totalChange&gt;\n" +
+            "        &lt;totalTaxValue&gt;0.00&lt;/totalTaxValue&gt;\n" +
+            "        &lt;unitRate&gt;300.0&lt;/unitRate&gt;\n" +
+            "        &lt;unittypeCde&gt;1&lt;/unittypeCde&gt;\n" +
+            "        &lt;untaxedPolicyNo&gt;&lt;/untaxedPolicyNo&gt;\n" +
+            "        &lt;useStatus&gt;&lt;/useStatus&gt;\n" +
+            "        &lt;vehecleTypeDetail&gt;3490010013&lt;/vehecleTypeDetail&gt;\n" +
+            "        &lt;vehicleCategory&gt;K33&lt;/vehicleCategory&gt;\n" +
+            "        &lt;vehicleNo&gt;晋A12551&lt;/vehicleNo&gt;\n" +
+            "        &lt;vehicleQuality&gt;0&lt;/vehicleQuality&gt;\n" +
+            "        &lt;vehicleType&gt;349001001&lt;/vehicleType&gt;\n" +
+            "        &lt;zip&gt;&lt;/zip&gt;\n" +
+            "    &lt;/Tax&gt;\n" +
+            "    &lt;Agent&gt;\n" +
+            "        &lt;agentBankType&gt;&lt;/agentBankType&gt;\n" +
+            "        &lt;agentCategory&gt;&lt;/agentCategory&gt;\n" +
+            "        &lt;agentCategoryNme&gt;&lt;/agentCategoryNme&gt;\n" +
+            "        &lt;agentCode&gt;250000P00004&lt;/agentCode&gt;\n" +
+            "        &lt;agentMajorType&gt;&lt;/agentMajorType&gt;\n" +
+            "        &lt;agentNme&gt;永鑫保险销售服务有限公司山西分公司&lt;/agentNme&gt;\n" +
+            "        &lt;agentProfId&gt;2752454675645&lt;/agentProfId&gt;\n" +
+            "        &lt;agentSaleNme&gt;专业代理&lt;/agentSaleNme&gt;\n" +
+            "        &lt;agentStaffNme&gt;&lt;/agentStaffNme&gt;\n" +
+            "        &lt;agentStockMrk&gt;189008&lt;/agentStockMrk&gt;\n" +
+            "        &lt;agentStockType&gt;199008&lt;/agentStockType&gt;\n" +
+            "        &lt;agentType&gt;191010&lt;/agentType&gt;\n" +
+            "        &lt;commissionProprortion&gt;0.04&lt;/commissionProprortion&gt;\n" +
+            "        &lt;conferCode&gt;250000P0000401&lt;/conferCode&gt;\n" +
+            "        &lt;cusLvl&gt;&lt;/cusLvl&gt;\n" +
+            "        &lt;custNature&gt;192099&lt;/custNature&gt;\n" +
+            "        &lt;dutyCde&gt;&lt;/dutyCde&gt;\n" +
+            "        &lt;dutyCnm&gt;&lt;/dutyCnm&gt;\n" +
+            "        &lt;extPrm&gt;0.0&lt;/extPrm&gt;\n" +
+            "        &lt;extProp&gt;0.0&lt;/extProp&gt;\n" +
+            "        &lt;fromCde&gt;&lt;/fromCde&gt;\n" +
+            "        &lt;qlftNo&gt;2752454675645&lt;/qlftNo&gt;\n" +
+            "        &lt;subCoNo&gt;250000P0000401&lt;/subCoNo&gt;\n" +
+            "        &lt;supportServicePacket&gt;&lt;/supportServicePacket&gt;\n" +
+            "        &lt;supportServiceProvider&gt;&lt;/supportServiceProvider&gt;\n" +
+            "    &lt;/Agent&gt;\n" +
+            "    &lt;VehicleAdjust&gt;\n" +
+            "        &lt;CInsuranceGroup&gt;DJ&lt;/CInsuranceGroup&gt;\n" +
+            "        &lt;drinkDrivingDealTime&gt;0&lt;/drinkDrivingDealTime&gt;\n" +
+            "        &lt;drinkDrivingNonDealTime&gt;0&lt;/drinkDrivingNonDealTime&gt;\n" +
+            "        &lt;drinkDrivingTime&gt;0&lt;/drinkDrivingTime&gt;\n" +
+            "        &lt;drunkDrivingDealTime&gt;0&lt;/drunkDrivingDealTime&gt;\n" +
+            "        &lt;drunkDrivingFloatingRate&gt;&lt;/drunkDrivingFloatingRate&gt;\n" +
+            "        &lt;drunkDrivingLastYear&gt;&lt;/drunkDrivingLastYear&gt;\n" +
+            "        &lt;drunkDrivingNonDealTime&gt;0&lt;/drunkDrivingNonDealTime&gt;\n" +
+            "        &lt;drunkDrivingTime&gt;0&lt;/drunkDrivingTime&gt;\n" +
+            "        &lt;dutyReparFloatingRate&gt;1&lt;/dutyReparFloatingRate&gt;\n" +
+            "        &lt;JQRecordDanger&gt;&lt;/JQRecordDanger&gt;\n" +
+            "        &lt;otherFirstNoProveYear&gt;&lt;/otherFirstNoProveYear&gt;\n" +
+            "        &lt;overCommitmentLastYear&gt;&lt;/overCommitmentLastYear&gt;\n" +
+            "        &lt;overallFloatingCoefficient&gt;1.0&lt;/overallFloatingCoefficient&gt;\n" +
+            "        &lt;rateFloatFlag&gt;02&lt;/rateFloatFlag&gt;\n" +
+            "        &lt;recDiscount&gt;1.0&lt;/recDiscount&gt;\n" +
+            "        &lt;roadAccidentFloatingRate&gt;&lt;/roadAccidentFloatingRate&gt;\n" +
+            "        &lt;roadAccidentFloatingRateValue&gt;&lt;/roadAccidentFloatingRateValue&gt;\n" +
+            "        &lt;roadViolatFloatingRate&gt;1&lt;/roadViolatFloatingRate&gt;\n" +
+            "        &lt;secondaryOrganization&gt;14&lt;/secondaryOrganization&gt;\n" +
+            "        &lt;taxDiscount&gt;&lt;/taxDiscount&gt;\n" +
+            "        &lt;typeMismatchLastYear&gt;&lt;/typeMismatchLastYear&gt;\n" +
+            "        &lt;voilateRoadSignLastYear&gt;&lt;/voilateRoadSignLastYear&gt;\n" +
+            "        &lt;weDiscount&gt;&lt;/weDiscount&gt;\n" +
+            "        &lt;cInsuranceGroup&gt;DJ&lt;/cInsuranceGroup&gt;\n" +
+            "    &lt;/VehicleAdjust&gt;\n" +
+            "    &lt;FeeListJQ&gt;\n" +
+            "        &lt;feeJQ&gt;\n" +
+            "            &lt;CAppNo&gt;&lt;/CAppNo&gt;\n" +
+            "            &lt;CFeetypCde&gt;A&lt;/CFeetypCde&gt;\n" +
+            "            &lt;CSellfeeBusicls&gt;&lt;/CSellfeeBusicls&gt;\n" +
+            "            &lt;NFee&gt;35.85&lt;/NFee&gt;\n" +
+            "            &lt;NFeeProp&gt;0.04&lt;/NFeeProp&gt;\n" +
+            "            &lt;NGotPrm&gt;&lt;/NGotPrm&gt;\n" +
+            "        &lt;/feeJQ&gt;\n" +
+            "        &lt;feeJQ&gt;\n" +
+            "            &lt;CAppNo&gt;&lt;/CAppNo&gt;\n" +
+            "            &lt;CFeetypCde&gt;Y0&lt;/CFeetypCde&gt;\n" +
+            "            &lt;CSellfeeBusicls&gt;&lt;/CSellfeeBusicls&gt;\n" +
+            "            &lt;NFee&gt;35.85&lt;/NFee&gt;\n" +
+            "            &lt;NFeeProp&gt;0.04&lt;/NFeeProp&gt;\n" +
+            "            &lt;NGotPrm&gt;&lt;/NGotPrm&gt;\n" +
+            "        &lt;/feeJQ&gt;\n" +
+            "        &lt;feeJQ&gt;\n" +
+            "            &lt;CAppNo&gt;&lt;/CAppNo&gt;\n" +
+            "            &lt;CFeetypCde&gt;Y1&lt;/CFeetypCde&gt;\n" +
+            "            &lt;CSellfeeBusicls&gt;&lt;/CSellfeeBusicls&gt;\n" +
+            "            &lt;NFee&gt;0.0&lt;/NFee&gt;\n" +
+            "            &lt;NFeeProp&gt;0.0&lt;/NFeeProp&gt;\n" +
+            "            &lt;NGotPrm&gt;&lt;/NGotPrm&gt;\n" +
+            "        &lt;/feeJQ&gt;\n" +
+            "        &lt;feeJQ&gt;\n" +
+            "            &lt;CAppNo&gt;&lt;/CAppNo&gt;\n" +
+            "            &lt;CFeetypCde&gt;Y2&lt;/CFeetypCde&gt;\n" +
+            "            &lt;CSellfeeBusicls&gt;&lt;/CSellfeeBusicls&gt;\n" +
+            "            &lt;NFee&gt;0.0&lt;/NFee&gt;\n" +
+            "            &lt;NFeeProp&gt;0.0&lt;/NFeeProp&gt;\n" +
+            "            &lt;NGotPrm&gt;&lt;/NGotPrm&gt;\n" +
+            "        &lt;/feeJQ&gt;\n" +
+            "        &lt;feeJQ&gt;\n" +
+            "            &lt;CAppNo&gt;&lt;/CAppNo&gt;\n" +
+            "            &lt;CFeetypCde&gt;Y3&lt;/CFeetypCde&gt;\n" +
+            "            &lt;CSellfeeBusicls&gt;&lt;/CSellfeeBusicls&gt;\n" +
+            "            &lt;NFee&gt;0.0&lt;/NFee&gt;\n" +
+            "            &lt;NFeeProp&gt;0.0&lt;/NFeeProp&gt;\n" +
+            "            &lt;NGotPrm&gt;&lt;/NGotPrm&gt;\n" +
+            "        &lt;/feeJQ&gt;\n" +
+            "        &lt;feeJQ&gt;\n" +
+            "            &lt;CAppNo&gt;&lt;/CAppNo&gt;\n" +
+            "            &lt;CFeetypCde&gt;Y5&lt;/CFeetypCde&gt;\n" +
+            "            &lt;CSellfeeBusicls&gt;&lt;/CSellfeeBusicls&gt;\n" +
+            "            &lt;NFee&gt;0.0&lt;/NFee&gt;\n" +
+            "            &lt;NFeeProp&gt;0.0&lt;/NFeeProp&gt;\n" +
+            "            &lt;NGotPrm&gt;&lt;/NGotPrm&gt;\n" +
+            "        &lt;/feeJQ&gt;\n" +
+            "        &lt;feeJQ&gt;\n" +
+            "            &lt;CAppNo&gt;&lt;/CAppNo&gt;\n" +
+            "            &lt;CFeetypCde&gt;Y10&lt;/CFeetypCde&gt;\n" +
+            "            &lt;CSellfeeBusicls&gt;&lt;/CSellfeeBusicls&gt;\n" +
+            "            &lt;NFee&gt;0.0&lt;/NFee&gt;\n" +
+            "            &lt;NFeeProp&gt;0.0&lt;/NFeeProp&gt;\n" +
+            "            &lt;NGotPrm&gt;&lt;/NGotPrm&gt;\n" +
+            "        &lt;/feeJQ&gt;\n" +
+            "        &lt;feeJQ&gt;\n" +
+            "            &lt;CAppNo&gt;&lt;/CAppNo&gt;\n" +
+            "            &lt;CFeetypCde&gt;Y11&lt;/CFeetypCde&gt;\n" +
+            "            &lt;CSellfeeBusicls&gt;&lt;/CSellfeeBusicls&gt;\n" +
+            "            &lt;NFee&gt;0.0&lt;/NFee&gt;\n" +
+            "            &lt;NFeeProp&gt;0.0&lt;/NFeeProp&gt;\n" +
+            "            &lt;NGotPrm&gt;&lt;/NGotPrm&gt;\n" +
+            "        &lt;/feeJQ&gt;\n" +
+            "        &lt;feeJQ&gt;\n" +
+            "            &lt;CAppNo&gt;&lt;/CAppNo&gt;\n" +
+            "            &lt;CFeetypCde&gt;Y12&lt;/CFeetypCde&gt;\n" +
+            "            &lt;CSellfeeBusicls&gt;&lt;/CSellfeeBusicls&gt;\n" +
+            "            &lt;NFee&gt;0.0&lt;/NFee&gt;\n" +
+            "            &lt;NFeeProp&gt;0.0&lt;/NFeeProp&gt;\n" +
+            "            &lt;NGotPrm&gt;&lt;/NGotPrm&gt;\n" +
+            "        &lt;/feeJQ&gt;\n" +
+            "        &lt;feeJQ&gt;\n" +
+            "            &lt;CAppNo&gt;&lt;/CAppNo&gt;\n" +
+            "            &lt;CFeetypCde&gt;Y0_1&lt;/CFeetypCde&gt;\n" +
+            "            &lt;CSellfeeBusicls&gt;&lt;/CSellfeeBusicls&gt;\n" +
+            "            &lt;NFee&gt;0.0&lt;/NFee&gt;\n" +
+            "            &lt;NFeeProp&gt;0.0&lt;/NFeeProp&gt;\n" +
+            "            &lt;NGotPrm&gt;&lt;/NGotPrm&gt;\n" +
+            "        &lt;/feeJQ&gt;\n" +
+            "        &lt;feeJQ&gt;\n" +
+            "            &lt;CAppNo&gt;&lt;/CAppNo&gt;\n" +
+            "            &lt;CFeetypCde&gt;Y1_1&lt;/CFeetypCde&gt;\n" +
+            "            &lt;CSellfeeBusicls&gt;&lt;/CSellfeeBusicls&gt;\n" +
+            "            &lt;NFee&gt;0.0&lt;/NFee&gt;\n" +
+            "            &lt;NFeeProp&gt;0.0&lt;/NFeeProp&gt;\n" +
+            "            &lt;NGotPrm&gt;&lt;/NGotPrm&gt;\n" +
+            "        &lt;/feeJQ&gt;\n" +
+            "        &lt;feeJQ&gt;\n" +
+            "            &lt;CAppNo&gt;&lt;/CAppNo&gt;\n" +
+            "            &lt;CFeetypCde&gt;Y2_1&lt;/CFeetypCde&gt;\n" +
+            "            &lt;CSellfeeBusicls&gt;&lt;/CSellfeeBusicls&gt;\n" +
+            "            &lt;NFee&gt;0.0&lt;/NFee&gt;\n" +
+            "            &lt;NFeeProp&gt;0.0&lt;/NFeeProp&gt;\n" +
+            "            &lt;NGotPrm&gt;&lt;/NGotPrm&gt;\n" +
+            "        &lt;/feeJQ&gt;\n" +
+            "        &lt;feeJQ&gt;\n" +
+            "            &lt;CAppNo&gt;&lt;/CAppNo&gt;\n" +
+            "            &lt;CFeetypCde&gt;Y5_1&lt;/CFeetypCde&gt;\n" +
+            "            &lt;CSellfeeBusicls&gt;&lt;/CSellfeeBusicls&gt;\n" +
+            "            &lt;NFee&gt;0.0&lt;/NFee&gt;\n" +
+            "            &lt;NFeeProp&gt;0.0&lt;/NFeeProp&gt;\n" +
+            "            &lt;NGotPrm&gt;&lt;/NGotPrm&gt;\n" +
+            "        &lt;/feeJQ&gt;\n" +
+            "        &lt;feeJQ&gt;\n" +
+            "            &lt;CAppNo&gt;&lt;/CAppNo&gt;\n" +
+            "            &lt;CFeetypCde&gt;A_1&lt;/CFeetypCde&gt;\n" +
+            "            &lt;CSellfeeBusicls&gt;&lt;/CSellfeeBusicls&gt;\n" +
+            "            &lt;NFee&gt;0.0&lt;/NFee&gt;\n" +
+            "            &lt;NFeeProp&gt;0.0&lt;/NFeeProp&gt;\n" +
+            "            &lt;NGotPrm&gt;&lt;/NGotPrm&gt;\n" +
+            "        &lt;/feeJQ&gt;\n" +
+            "        &lt;feeJQ&gt;\n" +
+            "            &lt;CAppNo&gt;&lt;/CAppNo&gt;\n" +
+            "            &lt;CFeetypCde&gt;036&lt;/CFeetypCde&gt;\n" +
+            "            &lt;CSellfeeBusicls&gt;&lt;/CSellfeeBusicls&gt;\n" +
+            "            &lt;NFee&gt;0.0&lt;/NFee&gt;\n" +
+            "            &lt;NFeeProp&gt;0.0&lt;/NFeeProp&gt;\n" +
+            "            &lt;NGotPrm&gt;&lt;/NGotPrm&gt;\n" +
+            "        &lt;/feeJQ&gt;\n" +
+            "        &lt;feeJQ&gt;\n" +
+            "            &lt;CAppNo&gt;&lt;/CAppNo&gt;\n" +
+            "            &lt;CFeetypCde&gt;037&lt;/CFeetypCde&gt;\n" +
+            "            &lt;CSellfeeBusicls&gt;&lt;/CSellfeeBusicls&gt;\n" +
+            "            &lt;NFee&gt;0.0&lt;/NFee&gt;\n" +
+            "            &lt;NFeeProp&gt;0.0&lt;/NFeeProp&gt;\n" +
+            "            &lt;NGotPrm&gt;&lt;/NGotPrm&gt;\n" +
+            "        &lt;/feeJQ&gt;\n" +
+            "        &lt;feeJQ&gt;\n" +
+            "            &lt;CAppNo&gt;&lt;/CAppNo&gt;\n" +
+            "            &lt;CFeetypCde&gt;038&lt;/CFeetypCde&gt;\n" +
+            "            &lt;CSellfeeBusicls&gt;&lt;/CSellfeeBusicls&gt;\n" +
+            "            &lt;NFee&gt;0.0&lt;/NFee&gt;\n" +
+            "            &lt;NFeeProp&gt;0.0&lt;/NFeeProp&gt;\n" +
+            "            &lt;NGotPrm&gt;&lt;/NGotPrm&gt;\n" +
+            "        &lt;/feeJQ&gt;\n" +
+            "        &lt;feeJQ&gt;\n" +
+            "            &lt;CAppNo&gt;&lt;/CAppNo&gt;\n" +
+            "            &lt;CFeetypCde&gt;036_1&lt;/CFeetypCde&gt;\n" +
+            "            &lt;CSellfeeBusicls&gt;&lt;/CSellfeeBusicls&gt;\n" +
+            "            &lt;NFee&gt;0.0&lt;/NFee&gt;\n" +
+            "            &lt;NFeeProp&gt;0.0&lt;/NFeeProp&gt;\n" +
+            "            &lt;NGotPrm&gt;&lt;/NGotPrm&gt;\n" +
+            "        &lt;/feeJQ&gt;\n" +
+            "        &lt;feeJQ&gt;\n" +
+            "            &lt;CAppNo&gt;&lt;/CAppNo&gt;\n" +
+            "            &lt;CFeetypCde&gt;037_1&lt;/CFeetypCde&gt;\n" +
+            "            &lt;CSellfeeBusicls&gt;&lt;/CSellfeeBusicls&gt;\n" +
+            "            &lt;NFee&gt;0.0&lt;/NFee&gt;\n" +
+            "            &lt;NFeeProp&gt;0.0&lt;/NFeeProp&gt;\n" +
+            "            &lt;NGotPrm&gt;&lt;/NGotPrm&gt;\n" +
+            "        &lt;/feeJQ&gt;\n" +
+            "        &lt;feeJQ&gt;\n" +
+            "            &lt;CAppNo&gt;&lt;/CAppNo&gt;\n" +
+            "            &lt;CFeetypCde&gt;038_1&lt;/CFeetypCde&gt;\n" +
+            "            &lt;CSellfeeBusicls&gt;&lt;/CSellfeeBusicls&gt;\n" +
+            "            &lt;NFee&gt;0.0&lt;/NFee&gt;\n" +
+            "            &lt;NFeeProp&gt;0.0&lt;/NFeeProp&gt;\n" +
+            "            &lt;NGotPrm&gt;&lt;/NGotPrm&gt;\n" +
+            "        &lt;/feeJQ&gt;\n" +
+            "    &lt;/FeeListJQ&gt;\n" +
+            "    &lt;FixspecListJQ&gt;\n" +
+            "        &lt;fixspecDataJQ&gt;\n" +
+            "            &lt;modify&gt;0&lt;/modify&gt;\n" +
+            "            &lt;ruleMrk&gt;1&lt;/ruleMrk&gt;\n" +
+            "            &lt;seqNo&gt;1&lt;/seqNo&gt;\n" +
+            "            &lt;specContent&gt;收到本保险单后请认真核对，如与投保事实不符，请立即通知本公司采用保险批单更改,其他方式的更改无效；如超过48小时未提出异议的，视为投保人同意本保险单所载内容&lt;/specContent&gt;\n" +
+            "            &lt;specNo&gt;202100224&lt;/specNo&gt;\n" +
+            "        &lt;/fixspecDataJQ&gt;\n" +
+            "        &lt;fixspecDataJQ&gt;\n" +
+            "            &lt;modify&gt;0&lt;/modify&gt;\n" +
+            "            &lt;ruleMrk&gt;1&lt;/ruleMrk&gt;\n" +
+            "            &lt;seqNo&gt;2&lt;/seqNo&gt;\n" +
+            "            &lt;specContent&gt;所有权发生转移，应及时到保险公司办理变更，未办理变更手续，且因转让导致保险车辆危险程度显著增加而发生保险事故的，保险人不负赔偿责任。&lt;/specContent&gt;\n" +
+            "            &lt;specNo&gt;202100024&lt;/specNo&gt;\n" +
+            "        &lt;/fixspecDataJQ&gt;\n" +
+            "        &lt;fixspecDataJQ&gt;\n" +
+            "            &lt;modify&gt;0&lt;/modify&gt;\n" +
+            "            &lt;ruleMrk&gt;1&lt;/ruleMrk&gt;\n" +
+            "            &lt;seqNo&gt;3&lt;/seqNo&gt;\n" +
+            "            &lt;specContent&gt;本保单车辆发生保险事故时，对事故车辆保险公司可以以不限于实物的方式进行赔付。&lt;/specContent&gt;\n" +
+            "            &lt;specNo&gt;201900114&lt;/specNo&gt;\n" +
+            "        &lt;/fixspecDataJQ&gt;\n" +
+            "        &lt;fixspecDataJQ&gt;\n" +
+            "            &lt;modify&gt;0&lt;/modify&gt;\n" +
+            "            &lt;ruleMrk&gt;1&lt;/ruleMrk&gt;\n" +
+            "            &lt;seqNo&gt;4&lt;/seqNo&gt;\n" +
+            "            &lt;specContent&gt;投保次日起，您可以关注本公司网页（http://www.yongcheng.com/new/policyAndClaim/query/type/policy/index） 查询、验真、下载电子保单、批单。电子保单、批单使用方法已发送至您在本公司预留的邮箱地址内，请您查收！&lt;/specContent&gt;\n" +
+            "            &lt;specNo&gt;202100011&lt;/specNo&gt;\n" +
+            "        &lt;/fixspecDataJQ&gt;\n" +
+            "    &lt;/FixspecListJQ&gt;\n" +
+            "    &lt;TfiWarnList&gt;\n" +
+            "        &lt;tfiWarnData/&gt;\n" +
+            "    &lt;/TfiWarnList&gt;\n" +
+            "&lt;/responseMessage&gt;</response></ns2:queryVehicleXnyQuotationServiceResponse></S:Body></S:Envelope>";
 
 
     private static String BBB = "<S:Envelope\n" +
@@ -286,32 +778,64 @@ public class HttpXmlUtil {
             "    &lt;sypolicyUrl&gt;&lt;/sypolicyUrl&gt;\n" +
             "&lt;/packet&gt;</response></ns2:dzbdUrlResponse></S:Body></S:Envelope>";
 
+    private static String HHH = "：<?xml version=\"1.0\" ?><S:Envelope xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\"><S:Body><ns2:newQueryYwCvrgResponse xmlns:ns2=\"http://newWS.front.app.echannel.ebiz.alltrust.com/\"><response>&lt;?xml version='1.0' encoding='UTF-8'?&gt;\n" +
+            "&lt;packet&gt;\n" +
+            "    &lt;head&gt;\n" +
+            "        &lt;responseCompleteMessageStatus&gt;\n" +
+            "            &lt;messageStatusCode&gt;E0000&lt;/messageStatusCode&gt;\n" +
+            "            &lt;messageStatusDescription&gt;成功,共5个方案！&lt;/messageStatusDescription&gt;\n" +
+            "        &lt;/responseCompleteMessageStatus&gt;\n" +
+            "    &lt;/head&gt;\n" +
+            "    &lt;responseYwCvrg&gt;\n" +
+            "        &lt;cvrgList&gt;\n" +
+            "            &lt;cInsuranceType&gt;A-5座车方案&lt;/cInsuranceType&gt;\n" +
+            "            &lt;cInsuranceTypeCode&gt;100&lt;/cInsuranceTypeCode&gt;\n" +
+            "            &lt;nPurchaseLimitsNum&gt;5&lt;/nPurchaseLimitsNum&gt;\n" +
+            "        &lt;/cvrgList&gt;\n" +
+            "        &lt;cvrgList&gt;\n" +
+            "            &lt;cInsuranceType&gt;5座车交强险方案&lt;/cInsuranceType&gt;\n" +
+            "            &lt;cInsuranceTypeCode&gt;119&lt;/cInsuranceTypeCode&gt;\n" +
+            "            &lt;nPurchaseLimitsNum&gt;5&lt;/nPurchaseLimitsNum&gt;\n" +
+            "        &lt;/cvrgList&gt;\n" +
+            "        &lt;cvrgList&gt;\n" +
+            "            &lt;cInsuranceType&gt;A-1- 5座车方案&lt;/cInsuranceType&gt;\n" +
+            "            &lt;cInsuranceTypeCode&gt;103&lt;/cInsuranceTypeCode&gt;\n" +
+            "            &lt;nPurchaseLimitsNum&gt;5&lt;/nPurchaseLimitsNum&gt;\n" +
+            "        &lt;/cvrgList&gt;\n" +
+            "        &lt;cvrgList&gt;\n" +
+            "            &lt;cInsuranceType&gt;陕分线上代理（5座版）&lt;/cInsuranceType&gt;\n" +
+            "            &lt;cInsuranceTypeCode&gt;160&lt;/cInsuranceTypeCode&gt;\n" +
+            "            &lt;nPurchaseLimitsNum&gt;5&lt;/nPurchaseLimitsNum&gt;\n" +
+            "        &lt;/cvrgList&gt;\n" +
+            "        &lt;cvrgList&gt;\n" +
+            "            &lt;cInsuranceType&gt;A - 5座车方案&lt;/cInsuranceType&gt;\n" +
+            "            &lt;cInsuranceTypeCode&gt;104&lt;/cInsuranceTypeCode&gt;\n" +
+            "            &lt;nPurchaseLimitsNum&gt;5&lt;/nPurchaseLimitsNum&gt;\n" +
+            "        &lt;/cvrgList&gt;\n" +
+            "    &lt;/responseYwCvrg&gt;\n" +
+            "&lt;/packet&gt;</response></ns2:newQueryYwCvrgResponse></S:Body></S:Envelope>";
 
 
 
-    public static void main(String[] agr) throws JsonProcessingException {
-
-//        String a = "53.77";
-//        String c = "896.23";
-//
-//        String b = "161.2";
-//        String d = "2686.58";
-//
-//        double jqPremium = StringUtils.toDouble(new BigDecimal(b).add(new BigDecimal(d)).toString());
-
-
 
+    public static void main(String[] agr) throws JsonProcessingException {
 
+//        ObjectMapper xmlMapper = new XmlMapper();
+//        xmlMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+//        xmlMapper.configure(SerializationFeature.WRAP_ROOT_VALUE, false);
+//        xmlMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+//        xmlMapper.setPropertyNamingStrategy(PropertyNamingStrategy.UPPER_CAMEL_CASE);
+//        xmlMapper.enable(MapperFeature.USE_STD_BEAN_NAMING);
+//        xmlMapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true);
 
         ObjectMapper xmlMapper = new XmlMapper();
+        xmlMapper = new XmlMapper();
         xmlMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         xmlMapper.configure(SerializationFeature.WRAP_ROOT_VALUE, false);
         xmlMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
         xmlMapper.setPropertyNamingStrategy(PropertyNamingStrategy.UPPER_CAMEL_CASE);
         xmlMapper.enable(MapperFeature.USE_STD_BEAN_NAMING);
-
-
-
+        xmlMapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true);
 
 
         //=================
@@ -319,34 +843,20 @@ public class HttpXmlUtil {
 
 
         //报价
-//        String responseStr = AAA;
+        String responseStr = AAA;
 //        String responseStr = BBB;
 //        报价响应
 //        String responseStr = CCC;
 //        String responseStr = DDD;
-        String responseStr = EEE;
+//        String responseStr = EEE;
 //        String responseStr = FFF;
 //        String responseStr = GGG;
+//        String responseStr = HHH;
 
         String str = YcBuildData.cleanResponseStr(responseStr);
 
         try {
-            AuditResponse rd = xmlMapper.readValue(str, AuditResponse.class);
-//            CallbackAnOrderResponse rd = xmlMapper.readValue(str, CallbackAnOrderResponse.class);
-//            PolicyResponse rd = xmlMapper.readValue(str, PolicyResponse.class);
-//            AuditResponse rd = xmlMapper.readValue(str, AuditResponse.class);
-//            RuoteResponse rd = xmlMapper.readValue(str, RuoteResponse.class);
-//            ImageUpResponse rd = xmlMapper.readValue(str, ImageUpResponse.class);
-
-//            List<QuoteKindRespVo> kindList1 = YcBuildData.buildQuoteKindList(rd);
-//
-//            if (!rd.getHead().getErrorCode().equals("000000")) {
-//                throw new SystemException(rd.getHead().getErrorMessage());
-//            }
-//
-//            double jqPremium = StringUtils.parseDouble(rd.getBase().getNBefTaxPrmJQ());
-//            double syPremium = StringUtils.parseDouble(rd.getBase().getNBefTaxPrmSY());
-//            List<QuoteKindRespVo> kindList1 = YcBuildData.buildQuoteKindList(rd);
+            RuoteResponse rd = xmlMapper.readValue(str, RuoteResponse.class);
             System.out.println("test msg：");
 
 

src/main/resources/application-test.yml

@@ -264,7 +264,8 @@ yc:
     password: 123456
     pay:
       # 回调地址
-      callBack: http://47.92.254.66:8080/api/yongCheng/callBack
+      callBack: http://39.98.239.48/web-api/api/yongCheng/callBack
+#      callBack: http://47.92.254.66:8080/api/yongCheng/callBack
     url: http://140.206.189.151:17000/
   audit:
     url: /yc/jiaofei

src/main/resources/logback-spring.xml

@@ -127,10 +127,13 @@
 
 
     <!--开发环境:打印控制台-->
-    <springProfile name="dev,test">
+    <springProfile name="dev,test,prod">
         <root level="debug">
             <appender-ref ref="console" />
             <appender-ref ref="file_console" />
+            <appender-ref ref="file_info" />
+            <appender-ref ref="file_error" />
+<!--            <appender-ref ref="custom_alltrust" />-->
         </root>
     </springProfile>
 
@@ -144,7 +147,7 @@
 <!--    </root>-->
 
     <!-- 添加永诚信息 -->
-    <logger name="alltrust" additivity="false" level="info">
+    <logger name="alltrust" additivity="false" level="debug">
         <appender-ref ref="custom_alltrust"/>
     </logger>