diff --git a/yudao-framework/yudao-spring-boot-starter-banner/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-banner/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index e04c9b4..0000000 --- a/yudao-framework/yudao-spring-boot-starter-banner/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.iocoder.yudao.framework.banner.config.YudaoBannerAutoConfiguration \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-banner/target/classes/banner.txt b/yudao-framework/yudao-spring-boot-starter-banner/target/classes/banner.txt deleted file mode 100644 index 39a441d..0000000 --- a/yudao-framework/yudao-spring-boot-starter-banner/target/classes/banner.txt +++ /dev/null @@ -1,17 +0,0 @@ -芋道源码 http://www.iocoder.cn -Application Version: ${yudao.info.version} -Spring Boot Version: ${spring-boot.version} - -.__ __. ______ .______ __ __ _______ -| \ | | / __ \ | _ \ | | | | / _____| -| \| | | | | | | |_) | | | | | | | __ -| . ` | | | | | | _ < | | | | | | |_ | -| |\ | | `--' | | |_) | | `--' | | |__| | -|__| \__| \______/ |______/ \______/ \______| - -███╗ ██╗ ██████╗ ██████╗ ██╗ ██╗ ██████╗ -████╗ ██║██╔═══██╗ ██╔══██╗██║ ██║██╔════╝ -██╔██╗ ██║██║ ██║ ██████╔╝██║ ██║██║ ███╗ -██║╚██╗██║██║ ██║ ██╔══██╗██║ ██║██║ ██║ -██║ ╚████║╚██████╔╝ ██████╔╝╚██████╔╝╚██████╔╝ -╚═╝ ╚═══╝ ╚═════╝ ╚═════╝ ╚═════╝ ╚═════╝ diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-biz-data-permission/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index bd0e97a..0000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -cn.iocoder.yudao.framework.datapermission.config.YudaoDataPermissionAutoConfiguration -cn.iocoder.yudao.framework.datapermission.config.YudaoDeptDataPermissionAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-biz-dict/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-biz-dict/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index c135368..0000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-dict/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -cn.iocoder.yudao.framework.dict.config.YudaoDictRpcAutoConfiguration -cn.iocoder.yudao.framework.dict.config.YudaoDictAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-biz-error-code/target/classes/META-INF/spring-configuration-metadata.json b/yudao-framework/yudao-spring-boot-starter-biz-error-code/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index 845f582..0000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-error-code/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "groups": [ - { - "name": "yudao.error-code", - "type": "cn.iocoder.yudao.framework.errorcode.config.ErrorCodeProperties", - "sourceType": "cn.iocoder.yudao.framework.errorcode.config.ErrorCodeProperties" - } - ], - "properties": [ - { - "name": "yudao.error-code.constants-class-list", - "type": "java.util.List", - "description": "错误码枚举类", - "sourceType": "cn.iocoder.yudao.framework.errorcode.config.ErrorCodeProperties" - }, - { - "name": "yudao.error-code.enable", - "type": "java.lang.Boolean", - "description": "是否开启", - "sourceType": "cn.iocoder.yudao.framework.errorcode.config.ErrorCodeProperties" - } - ], - "hints": [] -} \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-biz-error-code/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-biz-error-code/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 6e0ebb4..0000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-error-code/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -cn.iocoder.yudao.framework.errorcode.config.YudaoErrorCodeRpcAutoConfiguration -cn.iocoder.yudao.framework.errorcode.config.YudaoErrorCodeAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/resources/ip2region.xdb.bak1 b/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/resources/ip2region.xdb.bak1 deleted file mode 100644 index 58596a5..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/resources/ip2region.xdb.bak1 and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-biz-ip/target/classes/area.csv b/yudao-framework/yudao-spring-boot-starter-biz-ip/target/classes/area.csv deleted file mode 100644 index 27e753c..0000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-ip/target/classes/area.csv +++ /dev/null @@ -1,3608 +0,0 @@ -id,name,type,parentId -1,中国,1,0 -2,蒙古,1,0 -3,朝鲜,1,0 -4,韩国,1,0 -5,日本,1,0 -6,菲律宾,1,0 -7,越南,1,0 -8,老挝,1,0 -9,柬埔寨,1,0 -10,缅甸,1,0 -11,泰国,1,0 -12,马来西亚,1,0 -13,文莱,1,0 -14,新加坡,1,0 -15,印度尼西亚,1,0 -16,东帝汶,1,0 -17,尼泊尔,1,0 -18,不丹,1,0 -19,孟加拉国,1,0 -20,印度,1,0 -21,巴基斯坦,1,0 -22,斯里兰卡,1,0 -23,马尔代夫,1,0 -24,哈萨克斯坦,1,0 -25,吉尔吉斯斯坦,1,0 -26,塔吉克斯坦,1,0 -27,乌兹别克斯坦,1,0 -28,土库曼斯坦,1,0 -29,阿富汗,1,0 -30,伊拉克,1,0 -31,伊朗,1,0 -32,叙利亚,1,0 -33,约旦,1,0 -34,黎巴嫩,1,0 -35,以色列,1,0 -36,巴勒斯坦,1,0 -37,沙特阿拉伯,1,0 -38,巴林,1,0 -39,卡塔尔,1,0 -40,科威特,1,0 -41,阿拉伯联合酋长国,1,0 -42,阿曼,1,0 -43,也门,1,0 -44,格鲁吉亚,1,0 -45,亚美尼亚,1,0 -46,阿塞拜疆,1,0 -47,土耳其,1,0 -48,塞浦路斯,1,0 -49,芬兰,1,0 -50,瑞典,1,0 -51,挪威,1,0 -52,冰岛,1,0 -53,丹麦,1,0 -54,爱沙尼亚,1,0 -55,拉脱维亚,1,0 -56,立陶宛,1,0 -57,白俄罗斯,1,0 -58,俄罗斯,1,0 -59,乌克兰,1,0 -60,摩尔多瓦,1,0 -61,波兰,1,0 -62,捷克,1,0 -63,斯洛伐克,1,0 -64,匈牙利,1,0 -65,德国,1,0 -66,奥地利,1,0 -67,瑞士,1,0 -68,列支敦士登,1,0 -69,英国,1,0 -70,爱尔兰,1,0 -71,荷兰,1,0 -72,比利时,1,0 -73,卢森堡,1,0 -74,法国,1,0 -75,摩纳哥,1,0 -76,罗马尼亚,1,0 -77,保加利亚,1,0 -78,塞尔维亚,1,0 -79,马其顿,1,0 -80,阿尔巴尼亚,1,0 -81,希腊,1,0 -82,斯洛文尼亚,1,0 -83,克罗地亚,1,0 -84,波斯尼亚和墨塞哥维那,1,0 -85,意大利,1,0 -86,梵蒂冈,1,0 -87,圣马力诺,1,0 -88,马耳他,1,0 -89,西班牙,1,0 -90,葡萄牙,1,0 -91,安道尔共和国,1,0 -92,埃及,1,0 -93,利比亚,1,0 -94,苏丹,1,0 -95,突尼斯,1,0 -96,阿尔及利亚,1,0 -97,摩洛哥,1,0 -98,亚速尔群岛,1,0 -99,马德拉群岛,1,0 -100,埃塞俄比亚,1,0 -101,厄立特里亚,1,0 -102,索马里,1,0 -103,吉布提,1,0 -104,肯尼亚,1,0 -105,坦桑尼亚,1,0 -106,乌干达,1,0 -107,卢旺达,1,0 -108,布隆迪,1,0 -109,塞舌尔,1,0 -110,圣多美及普林西比,1,0 -111,塞内加尔,1,0 -112,冈比亚,1,0 -113,马里,1,0 -114,布基纳法索,1,0 -115,几内亚,1,0 -116,几内亚比绍,1,0 -117,佛得角,1,0 -118,塞拉利昂,1,0 -119,利比里亚,1,0 -120,科特迪瓦,1,0 -121,加纳,1,0 -122,多哥,1,0 -123,贝宁,1,0 -124,尼日尔,1,0 -125,加那利群岛,1,0 -126,赞比亚,1,0 -127,安哥拉,1,0 -128,津巴布韦,1,0 -129,马拉维,1,0 -130,莫桑比克,1,0 -131,博茨瓦纳,1,0 -132,纳米比亚,1,0 -133,南非,1,0 -134,斯威士兰,1,0 -135,莱索托,1,0 -136,马达加斯加,1,0 -137,科摩罗,1,0 -138,毛里求斯,1,0 -139,留尼旺,1,0 -140,圣赫勒拿,1,0 -141,澳大利亚,1,0 -142,新西兰,1,0 -143,巴布亚新几内亚,1,0 -144,所罗门群岛,1,0 -145,瓦努阿图共和国,1,0 -146,密克罗尼西亚,1,0 -147,马绍尔群岛,1,0 -148,帕劳,1,0 -149,瑙鲁,1,0 -150,基里巴斯,1,0 -151,图瓦卢,1,0 -152,萨摩亚,1,0 -153,斐济,1,0 -154,汤加,1,0 -155,库克群岛,1,0 -156,关岛,1,0 -157,新喀里多尼亚,1,0 -158,法属波利尼西亚,1,0 -159,皮特凯恩岛,1,0 -160,瓦利斯与富图纳,1,0 -161,纽埃,1,0 -162,托克劳,1,0 -163,美属萨摩亚,1,0 -164,北马里亚纳,1,0 -165,加拿大,1,0 -166,美国,1,0 -167,墨西哥,1,0 -168,格陵兰,1,0 -169,危地马拉,1,0 -170,伯利兹,1,0 -171,萨尔瓦多,1,0 -172,洪都拉斯,1,0 -173,尼加拉瓜,1,0 -174,哥斯达黎加,1,0 -175,巴拿马,1,0 -176,巴哈马,1,0 -177,古巴,1,0 -178,牙买加,1,0 -179,海地,1,0 -180,多米尼加共和国,1,0 -181,安提瓜和巴布达,1,0 -182,圣基茨和尼维斯,1,0 -183,多米尼克,1,0 -184,圣卢西亚,1,0 -185,圣文森特和格林纳丁斯,1,0 -186,格林纳达,1,0 -187,巴巴多斯,1,0 -188,特立尼达和多巴哥,1,0 -189,波多黎各,1,0 -190,英属维尔京群岛,1,0 -191,美属维尔京群岛,1,0 -192,安圭拉,1,0 -193,蒙特塞拉特岛,1,0 -194,瓜德罗普,1,0 -195,马提尼克,1,0 -196,荷属安的列斯,1,0 -197,阿鲁巴,1,0 -198,特克斯和凯科斯群岛,1,0 -199,开曼群岛,1,0 -200,百慕大,1,0 -201,哥伦比亚,1,0 -202,委内瑞拉,1,0 -203,圭亚那,1,0 -204,法属圭亚那,1,0 -205,苏里南,1,0 -206,厄瓜多尔,1,0 -207,秘鲁,1,0 -208,玻利维亚,1,0 -209,巴西,1,0 -210,智利,1,0 -211,阿根廷,1,0 -212,乌拉圭,1,0 -213,巴拉圭,1,0 -214,波黑,1,0 -215,直布罗陀,1,0 -216,新喀里多尼亚群岛,1,0 -217,瓦利斯和富图纳群岛,1,0 -218,泽西岛,1,0 -219,黑山,1,0 -220,英属马恩岛,1,0 -221,尼日利亚,1,0 -222,喀麦隆,1,0 -223,加蓬,1,0 -224,乍得,1,0 -225,刚果共和国,1,0 -226,中非共和国,1,0 -227,南苏丹,1,0 -228,赤道几内亚,1,0 -229,毛里塔尼亚,1,0 -230,刚果民主共和国,1,0 -231,留尼汪岛,1,0 -232,格陵兰岛,1,0 -233,法罗群岛,1,0 -234,根西岛,1,0 -235,百慕大群岛,1,0 -236,圣皮埃尔和密克隆群岛,1,0 -237,法属圣马丁,1,0 -238,奥兰群岛,1,0 -239,北马里亚纳群岛,1,0 -240,库拉索,1,0 -241,博内尔岛,1,0 -242,圣马丁岛,1,0 -243,圣巴泰勒米岛,1,0 -244,福克兰群岛,1,0 -245,圣多美和普林西比,1,0 -246,英属印度洋领地,1,0 -247,东萨摩亚,1,0 -248,诺福克岛,1,0 -110000,北京,2,1 -120000,天津,2,1 -130000,河北省,2,1 -140000,山西省,2,1 -150000,内蒙古自治区,2,1 -210000,辽宁省,2,1 -220000,吉林省,2,1 -230000,黑龙江省,2,1 -310000,上海,2,1 -320000,江苏省,2,1 -330000,浙江省,2,1 -340000,安徽省,2,1 -350000,福建省,2,1 -360000,江西省,2,1 -370000,山东省,2,1 -410000,河南省,2,1 -420000,湖北省,2,1 -430000,湖南省,2,1 -440000,广东省,2,1 -450000,广西壮族自治区,2,1 -460000,海南省,2,1 -500000,重庆,2,1 -510000,四川省,2,1 -520000,贵州省,2,1 -530000,云南省,2,1 -540000,西藏自治区,2,1 -610000,陕西省,2,1 -620000,甘肃省,2,1 -630000,青海省,2,1 -640000,宁夏回族自治区,2,1 -650000,新疆维吾尔自治区,2,1 -110100,北京市,3,110000 -120100,天津市,3,120000 -130100,石家庄市,3,130000 -130200,唐山市,3,130000 -130300,秦皇岛市,3,130000 -130400,邯郸市,3,130000 -130500,邢台市,3,130000 -130600,保定市,3,130000 -130700,张家口市,3,130000 -130800,承德市,3,130000 -130900,沧州市,3,130000 -131000,廊坊市,3,130000 -131100,衡水市,3,130000 -140100,太原市,3,140000 -140200,大同市,3,140000 -140300,阳泉市,3,140000 -140400,长治市,3,140000 -140500,晋城市,3,140000 -140600,朔州市,3,140000 -140700,晋中市,3,140000 -140800,运城市,3,140000 -140900,忻州市,3,140000 -141000,临汾市,3,140000 -141100,吕梁市,3,140000 -150100,呼和浩特市,3,150000 -150200,包头市,3,150000 -150300,乌海市,3,150000 -150400,赤峰市,3,150000 -150500,通辽市,3,150000 -150600,鄂尔多斯市,3,150000 -150700,呼伦贝尔市,3,150000 -150800,巴彦淖尔市,3,150000 -150900,乌兰察布市,3,150000 -152200,兴安盟,3,150000 -152500,锡林郭勒盟,3,150000 -152900,阿拉善盟,3,150000 -210100,沈阳市,3,210000 -210200,大连市,3,210000 -210300,鞍山市,3,210000 -210400,抚顺市,3,210000 -210500,本溪市,3,210000 -210600,丹东市,3,210000 -210700,锦州市,3,210000 -210800,营口市,3,210000 -210900,阜新市,3,210000 -211000,辽阳市,3,210000 -211100,盘锦市,3,210000 -211200,铁岭市,3,210000 -211300,朝阳市,3,210000 -211400,葫芦岛市,3,210000 -220100,长春市,3,220000 -220200,吉林市,3,220000 -220300,四平市,3,220000 -220400,辽源市,3,220000 -220500,通化市,3,220000 -220600,白山市,3,220000 -220700,松原市,3,220000 -220800,白城市,3,220000 -222400,延边朝鲜族自治州,3,220000 -230100,哈尔滨市,3,230000 -230200,齐齐哈尔市,3,230000 -230300,鸡西市,3,230000 -230400,鹤岗市,3,230000 -230500,双鸭山市,3,230000 -230600,大庆市,3,230000 -230700,伊春市,3,230000 -230800,佳木斯市,3,230000 -230900,七台河市,3,230000 -231000,牡丹江市,3,230000 -231100,黑河市,3,230000 -231200,绥化市,3,230000 -232700,大兴安岭地区,3,230000 -310100,上海市,3,310000 -320100,南京市,3,320000 -320200,无锡市,3,320000 -320300,徐州市,3,320000 -320400,常州市,3,320000 -320500,苏州市,3,320000 -320600,南通市,3,320000 -320700,连云港市,3,320000 -320800,淮安市,3,320000 -320900,盐城市,3,320000 -321000,扬州市,3,320000 -321100,镇江市,3,320000 -321200,泰州市,3,320000 -321300,宿迁市,3,320000 -330100,杭州市,3,330000 -330200,宁波市,3,330000 -330300,温州市,3,330000 -330400,嘉兴市,3,330000 -330500,湖州市,3,330000 -330600,绍兴市,3,330000 -330700,金华市,3,330000 -330800,衢州市,3,330000 -330900,舟山市,3,330000 -331000,台州市,3,330000 -331100,丽水市,3,330000 -340100,合肥市,3,340000 -340200,芜湖市,3,340000 -340300,蚌埠市,3,340000 -340400,淮南市,3,340000 -340500,马鞍山市,3,340000 -340600,淮北市,3,340000 -340700,铜陵市,3,340000 -340800,安庆市,3,340000 -341000,黄山市,3,340000 -341100,滁州市,3,340000 -341200,阜阳市,3,340000 -341300,宿州市,3,340000 -341500,六安市,3,340000 -341600,亳州市,3,340000 -341700,池州市,3,340000 -341800,宣城市,3,340000 -350100,福州市,3,350000 -350200,厦门市,3,350000 -350300,莆田市,3,350000 -350400,三明市,3,350000 -350500,泉州市,3,350000 -350600,漳州市,3,350000 -350700,南平市,3,350000 -350800,龙岩市,3,350000 -350900,宁德市,3,350000 -360100,南昌市,3,360000 -360200,景德镇市,3,360000 -360300,萍乡市,3,360000 -360400,九江市,3,360000 -360500,新余市,3,360000 -360600,鹰潭市,3,360000 -360700,赣州市,3,360000 -360800,吉安市,3,360000 -360900,宜春市,3,360000 -361000,抚州市,3,360000 -361100,上饶市,3,360000 -370100,济南市,3,370000 -370200,青岛市,3,370000 -370300,淄博市,3,370000 -370400,枣庄市,3,370000 -370500,东营市,3,370000 -370600,烟台市,3,370000 -370700,潍坊市,3,370000 -370800,济宁市,3,370000 -370900,泰安市,3,370000 -371000,威海市,3,370000 -371100,日照市,3,370000 -371300,临沂市,3,370000 -371400,德州市,3,370000 -371500,聊城市,3,370000 -371600,滨州市,3,370000 -371700,菏泽市,3,370000 -410100,郑州市,3,410000 -410200,开封市,3,410000 -410300,洛阳市,3,410000 -410400,平顶山市,3,410000 -410500,安阳市,3,410000 -410600,鹤壁市,3,410000 -410700,新乡市,3,410000 -410800,焦作市,3,410000 -410900,濮阳市,3,410000 -411000,许昌市,3,410000 -411100,漯河市,3,410000 -411200,三门峡市,3,410000 -411300,南阳市,3,410000 -411400,商丘市,3,410000 -411500,信阳市,3,410000 -411600,周口市,3,410000 -411700,驻马店市,3,410000 -419000,省直辖县级行政区划,3,410000 -420100,武汉市,3,420000 -420200,黄石市,3,420000 -420300,十堰市,3,420000 -420500,宜昌市,3,420000 -420600,襄阳市,3,420000 -420700,鄂州市,3,420000 -420800,荆门市,3,420000 -420900,孝感市,3,420000 -421000,荆州市,3,420000 -421100,黄冈市,3,420000 -421200,咸宁市,3,420000 -421300,随州市,3,420000 -422800,恩施土家族苗族自治州,3,420000 -429000,省直辖县级行政区划,3,420000 -430100,长沙市,3,430000 -430200,株洲市,3,430000 -430300,湘潭市,3,430000 -430400,衡阳市,3,430000 -430500,邵阳市,3,430000 -430600,岳阳市,3,430000 -430700,常德市,3,430000 -430800,张家界市,3,430000 -430900,益阳市,3,430000 -431000,郴州市,3,430000 -431100,永州市,3,430000 -431200,怀化市,3,430000 -431300,娄底市,3,430000 -433100,湘西土家族苗族自治州,3,430000 -440100,广州市,3,440000 -440200,韶关市,3,440000 -440300,深圳市,3,440000 -440400,珠海市,3,440000 -440500,汕头市,3,440000 -440600,佛山市,3,440000 -440700,江门市,3,440000 -440800,湛江市,3,440000 -440900,茂名市,3,440000 -441200,肇庆市,3,440000 -441300,惠州市,3,440000 -441400,梅州市,3,440000 -441500,汕尾市,3,440000 -441600,河源市,3,440000 -441700,阳江市,3,440000 -441800,清远市,3,440000 -441900,东莞市,3,440000 -442000,中山市,3,440000 -445100,潮州市,3,440000 -445200,揭阳市,3,440000 -445300,云浮市,3,440000 -450100,南宁市,3,450000 -450200,柳州市,3,450000 -450300,桂林市,3,450000 -450400,梧州市,3,450000 -450500,北海市,3,450000 -450600,防城港市,3,450000 -450700,钦州市,3,450000 -450800,贵港市,3,450000 -450900,玉林市,3,450000 -451000,百色市,3,450000 -451100,贺州市,3,450000 -451200,河池市,3,450000 -451300,来宾市,3,450000 -451400,崇左市,3,450000 -460100,海口市,3,460000 -460200,三亚市,3,460000 -460300,三沙市,3,460000 -460400,儋州市,3,460000 -469000,省直辖县级行政区划,3,460000 -500100,重庆市,3,500000 -510100,成都市,3,510000 -510300,自贡市,3,510000 -510400,攀枝花市,3,510000 -510500,泸州市,3,510000 -510600,德阳市,3,510000 -510700,绵阳市,3,510000 -510800,广元市,3,510000 -510900,遂宁市,3,510000 -511000,内江市,3,510000 -511100,乐山市,3,510000 -511300,南充市,3,510000 -511400,眉山市,3,510000 -511500,宜宾市,3,510000 -511600,广安市,3,510000 -511700,达州市,3,510000 -511800,雅安市,3,510000 -511900,巴中市,3,510000 -512000,资阳市,3,510000 -513200,阿坝藏族羌族自治州,3,510000 -513300,甘孜藏族自治州,3,510000 -513400,凉山彝族自治州,3,510000 -520100,贵阳市,3,520000 -520200,六盘水市,3,520000 -520300,遵义市,3,520000 -520400,安顺市,3,520000 -520500,毕节市,3,520000 -520600,铜仁市,3,520000 -522300,黔西南布依族苗族自治州,3,520000 -522600,黔东南苗族侗族自治州,3,520000 -522700,黔南布依族苗族自治州,3,520000 -530100,昆明市,3,530000 -530300,曲靖市,3,530000 -530400,玉溪市,3,530000 -530500,保山市,3,530000 -530600,昭通市,3,530000 -530700,丽江市,3,530000 -530800,普洱市,3,530000 -530900,临沧市,3,530000 -532300,楚雄彝族自治州,3,530000 -532500,红河哈尼族彝族自治州,3,530000 -532600,文山壮族苗族自治州,3,530000 -532800,西双版纳傣族自治州,3,530000 -532900,大理白族自治州,3,530000 -533100,德宏傣族景颇族自治州,3,530000 -533300,怒江傈僳族自治州,3,530000 -533400,迪庆藏族自治州,3,530000 -540100,拉萨市,3,540000 -540200,日喀则市,3,540000 -540300,昌都市,3,540000 -540400,林芝市,3,540000 -540500,山南市,3,540000 -540600,那曲市,3,540000 -542500,阿里地区,3,540000 -610100,西安市,3,610000 -610200,铜川市,3,610000 -610300,宝鸡市,3,610000 -610400,咸阳市,3,610000 -610500,渭南市,3,610000 -610600,延安市,3,610000 -610700,汉中市,3,610000 -610800,榆林市,3,610000 -610900,安康市,3,610000 -611000,商洛市,3,610000 -620100,兰州市,3,620000 -620200,嘉峪关市,3,620000 -620300,金昌市,3,620000 -620400,白银市,3,620000 -620500,天水市,3,620000 -620600,武威市,3,620000 -620700,张掖市,3,620000 -620800,平凉市,3,620000 -620900,酒泉市,3,620000 -621000,庆阳市,3,620000 -621100,定西市,3,620000 -621200,陇南市,3,620000 -622900,临夏回族自治州,3,620000 -623000,甘南藏族自治州,3,620000 -630100,西宁市,3,630000 -630200,海东市,3,630000 -632200,海北藏族自治州,3,630000 -632300,黄南藏族自治州,3,630000 -632500,海南藏族自治州,3,630000 -632600,果洛藏族自治州,3,630000 -632700,玉树藏族自治州,3,630000 -632800,海西蒙古族藏族自治州,3,630000 -640100,银川市,3,640000 -640200,石嘴山市,3,640000 -640300,吴忠市,3,640000 -640400,固原市,3,640000 -640500,中卫市,3,640000 -650100,乌鲁木齐市,3,650000 -650200,克拉玛依市,3,650000 -650400,吐鲁番市,3,650000 -650500,哈密市,3,650000 -652300,昌吉回族自治州,3,650000 -652700,博尔塔拉蒙古自治州,3,650000 -652800,巴音郭楞蒙古自治州,3,650000 -652900,阿克苏地区,3,650000 -653000,克孜勒苏柯尔克孜自治州,3,650000 -653100,喀什地区,3,650000 -653200,和田地区,3,650000 -654000,伊犁哈萨克自治州,3,650000 -654200,塔城地区,3,650000 -654300,阿勒泰地区,3,650000 -659000,自治区直辖县级行政区划,3,650000 -110101,东城区,4,110100 -110102,西城区,4,110100 -110105,朝阳区,4,110100 -110106,丰台区,4,110100 -110107,石景山区,4,110100 -110108,海淀区,4,110100 -110109,门头沟区,4,110100 -110111,房山区,4,110100 -110112,通州区,4,110100 -110113,顺义区,4,110100 -110114,昌平区,4,110100 -110115,大兴区,4,110100 -110116,怀柔区,4,110100 -110117,平谷区,4,110100 -110118,密云区,4,110100 -110119,延庆区,4,110100 -120101,和平区,4,120100 -120102,河东区,4,120100 -120103,河西区,4,120100 -120104,南开区,4,120100 -120105,河北区,4,120100 -120106,红桥区,4,120100 -120110,东丽区,4,120100 -120111,西青区,4,120100 -120112,津南区,4,120100 -120113,北辰区,4,120100 -120114,武清区,4,120100 -120115,宝坻区,4,120100 -120116,滨海新区,4,120100 -120117,宁河区,4,120100 -120118,静海区,4,120100 -120119,蓟州区,4,120100 -130102,长安区,4,130100 -130104,桥西区,4,130100 -130105,新华区,4,130100 -130107,井陉矿区,4,130100 -130108,裕华区,4,130100 -130109,藁城区,4,130100 -130110,鹿泉区,4,130100 -130111,栾城区,4,130100 -130121,井陉县,4,130100 -130123,正定县,4,130100 -130125,行唐县,4,130100 -130126,灵寿县,4,130100 -130127,高邑县,4,130100 -130128,深泽县,4,130100 -130129,赞皇县,4,130100 -130130,无极县,4,130100 -130131,平山县,4,130100 -130132,元氏县,4,130100 -130133,赵县,4,130100 -130171,石家庄高新技术产业开发区,4,130100 -130172,石家庄循环化工园区,4,130100 -130181,辛集市,4,130100 -130183,晋州市,4,130100 -130184,新乐市,4,130100 -130202,路南区,4,130200 -130203,路北区,4,130200 -130204,古冶区,4,130200 -130205,开平区,4,130200 -130207,丰南区,4,130200 -130208,丰润区,4,130200 -130209,曹妃甸区,4,130200 -130224,滦南县,4,130200 -130225,乐亭县,4,130200 -130227,迁西县,4,130200 -130229,玉田县,4,130200 -130271,河北唐山芦台经济开发区,4,130200 -130272,唐山市汉沽管理区,4,130200 -130273,唐山高新技术产业开发区,4,130200 -130274,河北唐山海港经济开发区,4,130200 -130281,遵化市,4,130200 -130283,迁安市,4,130200 -130284,滦州市,4,130200 -130302,海港区,4,130300 -130303,山海关区,4,130300 -130304,北戴河区,4,130300 -130306,抚宁区,4,130300 -130321,青龙满族自治县,4,130300 -130322,昌黎县,4,130300 -130324,卢龙县,4,130300 -130371,秦皇岛市经济技术开发区,4,130300 -130372,北戴河新区,4,130300 -130402,邯山区,4,130400 -130403,丛台区,4,130400 -130404,复兴区,4,130400 -130406,峰峰矿区,4,130400 -130407,肥乡区,4,130400 -130408,永年区,4,130400 -130423,临漳县,4,130400 -130424,成安县,4,130400 -130425,大名县,4,130400 -130426,涉县,4,130400 -130427,磁县,4,130400 -130430,邱县,4,130400 -130431,鸡泽县,4,130400 -130432,广平县,4,130400 -130433,馆陶县,4,130400 -130434,魏县,4,130400 -130435,曲周县,4,130400 -130471,邯郸经济技术开发区,4,130400 -130473,邯郸冀南新区,4,130400 -130481,武安市,4,130400 -130502,襄都区,4,130500 -130503,信都区,4,130500 -130505,任泽区,4,130500 -130506,南和区,4,130500 -130522,临城县,4,130500 -130523,内丘县,4,130500 -130524,柏乡县,4,130500 -130525,隆尧县,4,130500 -130528,宁晋县,4,130500 -130529,巨鹿县,4,130500 -130530,新河县,4,130500 -130531,广宗县,4,130500 -130532,平乡县,4,130500 -130533,威县,4,130500 -130534,清河县,4,130500 -130535,临西县,4,130500 -130571,河北邢台经济开发区,4,130500 -130581,南宫市,4,130500 -130582,沙河市,4,130500 -130602,竞秀区,4,130600 -130606,莲池区,4,130600 -130607,满城区,4,130600 -130608,清苑区,4,130600 -130609,徐水区,4,130600 -130623,涞水县,4,130600 -130624,阜平县,4,130600 -130626,定兴县,4,130600 -130627,唐县,4,130600 -130628,高阳县,4,130600 -130629,容城县,4,130600 -130630,涞源县,4,130600 -130631,望都县,4,130600 -130632,安新县,4,130600 -130633,易县,4,130600 -130634,曲阳县,4,130600 -130635,蠡县,4,130600 -130636,顺平县,4,130600 -130637,博野县,4,130600 -130638,雄县,4,130600 -130671,保定高新技术产业开发区,4,130600 -130672,保定白沟新城,4,130600 -130681,涿州市,4,130600 -130682,定州市,4,130600 -130683,安国市,4,130600 -130684,高碑店市,4,130600 -130702,桥东区,4,130700 -130703,桥西区,4,130700 -130705,宣化区,4,130700 -130706,下花园区,4,130700 -130708,万全区,4,130700 -130709,崇礼区,4,130700 -130722,张北县,4,130700 -130723,康保县,4,130700 -130724,沽源县,4,130700 -130725,尚义县,4,130700 -130726,蔚县,4,130700 -130727,阳原县,4,130700 -130728,怀安县,4,130700 -130730,怀来县,4,130700 -130731,涿鹿县,4,130700 -130732,赤城县,4,130700 -130771,张家口经济开发区,4,130700 -130772,张家口市察北管理区,4,130700 -130773,张家口市塞北管理区,4,130700 -130802,双桥区,4,130800 -130803,双滦区,4,130800 -130804,鹰手营子矿区,4,130800 -130821,承德县,4,130800 -130822,兴隆县,4,130800 -130824,滦平县,4,130800 -130825,隆化县,4,130800 -130826,丰宁满族自治县,4,130800 -130827,宽城满族自治县,4,130800 -130828,围场满族蒙古族自治县,4,130800 -130871,承德高新技术产业开发区,4,130800 -130881,平泉市,4,130800 -130902,新华区,4,130900 -130903,运河区,4,130900 -130921,沧县,4,130900 -130922,青县,4,130900 -130923,东光县,4,130900 -130924,海兴县,4,130900 -130925,盐山县,4,130900 -130926,肃宁县,4,130900 -130927,南皮县,4,130900 -130928,吴桥县,4,130900 -130929,献县,4,130900 -130930,孟村回族自治县,4,130900 -130971,河北沧州经济开发区,4,130900 -130972,沧州高新技术产业开发区,4,130900 -130973,沧州渤海新区,4,130900 -130981,泊头市,4,130900 -130982,任丘市,4,130900 -130983,黄骅市,4,130900 -130984,河间市,4,130900 -131002,安次区,4,131000 -131003,广阳区,4,131000 -131022,固安县,4,131000 -131023,永清县,4,131000 -131024,香河县,4,131000 -131025,大城县,4,131000 -131026,文安县,4,131000 -131028,大厂回族自治县,4,131000 -131071,廊坊经济技术开发区,4,131000 -131081,霸州市,4,131000 -131082,三河市,4,131000 -131102,桃城区,4,131100 -131103,冀州区,4,131100 -131121,枣强县,4,131100 -131122,武邑县,4,131100 -131123,武强县,4,131100 -131124,饶阳县,4,131100 -131125,安平县,4,131100 -131126,故城县,4,131100 -131127,景县,4,131100 -131128,阜城县,4,131100 -131171,河北衡水高新技术产业开发区,4,131100 -131172,衡水滨湖新区,4,131100 -131182,深州市,4,131100 -140105,小店区,4,140100 -140106,迎泽区,4,140100 -140107,杏花岭区,4,140100 -140108,尖草坪区,4,140100 -140109,万柏林区,4,140100 -140110,晋源区,4,140100 -140121,清徐县,4,140100 -140122,阳曲县,4,140100 -140123,娄烦县,4,140100 -140171,山西转型综合改革示范区,4,140100 -140181,古交市,4,140100 -140212,新荣区,4,140200 -140213,平城区,4,140200 -140214,云冈区,4,140200 -140215,云州区,4,140200 -140221,阳高县,4,140200 -140222,天镇县,4,140200 -140223,广灵县,4,140200 -140224,灵丘县,4,140200 -140225,浑源县,4,140200 -140226,左云县,4,140200 -140271,山西大同经济开发区,4,140200 -140302,城区,4,140300 -140303,矿区,4,140300 -140311,郊区,4,140300 -140321,平定县,4,140300 -140322,盂县,4,140300 -140403,潞州区,4,140400 -140404,上党区,4,140400 -140405,屯留区,4,140400 -140406,潞城区,4,140400 -140423,襄垣县,4,140400 -140425,平顺县,4,140400 -140426,黎城县,4,140400 -140427,壶关县,4,140400 -140428,长子县,4,140400 -140429,武乡县,4,140400 -140430,沁县,4,140400 -140431,沁源县,4,140400 -140471,山西长治高新技术产业园区,4,140400 -140502,城区,4,140500 -140521,沁水县,4,140500 -140522,阳城县,4,140500 -140524,陵川县,4,140500 -140525,泽州县,4,140500 -140581,高平市,4,140500 -140602,朔城区,4,140600 -140603,平鲁区,4,140600 -140621,山阴县,4,140600 -140622,应县,4,140600 -140623,右玉县,4,140600 -140671,山西朔州经济开发区,4,140600 -140681,怀仁市,4,140600 -140702,榆次区,4,140700 -140703,太谷区,4,140700 -140721,榆社县,4,140700 -140722,左权县,4,140700 -140723,和顺县,4,140700 -140724,昔阳县,4,140700 -140725,寿阳县,4,140700 -140727,祁县,4,140700 -140728,平遥县,4,140700 -140729,灵石县,4,140700 -140781,介休市,4,140700 -140802,盐湖区,4,140800 -140821,临猗县,4,140800 -140822,万荣县,4,140800 -140823,闻喜县,4,140800 -140824,稷山县,4,140800 -140825,新绛县,4,140800 -140826,绛县,4,140800 -140827,垣曲县,4,140800 -140828,夏县,4,140800 -140829,平陆县,4,140800 -140830,芮城县,4,140800 -140881,永济市,4,140800 -140882,河津市,4,140800 -140902,忻府区,4,140900 -140921,定襄县,4,140900 -140922,五台县,4,140900 -140923,代县,4,140900 -140924,繁峙县,4,140900 -140925,宁武县,4,140900 -140926,静乐县,4,140900 -140927,神池县,4,140900 -140928,五寨县,4,140900 -140929,岢岚县,4,140900 -140930,河曲县,4,140900 -140931,保德县,4,140900 -140932,偏关县,4,140900 -140971,五台山风景名胜区,4,140900 -140981,原平市,4,140900 -141002,尧都区,4,141000 -141021,曲沃县,4,141000 -141022,翼城县,4,141000 -141023,襄汾县,4,141000 -141024,洪洞县,4,141000 -141025,古县,4,141000 -141026,安泽县,4,141000 -141027,浮山县,4,141000 -141028,吉县,4,141000 -141029,乡宁县,4,141000 -141030,大宁县,4,141000 -141031,隰县,4,141000 -141032,永和县,4,141000 -141033,蒲县,4,141000 -141034,汾西县,4,141000 -141081,侯马市,4,141000 -141082,霍州市,4,141000 -141102,离石区,4,141100 -141121,文水县,4,141100 -141122,交城县,4,141100 -141123,兴县,4,141100 -141124,临县,4,141100 -141125,柳林县,4,141100 -141126,石楼县,4,141100 -141127,岚县,4,141100 -141128,方山县,4,141100 -141129,中阳县,4,141100 -141130,交口县,4,141100 -141181,孝义市,4,141100 -141182,汾阳市,4,141100 -150102,新城区,4,150100 -150103,回民区,4,150100 -150104,玉泉区,4,150100 -150105,赛罕区,4,150100 -150121,土默特左旗,4,150100 -150122,托克托县,4,150100 -150123,和林格尔县,4,150100 -150124,清水河县,4,150100 -150125,武川县,4,150100 -150172,呼和浩特经济技术开发区,4,150100 -150202,东河区,4,150200 -150203,昆都仑区,4,150200 -150204,青山区,4,150200 -150205,石拐区,4,150200 -150206,白云鄂博矿区,4,150200 -150207,九原区,4,150200 -150221,土默特右旗,4,150200 -150222,固阳县,4,150200 -150223,达尔罕茂明安联合旗,4,150200 -150271,包头稀土高新技术产业开发区,4,150200 -150302,海勃湾区,4,150300 -150303,海南区,4,150300 -150304,乌达区,4,150300 -150402,红山区,4,150400 -150403,元宝山区,4,150400 -150404,松山区,4,150400 -150421,阿鲁科尔沁旗,4,150400 -150422,巴林左旗,4,150400 -150423,巴林右旗,4,150400 -150424,林西县,4,150400 -150425,克什克腾旗,4,150400 -150426,翁牛特旗,4,150400 -150428,喀喇沁旗,4,150400 -150429,宁城县,4,150400 -150430,敖汉旗,4,150400 -150502,科尔沁区,4,150500 -150521,科尔沁左翼中旗,4,150500 -150522,科尔沁左翼后旗,4,150500 -150523,开鲁县,4,150500 -150524,库伦旗,4,150500 -150525,奈曼旗,4,150500 -150526,扎鲁特旗,4,150500 -150571,通辽经济技术开发区,4,150500 -150581,霍林郭勒市,4,150500 -150602,东胜区,4,150600 -150603,康巴什区,4,150600 -150621,达拉特旗,4,150600 -150622,准格尔旗,4,150600 -150623,鄂托克前旗,4,150600 -150624,鄂托克旗,4,150600 -150625,杭锦旗,4,150600 -150626,乌审旗,4,150600 -150627,伊金霍洛旗,4,150600 -150702,海拉尔区,4,150700 -150703,扎赉诺尔区,4,150700 -150721,阿荣旗,4,150700 -150722,莫力达瓦达斡尔族自治旗,4,150700 -150723,鄂伦春自治旗,4,150700 -150724,鄂温克族自治旗,4,150700 -150725,陈巴尔虎旗,4,150700 -150726,新巴尔虎左旗,4,150700 -150727,新巴尔虎右旗,4,150700 -150781,满洲里市,4,150700 -150782,牙克石市,4,150700 -150783,扎兰屯市,4,150700 -150784,额尔古纳市,4,150700 -150785,根河市,4,150700 -150802,临河区,4,150800 -150821,五原县,4,150800 -150822,磴口县,4,150800 -150823,乌拉特前旗,4,150800 -150824,乌拉特中旗,4,150800 -150825,乌拉特后旗,4,150800 -150826,杭锦后旗,4,150800 -150902,集宁区,4,150900 -150921,卓资县,4,150900 -150922,化德县,4,150900 -150923,商都县,4,150900 -150924,兴和县,4,150900 -150925,凉城县,4,150900 -150926,察哈尔右翼前旗,4,150900 -150927,察哈尔右翼中旗,4,150900 -150928,察哈尔右翼后旗,4,150900 -150929,四子王旗,4,150900 -150981,丰镇市,4,150900 -152201,乌兰浩特市,4,152200 -152202,阿尔山市,4,152200 -152221,科尔沁右翼前旗,4,152200 -152222,科尔沁右翼中旗,4,152200 -152223,扎赉特旗,4,152200 -152224,突泉县,4,152200 -152501,二连浩特市,4,152500 -152502,锡林浩特市,4,152500 -152522,阿巴嘎旗,4,152500 -152523,苏尼特左旗,4,152500 -152524,苏尼特右旗,4,152500 -152525,东乌珠穆沁旗,4,152500 -152526,西乌珠穆沁旗,4,152500 -152527,太仆寺旗,4,152500 -152528,镶黄旗,4,152500 -152529,正镶白旗,4,152500 -152530,正蓝旗,4,152500 -152531,多伦县,4,152500 -152571,乌拉盖管委会,4,152500 -152921,阿拉善左旗,4,152900 -152922,阿拉善右旗,4,152900 -152923,额济纳旗,4,152900 -152971,内蒙古阿拉善高新技术产业开发区,4,152900 -210102,和平区,4,210100 -210103,沈河区,4,210100 -210104,大东区,4,210100 -210105,皇姑区,4,210100 -210106,铁西区,4,210100 -210111,苏家屯区,4,210100 -210112,浑南区,4,210100 -210113,沈北新区,4,210100 -210114,于洪区,4,210100 -210115,辽中区,4,210100 -210123,康平县,4,210100 -210124,法库县,4,210100 -210181,新民市,4,210100 -210202,中山区,4,210200 -210203,西岗区,4,210200 -210204,沙河口区,4,210200 -210211,甘井子区,4,210200 -210212,旅顺口区,4,210200 -210213,金州区,4,210200 -210214,普兰店区,4,210200 -210224,长海县,4,210200 -210281,瓦房店市,4,210200 -210283,庄河市,4,210200 -210302,铁东区,4,210300 -210303,铁西区,4,210300 -210304,立山区,4,210300 -210311,千山区,4,210300 -210321,台安县,4,210300 -210323,岫岩满族自治县,4,210300 -210381,海城市,4,210300 -210402,新抚区,4,210400 -210403,东洲区,4,210400 -210404,望花区,4,210400 -210411,顺城区,4,210400 -210421,抚顺县,4,210400 -210422,新宾满族自治县,4,210400 -210423,清原满族自治县,4,210400 -210502,平山区,4,210500 -210503,溪湖区,4,210500 -210504,明山区,4,210500 -210505,南芬区,4,210500 -210521,本溪满族自治县,4,210500 -210522,桓仁满族自治县,4,210500 -210602,元宝区,4,210600 -210603,振兴区,4,210600 -210604,振安区,4,210600 -210624,宽甸满族自治县,4,210600 -210681,东港市,4,210600 -210682,凤城市,4,210600 -210702,古塔区,4,210700 -210703,凌河区,4,210700 -210711,太和区,4,210700 -210726,黑山县,4,210700 -210727,义县,4,210700 -210781,凌海市,4,210700 -210782,北镇市,4,210700 -210802,站前区,4,210800 -210803,西市区,4,210800 -210804,鲅鱼圈区,4,210800 -210811,老边区,4,210800 -210881,盖州市,4,210800 -210882,大石桥市,4,210800 -210902,海州区,4,210900 -210903,新邱区,4,210900 -210904,太平区,4,210900 -210905,清河门区,4,210900 -210911,细河区,4,210900 -210921,阜新蒙古族自治县,4,210900 -210922,彰武县,4,210900 -211002,白塔区,4,211000 -211003,文圣区,4,211000 -211004,宏伟区,4,211000 -211005,弓长岭区,4,211000 -211011,太子河区,4,211000 -211021,辽阳县,4,211000 -211081,灯塔市,4,211000 -211102,双台子区,4,211100 -211103,兴隆台区,4,211100 -211104,大洼区,4,211100 -211122,盘山县,4,211100 -211202,银州区,4,211200 -211204,清河区,4,211200 -211221,铁岭县,4,211200 -211223,西丰县,4,211200 -211224,昌图县,4,211200 -211281,调兵山市,4,211200 -211282,开原市,4,211200 -211302,双塔区,4,211300 -211303,龙城区,4,211300 -211321,朝阳县,4,211300 -211322,建平县,4,211300 -211324,喀喇沁左翼蒙古族自治县,4,211300 -211381,北票市,4,211300 -211382,凌源市,4,211300 -211402,连山区,4,211400 -211403,龙港区,4,211400 -211404,南票区,4,211400 -211421,绥中县,4,211400 -211422,建昌县,4,211400 -211481,兴城市,4,211400 -220102,南关区,4,220100 -220103,宽城区,4,220100 -220104,朝阳区,4,220100 -220105,二道区,4,220100 -220106,绿园区,4,220100 -220112,双阳区,4,220100 -220113,九台区,4,220100 -220122,农安县,4,220100 -220171,长春经济技术开发区,4,220100 -220172,长春净月高新技术产业开发区,4,220100 -220173,长春高新技术产业开发区,4,220100 -220174,长春汽车经济技术开发区,4,220100 -220182,榆树市,4,220100 -220183,德惠市,4,220100 -220184,公主岭市,4,220100 -220202,昌邑区,4,220200 -220203,龙潭区,4,220200 -220204,船营区,4,220200 -220211,丰满区,4,220200 -220221,永吉县,4,220200 -220271,吉林经济开发区,4,220200 -220272,吉林高新技术产业开发区,4,220200 -220273,吉林中国新加坡食品区,4,220200 -220281,蛟河市,4,220200 -220282,桦甸市,4,220200 -220283,舒兰市,4,220200 -220284,磐石市,4,220200 -220302,铁西区,4,220300 -220303,铁东区,4,220300 -220322,梨树县,4,220300 -220323,伊通满族自治县,4,220300 -220382,双辽市,4,220300 -220402,龙山区,4,220400 -220403,西安区,4,220400 -220421,东丰县,4,220400 -220422,东辽县,4,220400 -220502,东昌区,4,220500 -220503,二道江区,4,220500 -220521,通化县,4,220500 -220523,辉南县,4,220500 -220524,柳河县,4,220500 -220581,梅河口市,4,220500 -220582,集安市,4,220500 -220602,浑江区,4,220600 -220605,江源区,4,220600 -220621,抚松县,4,220600 -220622,靖宇县,4,220600 -220623,长白朝鲜族自治县,4,220600 -220681,临江市,4,220600 -220702,宁江区,4,220700 -220721,前郭尔罗斯蒙古族自治县,4,220700 -220722,长岭县,4,220700 -220723,乾安县,4,220700 -220771,吉林松原经济开发区,4,220700 -220781,扶余市,4,220700 -220802,洮北区,4,220800 -220821,镇赉县,4,220800 -220822,通榆县,4,220800 -220871,吉林白城经济开发区,4,220800 -220881,洮南市,4,220800 -220882,大安市,4,220800 -222401,延吉市,4,222400 -222402,图们市,4,222400 -222403,敦化市,4,222400 -222404,珲春市,4,222400 -222405,龙井市,4,222400 -222406,和龙市,4,222400 -222424,汪清县,4,222400 -222426,安图县,4,222400 -230102,道里区,4,230100 -230103,南岗区,4,230100 -230104,道外区,4,230100 -230108,平房区,4,230100 -230109,松北区,4,230100 -230110,香坊区,4,230100 -230111,呼兰区,4,230100 -230112,阿城区,4,230100 -230113,双城区,4,230100 -230123,依兰县,4,230100 -230124,方正县,4,230100 -230125,宾县,4,230100 -230126,巴彦县,4,230100 -230127,木兰县,4,230100 -230128,通河县,4,230100 -230129,延寿县,4,230100 -230183,尚志市,4,230100 -230184,五常市,4,230100 -230202,龙沙区,4,230200 -230203,建华区,4,230200 -230204,铁锋区,4,230200 -230205,昂昂溪区,4,230200 -230206,富拉尔基区,4,230200 -230207,碾子山区,4,230200 -230208,梅里斯达斡尔族区,4,230200 -230221,龙江县,4,230200 -230223,依安县,4,230200 -230224,泰来县,4,230200 -230225,甘南县,4,230200 -230227,富裕县,4,230200 -230229,克山县,4,230200 -230230,克东县,4,230200 -230231,拜泉县,4,230200 -230281,讷河市,4,230200 -230302,鸡冠区,4,230300 -230303,恒山区,4,230300 -230304,滴道区,4,230300 -230305,梨树区,4,230300 -230306,城子河区,4,230300 -230307,麻山区,4,230300 -230321,鸡东县,4,230300 -230381,虎林市,4,230300 -230382,密山市,4,230300 -230402,向阳区,4,230400 -230403,工农区,4,230400 -230404,南山区,4,230400 -230405,兴安区,4,230400 -230406,东山区,4,230400 -230407,兴山区,4,230400 -230421,萝北县,4,230400 -230422,绥滨县,4,230400 -230502,尖山区,4,230500 -230503,岭东区,4,230500 -230505,四方台区,4,230500 -230506,宝山区,4,230500 -230521,集贤县,4,230500 -230522,友谊县,4,230500 -230523,宝清县,4,230500 -230524,饶河县,4,230500 -230602,萨尔图区,4,230600 -230603,龙凤区,4,230600 -230604,让胡路区,4,230600 -230605,红岗区,4,230600 -230606,大同区,4,230600 -230621,肇州县,4,230600 -230622,肇源县,4,230600 -230623,林甸县,4,230600 -230624,杜尔伯特蒙古族自治县,4,230600 -230671,大庆高新技术产业开发区,4,230600 -230717,伊美区,4,230700 -230718,乌翠区,4,230700 -230719,友好区,4,230700 -230722,嘉荫县,4,230700 -230723,汤旺县,4,230700 -230724,丰林县,4,230700 -230725,大箐山县,4,230700 -230726,南岔县,4,230700 -230751,金林区,4,230700 -230781,铁力市,4,230700 -230803,向阳区,4,230800 -230804,前进区,4,230800 -230805,东风区,4,230800 -230811,郊区,4,230800 -230822,桦南县,4,230800 -230826,桦川县,4,230800 -230828,汤原县,4,230800 -230881,同江市,4,230800 -230882,富锦市,4,230800 -230883,抚远市,4,230800 -230902,新兴区,4,230900 -230903,桃山区,4,230900 -230904,茄子河区,4,230900 -230921,勃利县,4,230900 -231002,东安区,4,231000 -231003,阳明区,4,231000 -231004,爱民区,4,231000 -231005,西安区,4,231000 -231025,林口县,4,231000 -231071,牡丹江经济技术开发区,4,231000 -231081,绥芬河市,4,231000 -231083,海林市,4,231000 -231084,宁安市,4,231000 -231085,穆棱市,4,231000 -231086,东宁市,4,231000 -231102,爱辉区,4,231100 -231123,逊克县,4,231100 -231124,孙吴县,4,231100 -231181,北安市,4,231100 -231182,五大连池市,4,231100 -231183,嫩江市,4,231100 -231202,北林区,4,231200 -231221,望奎县,4,231200 -231222,兰西县,4,231200 -231223,青冈县,4,231200 -231224,庆安县,4,231200 -231225,明水县,4,231200 -231226,绥棱县,4,231200 -231281,安达市,4,231200 -231282,肇东市,4,231200 -231283,海伦市,4,231200 -232701,漠河市,4,232700 -232721,呼玛县,4,232700 -232722,塔河县,4,232700 -232761,加格达奇区,4,232700 -232762,松岭区,4,232700 -232763,新林区,4,232700 -232764,呼中区,4,232700 -310101,黄浦区,4,310100 -310104,徐汇区,4,310100 -310105,长宁区,4,310100 -310106,静安区,4,310100 -310107,普陀区,4,310100 -310109,虹口区,4,310100 -310110,杨浦区,4,310100 -310112,闵行区,4,310100 -310113,宝山区,4,310100 -310114,嘉定区,4,310100 -310115,浦东新区,4,310100 -310116,金山区,4,310100 -310117,松江区,4,310100 -310118,青浦区,4,310100 -310120,奉贤区,4,310100 -310151,崇明区,4,310100 -320102,玄武区,4,320100 -320104,秦淮区,4,320100 -320105,建邺区,4,320100 -320106,鼓楼区,4,320100 -320111,浦口区,4,320100 -320113,栖霞区,4,320100 -320114,雨花台区,4,320100 -320115,江宁区,4,320100 -320116,六合区,4,320100 -320117,溧水区,4,320100 -320118,高淳区,4,320100 -320205,锡山区,4,320200 -320206,惠山区,4,320200 -320211,滨湖区,4,320200 -320213,梁溪区,4,320200 -320214,新吴区,4,320200 -320281,江阴市,4,320200 -320282,宜兴市,4,320200 -320302,鼓楼区,4,320300 -320303,云龙区,4,320300 -320305,贾汪区,4,320300 -320311,泉山区,4,320300 -320312,铜山区,4,320300 -320321,丰县,4,320300 -320322,沛县,4,320300 -320324,睢宁县,4,320300 -320371,徐州经济技术开发区,4,320300 -320381,新沂市,4,320300 -320382,邳州市,4,320300 -320402,天宁区,4,320400 -320404,钟楼区,4,320400 -320411,新北区,4,320400 -320412,武进区,4,320400 -320413,金坛区,4,320400 -320481,溧阳市,4,320400 -320505,虎丘区,4,320500 -320506,吴中区,4,320500 -320507,相城区,4,320500 -320508,姑苏区,4,320500 -320509,吴江区,4,320500 -320571,苏州工业园区,4,320500 -320581,常熟市,4,320500 -320582,张家港市,4,320500 -320583,昆山市,4,320500 -320585,太仓市,4,320500 -320612,通州区,4,320600 -320613,崇川区,4,320600 -320614,海门区,4,320600 -320623,如东县,4,320600 -320671,南通经济技术开发区,4,320600 -320681,启东市,4,320600 -320682,如皋市,4,320600 -320685,海安市,4,320600 -320703,连云区,4,320700 -320706,海州区,4,320700 -320707,赣榆区,4,320700 -320722,东海县,4,320700 -320723,灌云县,4,320700 -320724,灌南县,4,320700 -320771,连云港经济技术开发区,4,320700 -320772,连云港高新技术产业开发区,4,320700 -320803,淮安区,4,320800 -320804,淮阴区,4,320800 -320812,清江浦区,4,320800 -320813,洪泽区,4,320800 -320826,涟水县,4,320800 -320830,盱眙县,4,320800 -320831,金湖县,4,320800 -320871,淮安经济技术开发区,4,320800 -320902,亭湖区,4,320900 -320903,盐都区,4,320900 -320904,大丰区,4,320900 -320921,响水县,4,320900 -320922,滨海县,4,320900 -320923,阜宁县,4,320900 -320924,射阳县,4,320900 -320925,建湖县,4,320900 -320971,盐城经济技术开发区,4,320900 -320981,东台市,4,320900 -321002,广陵区,4,321000 -321003,邗江区,4,321000 -321012,江都区,4,321000 -321023,宝应县,4,321000 -321071,扬州经济技术开发区,4,321000 -321081,仪征市,4,321000 -321084,高邮市,4,321000 -321102,京口区,4,321100 -321111,润州区,4,321100 -321112,丹徒区,4,321100 -321171,镇江新区,4,321100 -321181,丹阳市,4,321100 -321182,扬中市,4,321100 -321183,句容市,4,321100 -321202,海陵区,4,321200 -321203,高港区,4,321200 -321204,姜堰区,4,321200 -321271,泰州医药高新技术产业开发区,4,321200 -321281,兴化市,4,321200 -321282,靖江市,4,321200 -321283,泰兴市,4,321200 -321302,宿城区,4,321300 -321311,宿豫区,4,321300 -321322,沭阳县,4,321300 -321323,泗阳县,4,321300 -321324,泗洪县,4,321300 -321371,宿迁经济技术开发区,4,321300 -330102,上城区,4,330100 -330105,拱墅区,4,330100 -330106,西湖区,4,330100 -330108,滨江区,4,330100 -330109,萧山区,4,330100 -330110,余杭区,4,330100 -330111,富阳区,4,330100 -330112,临安区,4,330100 -330113,临平区,4,330100 -330114,钱塘区,4,330100 -330122,桐庐县,4,330100 -330127,淳安县,4,330100 -330182,建德市,4,330100 -330203,海曙区,4,330200 -330205,江北区,4,330200 -330206,北仑区,4,330200 -330211,镇海区,4,330200 -330212,鄞州区,4,330200 -330213,奉化区,4,330200 -330225,象山县,4,330200 -330226,宁海县,4,330200 -330281,余姚市,4,330200 -330282,慈溪市,4,330200 -330302,鹿城区,4,330300 -330303,龙湾区,4,330300 -330304,瓯海区,4,330300 -330305,洞头区,4,330300 -330324,永嘉县,4,330300 -330326,平阳县,4,330300 -330327,苍南县,4,330300 -330328,文成县,4,330300 -330329,泰顺县,4,330300 -330371,温州经济技术开发区,4,330300 -330381,瑞安市,4,330300 -330382,乐清市,4,330300 -330383,龙港市,4,330300 -330402,南湖区,4,330400 -330411,秀洲区,4,330400 -330421,嘉善县,4,330400 -330424,海盐县,4,330400 -330481,海宁市,4,330400 -330482,平湖市,4,330400 -330483,桐乡市,4,330400 -330502,吴兴区,4,330500 -330503,南浔区,4,330500 -330521,德清县,4,330500 -330522,长兴县,4,330500 -330523,安吉县,4,330500 -330602,越城区,4,330600 -330603,柯桥区,4,330600 -330604,上虞区,4,330600 -330624,新昌县,4,330600 -330681,诸暨市,4,330600 -330683,嵊州市,4,330600 -330702,婺城区,4,330700 -330703,金东区,4,330700 -330723,武义县,4,330700 -330726,浦江县,4,330700 -330727,磐安县,4,330700 -330781,兰溪市,4,330700 -330782,义乌市,4,330700 -330783,东阳市,4,330700 -330784,永康市,4,330700 -330802,柯城区,4,330800 -330803,衢江区,4,330800 -330822,常山县,4,330800 -330824,开化县,4,330800 -330825,龙游县,4,330800 -330881,江山市,4,330800 -330902,定海区,4,330900 -330903,普陀区,4,330900 -330921,岱山县,4,330900 -330922,嵊泗县,4,330900 -331002,椒江区,4,331000 -331003,黄岩区,4,331000 -331004,路桥区,4,331000 -331022,三门县,4,331000 -331023,天台县,4,331000 -331024,仙居县,4,331000 -331081,温岭市,4,331000 -331082,临海市,4,331000 -331083,玉环市,4,331000 -331102,莲都区,4,331100 -331121,青田县,4,331100 -331122,缙云县,4,331100 -331123,遂昌县,4,331100 -331124,松阳县,4,331100 -331125,云和县,4,331100 -331126,庆元县,4,331100 -331127,景宁畲族自治县,4,331100 -331181,龙泉市,4,331100 -340102,瑶海区,4,340100 -340103,庐阳区,4,340100 -340104,蜀山区,4,340100 -340111,包河区,4,340100 -340121,长丰县,4,340100 -340122,肥东县,4,340100 -340123,肥西县,4,340100 -340124,庐江县,4,340100 -340171,合肥高新技术产业开发区,4,340100 -340172,合肥经济技术开发区,4,340100 -340173,合肥新站高新技术产业开发区,4,340100 -340181,巢湖市,4,340100 -340202,镜湖区,4,340200 -340207,鸠江区,4,340200 -340209,弋江区,4,340200 -340210,湾沚区,4,340200 -340212,繁昌区,4,340200 -340223,南陵县,4,340200 -340271,芜湖经济技术开发区,4,340200 -340272,安徽芜湖三山经济开发区,4,340200 -340281,无为市,4,340200 -340302,龙子湖区,4,340300 -340303,蚌山区,4,340300 -340304,禹会区,4,340300 -340311,淮上区,4,340300 -340321,怀远县,4,340300 -340322,五河县,4,340300 -340323,固镇县,4,340300 -340371,蚌埠市高新技术开发区,4,340300 -340372,蚌埠市经济开发区,4,340300 -340402,大通区,4,340400 -340403,田家庵区,4,340400 -340404,谢家集区,4,340400 -340405,八公山区,4,340400 -340406,潘集区,4,340400 -340421,凤台县,4,340400 -340422,寿县,4,340400 -340503,花山区,4,340500 -340504,雨山区,4,340500 -340506,博望区,4,340500 -340521,当涂县,4,340500 -340522,含山县,4,340500 -340523,和县,4,340500 -340602,杜集区,4,340600 -340603,相山区,4,340600 -340604,烈山区,4,340600 -340621,濉溪县,4,340600 -340705,铜官区,4,340700 -340706,义安区,4,340700 -340711,郊区,4,340700 -340722,枞阳县,4,340700 -340802,迎江区,4,340800 -340803,大观区,4,340800 -340811,宜秀区,4,340800 -340822,怀宁县,4,340800 -340825,太湖县,4,340800 -340826,宿松县,4,340800 -340827,望江县,4,340800 -340828,岳西县,4,340800 -340871,安徽安庆经济开发区,4,340800 -340881,桐城市,4,340800 -340882,潜山市,4,340800 -341002,屯溪区,4,341000 -341003,黄山区,4,341000 -341004,徽州区,4,341000 -341021,歙县,4,341000 -341022,休宁县,4,341000 -341023,黟县,4,341000 -341024,祁门县,4,341000 -341102,琅琊区,4,341100 -341103,南谯区,4,341100 -341122,来安县,4,341100 -341124,全椒县,4,341100 -341125,定远县,4,341100 -341126,凤阳县,4,341100 -341171,中新苏滁高新技术产业开发区,4,341100 -341172,滁州经济技术开发区,4,341100 -341181,天长市,4,341100 -341182,明光市,4,341100 -341202,颍州区,4,341200 -341203,颍东区,4,341200 -341204,颍泉区,4,341200 -341221,临泉县,4,341200 -341222,太和县,4,341200 -341225,阜南县,4,341200 -341226,颍上县,4,341200 -341271,阜阳合肥现代产业园区,4,341200 -341272,阜阳经济技术开发区,4,341200 -341282,界首市,4,341200 -341302,埇桥区,4,341300 -341321,砀山县,4,341300 -341322,萧县,4,341300 -341323,灵璧县,4,341300 -341324,泗县,4,341300 -341371,宿州马鞍山现代产业园区,4,341300 -341372,宿州经济技术开发区,4,341300 -341502,金安区,4,341500 -341503,裕安区,4,341500 -341504,叶集区,4,341500 -341522,霍邱县,4,341500 -341523,舒城县,4,341500 -341524,金寨县,4,341500 -341525,霍山县,4,341500 -341602,谯城区,4,341600 -341621,涡阳县,4,341600 -341622,蒙城县,4,341600 -341623,利辛县,4,341600 -341702,贵池区,4,341700 -341721,东至县,4,341700 -341722,石台县,4,341700 -341723,青阳县,4,341700 -341802,宣州区,4,341800 -341821,郎溪县,4,341800 -341823,泾县,4,341800 -341824,绩溪县,4,341800 -341825,旌德县,4,341800 -341871,宣城市经济开发区,4,341800 -341881,宁国市,4,341800 -341882,广德市,4,341800 -350102,鼓楼区,4,350100 -350103,台江区,4,350100 -350104,仓山区,4,350100 -350105,马尾区,4,350100 -350111,晋安区,4,350100 -350112,长乐区,4,350100 -350121,闽侯县,4,350100 -350122,连江县,4,350100 -350123,罗源县,4,350100 -350124,闽清县,4,350100 -350125,永泰县,4,350100 -350128,平潭县,4,350100 -350181,福清市,4,350100 -350203,思明区,4,350200 -350205,海沧区,4,350200 -350206,湖里区,4,350200 -350211,集美区,4,350200 -350212,同安区,4,350200 -350213,翔安区,4,350200 -350302,城厢区,4,350300 -350303,涵江区,4,350300 -350304,荔城区,4,350300 -350305,秀屿区,4,350300 -350322,仙游县,4,350300 -350404,三元区,4,350400 -350405,沙县区,4,350400 -350421,明溪县,4,350400 -350423,清流县,4,350400 -350424,宁化县,4,350400 -350425,大田县,4,350400 -350426,尤溪县,4,350400 -350428,将乐县,4,350400 -350429,泰宁县,4,350400 -350430,建宁县,4,350400 -350481,永安市,4,350400 -350502,鲤城区,4,350500 -350503,丰泽区,4,350500 -350504,洛江区,4,350500 -350505,泉港区,4,350500 -350521,惠安县,4,350500 -350524,安溪县,4,350500 -350525,永春县,4,350500 -350526,德化县,4,350500 -350527,金门县,4,350500 -350581,石狮市,4,350500 -350582,晋江市,4,350500 -350583,南安市,4,350500 -350602,芗城区,4,350600 -350603,龙文区,4,350600 -350604,龙海区,4,350600 -350605,长泰区,4,350600 -350622,云霄县,4,350600 -350623,漳浦县,4,350600 -350624,诏安县,4,350600 -350626,东山县,4,350600 -350627,南靖县,4,350600 -350628,平和县,4,350600 -350629,华安县,4,350600 -350702,延平区,4,350700 -350703,建阳区,4,350700 -350721,顺昌县,4,350700 -350722,浦城县,4,350700 -350723,光泽县,4,350700 -350724,松溪县,4,350700 -350725,政和县,4,350700 -350781,邵武市,4,350700 -350782,武夷山市,4,350700 -350783,建瓯市,4,350700 -350802,新罗区,4,350800 -350803,永定区,4,350800 -350821,长汀县,4,350800 -350823,上杭县,4,350800 -350824,武平县,4,350800 -350825,连城县,4,350800 -350881,漳平市,4,350800 -350902,蕉城区,4,350900 -350921,霞浦县,4,350900 -350922,古田县,4,350900 -350923,屏南县,4,350900 -350924,寿宁县,4,350900 -350925,周宁县,4,350900 -350926,柘荣县,4,350900 -350981,福安市,4,350900 -350982,福鼎市,4,350900 -360102,东湖区,4,360100 -360103,西湖区,4,360100 -360104,青云谱区,4,360100 -360111,青山湖区,4,360100 -360112,新建区,4,360100 -360113,红谷滩区,4,360100 -360121,南昌县,4,360100 -360123,安义县,4,360100 -360124,进贤县,4,360100 -360202,昌江区,4,360200 -360203,珠山区,4,360200 -360222,浮梁县,4,360200 -360281,乐平市,4,360200 -360302,安源区,4,360300 -360313,湘东区,4,360300 -360321,莲花县,4,360300 -360322,上栗县,4,360300 -360323,芦溪县,4,360300 -360402,濂溪区,4,360400 -360403,浔阳区,4,360400 -360404,柴桑区,4,360400 -360423,武宁县,4,360400 -360424,修水县,4,360400 -360425,永修县,4,360400 -360426,德安县,4,360400 -360428,都昌县,4,360400 -360429,湖口县,4,360400 -360430,彭泽县,4,360400 -360481,瑞昌市,4,360400 -360482,共青城市,4,360400 -360483,庐山市,4,360400 -360502,渝水区,4,360500 -360521,分宜县,4,360500 -360602,月湖区,4,360600 -360603,余江区,4,360600 -360681,贵溪市,4,360600 -360702,章贡区,4,360700 -360703,南康区,4,360700 -360704,赣县区,4,360700 -360722,信丰县,4,360700 -360723,大余县,4,360700 -360724,上犹县,4,360700 -360725,崇义县,4,360700 -360726,安远县,4,360700 -360728,定南县,4,360700 -360729,全南县,4,360700 -360730,宁都县,4,360700 -360731,于都县,4,360700 -360732,兴国县,4,360700 -360733,会昌县,4,360700 -360734,寻乌县,4,360700 -360735,石城县,4,360700 -360781,瑞金市,4,360700 -360783,龙南市,4,360700 -360802,吉州区,4,360800 -360803,青原区,4,360800 -360821,吉安县,4,360800 -360822,吉水县,4,360800 -360823,峡江县,4,360800 -360824,新干县,4,360800 -360825,永丰县,4,360800 -360826,泰和县,4,360800 -360827,遂川县,4,360800 -360828,万安县,4,360800 -360829,安福县,4,360800 -360830,永新县,4,360800 -360881,井冈山市,4,360800 -360902,袁州区,4,360900 -360921,奉新县,4,360900 -360922,万载县,4,360900 -360923,上高县,4,360900 -360924,宜丰县,4,360900 -360925,靖安县,4,360900 -360926,铜鼓县,4,360900 -360981,丰城市,4,360900 -360982,樟树市,4,360900 -360983,高安市,4,360900 -361002,临川区,4,361000 -361003,东乡区,4,361000 -361021,南城县,4,361000 -361022,黎川县,4,361000 -361023,南丰县,4,361000 -361024,崇仁县,4,361000 -361025,乐安县,4,361000 -361026,宜黄县,4,361000 -361027,金溪县,4,361000 -361028,资溪县,4,361000 -361030,广昌县,4,361000 -361102,信州区,4,361100 -361103,广丰区,4,361100 -361104,广信区,4,361100 -361123,玉山县,4,361100 -361124,铅山县,4,361100 -361125,横峰县,4,361100 -361126,弋阳县,4,361100 -361127,余干县,4,361100 -361128,鄱阳县,4,361100 -361129,万年县,4,361100 -361130,婺源县,4,361100 -361181,德兴市,4,361100 -370102,历下区,4,370100 -370103,市中区,4,370100 -370104,槐荫区,4,370100 -370105,天桥区,4,370100 -370112,历城区,4,370100 -370113,长清区,4,370100 -370114,章丘区,4,370100 -370115,济阳区,4,370100 -370116,莱芜区,4,370100 -370117,钢城区,4,370100 -370124,平阴县,4,370100 -370126,商河县,4,370100 -370171,济南高新技术产业开发区,4,370100 -370202,市南区,4,370200 -370203,市北区,4,370200 -370211,黄岛区,4,370200 -370212,崂山区,4,370200 -370213,李沧区,4,370200 -370214,城阳区,4,370200 -370215,即墨区,4,370200 -370271,青岛高新技术产业开发区,4,370200 -370281,胶州市,4,370200 -370283,平度市,4,370200 -370285,莱西市,4,370200 -370302,淄川区,4,370300 -370303,张店区,4,370300 -370304,博山区,4,370300 -370305,临淄区,4,370300 -370306,周村区,4,370300 -370321,桓台县,4,370300 -370322,高青县,4,370300 -370323,沂源县,4,370300 -370402,市中区,4,370400 -370403,薛城区,4,370400 -370404,峄城区,4,370400 -370405,台儿庄区,4,370400 -370406,山亭区,4,370400 -370481,滕州市,4,370400 -370502,东营区,4,370500 -370503,河口区,4,370500 -370505,垦利区,4,370500 -370522,利津县,4,370500 -370523,广饶县,4,370500 -370571,东营经济技术开发区,4,370500 -370572,东营港经济开发区,4,370500 -370602,芝罘区,4,370600 -370611,福山区,4,370600 -370612,牟平区,4,370600 -370613,莱山区,4,370600 -370614,蓬莱区,4,370600 -370671,烟台高新技术产业开发区,4,370600 -370672,烟台经济技术开发区,4,370600 -370681,龙口市,4,370600 -370682,莱阳市,4,370600 -370683,莱州市,4,370600 -370685,招远市,4,370600 -370686,栖霞市,4,370600 -370687,海阳市,4,370600 -370702,潍城区,4,370700 -370703,寒亭区,4,370700 -370704,坊子区,4,370700 -370705,奎文区,4,370700 -370724,临朐县,4,370700 -370725,昌乐县,4,370700 -370772,潍坊滨海经济技术开发区,4,370700 -370781,青州市,4,370700 -370782,诸城市,4,370700 -370783,寿光市,4,370700 -370784,安丘市,4,370700 -370785,高密市,4,370700 -370786,昌邑市,4,370700 -370811,任城区,4,370800 -370812,兖州区,4,370800 -370826,微山县,4,370800 -370827,鱼台县,4,370800 -370828,金乡县,4,370800 -370829,嘉祥县,4,370800 -370830,汶上县,4,370800 -370831,泗水县,4,370800 -370832,梁山县,4,370800 -370871,济宁高新技术产业开发区,4,370800 -370881,曲阜市,4,370800 -370883,邹城市,4,370800 -370902,泰山区,4,370900 -370911,岱岳区,4,370900 -370921,宁阳县,4,370900 -370923,东平县,4,370900 -370982,新泰市,4,370900 -370983,肥城市,4,370900 -371002,环翠区,4,371000 -371003,文登区,4,371000 -371071,威海火炬高技术产业开发区,4,371000 -371072,威海经济技术开发区,4,371000 -371073,威海临港经济技术开发区,4,371000 -371082,荣成市,4,371000 -371083,乳山市,4,371000 -371102,东港区,4,371100 -371103,岚山区,4,371100 -371121,五莲县,4,371100 -371122,莒县,4,371100 -371171,日照经济技术开发区,4,371100 -371302,兰山区,4,371300 -371311,罗庄区,4,371300 -371312,河东区,4,371300 -371321,沂南县,4,371300 -371322,郯城县,4,371300 -371323,沂水县,4,371300 -371324,兰陵县,4,371300 -371325,费县,4,371300 -371326,平邑县,4,371300 -371327,莒南县,4,371300 -371328,蒙阴县,4,371300 -371329,临沭县,4,371300 -371371,临沂高新技术产业开发区,4,371300 -371402,德城区,4,371400 -371403,陵城区,4,371400 -371422,宁津县,4,371400 -371423,庆云县,4,371400 -371424,临邑县,4,371400 -371425,齐河县,4,371400 -371426,平原县,4,371400 -371427,夏津县,4,371400 -371428,武城县,4,371400 -371471,德州经济技术开发区,4,371400 -371472,德州运河经济开发区,4,371400 -371481,乐陵市,4,371400 -371482,禹城市,4,371400 -371502,东昌府区,4,371500 -371503,茌平区,4,371500 -371521,阳谷县,4,371500 -371522,莘县,4,371500 -371524,东阿县,4,371500 -371525,冠县,4,371500 -371526,高唐县,4,371500 -371581,临清市,4,371500 -371602,滨城区,4,371600 -371603,沾化区,4,371600 -371621,惠民县,4,371600 -371622,阳信县,4,371600 -371623,无棣县,4,371600 -371625,博兴县,4,371600 -371681,邹平市,4,371600 -371702,牡丹区,4,371700 -371703,定陶区,4,371700 -371721,曹县,4,371700 -371722,单县,4,371700 -371723,成武县,4,371700 -371724,巨野县,4,371700 -371725,郓城县,4,371700 -371726,鄄城县,4,371700 -371728,东明县,4,371700 -371771,菏泽经济技术开发区,4,371700 -371772,菏泽高新技术开发区,4,371700 -410102,中原区,4,410100 -410103,二七区,4,410100 -410104,管城回族区,4,410100 -410105,金水区,4,410100 -410106,上街区,4,410100 -410108,惠济区,4,410100 -410122,中牟县,4,410100 -410171,郑州经济技术开发区,4,410100 -410172,郑州高新技术产业开发区,4,410100 -410173,郑州航空港经济综合实验区,4,410100 -410181,巩义市,4,410100 -410182,荥阳市,4,410100 -410183,新密市,4,410100 -410184,新郑市,4,410100 -410185,登封市,4,410100 -410202,龙亭区,4,410200 -410203,顺河回族区,4,410200 -410204,鼓楼区,4,410200 -410205,禹王台区,4,410200 -410212,祥符区,4,410200 -410221,杞县,4,410200 -410222,通许县,4,410200 -410223,尉氏县,4,410200 -410225,兰考县,4,410200 -410302,老城区,4,410300 -410303,西工区,4,410300 -410304,瀍河回族区,4,410300 -410305,涧西区,4,410300 -410307,偃师区,4,410300 -410308,孟津区,4,410300 -410311,洛龙区,4,410300 -410323,新安县,4,410300 -410324,栾川县,4,410300 -410325,嵩县,4,410300 -410326,汝阳县,4,410300 -410327,宜阳县,4,410300 -410328,洛宁县,4,410300 -410329,伊川县,4,410300 -410371,洛阳高新技术产业开发区,4,410300 -410402,新华区,4,410400 -410403,卫东区,4,410400 -410404,石龙区,4,410400 -410411,湛河区,4,410400 -410421,宝丰县,4,410400 -410422,叶县,4,410400 -410423,鲁山县,4,410400 -410425,郏县,4,410400 -410471,平顶山高新技术产业开发区,4,410400 -410472,平顶山市城乡一体化示范区,4,410400 -410481,舞钢市,4,410400 -410482,汝州市,4,410400 -410502,文峰区,4,410500 -410503,北关区,4,410500 -410505,殷都区,4,410500 -410506,龙安区,4,410500 -410522,安阳县,4,410500 -410523,汤阴县,4,410500 -410526,滑县,4,410500 -410527,内黄县,4,410500 -410571,安阳高新技术产业开发区,4,410500 -410581,林州市,4,410500 -410602,鹤山区,4,410600 -410603,山城区,4,410600 -410611,淇滨区,4,410600 -410621,浚县,4,410600 -410622,淇县,4,410600 -410671,鹤壁经济技术开发区,4,410600 -410702,红旗区,4,410700 -410703,卫滨区,4,410700 -410704,凤泉区,4,410700 -410711,牧野区,4,410700 -410721,新乡县,4,410700 -410724,获嘉县,4,410700 -410725,原阳县,4,410700 -410726,延津县,4,410700 -410727,封丘县,4,410700 -410771,新乡高新技术产业开发区,4,410700 -410772,新乡经济技术开发区,4,410700 -410773,新乡市平原城乡一体化示范区,4,410700 -410781,卫辉市,4,410700 -410782,辉县市,4,410700 -410783,长垣市,4,410700 -410802,解放区,4,410800 -410803,中站区,4,410800 -410804,马村区,4,410800 -410811,山阳区,4,410800 -410821,修武县,4,410800 -410822,博爱县,4,410800 -410823,武陟县,4,410800 -410825,温县,4,410800 -410871,焦作城乡一体化示范区,4,410800 -410882,沁阳市,4,410800 -410883,孟州市,4,410800 -410902,华龙区,4,410900 -410922,清丰县,4,410900 -410923,南乐县,4,410900 -410926,范县,4,410900 -410927,台前县,4,410900 -410928,濮阳县,4,410900 -410971,河南濮阳工业园区,4,410900 -410972,濮阳经济技术开发区,4,410900 -411002,魏都区,4,411000 -411003,建安区,4,411000 -411024,鄢陵县,4,411000 -411025,襄城县,4,411000 -411071,许昌经济技术开发区,4,411000 -411081,禹州市,4,411000 -411082,长葛市,4,411000 -411102,源汇区,4,411100 -411103,郾城区,4,411100 -411104,召陵区,4,411100 -411121,舞阳县,4,411100 -411122,临颍县,4,411100 -411171,漯河经济技术开发区,4,411100 -411202,湖滨区,4,411200 -411203,陕州区,4,411200 -411221,渑池县,4,411200 -411224,卢氏县,4,411200 -411271,河南三门峡经济开发区,4,411200 -411281,义马市,4,411200 -411282,灵宝市,4,411200 -411302,宛城区,4,411300 -411303,卧龙区,4,411300 -411321,南召县,4,411300 -411322,方城县,4,411300 -411323,西峡县,4,411300 -411324,镇平县,4,411300 -411325,内乡县,4,411300 -411326,淅川县,4,411300 -411327,社旗县,4,411300 -411328,唐河县,4,411300 -411329,新野县,4,411300 -411330,桐柏县,4,411300 -411371,南阳高新技术产业开发区,4,411300 -411372,南阳市城乡一体化示范区,4,411300 -411381,邓州市,4,411300 -411402,梁园区,4,411400 -411403,睢阳区,4,411400 -411421,民权县,4,411400 -411422,睢县,4,411400 -411423,宁陵县,4,411400 -411424,柘城县,4,411400 -411425,虞城县,4,411400 -411426,夏邑县,4,411400 -411471,豫东综合物流产业聚集区,4,411400 -411472,河南商丘经济开发区,4,411400 -411481,永城市,4,411400 -411502,浉河区,4,411500 -411503,平桥区,4,411500 -411521,罗山县,4,411500 -411522,光山县,4,411500 -411523,新县,4,411500 -411524,商城县,4,411500 -411525,固始县,4,411500 -411526,潢川县,4,411500 -411527,淮滨县,4,411500 -411528,息县,4,411500 -411571,信阳高新技术产业开发区,4,411500 -411602,川汇区,4,411600 -411603,淮阳区,4,411600 -411621,扶沟县,4,411600 -411622,西华县,4,411600 -411623,商水县,4,411600 -411624,沈丘县,4,411600 -411625,郸城县,4,411600 -411627,太康县,4,411600 -411628,鹿邑县,4,411600 -411671,河南周口经济开发区,4,411600 -411681,项城市,4,411600 -411702,驿城区,4,411700 -411721,西平县,4,411700 -411722,上蔡县,4,411700 -411723,平舆县,4,411700 -411724,正阳县,4,411700 -411725,确山县,4,411700 -411726,泌阳县,4,411700 -411727,汝南县,4,411700 -411728,遂平县,4,411700 -411729,新蔡县,4,411700 -411771,河南驻马店经济开发区,4,411700 -419001,济源市,4,419000 -420102,江岸区,4,420100 -420103,江汉区,4,420100 -420104,硚口区,4,420100 -420105,汉阳区,4,420100 -420106,武昌区,4,420100 -420107,青山区,4,420100 -420111,洪山区,4,420100 -420112,东西湖区,4,420100 -420113,汉南区,4,420100 -420114,蔡甸区,4,420100 -420115,江夏区,4,420100 -420116,黄陂区,4,420100 -420117,新洲区,4,420100 -420202,黄石港区,4,420200 -420203,西塞山区,4,420200 -420204,下陆区,4,420200 -420205,铁山区,4,420200 -420222,阳新县,4,420200 -420281,大冶市,4,420200 -420302,茅箭区,4,420300 -420303,张湾区,4,420300 -420304,郧阳区,4,420300 -420322,郧西县,4,420300 -420323,竹山县,4,420300 -420324,竹溪县,4,420300 -420325,房县,4,420300 -420381,丹江口市,4,420300 -420502,西陵区,4,420500 -420503,伍家岗区,4,420500 -420504,点军区,4,420500 -420505,猇亭区,4,420500 -420506,夷陵区,4,420500 -420525,远安县,4,420500 -420526,兴山县,4,420500 -420527,秭归县,4,420500 -420528,长阳土家族自治县,4,420500 -420529,五峰土家族自治县,4,420500 -420581,宜都市,4,420500 -420582,当阳市,4,420500 -420583,枝江市,4,420500 -420602,襄城区,4,420600 -420606,樊城区,4,420600 -420607,襄州区,4,420600 -420624,南漳县,4,420600 -420625,谷城县,4,420600 -420626,保康县,4,420600 -420682,老河口市,4,420600 -420683,枣阳市,4,420600 -420684,宜城市,4,420600 -420702,梁子湖区,4,420700 -420703,华容区,4,420700 -420704,鄂城区,4,420700 -420802,东宝区,4,420800 -420804,掇刀区,4,420800 -420822,沙洋县,4,420800 -420881,钟祥市,4,420800 -420882,京山市,4,420800 -420902,孝南区,4,420900 -420921,孝昌县,4,420900 -420922,大悟县,4,420900 -420923,云梦县,4,420900 -420981,应城市,4,420900 -420982,安陆市,4,420900 -420984,汉川市,4,420900 -421002,沙市区,4,421000 -421003,荆州区,4,421000 -421022,公安县,4,421000 -421024,江陵县,4,421000 -421071,荆州经济技术开发区,4,421000 -421081,石首市,4,421000 -421083,洪湖市,4,421000 -421087,松滋市,4,421000 -421088,监利市,4,421000 -421102,黄州区,4,421100 -421121,团风县,4,421100 -421122,红安县,4,421100 -421123,罗田县,4,421100 -421124,英山县,4,421100 -421125,浠水县,4,421100 -421126,蕲春县,4,421100 -421127,黄梅县,4,421100 -421171,龙感湖管理区,4,421100 -421181,麻城市,4,421100 -421182,武穴市,4,421100 -421202,咸安区,4,421200 -421221,嘉鱼县,4,421200 -421222,通城县,4,421200 -421223,崇阳县,4,421200 -421224,通山县,4,421200 -421281,赤壁市,4,421200 -421303,曾都区,4,421300 -421321,随县,4,421300 -421381,广水市,4,421300 -422801,恩施市,4,422800 -422802,利川市,4,422800 -422822,建始县,4,422800 -422823,巴东县,4,422800 -422825,宣恩县,4,422800 -422826,咸丰县,4,422800 -422827,来凤县,4,422800 -422828,鹤峰县,4,422800 -429004,仙桃市,4,429000 -429005,潜江市,4,429000 -429006,天门市,4,429000 -429021,神农架林区,4,429000 -430102,芙蓉区,4,430100 -430103,天心区,4,430100 -430104,岳麓区,4,430100 -430105,开福区,4,430100 -430111,雨花区,4,430100 -430112,望城区,4,430100 -430121,长沙县,4,430100 -430181,浏阳市,4,430100 -430182,宁乡市,4,430100 -430202,荷塘区,4,430200 -430203,芦淞区,4,430200 -430204,石峰区,4,430200 -430211,天元区,4,430200 -430212,渌口区,4,430200 -430223,攸县,4,430200 -430224,茶陵县,4,430200 -430225,炎陵县,4,430200 -430271,云龙示范区,4,430200 -430281,醴陵市,4,430200 -430302,雨湖区,4,430300 -430304,岳塘区,4,430300 -430321,湘潭县,4,430300 -430371,湖南湘潭高新技术产业园区,4,430300 -430372,湘潭昭山示范区,4,430300 -430373,湘潭九华示范区,4,430300 -430381,湘乡市,4,430300 -430382,韶山市,4,430300 -430405,珠晖区,4,430400 -430406,雁峰区,4,430400 -430407,石鼓区,4,430400 -430408,蒸湘区,4,430400 -430412,南岳区,4,430400 -430421,衡阳县,4,430400 -430422,衡南县,4,430400 -430423,衡山县,4,430400 -430424,衡东县,4,430400 -430426,祁东县,4,430400 -430471,衡阳综合保税区,4,430400 -430472,湖南衡阳高新技术产业园区,4,430400 -430473,湖南衡阳松木经济开发区,4,430400 -430481,耒阳市,4,430400 -430482,常宁市,4,430400 -430502,双清区,4,430500 -430503,大祥区,4,430500 -430511,北塔区,4,430500 -430522,新邵县,4,430500 -430523,邵阳县,4,430500 -430524,隆回县,4,430500 -430525,洞口县,4,430500 -430527,绥宁县,4,430500 -430528,新宁县,4,430500 -430529,城步苗族自治县,4,430500 -430581,武冈市,4,430500 -430582,邵东市,4,430500 -430602,岳阳楼区,4,430600 -430603,云溪区,4,430600 -430611,君山区,4,430600 -430621,岳阳县,4,430600 -430623,华容县,4,430600 -430624,湘阴县,4,430600 -430626,平江县,4,430600 -430671,岳阳市屈原管理区,4,430600 -430681,汨罗市,4,430600 -430682,临湘市,4,430600 -430702,武陵区,4,430700 -430703,鼎城区,4,430700 -430721,安乡县,4,430700 -430722,汉寿县,4,430700 -430723,澧县,4,430700 -430724,临澧县,4,430700 -430725,桃源县,4,430700 -430726,石门县,4,430700 -430771,常德市西洞庭管理区,4,430700 -430781,津市市,4,430700 -430802,永定区,4,430800 -430811,武陵源区,4,430800 -430821,慈利县,4,430800 -430822,桑植县,4,430800 -430902,资阳区,4,430900 -430903,赫山区,4,430900 -430921,南县,4,430900 -430922,桃江县,4,430900 -430923,安化县,4,430900 -430971,益阳市大通湖管理区,4,430900 -430972,湖南益阳高新技术产业园区,4,430900 -430981,沅江市,4,430900 -431002,北湖区,4,431000 -431003,苏仙区,4,431000 -431021,桂阳县,4,431000 -431022,宜章县,4,431000 -431023,永兴县,4,431000 -431024,嘉禾县,4,431000 -431025,临武县,4,431000 -431026,汝城县,4,431000 -431027,桂东县,4,431000 -431028,安仁县,4,431000 -431081,资兴市,4,431000 -431102,零陵区,4,431100 -431103,冷水滩区,4,431100 -431122,东安县,4,431100 -431123,双牌县,4,431100 -431124,道县,4,431100 -431125,江永县,4,431100 -431126,宁远县,4,431100 -431127,蓝山县,4,431100 -431128,新田县,4,431100 -431129,江华瑶族自治县,4,431100 -431171,永州经济技术开发区,4,431100 -431173,永州市回龙圩管理区,4,431100 -431181,祁阳市,4,431100 -431202,鹤城区,4,431200 -431221,中方县,4,431200 -431222,沅陵县,4,431200 -431223,辰溪县,4,431200 -431224,溆浦县,4,431200 -431225,会同县,4,431200 -431226,麻阳苗族自治县,4,431200 -431227,新晃侗族自治县,4,431200 -431228,芷江侗族自治县,4,431200 -431229,靖州苗族侗族自治县,4,431200 -431230,通道侗族自治县,4,431200 -431271,怀化市洪江管理区,4,431200 -431281,洪江市,4,431200 -431302,娄星区,4,431300 -431321,双峰县,4,431300 -431322,新化县,4,431300 -431381,冷水江市,4,431300 -431382,涟源市,4,431300 -433101,吉首市,4,433100 -433122,泸溪县,4,433100 -433123,凤凰县,4,433100 -433124,花垣县,4,433100 -433125,保靖县,4,433100 -433126,古丈县,4,433100 -433127,永顺县,4,433100 -433130,龙山县,4,433100 -440103,荔湾区,4,440100 -440104,越秀区,4,440100 -440105,海珠区,4,440100 -440106,天河区,4,440100 -440111,白云区,4,440100 -440112,黄埔区,4,440100 -440113,番禺区,4,440100 -440114,花都区,4,440100 -440115,南沙区,4,440100 -440117,从化区,4,440100 -440118,增城区,4,440100 -440203,武江区,4,440200 -440204,浈江区,4,440200 -440205,曲江区,4,440200 -440222,始兴县,4,440200 -440224,仁化县,4,440200 -440229,翁源县,4,440200 -440232,乳源瑶族自治县,4,440200 -440233,新丰县,4,440200 -440281,乐昌市,4,440200 -440282,南雄市,4,440200 -440303,罗湖区,4,440300 -440304,福田区,4,440300 -440305,南山区,4,440300 -440306,宝安区,4,440300 -440307,龙岗区,4,440300 -440308,盐田区,4,440300 -440309,龙华区,4,440300 -440310,坪山区,4,440300 -440311,光明区,4,440300 -440402,香洲区,4,440400 -440403,斗门区,4,440400 -440404,金湾区,4,440400 -440507,龙湖区,4,440500 -440511,金平区,4,440500 -440512,濠江区,4,440500 -440513,潮阳区,4,440500 -440514,潮南区,4,440500 -440515,澄海区,4,440500 -440523,南澳县,4,440500 -440604,禅城区,4,440600 -440605,南海区,4,440600 -440606,顺德区,4,440600 -440607,三水区,4,440600 -440608,高明区,4,440600 -440703,蓬江区,4,440700 -440704,江海区,4,440700 -440705,新会区,4,440700 -440781,台山市,4,440700 -440783,开平市,4,440700 -440784,鹤山市,4,440700 -440785,恩平市,4,440700 -440802,赤坎区,4,440800 -440803,霞山区,4,440800 -440804,坡头区,4,440800 -440811,麻章区,4,440800 -440823,遂溪县,4,440800 -440825,徐闻县,4,440800 -440881,廉江市,4,440800 -440882,雷州市,4,440800 -440883,吴川市,4,440800 -440902,茂南区,4,440900 -440904,电白区,4,440900 -440981,高州市,4,440900 -440982,化州市,4,440900 -440983,信宜市,4,440900 -441202,端州区,4,441200 -441203,鼎湖区,4,441200 -441204,高要区,4,441200 -441223,广宁县,4,441200 -441224,怀集县,4,441200 -441225,封开县,4,441200 -441226,德庆县,4,441200 -441284,四会市,4,441200 -441302,惠城区,4,441300 -441303,惠阳区,4,441300 -441322,博罗县,4,441300 -441323,惠东县,4,441300 -441324,龙门县,4,441300 -441402,梅江区,4,441400 -441403,梅县区,4,441400 -441422,大埔县,4,441400 -441423,丰顺县,4,441400 -441424,五华县,4,441400 -441426,平远县,4,441400 -441427,蕉岭县,4,441400 -441481,兴宁市,4,441400 -441502,城区,4,441500 -441521,海丰县,4,441500 -441523,陆河县,4,441500 -441581,陆丰市,4,441500 -441602,源城区,4,441600 -441621,紫金县,4,441600 -441622,龙川县,4,441600 -441623,连平县,4,441600 -441624,和平县,4,441600 -441625,东源县,4,441600 -441702,江城区,4,441700 -441704,阳东区,4,441700 -441721,阳西县,4,441700 -441781,阳春市,4,441700 -441802,清城区,4,441800 -441803,清新区,4,441800 -441821,佛冈县,4,441800 -441823,阳山县,4,441800 -441825,连山壮族瑶族自治县,4,441800 -441826,连南瑶族自治县,4,441800 -441881,英德市,4,441800 -441882,连州市,4,441800 -445102,湘桥区,4,445100 -445103,潮安区,4,445100 -445122,饶平县,4,445100 -445202,榕城区,4,445200 -445203,揭东区,4,445200 -445222,揭西县,4,445200 -445224,惠来县,4,445200 -445281,普宁市,4,445200 -445302,云城区,4,445300 -445303,云安区,4,445300 -445321,新兴县,4,445300 -445322,郁南县,4,445300 -445381,罗定市,4,445300 -450102,兴宁区,4,450100 -450103,青秀区,4,450100 -450105,江南区,4,450100 -450107,西乡塘区,4,450100 -450108,良庆区,4,450100 -450109,邕宁区,4,450100 -450110,武鸣区,4,450100 -450123,隆安县,4,450100 -450124,马山县,4,450100 -450125,上林县,4,450100 -450126,宾阳县,4,450100 -450181,横州市,4,450100 -450202,城中区,4,450200 -450203,鱼峰区,4,450200 -450204,柳南区,4,450200 -450205,柳北区,4,450200 -450206,柳江区,4,450200 -450222,柳城县,4,450200 -450223,鹿寨县,4,450200 -450224,融安县,4,450200 -450225,融水苗族自治县,4,450200 -450226,三江侗族自治县,4,450200 -450302,秀峰区,4,450300 -450303,叠彩区,4,450300 -450304,象山区,4,450300 -450305,七星区,4,450300 -450311,雁山区,4,450300 -450312,临桂区,4,450300 -450321,阳朔县,4,450300 -450323,灵川县,4,450300 -450324,全州县,4,450300 -450325,兴安县,4,450300 -450326,永福县,4,450300 -450327,灌阳县,4,450300 -450328,龙胜各族自治县,4,450300 -450329,资源县,4,450300 -450330,平乐县,4,450300 -450332,恭城瑶族自治县,4,450300 -450381,荔浦市,4,450300 -450403,万秀区,4,450400 -450405,长洲区,4,450400 -450406,龙圩区,4,450400 -450421,苍梧县,4,450400 -450422,藤县,4,450400 -450423,蒙山县,4,450400 -450481,岑溪市,4,450400 -450502,海城区,4,450500 -450503,银海区,4,450500 -450512,铁山港区,4,450500 -450521,合浦县,4,450500 -450602,港口区,4,450600 -450603,防城区,4,450600 -450621,上思县,4,450600 -450681,东兴市,4,450600 -450702,钦南区,4,450700 -450703,钦北区,4,450700 -450721,灵山县,4,450700 -450722,浦北县,4,450700 -450802,港北区,4,450800 -450803,港南区,4,450800 -450804,覃塘区,4,450800 -450821,平南县,4,450800 -450881,桂平市,4,450800 -450902,玉州区,4,450900 -450903,福绵区,4,450900 -450921,容县,4,450900 -450922,陆川县,4,450900 -450923,博白县,4,450900 -450924,兴业县,4,450900 -450981,北流市,4,450900 -451002,右江区,4,451000 -451003,田阳区,4,451000 -451022,田东县,4,451000 -451024,德保县,4,451000 -451026,那坡县,4,451000 -451027,凌云县,4,451000 -451028,乐业县,4,451000 -451029,田林县,4,451000 -451030,西林县,4,451000 -451031,隆林各族自治县,4,451000 -451081,靖西市,4,451000 -451082,平果市,4,451000 -451102,八步区,4,451100 -451103,平桂区,4,451100 -451121,昭平县,4,451100 -451122,钟山县,4,451100 -451123,富川瑶族自治县,4,451100 -451202,金城江区,4,451200 -451203,宜州区,4,451200 -451221,南丹县,4,451200 -451222,天峨县,4,451200 -451223,凤山县,4,451200 -451224,东兰县,4,451200 -451225,罗城仫佬族自治县,4,451200 -451226,环江毛南族自治县,4,451200 -451227,巴马瑶族自治县,4,451200 -451228,都安瑶族自治县,4,451200 -451229,大化瑶族自治县,4,451200 -451302,兴宾区,4,451300 -451321,忻城县,4,451300 -451322,象州县,4,451300 -451323,武宣县,4,451300 -451324,金秀瑶族自治县,4,451300 -451381,合山市,4,451300 -451402,江州区,4,451400 -451421,扶绥县,4,451400 -451422,宁明县,4,451400 -451423,龙州县,4,451400 -451424,大新县,4,451400 -451425,天等县,4,451400 -451481,凭祥市,4,451400 -460105,秀英区,4,460100 -460106,龙华区,4,460100 -460107,琼山区,4,460100 -460108,美兰区,4,460100 -460202,海棠区,4,460200 -460203,吉阳区,4,460200 -460204,天涯区,4,460200 -460205,崖州区,4,460200 -460321,西沙群岛,4,460300 -460322,南沙群岛,4,460300 -460323,中沙群岛的岛礁及其海域,4,460300 -469001,五指山市,4,469000 -469002,琼海市,4,469000 -469005,文昌市,4,469000 -469006,万宁市,4,469000 -469007,东方市,4,469000 -469021,定安县,4,469000 -469022,屯昌县,4,469000 -469023,澄迈县,4,469000 -469024,临高县,4,469000 -469025,白沙黎族自治县,4,469000 -469026,昌江黎族自治县,4,469000 -469027,乐东黎族自治县,4,469000 -469028,陵水黎族自治县,4,469000 -469029,保亭黎族苗族自治县,4,469000 -469030,琼中黎族苗族自治县,4,469000 -500101,万州区,4,500100 -500102,涪陵区,4,500100 -500103,渝中区,4,500100 -500104,大渡口区,4,500100 -500105,江北区,4,500100 -500106,沙坪坝区,4,500100 -500107,九龙坡区,4,500100 -500108,南岸区,4,500100 -500109,北碚区,4,500100 -500110,綦江区,4,500100 -500111,大足区,4,500100 -500112,渝北区,4,500100 -500113,巴南区,4,500100 -500114,黔江区,4,500100 -500115,长寿区,4,500100 -500116,江津区,4,500100 -500117,合川区,4,500100 -500118,永川区,4,500100 -500119,南川区,4,500100 -500120,璧山区,4,500100 -500151,铜梁区,4,500100 -500152,潼南区,4,500100 -500153,荣昌区,4,500100 -500154,开州区,4,500100 -500155,梁平区,4,500100 -500156,武隆区,4,500100 -500229,城口县,4,500100 -500230,丰都县,4,500100 -500231,垫江县,4,500100 -500233,忠县,4,500100 -500235,云阳县,4,500100 -500236,奉节县,4,500100 -500237,巫山县,4,500100 -500238,巫溪县,4,500100 -500240,石柱土家族自治县,4,500100 -500241,秀山土家族苗族自治县,4,500100 -500242,酉阳土家族苗族自治县,4,500100 -500243,彭水苗族土家族自治县,4,500100 -510104,锦江区,4,510100 -510105,青羊区,4,510100 -510106,金牛区,4,510100 -510107,武侯区,4,510100 -510108,成华区,4,510100 -510112,龙泉驿区,4,510100 -510113,青白江区,4,510100 -510114,新都区,4,510100 -510115,温江区,4,510100 -510116,双流区,4,510100 -510117,郫都区,4,510100 -510118,新津区,4,510100 -510121,金堂县,4,510100 -510129,大邑县,4,510100 -510131,蒲江县,4,510100 -510181,都江堰市,4,510100 -510182,彭州市,4,510100 -510183,邛崃市,4,510100 -510184,崇州市,4,510100 -510185,简阳市,4,510100 -510302,自流井区,4,510300 -510303,贡井区,4,510300 -510304,大安区,4,510300 -510311,沿滩区,4,510300 -510321,荣县,4,510300 -510322,富顺县,4,510300 -510402,东区,4,510400 -510403,西区,4,510400 -510411,仁和区,4,510400 -510421,米易县,4,510400 -510422,盐边县,4,510400 -510502,江阳区,4,510500 -510503,纳溪区,4,510500 -510504,龙马潭区,4,510500 -510521,泸县,4,510500 -510522,合江县,4,510500 -510524,叙永县,4,510500 -510525,古蔺县,4,510500 -510603,旌阳区,4,510600 -510604,罗江区,4,510600 -510623,中江县,4,510600 -510681,广汉市,4,510600 -510682,什邡市,4,510600 -510683,绵竹市,4,510600 -510703,涪城区,4,510700 -510704,游仙区,4,510700 -510705,安州区,4,510700 -510722,三台县,4,510700 -510723,盐亭县,4,510700 -510725,梓潼县,4,510700 -510726,北川羌族自治县,4,510700 -510727,平武县,4,510700 -510781,江油市,4,510700 -510802,利州区,4,510800 -510811,昭化区,4,510800 -510812,朝天区,4,510800 -510821,旺苍县,4,510800 -510822,青川县,4,510800 -510823,剑阁县,4,510800 -510824,苍溪县,4,510800 -510903,船山区,4,510900 -510904,安居区,4,510900 -510921,蓬溪县,4,510900 -510923,大英县,4,510900 -510981,射洪市,4,510900 -511002,市中区,4,511000 -511011,东兴区,4,511000 -511024,威远县,4,511000 -511025,资中县,4,511000 -511071,内江经济开发区,4,511000 -511083,隆昌市,4,511000 -511102,市中区,4,511100 -511111,沙湾区,4,511100 -511112,五通桥区,4,511100 -511113,金口河区,4,511100 -511123,犍为县,4,511100 -511124,井研县,4,511100 -511126,夹江县,4,511100 -511129,沐川县,4,511100 -511132,峨边彝族自治县,4,511100 -511133,马边彝族自治县,4,511100 -511181,峨眉山市,4,511100 -511302,顺庆区,4,511300 -511303,高坪区,4,511300 -511304,嘉陵区,4,511300 -511321,南部县,4,511300 -511322,营山县,4,511300 -511323,蓬安县,4,511300 -511324,仪陇县,4,511300 -511325,西充县,4,511300 -511381,阆中市,4,511300 -511402,东坡区,4,511400 -511403,彭山区,4,511400 -511421,仁寿县,4,511400 -511423,洪雅县,4,511400 -511424,丹棱县,4,511400 -511425,青神县,4,511400 -511502,翠屏区,4,511500 -511503,南溪区,4,511500 -511504,叙州区,4,511500 -511523,江安县,4,511500 -511524,长宁县,4,511500 -511525,高县,4,511500 -511526,珙县,4,511500 -511527,筠连县,4,511500 -511528,兴文县,4,511500 -511529,屏山县,4,511500 -511602,广安区,4,511600 -511603,前锋区,4,511600 -511621,岳池县,4,511600 -511622,武胜县,4,511600 -511623,邻水县,4,511600 -511681,华蓥市,4,511600 -511702,通川区,4,511700 -511703,达川区,4,511700 -511722,宣汉县,4,511700 -511723,开江县,4,511700 -511724,大竹县,4,511700 -511725,渠县,4,511700 -511771,达州经济开发区,4,511700 -511781,万源市,4,511700 -511802,雨城区,4,511800 -511803,名山区,4,511800 -511822,荥经县,4,511800 -511823,汉源县,4,511800 -511824,石棉县,4,511800 -511825,天全县,4,511800 -511826,芦山县,4,511800 -511827,宝兴县,4,511800 -511902,巴州区,4,511900 -511903,恩阳区,4,511900 -511921,通江县,4,511900 -511922,南江县,4,511900 -511923,平昌县,4,511900 -511971,巴中经济开发区,4,511900 -512002,雁江区,4,512000 -512021,安岳县,4,512000 -512022,乐至县,4,512000 -513201,马尔康市,4,513200 -513221,汶川县,4,513200 -513222,理县,4,513200 -513223,茂县,4,513200 -513224,松潘县,4,513200 -513225,九寨沟县,4,513200 -513226,金川县,4,513200 -513227,小金县,4,513200 -513228,黑水县,4,513200 -513230,壤塘县,4,513200 -513231,阿坝县,4,513200 -513232,若尔盖县,4,513200 -513233,红原县,4,513200 -513301,康定市,4,513300 -513322,泸定县,4,513300 -513323,丹巴县,4,513300 -513324,九龙县,4,513300 -513325,雅江县,4,513300 -513326,道孚县,4,513300 -513327,炉霍县,4,513300 -513328,甘孜县,4,513300 -513329,新龙县,4,513300 -513330,德格县,4,513300 -513331,白玉县,4,513300 -513332,石渠县,4,513300 -513333,色达县,4,513300 -513334,理塘县,4,513300 -513335,巴塘县,4,513300 -513336,乡城县,4,513300 -513337,稻城县,4,513300 -513338,得荣县,4,513300 -513401,西昌市,4,513400 -513402,会理市,4,513400 -513422,木里藏族自治县,4,513400 -513423,盐源县,4,513400 -513424,德昌县,4,513400 -513426,会东县,4,513400 -513427,宁南县,4,513400 -513428,普格县,4,513400 -513429,布拖县,4,513400 -513430,金阳县,4,513400 -513431,昭觉县,4,513400 -513432,喜德县,4,513400 -513433,冕宁县,4,513400 -513434,越西县,4,513400 -513435,甘洛县,4,513400 -513436,美姑县,4,513400 -513437,雷波县,4,513400 -520102,南明区,4,520100 -520103,云岩区,4,520100 -520111,花溪区,4,520100 -520112,乌当区,4,520100 -520113,白云区,4,520100 -520115,观山湖区,4,520100 -520121,开阳县,4,520100 -520122,息烽县,4,520100 -520123,修文县,4,520100 -520181,清镇市,4,520100 -520201,钟山区,4,520200 -520203,六枝特区,4,520200 -520204,水城区,4,520200 -520281,盘州市,4,520200 -520302,红花岗区,4,520300 -520303,汇川区,4,520300 -520304,播州区,4,520300 -520322,桐梓县,4,520300 -520323,绥阳县,4,520300 -520324,正安县,4,520300 -520325,道真仡佬族苗族自治县,4,520300 -520326,务川仡佬族苗族自治县,4,520300 -520327,凤冈县,4,520300 -520328,湄潭县,4,520300 -520329,余庆县,4,520300 -520330,习水县,4,520300 -520381,赤水市,4,520300 -520382,仁怀市,4,520300 -520402,西秀区,4,520400 -520403,平坝区,4,520400 -520422,普定县,4,520400 -520423,镇宁布依族苗族自治县,4,520400 -520424,关岭布依族苗族自治县,4,520400 -520425,紫云苗族布依族自治县,4,520400 -520502,七星关区,4,520500 -520521,大方县,4,520500 -520523,金沙县,4,520500 -520524,织金县,4,520500 -520525,纳雍县,4,520500 -520526,威宁彝族回族苗族自治县,4,520500 -520527,赫章县,4,520500 -520581,黔西市,4,520500 -520602,碧江区,4,520600 -520603,万山区,4,520600 -520621,江口县,4,520600 -520622,玉屏侗族自治县,4,520600 -520623,石阡县,4,520600 -520624,思南县,4,520600 -520625,印江土家族苗族自治县,4,520600 -520626,德江县,4,520600 -520627,沿河土家族自治县,4,520600 -520628,松桃苗族自治县,4,520600 -522301,兴义市,4,522300 -522302,兴仁市,4,522300 -522323,普安县,4,522300 -522324,晴隆县,4,522300 -522325,贞丰县,4,522300 -522326,望谟县,4,522300 -522327,册亨县,4,522300 -522328,安龙县,4,522300 -522601,凯里市,4,522600 -522622,黄平县,4,522600 -522623,施秉县,4,522600 -522624,三穗县,4,522600 -522625,镇远县,4,522600 -522626,岑巩县,4,522600 -522627,天柱县,4,522600 -522628,锦屏县,4,522600 -522629,剑河县,4,522600 -522630,台江县,4,522600 -522631,黎平县,4,522600 -522632,榕江县,4,522600 -522633,从江县,4,522600 -522634,雷山县,4,522600 -522635,麻江县,4,522600 -522636,丹寨县,4,522600 -522701,都匀市,4,522700 -522702,福泉市,4,522700 -522722,荔波县,4,522700 -522723,贵定县,4,522700 -522725,瓮安县,4,522700 -522726,独山县,4,522700 -522727,平塘县,4,522700 -522728,罗甸县,4,522700 -522729,长顺县,4,522700 -522730,龙里县,4,522700 -522731,惠水县,4,522700 -522732,三都水族自治县,4,522700 -530102,五华区,4,530100 -530103,盘龙区,4,530100 -530111,官渡区,4,530100 -530112,西山区,4,530100 -530113,东川区,4,530100 -530114,呈贡区,4,530100 -530115,晋宁区,4,530100 -530124,富民县,4,530100 -530125,宜良县,4,530100 -530126,石林彝族自治县,4,530100 -530127,嵩明县,4,530100 -530128,禄劝彝族苗族自治县,4,530100 -530129,寻甸回族彝族自治县,4,530100 -530181,安宁市,4,530100 -530302,麒麟区,4,530300 -530303,沾益区,4,530300 -530304,马龙区,4,530300 -530322,陆良县,4,530300 -530323,师宗县,4,530300 -530324,罗平县,4,530300 -530325,富源县,4,530300 -530326,会泽县,4,530300 -530381,宣威市,4,530300 -530402,红塔区,4,530400 -530403,江川区,4,530400 -530423,通海县,4,530400 -530424,华宁县,4,530400 -530425,易门县,4,530400 -530426,峨山彝族自治县,4,530400 -530427,新平彝族傣族自治县,4,530400 -530428,元江哈尼族彝族傣族自治县,4,530400 -530481,澄江市,4,530400 -530502,隆阳区,4,530500 -530521,施甸县,4,530500 -530523,龙陵县,4,530500 -530524,昌宁县,4,530500 -530581,腾冲市,4,530500 -530602,昭阳区,4,530600 -530621,鲁甸县,4,530600 -530622,巧家县,4,530600 -530623,盐津县,4,530600 -530624,大关县,4,530600 -530625,永善县,4,530600 -530626,绥江县,4,530600 -530627,镇雄县,4,530600 -530628,彝良县,4,530600 -530629,威信县,4,530600 -530681,水富市,4,530600 -530702,古城区,4,530700 -530721,玉龙纳西族自治县,4,530700 -530722,永胜县,4,530700 -530723,华坪县,4,530700 -530724,宁蒗彝族自治县,4,530700 -530802,思茅区,4,530800 -530821,宁洱哈尼族彝族自治县,4,530800 -530822,墨江哈尼族自治县,4,530800 -530823,景东彝族自治县,4,530800 -530824,景谷傣族彝族自治县,4,530800 -530825,镇沅彝族哈尼族拉祜族自治县,4,530800 -530826,江城哈尼族彝族自治县,4,530800 -530827,孟连傣族拉祜族佤族自治县,4,530800 -530828,澜沧拉祜族自治县,4,530800 -530829,西盟佤族自治县,4,530800 -530902,临翔区,4,530900 -530921,凤庆县,4,530900 -530922,云县,4,530900 -530923,永德县,4,530900 -530924,镇康县,4,530900 -530925,双江拉祜族佤族布朗族傣族自治县,4,530900 -530926,耿马傣族佤族自治县,4,530900 -530927,沧源佤族自治县,4,530900 -532301,楚雄市,4,532300 -532302,禄丰市,4,532300 -532322,双柏县,4,532300 -532323,牟定县,4,532300 -532324,南华县,4,532300 -532325,姚安县,4,532300 -532326,大姚县,4,532300 -532327,永仁县,4,532300 -532328,元谋县,4,532300 -532329,武定县,4,532300 -532501,个旧市,4,532500 -532502,开远市,4,532500 -532503,蒙自市,4,532500 -532504,弥勒市,4,532500 -532523,屏边苗族自治县,4,532500 -532524,建水县,4,532500 -532525,石屏县,4,532500 -532527,泸西县,4,532500 -532528,元阳县,4,532500 -532529,红河县,4,532500 -532530,金平苗族瑶族傣族自治县,4,532500 -532531,绿春县,4,532500 -532532,河口瑶族自治县,4,532500 -532601,文山市,4,532600 -532622,砚山县,4,532600 -532623,西畴县,4,532600 -532624,麻栗坡县,4,532600 -532625,马关县,4,532600 -532626,丘北县,4,532600 -532627,广南县,4,532600 -532628,富宁县,4,532600 -532801,景洪市,4,532800 -532822,勐海县,4,532800 -532823,勐腊县,4,532800 -532901,大理市,4,532900 -532922,漾濞彝族自治县,4,532900 -532923,祥云县,4,532900 -532924,宾川县,4,532900 -532925,弥渡县,4,532900 -532926,南涧彝族自治县,4,532900 -532927,巍山彝族回族自治县,4,532900 -532928,永平县,4,532900 -532929,云龙县,4,532900 -532930,洱源县,4,532900 -532931,剑川县,4,532900 -532932,鹤庆县,4,532900 -533102,瑞丽市,4,533100 -533103,芒市,4,533100 -533122,梁河县,4,533100 -533123,盈江县,4,533100 -533124,陇川县,4,533100 -533301,泸水市,4,533300 -533323,福贡县,4,533300 -533324,贡山独龙族怒族自治县,4,533300 -533325,兰坪白族普米族自治县,4,533300 -533401,香格里拉市,4,533400 -533422,德钦县,4,533400 -533423,维西傈僳族自治县,4,533400 -540102,城关区,4,540100 -540103,堆龙德庆区,4,540100 -540104,达孜区,4,540100 -540121,林周县,4,540100 -540122,当雄县,4,540100 -540123,尼木县,4,540100 -540124,曲水县,4,540100 -540127,墨竹工卡县,4,540100 -540171,格尔木藏青工业园区,4,540100 -540172,拉萨经济技术开发区,4,540100 -540173,西藏文化旅游创意园区,4,540100 -540174,达孜工业园区,4,540100 -540202,桑珠孜区,4,540200 -540221,南木林县,4,540200 -540222,江孜县,4,540200 -540223,定日县,4,540200 -540224,萨迦县,4,540200 -540225,拉孜县,4,540200 -540226,昂仁县,4,540200 -540227,谢通门县,4,540200 -540228,白朗县,4,540200 -540229,仁布县,4,540200 -540230,康马县,4,540200 -540231,定结县,4,540200 -540232,仲巴县,4,540200 -540233,亚东县,4,540200 -540234,吉隆县,4,540200 -540235,聂拉木县,4,540200 -540236,萨嘎县,4,540200 -540237,岗巴县,4,540200 -540302,卡若区,4,540300 -540321,江达县,4,540300 -540322,贡觉县,4,540300 -540323,类乌齐县,4,540300 -540324,丁青县,4,540300 -540325,察雅县,4,540300 -540326,八宿县,4,540300 -540327,左贡县,4,540300 -540328,芒康县,4,540300 -540329,洛隆县,4,540300 -540330,边坝县,4,540300 -540402,巴宜区,4,540400 -540421,工布江达县,4,540400 -540422,米林县,4,540400 -540423,墨脱县,4,540400 -540424,波密县,4,540400 -540425,察隅县,4,540400 -540426,朗县,4,540400 -540502,乃东区,4,540500 -540521,扎囊县,4,540500 -540522,贡嘎县,4,540500 -540523,桑日县,4,540500 -540524,琼结县,4,540500 -540525,曲松县,4,540500 -540526,措美县,4,540500 -540527,洛扎县,4,540500 -540528,加查县,4,540500 -540529,隆子县,4,540500 -540530,错那县,4,540500 -540531,浪卡子县,4,540500 -540602,色尼区,4,540600 -540621,嘉黎县,4,540600 -540622,比如县,4,540600 -540623,聂荣县,4,540600 -540624,安多县,4,540600 -540625,申扎县,4,540600 -540626,索县,4,540600 -540627,班戈县,4,540600 -540628,巴青县,4,540600 -540629,尼玛县,4,540600 -540630,双湖县,4,540600 -542521,普兰县,4,542500 -542522,札达县,4,542500 -542523,噶尔县,4,542500 -542524,日土县,4,542500 -542525,革吉县,4,542500 -542526,改则县,4,542500 -542527,措勤县,4,542500 -610102,新城区,4,610100 -610103,碑林区,4,610100 -610104,莲湖区,4,610100 -610111,灞桥区,4,610100 -610112,未央区,4,610100 -610113,雁塔区,4,610100 -610114,阎良区,4,610100 -610115,临潼区,4,610100 -610116,长安区,4,610100 -610117,高陵区,4,610100 -610118,鄠邑区,4,610100 -610122,蓝田县,4,610100 -610124,周至县,4,610100 -610202,王益区,4,610200 -610203,印台区,4,610200 -610204,耀州区,4,610200 -610222,宜君县,4,610200 -610302,渭滨区,4,610300 -610303,金台区,4,610300 -610304,陈仓区,4,610300 -610305,凤翔区,4,610300 -610323,岐山县,4,610300 -610324,扶风县,4,610300 -610326,眉县,4,610300 -610327,陇县,4,610300 -610328,千阳县,4,610300 -610329,麟游县,4,610300 -610330,凤县,4,610300 -610331,太白县,4,610300 -610402,秦都区,4,610400 -610403,杨陵区,4,610400 -610404,渭城区,4,610400 -610422,三原县,4,610400 -610423,泾阳县,4,610400 -610424,乾县,4,610400 -610425,礼泉县,4,610400 -610426,永寿县,4,610400 -610428,长武县,4,610400 -610429,旬邑县,4,610400 -610430,淳化县,4,610400 -610431,武功县,4,610400 -610481,兴平市,4,610400 -610482,彬州市,4,610400 -610502,临渭区,4,610500 -610503,华州区,4,610500 -610522,潼关县,4,610500 -610523,大荔县,4,610500 -610524,合阳县,4,610500 -610525,澄城县,4,610500 -610526,蒲城县,4,610500 -610527,白水县,4,610500 -610528,富平县,4,610500 -610581,韩城市,4,610500 -610582,华阴市,4,610500 -610602,宝塔区,4,610600 -610603,安塞区,4,610600 -610621,延长县,4,610600 -610622,延川县,4,610600 -610625,志丹县,4,610600 -610626,吴起县,4,610600 -610627,甘泉县,4,610600 -610628,富县,4,610600 -610629,洛川县,4,610600 -610630,宜川县,4,610600 -610631,黄龙县,4,610600 -610632,黄陵县,4,610600 -610681,子长市,4,610600 -610702,汉台区,4,610700 -610703,南郑区,4,610700 -610722,城固县,4,610700 -610723,洋县,4,610700 -610724,西乡县,4,610700 -610725,勉县,4,610700 -610726,宁强县,4,610700 -610727,略阳县,4,610700 -610728,镇巴县,4,610700 -610729,留坝县,4,610700 -610730,佛坪县,4,610700 -610802,榆阳区,4,610800 -610803,横山区,4,610800 -610822,府谷县,4,610800 -610824,靖边县,4,610800 -610825,定边县,4,610800 -610826,绥德县,4,610800 -610827,米脂县,4,610800 -610828,佳县,4,610800 -610829,吴堡县,4,610800 -610830,清涧县,4,610800 -610831,子洲县,4,610800 -610881,神木市,4,610800 -610902,汉滨区,4,610900 -610921,汉阴县,4,610900 -610922,石泉县,4,610900 -610923,宁陕县,4,610900 -610924,紫阳县,4,610900 -610925,岚皋县,4,610900 -610926,平利县,4,610900 -610927,镇坪县,4,610900 -610929,白河县,4,610900 -610981,旬阳市,4,610900 -611002,商州区,4,611000 -611021,洛南县,4,611000 -611022,丹凤县,4,611000 -611023,商南县,4,611000 -611024,山阳县,4,611000 -611025,镇安县,4,611000 -611026,柞水县,4,611000 -620102,城关区,4,620100 -620103,七里河区,4,620100 -620104,西固区,4,620100 -620105,安宁区,4,620100 -620111,红古区,4,620100 -620121,永登县,4,620100 -620122,皋兰县,4,620100 -620123,榆中县,4,620100 -620171,兰州新区,4,620100 -620201,嘉峪关市,4,620200 -620302,金川区,4,620300 -620321,永昌县,4,620300 -620402,白银区,4,620400 -620403,平川区,4,620400 -620421,靖远县,4,620400 -620422,会宁县,4,620400 -620423,景泰县,4,620400 -620502,秦州区,4,620500 -620503,麦积区,4,620500 -620521,清水县,4,620500 -620522,秦安县,4,620500 -620523,甘谷县,4,620500 -620524,武山县,4,620500 -620525,张家川回族自治县,4,620500 -620602,凉州区,4,620600 -620621,民勤县,4,620600 -620622,古浪县,4,620600 -620623,天祝藏族自治县,4,620600 -620702,甘州区,4,620700 -620721,肃南裕固族自治县,4,620700 -620722,民乐县,4,620700 -620723,临泽县,4,620700 -620724,高台县,4,620700 -620725,山丹县,4,620700 -620802,崆峒区,4,620800 -620821,泾川县,4,620800 -620822,灵台县,4,620800 -620823,崇信县,4,620800 -620825,庄浪县,4,620800 -620826,静宁县,4,620800 -620881,华亭市,4,620800 -620902,肃州区,4,620900 -620921,金塔县,4,620900 -620922,瓜州县,4,620900 -620923,肃北蒙古族自治县,4,620900 -620924,阿克塞哈萨克族自治县,4,620900 -620981,玉门市,4,620900 -620982,敦煌市,4,620900 -621002,西峰区,4,621000 -621021,庆城县,4,621000 -621022,环县,4,621000 -621023,华池县,4,621000 -621024,合水县,4,621000 -621025,正宁县,4,621000 -621026,宁县,4,621000 -621027,镇原县,4,621000 -621102,安定区,4,621100 -621121,通渭县,4,621100 -621122,陇西县,4,621100 -621123,渭源县,4,621100 -621124,临洮县,4,621100 -621125,漳县,4,621100 -621126,岷县,4,621100 -621202,武都区,4,621200 -621221,成县,4,621200 -621222,文县,4,621200 -621223,宕昌县,4,621200 -621224,康县,4,621200 -621225,西和县,4,621200 -621226,礼县,4,621200 -621227,徽县,4,621200 -621228,两当县,4,621200 -622901,临夏市,4,622900 -622921,临夏县,4,622900 -622922,康乐县,4,622900 -622923,永靖县,4,622900 -622924,广河县,4,622900 -622925,和政县,4,622900 -622926,东乡族自治县,4,622900 -622927,积石山保安族东乡族撒拉族自治县,4,622900 -623001,合作市,4,623000 -623021,临潭县,4,623000 -623022,卓尼县,4,623000 -623023,舟曲县,4,623000 -623024,迭部县,4,623000 -623025,玛曲县,4,623000 -623026,碌曲县,4,623000 -623027,夏河县,4,623000 -630102,城东区,4,630100 -630103,城中区,4,630100 -630104,城西区,4,630100 -630105,城北区,4,630100 -630106,湟中区,4,630100 -630121,大通回族土族自治县,4,630100 -630123,湟源县,4,630100 -630202,乐都区,4,630200 -630203,平安区,4,630200 -630222,民和回族土族自治县,4,630200 -630223,互助土族自治县,4,630200 -630224,化隆回族自治县,4,630200 -630225,循化撒拉族自治县,4,630200 -632221,门源回族自治县,4,632200 -632222,祁连县,4,632200 -632223,海晏县,4,632200 -632224,刚察县,4,632200 -632301,同仁市,4,632300 -632322,尖扎县,4,632300 -632323,泽库县,4,632300 -632324,河南蒙古族自治县,4,632300 -632521,共和县,4,632500 -632522,同德县,4,632500 -632523,贵德县,4,632500 -632524,兴海县,4,632500 -632525,贵南县,4,632500 -632621,玛沁县,4,632600 -632622,班玛县,4,632600 -632623,甘德县,4,632600 -632624,达日县,4,632600 -632625,久治县,4,632600 -632626,玛多县,4,632600 -632701,玉树市,4,632700 -632722,杂多县,4,632700 -632723,称多县,4,632700 -632724,治多县,4,632700 -632725,囊谦县,4,632700 -632726,曲麻莱县,4,632700 -632801,格尔木市,4,632800 -632802,德令哈市,4,632800 -632803,茫崖市,4,632800 -632821,乌兰县,4,632800 -632822,都兰县,4,632800 -632823,天峻县,4,632800 -632857,大柴旦行政委员会,4,632800 -640104,兴庆区,4,640100 -640105,西夏区,4,640100 -640106,金凤区,4,640100 -640121,永宁县,4,640100 -640122,贺兰县,4,640100 -640181,灵武市,4,640100 -640202,大武口区,4,640200 -640205,惠农区,4,640200 -640221,平罗县,4,640200 -640302,利通区,4,640300 -640303,红寺堡区,4,640300 -640323,盐池县,4,640300 -640324,同心县,4,640300 -640381,青铜峡市,4,640300 -640402,原州区,4,640400 -640422,西吉县,4,640400 -640423,隆德县,4,640400 -640424,泾源县,4,640400 -640425,彭阳县,4,640400 -640502,沙坡头区,4,640500 -640521,中宁县,4,640500 -640522,海原县,4,640500 -650102,天山区,4,650100 -650103,沙依巴克区,4,650100 -650104,新市区,4,650100 -650105,水磨沟区,4,650100 -650106,头屯河区,4,650100 -650107,达坂城区,4,650100 -650109,米东区,4,650100 -650121,乌鲁木齐县,4,650100 -650202,独山子区,4,650200 -650203,克拉玛依区,4,650200 -650204,白碱滩区,4,650200 -650205,乌尔禾区,4,650200 -650402,高昌区,4,650400 -650421,鄯善县,4,650400 -650422,托克逊县,4,650400 -650502,伊州区,4,650500 -650521,巴里坤哈萨克自治县,4,650500 -650522,伊吾县,4,650500 -652301,昌吉市,4,652300 -652302,阜康市,4,652300 -652323,呼图壁县,4,652300 -652324,玛纳斯县,4,652300 -652325,奇台县,4,652300 -652327,吉木萨尔县,4,652300 -652328,木垒哈萨克自治县,4,652300 -652701,博乐市,4,652700 -652702,阿拉山口市,4,652700 -652722,精河县,4,652700 -652723,温泉县,4,652700 -652801,库尔勒市,4,652800 -652822,轮台县,4,652800 -652823,尉犁县,4,652800 -652824,若羌县,4,652800 -652825,且末县,4,652800 -652826,焉耆回族自治县,4,652800 -652827,和静县,4,652800 -652828,和硕县,4,652800 -652829,博湖县,4,652800 -652871,库尔勒经济技术开发区,4,652800 -652901,阿克苏市,4,652900 -652902,库车市,4,652900 -652922,温宿县,4,652900 -652924,沙雅县,4,652900 -652925,新和县,4,652900 -652926,拜城县,4,652900 -652927,乌什县,4,652900 -652928,阿瓦提县,4,652900 -652929,柯坪县,4,652900 -653001,阿图什市,4,653000 -653022,阿克陶县,4,653000 -653023,阿合奇县,4,653000 -653024,乌恰县,4,653000 -653101,喀什市,4,653100 -653121,疏附县,4,653100 -653122,疏勒县,4,653100 -653123,英吉沙县,4,653100 -653124,泽普县,4,653100 -653125,莎车县,4,653100 -653126,叶城县,4,653100 -653127,麦盖提县,4,653100 -653128,岳普湖县,4,653100 -653129,伽师县,4,653100 -653130,巴楚县,4,653100 -653131,塔什库尔干塔吉克自治县,4,653100 -653201,和田市,4,653200 -653221,和田县,4,653200 -653222,墨玉县,4,653200 -653223,皮山县,4,653200 -653224,洛浦县,4,653200 -653225,策勒县,4,653200 -653226,于田县,4,653200 -653227,民丰县,4,653200 -654002,伊宁市,4,654000 -654003,奎屯市,4,654000 -654004,霍尔果斯市,4,654000 -654021,伊宁县,4,654000 -654022,察布查尔锡伯自治县,4,654000 -654023,霍城县,4,654000 -654024,巩留县,4,654000 -654025,新源县,4,654000 -654026,昭苏县,4,654000 -654027,特克斯县,4,654000 -654028,尼勒克县,4,654000 -654201,塔城市,4,654200 -654202,乌苏市,4,654200 -654203,沙湾市,4,654200 -654221,额敏县,4,654200 -654224,托里县,4,654200 -654225,裕民县,4,654200 -654226,和布克赛尔蒙古自治县,4,654200 -654301,阿勒泰市,4,654300 -654321,布尔津县,4,654300 -654322,富蕴县,4,654300 -654323,福海县,4,654300 -654324,哈巴河县,4,654300 -654325,青河县,4,654300 -654326,吉木乃县,4,654300 -659001,石河子市,4,659000 -659002,阿拉尔市,4,659000 -659003,图木舒克市,4,659000 -659004,五家渠市,4,659000 -659005,北屯市,4,659000 -659006,铁门关市,4,659000 -659007,双河市,4,659000 -659008,可克达拉市,4,659000 -659009,昆玉市,4,659000 -659010,胡杨河市,4,659000 -659011,新星市,4,659000 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-ip/target/classes/ip2region.xdb b/yudao-framework/yudao-spring-boot-starter-biz-ip/target/classes/ip2region.xdb deleted file mode 100644 index c78b792..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-biz-ip/target/classes/ip2region.xdb and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-biz-ip/target/classes/ip2region.xdb.bak1 b/yudao-framework/yudao-spring-boot-starter-biz-ip/target/classes/ip2region.xdb.bak1 deleted file mode 100644 index 58596a5..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-biz-ip/target/classes/ip2region.xdb.bak1 and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-biz-operatelog/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index d68cf1c..0000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -cn.iocoder.yudao.framework.operatelog.config.YudaoOperateLogRpcAutoConfiguration -cn.iocoder.yudao.framework.operatelog.config.YudaoOperateLogAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-biz-sms/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 8eb45ac..0000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.iocoder.yudao.framework.sms.config.YudaoSmsAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-biz-social/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-biz-social/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index c7ca9cf..0000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-social/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.iocoder.yudao.framework.social.config.YudaoSocialAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/target/classes/META-INF/spring-configuration-metadata.json b/yudao-framework/yudao-spring-boot-starter-biz-tenant/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index b0f3661..0000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "groups": [ - { - "name": "yudao.tenant", - "type": "cn.iocoder.yudao.framework.tenant.config.TenantProperties", - "sourceType": "cn.iocoder.yudao.framework.tenant.config.TenantProperties" - } - ], - "properties": [ - { - "name": "yudao.tenant.enable", - "type": "java.lang.Boolean", - "description": "是否开启", - "sourceType": "cn.iocoder.yudao.framework.tenant.config.TenantProperties" - }, - { - "name": "yudao.tenant.ignore-tables", - "type": "java.util.Set", - "description": "需要忽略多租户的表 即默认所有表都开启多租户的功能，所以记得添加对应的 tenant_id 字段哟", - "sourceType": "cn.iocoder.yudao.framework.tenant.config.TenantProperties" - }, - { - "name": "yudao.tenant.ignore-urls", - "type": "java.util.Set", - "description": "需要忽略多租户的请求 默认情况下，每个请求需要带上 tenant-id 的请求头。但是，部分请求是无需带上的，例如说短信回调、支付回调等 Open API！", - "sourceType": "cn.iocoder.yudao.framework.tenant.config.TenantProperties" - } - ], - "hints": [] -} \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-biz-tenant/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 1a18bae..0000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,3 +0,0 @@ -cn.iocoder.yudao.framework.tenant.config.YudaoTenantRpcAutoConfiguration -cn.iocoder.yudao.framework.tenant.config.YudaoTenantAutoConfiguration -cn.iocoder.yudao.framework.tenant.config.YudaoTenantMQAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService deleted file mode 100644 index afede97..0000000 --- a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService +++ /dev/null @@ -1 +0,0 @@ -cn.iocoder.yudao.framework.captcha.core.service.RedisCaptchaServiceImpl diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 8411d2c..0000000 --- a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.iocoder.yudao.framework.captcha.config.YudaoCaptchaConfiguration \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg1.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg1.png deleted file mode 100644 index c481457..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg1.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg2.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg2.png deleted file mode 100644 index bf8fb38..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg2.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg3.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg3.png deleted file mode 100644 index f871d3d..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg3.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg4.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg4.png deleted file mode 100644 index 2e3d871..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg4.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg5.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg5.png deleted file mode 100644 index fe383b7..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg5.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg6.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg6.png deleted file mode 100644 index 5024ceb..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg6.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg7.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg7.png deleted file mode 100644 index efe76f8..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg7.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg8.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg8.png deleted file mode 100644 index 2727aa3..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg8.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg9.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg9.png deleted file mode 100644 index 4463aa2..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/original/bg9.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/1.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/1.png deleted file mode 100644 index ef11324..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/1.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/10.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/10.png deleted file mode 100644 index 297e44c..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/10.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/11.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/11.png deleted file mode 100644 index d9b1da8..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/11.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/12.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/12.png deleted file mode 100644 index 07e7313..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/12.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/13.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/13.png deleted file mode 100644 index 82c3dd9..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/13.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/14.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/14.png deleted file mode 100644 index 0b9a866..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/14.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/15.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/15.png deleted file mode 100644 index 86b0d1c..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/15.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/16.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/16.png deleted file mode 100644 index e90a6e2..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/16.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/17.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/17.png deleted file mode 100644 index a82cbc7..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/17.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/18.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/18.png deleted file mode 100644 index d3f3cfd..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/18.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/19.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/19.png deleted file mode 100644 index eb2855b..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/19.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/8.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/8.png deleted file mode 100644 index 3cb5ce1..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/8.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/9.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/9.png deleted file mode 100644 index 384d354..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/11/9.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/2.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/2.png deleted file mode 100644 index baf3f06..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/2.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/3.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/3.png deleted file mode 100644 index ccaf617..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/3.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/4.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/4.png deleted file mode 100644 index 7dab162..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/jigsaw/slidingBlock/4.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg1.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg1.png deleted file mode 100644 index 14e7345..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg1.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg10.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg10.png deleted file mode 100644 index 1ea1d6d..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg10.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg2.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg2.png deleted file mode 100644 index 0edb329..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg2.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg3.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg3.png deleted file mode 100644 index 9167996..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg3.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg4.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg4.png deleted file mode 100644 index e8e8e6c..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg4.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg5.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg5.png deleted file mode 100644 index 66a3181..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg5.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg6.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg6.png deleted file mode 100644 index 9b0f5d8..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg6.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg7.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg7.png deleted file mode 100644 index db41c74..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg7.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg8.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg8.png deleted file mode 100644 index 3496813..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg8.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg9.png b/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg9.png deleted file mode 100644 index 4e7b477..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/target/classes/images/pic-click/bg9.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-env/target/classes/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter b/yudao-framework/yudao-spring-boot-starter-env/target/classes/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter deleted file mode 100644 index c0984fd..0000000 --- a/yudao-framework/yudao-spring-boot-starter-env/target/classes/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter +++ /dev/null @@ -1 +0,0 @@ -dubboProviderRouterTagFilter=cn.iocoder.yudao.framework.env.core.dubbo.DubboProviderRouterTagFilter diff --git a/yudao-framework/yudao-spring-boot-starter-env/target/classes/META-INF/dubbo/org.apache.dubbo.rpc.cluster.interceptor.ClusterInterceptor b/yudao-framework/yudao-spring-boot-starter-env/target/classes/META-INF/dubbo/org.apache.dubbo.rpc.cluster.interceptor.ClusterInterceptor deleted file mode 100644 index 03d7a57..0000000 --- a/yudao-framework/yudao-spring-boot-starter-env/target/classes/META-INF/dubbo/org.apache.dubbo.rpc.cluster.interceptor.ClusterInterceptor +++ /dev/null @@ -1 +0,0 @@ -dubboConsumerRouterTagClusterInterceptor=cn.iocoder.yudao.framework.env.core.dubbo.DubboConsumerRouterTagClusterInterceptor diff --git a/yudao-framework/yudao-spring-boot-starter-env/target/classes/META-INF/spring-configuration-metadata.json b/yudao-framework/yudao-spring-boot-starter-env/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index e1a5687..0000000 --- a/yudao-framework/yudao-spring-boot-starter-env/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "groups": [ - { - "name": "yudao.env", - "type": "cn.iocoder.yudao.framework.env.config.EnvProperties", - "sourceType": "cn.iocoder.yudao.framework.env.config.EnvProperties" - } - ], - "properties": [ - { - "name": "yudao.env.tag", - "type": "java.lang.String", - "description": "环境标签", - "sourceType": "cn.iocoder.yudao.framework.env.config.EnvProperties" - } - ], - "hints": [] -} \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-env/target/classes/META-INF/spring.factories b/yudao-framework/yudao-spring-boot-starter-env/target/classes/META-INF/spring.factories deleted file mode 100644 index 6df9601..0000000 --- a/yudao-framework/yudao-spring-boot-starter-env/target/classes/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.env.EnvironmentPostProcessor=\ - cn.iocoder.yudao.framework.env.config.EnvEnvironmentPostProcessor diff --git a/yudao-framework/yudao-spring-boot-starter-env/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-env/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 8bb162e..0000000 --- a/yudao-framework/yudao-spring-boot-starter-env/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -cn.iocoder.yudao.framework.env.config.YudaoEnvWebAutoConfiguration -cn.iocoder.yudao.framework.env.config.YudaoEnvRpcAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-file/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-file/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index f153668..0000000 --- a/yudao-framework/yudao-spring-boot-starter-file/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.iocoder.yudao.framework.file.config.YudaoFileAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-job/target/classes/META-INF/spring-configuration-metadata.json b/yudao-framework/yudao-spring-boot-starter-job/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index 95c0465..0000000 --- a/yudao-framework/yudao-spring-boot-starter-job/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "groups": [ - { - "name": "xxl.job", - "type": "cn.iocoder.yudao.framework.quartz.config.XxlJobProperties", - "sourceType": "cn.iocoder.yudao.framework.quartz.config.XxlJobProperties" - }, - { - "name": "xxl.job.admin", - "type": "cn.iocoder.yudao.framework.quartz.config.XxlJobProperties$AdminProperties", - "sourceType": "cn.iocoder.yudao.framework.quartz.config.XxlJobProperties" - }, - { - "name": "xxl.job.executor", - "type": "cn.iocoder.yudao.framework.quartz.config.XxlJobProperties$ExecutorProperties", - "sourceType": "cn.iocoder.yudao.framework.quartz.config.XxlJobProperties" - } - ], - "properties": [ - { - "name": "xxl.job.access-token", - "type": "java.lang.String", - "description": "访问令牌", - "sourceType": "cn.iocoder.yudao.framework.quartz.config.XxlJobProperties" - }, - { - "name": "xxl.job.admin.addresses", - "type": "java.lang.String", - "description": "调度器地址", - "sourceType": "cn.iocoder.yudao.framework.quartz.config.XxlJobProperties$AdminProperties" - }, - { - "name": "xxl.job.enabled", - "type": "java.lang.Boolean", - "description": "是否开启，默认为 true 关闭", - "sourceType": "cn.iocoder.yudao.framework.quartz.config.XxlJobProperties" - }, - { - "name": "xxl.job.executor.app-name", - "type": "java.lang.String", - "description": "应用名", - "sourceType": "cn.iocoder.yudao.framework.quartz.config.XxlJobProperties$ExecutorProperties" - }, - { - "name": "xxl.job.executor.ip", - "type": "java.lang.String", - "description": "执行器的 IP", - "sourceType": "cn.iocoder.yudao.framework.quartz.config.XxlJobProperties$ExecutorProperties" - }, - { - "name": "xxl.job.executor.log-path", - "type": "java.lang.String", - "description": "日志地址", - "sourceType": "cn.iocoder.yudao.framework.quartz.config.XxlJobProperties$ExecutorProperties" - }, - { - "name": "xxl.job.executor.log-retention-days", - "type": "java.lang.Integer", - "description": "日志保留天数", - "sourceType": "cn.iocoder.yudao.framework.quartz.config.XxlJobProperties$ExecutorProperties" - }, - { - "name": "xxl.job.executor.port", - "type": "java.lang.Integer", - "description": "执行器的 Port", - "sourceType": "cn.iocoder.yudao.framework.quartz.config.XxlJobProperties$ExecutorProperties" - } - ], - "hints": [] -} \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-job/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-job/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index a3a316d..0000000 --- a/yudao-framework/yudao-spring-boot-starter-job/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -cn.iocoder.yudao.framework.quartz.config.YudaoXxlJobAutoConfiguration -cn.iocoder.yudao.framework.quartz.config.YudaoAsyncAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-monitor/target/classes/META-INF/spring-configuration-metadata.json b/yudao-framework/yudao-spring-boot-starter-monitor/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index d731576..0000000 --- a/yudao-framework/yudao-spring-boot-starter-monitor/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "groups": [ - { - "name": "yudao.tracer", - "type": "cn.iocoder.yudao.framework.tracer.config.TracerProperties", - "sourceType": "cn.iocoder.yudao.framework.tracer.config.TracerProperties" - } - ], - "properties": [], - "hints": [] -} \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-monitor/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-monitor/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 581832f..0000000 --- a/yudao-framework/yudao-spring-boot-starter-monitor/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -cn.iocoder.yudao.framework.tracer.config.YudaoTracerAutoConfiguration -cn.iocoder.yudao.framework.tracer.config.YudaoMetricsAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-mq/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-mq/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index c45ba76..0000000 --- a/yudao-framework/yudao-spring-boot-starter-mq/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.iocoder.yudao.framework.mq.config.YudaoMQAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/target/classes/META-INF/spring.factories b/yudao-framework/yudao-spring-boot-starter-mybatis/target/classes/META-INF/spring.factories deleted file mode 100644 index eb172e4..0000000 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/target/classes/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.env.EnvironmentPostProcessor=\ - cn.iocoder.yudao.framework.mybatis.config.IdTypeEnvironmentPostProcessor diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-mybatis/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index c4aee8a..0000000 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration -cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-redis/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-redis/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 49724a4..0000000 --- a/yudao-framework/yudao-spring-boot-starter-redis/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration -cn.iocoder.yudao.framework.redis.config.YudaoCacheAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-rpc/target/classes/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter b/yudao-framework/yudao-spring-boot-starter-rpc/target/classes/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter deleted file mode 100644 index 20b1251..0000000 --- a/yudao-framework/yudao-spring-boot-starter-rpc/target/classes/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter +++ /dev/null @@ -1 +0,0 @@ -dubboExceptionFilter=cn.iocoder.yudao.framework.rpc.core.dubbo.DubboProviderExceptionFilter diff --git a/yudao-framework/yudao-spring-boot-starter-security/target/classes/META-INF/spring-configuration-metadata.json b/yudao-framework/yudao-spring-boot-starter-security/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index 38ff715..0000000 --- a/yudao-framework/yudao-spring-boot-starter-security/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "groups": [ - { - "name": "yudao.security", - "type": "cn.iocoder.yudao.framework.security.config.SecurityProperties", - "sourceType": "cn.iocoder.yudao.framework.security.config.SecurityProperties" - } - ], - "properties": [ - { - "name": "yudao.security.mock-enable", - "type": "java.lang.Boolean", - "description": "mock 模式的开关", - "sourceType": "cn.iocoder.yudao.framework.security.config.SecurityProperties" - }, - { - "name": "yudao.security.mock-secret", - "type": "java.lang.String", - "description": "mock 模式的密钥 一定要配置密钥，保证安全性", - "sourceType": "cn.iocoder.yudao.framework.security.config.SecurityProperties" - }, - { - "name": "yudao.security.permit-all-urls", - "type": "java.util.List", - "description": "免登录的 URL 列表", - "sourceType": "cn.iocoder.yudao.framework.security.config.SecurityProperties" - }, - { - "name": "yudao.security.token-header", - "type": "java.lang.String", - "description": "HTTP 请求时，访问令牌的请求 Header", - "sourceType": "cn.iocoder.yudao.framework.security.config.SecurityProperties" - } - ], - "hints": [] -} \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-security/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-security/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 0e30c5e..0000000 --- a/yudao-framework/yudao-spring-boot-starter-security/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,3 +0,0 @@ -cn.iocoder.yudao.framework.security.config.YudaoSecurityRpcAutoConfiguration -cn.iocoder.yudao.framework.security.config.YudaoSecurityAutoConfiguration -cn.iocoder.yudao.framework.security.config.YudaoWebSecurityConfigurerAdapter diff --git a/yudao-framework/yudao-spring-boot-starter-web/target/classes/META-INF/spring-configuration-metadata.json b/yudao-framework/yudao-spring-boot-starter-web/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index 36da29f..0000000 --- a/yudao-framework/yudao-spring-boot-starter-web/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "groups": [ - { - "name": "yudao.swagger", - "type": "cn.iocoder.yudao.framework.swagger.config.SwaggerProperties", - "sourceType": "cn.iocoder.yudao.framework.swagger.config.SwaggerProperties" - }, - { - "name": "yudao.web", - "type": "cn.iocoder.yudao.framework.web.config.WebProperties", - "sourceType": "cn.iocoder.yudao.framework.web.config.WebProperties" - }, - { - "name": "yudao.web.admin-api", - "type": "cn.iocoder.yudao.framework.web.config.WebProperties$Api", - "sourceType": "cn.iocoder.yudao.framework.web.config.WebProperties" - }, - { - "name": "yudao.web.admin-ui", - "type": "cn.iocoder.yudao.framework.web.config.WebProperties$Ui", - "sourceType": "cn.iocoder.yudao.framework.web.config.WebProperties" - }, - { - "name": "yudao.web.app-api", - "type": "cn.iocoder.yudao.framework.web.config.WebProperties$Api", - "sourceType": "cn.iocoder.yudao.framework.web.config.WebProperties" - }, - { - "name": "yudao.xss", - "type": "cn.iocoder.yudao.framework.web.config.XssProperties", - "sourceType": "cn.iocoder.yudao.framework.web.config.XssProperties" - } - ], - "properties": [ - { - "name": "yudao.swagger.author", - "type": "java.lang.String", - "description": "作者", - "sourceType": "cn.iocoder.yudao.framework.swagger.config.SwaggerProperties" - }, - { - "name": "yudao.swagger.base-package", - "type": "java.lang.String", - "description": "扫描的包", - "sourceType": "cn.iocoder.yudao.framework.swagger.config.SwaggerProperties" - }, - { - "name": "yudao.swagger.description", - "type": "java.lang.String", - "description": "描述", - "sourceType": "cn.iocoder.yudao.framework.swagger.config.SwaggerProperties" - }, - { - "name": "yudao.swagger.title", - "type": "java.lang.String", - "description": "标题", - "sourceType": "cn.iocoder.yudao.framework.swagger.config.SwaggerProperties" - }, - { - "name": "yudao.swagger.version", - "type": "java.lang.String", - "description": "版本", - "sourceType": "cn.iocoder.yudao.framework.swagger.config.SwaggerProperties" - }, - { - "name": "yudao.web.admin-api.controller", - "type": "java.lang.String", - "description": "Controller 所在包的 Ant 路径规则 主要目的是，给该 Controller 设置指定的 {@link #prefix}", - "sourceType": "cn.iocoder.yudao.framework.web.config.WebProperties$Api" - }, - { - "name": "yudao.web.admin-api.prefix", - "type": "java.lang.String", - "description": "API 前缀，实现所有 Controller 提供的 RESTFul API 的统一前缀 意义：通过该前缀，避免 Swagger、Actuator 意外通过 Nginx 暴露出来给外部，带来安全性问题 这样，Nginx 只需要配置转发到 \/api\/* 的所有接口即可。 @see YudaoWebAutoConfiguration#configurePathMatch(PathMatchConfigurer)", - "sourceType": "cn.iocoder.yudao.framework.web.config.WebProperties$Api" - }, - { - "name": "yudao.web.admin-ui.url", - "type": "java.lang.String", - "description": "访问地址", - "sourceType": "cn.iocoder.yudao.framework.web.config.WebProperties$Ui" - }, - { - "name": "yudao.web.app-api.controller", - "type": "java.lang.String", - "description": "Controller 所在包的 Ant 路径规则 主要目的是，给该 Controller 设置指定的 {@link #prefix}", - "sourceType": "cn.iocoder.yudao.framework.web.config.WebProperties$Api" - }, - { - "name": "yudao.web.app-api.prefix", - "type": "java.lang.String", - "description": "API 前缀，实现所有 Controller 提供的 RESTFul API 的统一前缀 意义：通过该前缀，避免 Swagger、Actuator 意外通过 Nginx 暴露出来给外部，带来安全性问题 这样，Nginx 只需要配置转发到 \/api\/* 的所有接口即可。 @see YudaoWebAutoConfiguration#configurePathMatch(PathMatchConfigurer)", - "sourceType": "cn.iocoder.yudao.framework.web.config.WebProperties$Api" - }, - { - "name": "yudao.xss.enable", - "type": "java.lang.Boolean", - "description": "是否开启，默认为 true", - "sourceType": "cn.iocoder.yudao.framework.web.config.XssProperties" - }, - { - "name": "yudao.xss.exclude-urls", - "type": "java.util.List", - "description": "需要排除的 URL，默认为空", - "sourceType": "cn.iocoder.yudao.framework.web.config.XssProperties" - } - ], - "hints": [] -} \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-web/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-web/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 314b3d8..0000000 --- a/yudao-framework/yudao-spring-boot-starter-web/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,5 +0,0 @@ -cn.iocoder.yudao.framework.apilog.config.YudaoApiLogRpcAutoConfiguration -cn.iocoder.yudao.framework.apilog.config.YudaoApiLogAutoConfiguration -cn.iocoder.yudao.framework.jackson.config.YudaoJacksonAutoConfiguration -cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration -cn.iocoder.yudao.framework.web.config.YudaoWebAutoConfiguration diff --git a/yudao-gateway/target/classes/bootstrap-local.yaml b/yudao-gateway/target/classes/bootstrap-local.yaml deleted file mode 100644 index 62802db..0000000 --- a/yudao-gateway/target/classes/bootstrap-local.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- #################### 注册中心相关配置 #################### - -spring: - cloud: - nacos: - server-addr: 192.168.233.128:8848 - discovery: - namespace: dev # 命名空间。这里使用 dev 开发环境 - ---- #################### 配置中心相关配置 #################### - -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: 192.168.233.128:8848 # Nacos 服务器地址 - namespace: dev # 命名空间。这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - #name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties diff --git a/yudao-gateway/target/classes/bootstrap-prod.yaml b/yudao-gateway/target/classes/bootstrap-prod.yaml deleted file mode 100644 index 015a70d..0000000 --- a/yudao-gateway/target/classes/bootstrap-prod.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- #################### 注册中心相关配置 #################### - -spring: - cloud: - nacos: - server-addr: localhost:8848 - discovery: - namespace: prod # 命名空间。这里使用 dev 开发环境 - ---- #################### 配置中心相关配置 #################### - -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: localhost:8848 # Nacos 服务器地址 - namespace: prod # 命名空间。这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties diff --git a/yudao-gateway/target/classes/bootstrap.yaml b/yudao-gateway/target/classes/bootstrap.yaml deleted file mode 100644 index 189a4ea..0000000 --- a/yudao-gateway/target/classes/bootstrap.yaml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - application: - name: gateway-server - - profiles: - active: local - -server: - port: 48060 - -# 日志文件配置。注意，如果 logging.file.name 不放在 bootstrap.yaml 配置文件，而是放在 application.yaml 中，会导致出现 LOG_FILE_IS_UNDEFINED 文件 -logging: - file: - name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径 diff --git a/yudao-gateway/target/classes/logback-spring.xml b/yudao-gateway/target/classes/logback-spring.xml deleted file mode 100644 index 5f4b30d..0000000 --- a/yudao-gateway/target/classes/logback-spring.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - 　　　　　 - - - ${PATTERN_DEFAULT} - - - - - - - - - - ${PATTERN_DEFAULT} - - - - ${LOG_FILE} - - - ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz} - - ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} - - ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB} - - ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0} - - ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30} - - - - - - 0 - - 256 - - - - - - - - ${PATTERN_DEFAULT} - - - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/goodsinputrelational/GoodsInputRelationalApi.java b/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/goodsinputrelational/GoodsInputRelationalApi.java deleted file mode 100644 index 5345a4e..0000000 --- a/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/goodsinputrelational/GoodsInputRelationalApi.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.iocoder.yudao.module.basic.api.goodsinputrelational; - -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.basic.api.goodsinputrelational.dto.RelationalRespDTO; -import cn.iocoder.yudao.module.basic.enums.ApiConstants; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import java.util.List; - -@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory = -@Api(tags = "RPC 服务 - 商品与投入品映射") -public interface GoodsInputRelationalApi { - - String PREFIX = ApiConstants.PREFIX + "/goods-input-relational"; - - @GetMapping(PREFIX + "/getInputInfoByGoodsId") - @ApiOperation("获得投入品列表") - @ApiImplicitParam(name = "goodsIds", value = "商品编码集合", required = true, example = "INBTBC20230421141955HIMK976D, INBTBC20230421141955HIMK976D", dataTypeClass = String.class) - CommonResult getInputInfoByGoodsId(@RequestParam("goodsIds") List goodsIds); -} diff --git a/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/goodsinputrelational/dto/GoodsInfoExpandRespDTO.java b/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/goodsinputrelational/dto/GoodsInfoExpandRespDTO.java deleted file mode 100644 index 643f06e..0000000 --- a/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/goodsinputrelational/dto/GoodsInfoExpandRespDTO.java +++ /dev/null @@ -1,56 +0,0 @@ -package cn.iocoder.yudao.module.basic.api.goodsinputrelational.dto; - -import lombok.Data; - -@Data -public class GoodsInfoExpandRespDTO { - - /** - * 编码 - */ - private Long id; - /** - * 商品名称 - */ - private String goodsName; - /** - * 商品编码 - */ - private String goodsId; - /** - * 商品类型 - */ - private String goodsType; - /** - * 商品类型id - */ - private Long goodsTypeId; - /** - * 商品单位 - */ - private String goodsUnit; - /** - * 商品规格 - */ - private String goodsSpecs; - /** - * 商品说明 - */ - private String goodsRemarks; - /** - * 商品图片url，以;分割，最多6张 - */ - private String goodsImgUrl; - /** - * 保质期天 - */ - private Integer shelfLife; - /** - * 所属商户id - */ - private Long belongBusinessId; - /** - * 所属商户名称 - */ - private String belongBusinessName; -} diff --git a/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/goodsinputrelational/dto/InputInfoRelationalRespDTO.java b/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/goodsinputrelational/dto/InputInfoRelationalRespDTO.java deleted file mode 100644 index 692c244..0000000 --- a/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/goodsinputrelational/dto/InputInfoRelationalRespDTO.java +++ /dev/null @@ -1,58 +0,0 @@ -package cn.iocoder.yudao.module.basic.api.goodsinputrelational.dto; - -import lombok.Data; - -@Data -public class InputInfoRelationalRespDTO { - - /** - * 编码 - */ - private Long id; - /** - * 投入品名称 - */ - private String inputsName; - /** - * 投入品编码 - */ - private String inputsId; - - /** - * 商品名称 - */ - private String goodsName; - /** - * 商品编码 - */ - private String goodsId; - - /** - * 投入品单位 - */ - private String inputsUnit; - /** - * 投入品规格 - */ - private String inputsSpecs; - /** - * 投入品说明 - */ - private String inputsRemarks; - /** - * 图片，；分割，最多6张 - */ - private String inputsPhotoUrl; - /** - * 保质期天 - */ - private Integer shelfLife; - /** - * 所属商户id - */ - private Long belongBusinessId; - /** - * 所属商户名称 - */ - private String belongBusinessName; -} diff --git a/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/goodsinputrelational/dto/RelationalRespDTO.java b/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/goodsinputrelational/dto/RelationalRespDTO.java deleted file mode 100644 index a61958d..0000000 --- a/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/goodsinputrelational/dto/RelationalRespDTO.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.iocoder.yudao.module.basic.api.goodsinputrelational.dto; - -import cn.iocoder.yudao.module.basic.api.goodsinfo.dto.GoodsInfoRespDTO; -import lombok.Data; - -import java.util.List; - -@Data -public class RelationalRespDTO { - - List goodsInfos; - - List inputsInfo; -} diff --git a/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/inputsinfo/InputsInfoApi.java b/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/inputsinfo/InputsInfoApi.java deleted file mode 100644 index 88c950c..0000000 --- a/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/inputsinfo/InputsInfoApi.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.iocoder.yudao.module.basic.api.inputsinfo; - -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.basic.api.inputsinfo.dto.InputsInfoRespDTO; -import cn.iocoder.yudao.module.basic.enums.ApiConstants; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import java.util.List; - -@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory = -@Api(tags = "RPC 服务 - 投入品") -public interface InputsInfoApi { - - String PREFIX = ApiConstants.PREFIX + "/inputs-info"; - - @GetMapping(PREFIX + "/getInputsInfoListByInputId") - @ApiOperation("获得投入品列表") - @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class) - CommonResult> getInputsInfoListByInputId(@RequestParam("ids") List ids); -} diff --git a/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/inputsinfo/dto/InputsInfoRespDTO.java b/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/inputsinfo/dto/InputsInfoRespDTO.java deleted file mode 100644 index 04fb003..0000000 --- a/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/inputsinfo/dto/InputsInfoRespDTO.java +++ /dev/null @@ -1,65 +0,0 @@ -package cn.iocoder.yudao.module.basic.api.inputsinfo.dto; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; -import lombok.Data; - -/** - * InputsInfo 投入品 Response DTO - * - * @author 芋道源码 - */ -@Data -public class InputsInfoRespDTO { - - /** - * 编码 - */ - @ApiModelProperty(value = "主键id") - private Long id; - /** - * 投入品名称 - */ - @ApiModelProperty(value = "投入品名称") - private String inputsName; - /** - * 投入品id - */ - @ApiModelProperty(value = "投入品id") - private String inputsId; - /** - * 投入品单位 - */ - @ApiModelProperty(value = "投入品单位") - private String inputsUnit; - /** - * 投入品规格 - */ - @ApiModelProperty(value = "投入品规格") - private String inputsSpecs; - /** - * 投入品说明 - */ - @ApiModelProperty(value = "投入品说明") - private String inputsRemarks; - /** - * 图片url，以','分割，最多6张 - */ - @ApiModelProperty(value = "图片url，以','分割，最多6张") - private String inputsPhotoUrl; - /** - * 保质期天数 - */ - @ApiModelProperty(value = "保质期天") - private Integer shelfLife; - /** - * 所属商户id - */ - @ApiModelProperty(value = "所属商户id") - private Long belongBusinessId; - /** - * 所属商户名称 - */ - @ApiModelProperty(value = "所属商户名称") - private String belongBusinessName; -} diff --git a/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/redis/RedisBasicInfoUtilApi.java b/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/redis/RedisBasicInfoUtilApi.java index eb47bd8..ce015ad 100644 --- a/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/redis/RedisBasicInfoUtilApi.java +++ b/yudao-module-basic/yudao-module-basic-api/src/main/java/cn/iocoder/yudao/module/basic/api/redis/RedisBasicInfoUtilApi.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.basic.api.redis; -import cn.iocoder.yudao.module.basic.api.inputsinfo.dto.InputsInfoRespDTO; import cn.iocoder.yudao.module.basic.api.redis.dto.BusinessInfoDTO; import cn.iocoder.yudao.module.basic.api.redis.dto.DealerInfoDTO; import cn.iocoder.yudao.module.basic.api.redis.dto.GoodsInfoDTO; @@ -9,7 +8,6 @@ import cn.iocoder.yudao.module.basic.api.vendorinfo.dto.VendorInfoRespDTO; import cn.iocoder.yudao.module.basic.enums.ApiConstants; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -105,24 +103,4 @@ public interface RedisBasicInfoUtilApi { @ApiImplicitParam(name = "id", value = "商品ID", required = true, example = "1024", dataTypeClass = Long.class) void delGoodsInfoRedis(Long id); - /*-------------投入品信息Redis缓存方法-------------*/ - @GetMapping(PREFIX + "/validateInputsInfoRedisExists") - @ApiOperation("根据投入品ID，判断缓存中供应商信息是否存在") - @ApiImplicitParam(name = "id", value = "投入品ID", required = true, example = "1024", dataTypeClass = Long.class) - boolean validateInputsInfoRedisExists(Long id); - - @GetMapping(PREFIX + "/getInputsInfoRedis") - @ApiOperation("根据投入品ID，从缓存获取投入品信息") - @ApiImplicitParam(name = "id", value = "投入品ID", required = true, example = "1024", dataTypeClass = Long.class) - InputsInfoRespDTO getInputsInfoRedis(Long id); - - @GetMapping(PREFIX + "/updateInputsInfoRedis") - @ApiOperation("根据投入品ID，更新缓存中投入品信息") - @ApiImplicitParam(name = "iid", value = "投入品ID", required = true, example = "1024", dataTypeClass = Long.class) - void updateInputsInfoRedis(Long iid, InputsInfoRespDTO inputsInfoRespDTO); - - @GetMapping(PREFIX + "/delInputsInfoRedis") - @ApiOperation("根据投入品ID，从缓存删除投入品信息") - @ApiImplicitParam(name = "id", value = "投入品ID", required = true, example = "1024", dataTypeClass = Long.class) - void delInputsInfoRedis(Long id); } diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/api/goodsinputrelational/GoodsInputRelationalApiImpl.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/api/goodsinputrelational/GoodsInputRelationalApiImpl.java deleted file mode 100644 index 1fa5323..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/api/goodsinputrelational/GoodsInputRelationalApiImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.iocoder.yudao.module.basic.api.goodsinputrelational; - -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.basic.api.goodsinputrelational.dto.RelationalRespDTO; -import cn.iocoder.yudao.module.basic.service.goodsinputrelational.GoodsInputRelationalService; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; - -import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; - -@RestController // 提供 RESTful API 接口，给 Feign 调用 -@DubboService(version = VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 -@Validated -public class GoodsInputRelationalApiImpl implements GoodsInputRelationalApi { - - @Resource - private GoodsInputRelationalService goodsInputRelationalService; - - @Override - public CommonResult getInputInfoByGoodsId(List goodsIds) { - return CommonResult.success(goodsInputRelationalService.getInputInfoByGoodsId(goodsIds)); - } -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/api/inputsinfo/InputsInfoApiImpl.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/api/inputsinfo/InputsInfoApiImpl.java deleted file mode 100644 index 35baeb1..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/api/inputsinfo/InputsInfoApiImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.iocoder.yudao.module.basic.api.inputsinfo; - -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.basic.api.inputsinfo.dto.InputsInfoRespDTO; -import cn.iocoder.yudao.module.basic.convert.inputsinfo.InputsInfoConvert; -import cn.iocoder.yudao.module.basic.dal.dataobject.inputsinfo.InputsInfoDO; -import cn.iocoder.yudao.module.basic.dal.mysql.inputsinfo.InputsInfoMapper; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; - -import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; - -@RestController // 提供 RESTful API 接口，给 Feign 调用 -@DubboService(version = VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 -@Validated -public class InputsInfoApiImpl implements InputsInfoApi { - - @Resource - private InputsInfoMapper inputsInfoMapper; - - @Override - public CommonResult> getInputsInfoListByInputId(List ids) { - return CommonResult.success(InputsInfoConvert.INSTANCE.convertToDTOList(inputsInfoMapper.selectList(InputsInfoDO::getInputsId, ids))); - } -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/api/redis/RedisBasicInfoUtilImpl.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/api/redis/RedisBasicInfoUtilImpl.java index ad90c60..a5e03af 100644 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/api/redis/RedisBasicInfoUtilImpl.java +++ b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/api/redis/RedisBasicInfoUtilImpl.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.basic.api.redis; import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; -import cn.iocoder.yudao.module.basic.api.inputsinfo.dto.InputsInfoRespDTO; import cn.iocoder.yudao.module.basic.api.redis.dto.BusinessInfoDTO; import cn.iocoder.yudao.module.basic.api.redis.dto.DealerInfoDTO; import cn.iocoder.yudao.module.basic.api.redis.dto.GoodsInfoDTO; @@ -9,12 +8,10 @@ import cn.iocoder.yudao.module.basic.api.vendorinfo.dto.VendorInfoRespDTO; import cn.iocoder.yudao.module.basic.convert.businessinfo.BusinessInfoConvert; import cn.iocoder.yudao.module.basic.convert.dealerinfo.DealerInfoConvert; import cn.iocoder.yudao.module.basic.convert.goodsinfo.GoodsInfoConvert; -import cn.iocoder.yudao.module.basic.convert.inputsinfo.InputsInfoConvert; import cn.iocoder.yudao.module.basic.convert.vendorinfo.VendorInfoConvert; import cn.iocoder.yudao.module.basic.dal.mysql.businessinfo.BusinessInfoMapper; import cn.iocoder.yudao.module.basic.dal.mysql.dealerinfo.DealerInfoMapper; import cn.iocoder.yudao.module.basic.dal.mysql.goodsinfo.GoodsInfoMapper; -import cn.iocoder.yudao.module.basic.dal.mysql.inputsinfo.InputsInfoMapper; import cn.iocoder.yudao.module.basic.dal.mysql.vendorinfo.VendorInfoMapper; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.data.redis.core.RedisTemplate; @@ -47,8 +44,6 @@ public class RedisBasicInfoUtilImpl implements RedisBasicInfoUtilApi { private DealerInfoMapper dealerInfoMapper; @Resource private GoodsInfoMapper goodsInfoMapper; - @Resource - private InputsInfoMapper inputsInfoMapper; /** * 初始化 @@ -310,67 +305,4 @@ public class RedisBasicInfoUtilImpl implements RedisBasicInfoUtilApi { } } - /*----------------------------------------投入品信息Redis缓存方法----------------------------------------*/ - @Override - public boolean validateInputsInfoRedisExists(Long id) { - String tenantId = String.valueOf(TenantContextHolder.getRequiredTenantId()); - - if (!redisTemplate.hasKey("InputsInfo:" + tenantId)) { - HashMap map = new HashMap<>(); - List inputsInfoRespDTOList = InputsInfoConvert.INSTANCE.convertToDTOList(inputsInfoMapper.selectList()); - inputsInfoRespDTOList.forEach(item -> map.put(String.valueOf(item.getId()), item)); - System.out.println("插入Redis," + "InputsInfo:" + tenantId); - redisTemplate.opsForHash().putAll("InputsInfo:" + tenantId, map); - redisTemplate.expire("InputsInfo:" + tenantId, 7, TimeUnit.DAYS); - } - - if (redisTemplate.opsForHash().hasKey("InputsInfo:" + tenantId, String.valueOf(id))) { - return true; - } else { - return false; - } - } - - @Override - public InputsInfoRespDTO getInputsInfoRedis(Long id) { - String tenantId = String.valueOf(TenantContextHolder.getRequiredTenantId()); - - if (!redisTemplate.hasKey("InputsInfo:" + tenantId)) { - HashMap map = new HashMap<>(); - List inputsInfoRespDTOList = InputsInfoConvert.INSTANCE.convertToDTOList(inputsInfoMapper.selectList()); - inputsInfoRespDTOList.forEach(item -> map.put(String.valueOf(item.getId()), item)); - System.out.println("插入Redis," + "InputsInfo:" + tenantId); - redisTemplate.opsForHash().putAll("InputsInfo:" + tenantId, map); - redisTemplate.expire("InputsInfo:" + tenantId, 7, TimeUnit.DAYS); - } - - InputsInfoRespDTO o = (InputsInfoRespDTO) redisTemplate.opsForHash().get("InputsInfo:" + tenantId, String.valueOf(id)); - return o; - } - - @Override - public void updateInputsInfoRedis(Long id, InputsInfoRespDTO inputsInfoRespDTO) { - String tenantId = String.valueOf(TenantContextHolder.getRequiredTenantId()); - - if (!redisTemplate.hasKey("InputsInfo:" + tenantId)) { - System.out.println("未插入Redis," + "InputsInfo:" + tenantId); - } else { - System.out.println("更新Redis," + "InputsInfo:" + tenantId); - redisTemplate.opsForHash().put("InputsInfo:" + tenantId, String.valueOf(id), inputsInfoRespDTO); - redisTemplate.expire("InputsInfo:" + tenantId, 7, TimeUnit.DAYS); - } - } - - @Override - public void delInputsInfoRedis(Long id) { - String tenantId = String.valueOf(TenantContextHolder.getRequiredTenantId()); - - if (!redisTemplate.hasKey("InputsInfo:" + tenantId)) { - System.out.println("未插入Redis," + "InputsInfo:" + tenantId); - } else { - System.out.println("删除Redis," + "InputsInfo:" + tenantId); - redisTemplate.opsForHash().delete("InputsInfo:" + tenantId, String.valueOf(id)); - } - } - } diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinputrelational/GoodsInputRelationalController.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinputrelational/GoodsInputRelationalController.java deleted file mode 100644 index f6798ab..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinputrelational/GoodsInputRelationalController.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.iocoder.yudao.module.basic.controller.admin.goodsinputrelational; - -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.basic.controller.admin.goodsinfo.vo.GoodsInfoCreateReqVO; -import cn.iocoder.yudao.module.basic.controller.admin.goodsinputrelational.vo.GoodsInputRelationalCreateBatchReqVO; -import cn.iocoder.yudao.module.basic.controller.admin.goodsinputrelational.vo.GoodsInputRelationalCreateReqVO; -import cn.iocoder.yudao.module.basic.service.goodsinfo.GoodsInfoService; -import cn.iocoder.yudao.module.basic.service.goodsinputrelational.GoodsInputRelationalService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import javax.validation.Valid; - -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - -@Api(tags = "管理后台 - 投入品与商品映射") -@RestController -@RequestMapping("/basic/goods-input-relational") -@Validated -public class GoodsInputRelationalController { - - @Resource - private GoodsInputRelationalService goodsInputRelationalService; - - @PostMapping("/createGoodsInputRelationalBatch") - @ApiOperation("批量创建投入品与商品关联") - @PreAuthorize("@ss.hasPermission('basic:goods-info:create')") - public CommonResult createGoodsInputRelationalBatch(@Valid @RequestBody GoodsInputRelationalCreateBatchReqVO createReqVO) { - goodsInputRelationalService.createGoodsInputRelationalBatch(createReqVO); - return success(true); - } - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinputrelational/vo/GoodsInputRelationalBaseVO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinputrelational/vo/GoodsInputRelationalBaseVO.java deleted file mode 100644 index 9f4731d..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinputrelational/vo/GoodsInputRelationalBaseVO.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.iocoder.yudao.module.basic.controller.admin.goodsinputrelational.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -/** -* 投入品与商品映射 Base VO，提供给添加、修改、详细的子 VO 使用 -* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 -*/ -@Data -public class GoodsInputRelationalBaseVO { - - @ApiModelProperty(value = "商品编码", required = true) - @NotNull(message = "商品编码不能为空") - private String goodsId; - - @ApiModelProperty(value = "投入品编码", required = true) - @NotNull(message = "投入品编码不能为空") - private String inputsId; - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinputrelational/vo/GoodsInputRelationalCreateBatchReqVO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinputrelational/vo/GoodsInputRelationalCreateBatchReqVO.java deleted file mode 100644 index 10c21e8..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinputrelational/vo/GoodsInputRelationalCreateBatchReqVO.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.iocoder.yudao.module.basic.controller.admin.goodsinputrelational.vo; - -import io.swagger.annotations.ApiModel; -import lombok.Data; - -import javax.validation.constraints.NotEmpty; -import java.util.List; - -@ApiModel("管理后台 - 投入品与商品关系批量创建 Request VO") -@Data -public class GoodsInputRelationalCreateBatchReqVO { - - @NotEmpty(message = "投入品和商品编码集合不能为空") - List goodsInputRelationals; -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinputrelational/vo/GoodsInputRelationalCreateReqVO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinputrelational/vo/GoodsInputRelationalCreateReqVO.java deleted file mode 100644 index 9039d76..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/goodsinputrelational/vo/GoodsInputRelationalCreateReqVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.iocoder.yudao.module.basic.controller.admin.goodsinputrelational.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotNull; - -@ApiModel("管理后台 - 投入品与商品关系创建 Request VO") -@Data -public class GoodsInputRelationalCreateReqVO { - - @ApiModelProperty(value = "商品编码", required = true) - @NotNull(message = "商品编码不能为空") - private String goodsId; - - @ApiModelProperty(value = "投入品编码") -// @NotNull(message = "投入品编码不能为空") - private String inputsId; -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/InputsInfoController.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/InputsInfoController.java deleted file mode 100644 index 7dc8692..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/InputsInfoController.java +++ /dev/null @@ -1,102 +0,0 @@ -package cn.iocoder.yudao.module.basic.controller.admin.inputsinfo; - -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.annotations.*; - -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; - -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*; - -import cn.iocoder.yudao.module.basic.controller.admin.inputsinfo.vo.*; -import cn.iocoder.yudao.module.basic.dal.dataobject.inputsinfo.InputsInfoDO; -import cn.iocoder.yudao.module.basic.convert.inputsinfo.InputsInfoConvert; -import cn.iocoder.yudao.module.basic.service.inputsinfo.InputsInfoService; - -@Api(tags = "管理后台 - 投入品") -@RestController -@RequestMapping("/basic/inputs-info") -@Validated -public class InputsInfoController { - - @Resource - private InputsInfoService inputsInfoService; - - @PostMapping("/create") - @ApiOperation("创建投入品") - @PreAuthorize("@ss.hasPermission('basic:inputs-info:create')") - public CommonResult createInputsInfo(@Valid @RequestBody InputsInfoCreateReqVO createReqVO) { - return success(inputsInfoService.createInputsInfo(createReqVO)); - } - - @PutMapping("/update") - @ApiOperation("更新投入品") - @PreAuthorize("@ss.hasPermission('basic:inputs-info:update')") - public CommonResult updateInputsInfo(@Valid @RequestBody InputsInfoUpdateReqVO updateReqVO) { - inputsInfoService.updateInputsInfo(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @ApiOperation("删除投入品") - @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('basic:inputs-info:delete')") - public CommonResult deleteInputsInfo(@RequestParam("id") Long id) { - inputsInfoService.deleteInputsInfo(id); - return success(true); - } - - @GetMapping("/get") - @ApiOperation("获得投入品") - @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('basic:inputs-info:query')") - public CommonResult getInputsInfo(@RequestParam("id") Long id) { - InputsInfoDO inputsInfo = inputsInfoService.getInputsInfo(id); - return success(InputsInfoConvert.INSTANCE.convert(inputsInfo)); - } - - @GetMapping("/page") - @ApiOperation("获得投入品分页") - @PreAuthorize("@ss.hasPermission('basic:inputs-info:query')") - public CommonResult> getInputsInfoPage(@Valid InputsInfoPageReqVO pageVO) { - PageResult pageResult = inputsInfoService.getInputsInfoPage(pageVO); - return success(InputsInfoConvert.INSTANCE.convertPage(pageResult)); - } - - @GetMapping("/queryListOfMiniResult") - @ApiOperation("获得投入品信息（返回字段做精简化）") - @ApiImplicitParam(name = "businessInfoId", value = "商户信息ID", required = true, example = "1024", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('basic:inputs-info:query')") - public CommonResult> queryListOfMiniResult(@RequestParam("businessInfoId") Long businessInfoId) { - return success(inputsInfoService.queryListOfMiniResult(businessInfoId)); - } - - @GetMapping("/getInputsInfoInputsInfoList") - @ApiOperation("获得所有投入品信息") - @PreAuthorize("@ss.hasPermission('basic:inputs-info:query')") - public CommonResult> getInputsInfoInputsInfoList() { - List inputsInfoInputsInfoList = inputsInfoService.getInputsInfoInputsInfoList(); - return success(inputsInfoInputsInfoList); - } - - @GetMapping("/getInputsInfoListByBelongBusinessId") - @ApiOperation("根据指定的商户id 获取所有名下多个投入品") - @ApiImplicitParam(name = "belongBusinessId", value = "商户ID", required = true, example = "1", dataTypeClass = List.class) - public CommonResult> getInputsInfoListByBelongBusinessId(@RequestParam("belongBusinessId") List belongBusinessId) { - List inputsInfoListByBelongBusinessId = inputsInfoService.getInputsInfoListByBelongBusinessId(belongBusinessId); - return success(inputsInfoListByBelongBusinessId); - } -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/vo/InputsInfoBaseVO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/vo/InputsInfoBaseVO.java deleted file mode 100644 index d1a8996..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/vo/InputsInfoBaseVO.java +++ /dev/null @@ -1,53 +0,0 @@ -package cn.iocoder.yudao.module.basic.controller.admin.inputsinfo.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotNull; -import java.math.BigDecimal; - -/** -* 投入品 Base VO，提供给添加、修改、详细的子 VO 使用 -* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 -*/ -@Data -public class InputsInfoBaseVO { - - @ApiModelProperty(value = "投入品名称", required = true) - @NotNull(message = "投入品名称不能为空") - private String inputsName; - - @ApiModelProperty(value = "投入品id", required = true) - private String inputsId; - - @ApiModelProperty(value = "是否基础单位(kg)") - private Boolean isBaseUnit; - - @ApiModelProperty(value = "投入品单位id, 是基础单位(kg)时 该字段为0") - private Long inputsUnitId; - - @ApiModelProperty(value = "投入品规格, 换算之后写入的数值 如：5kg/袋 (或者kg)") - private String inputsSpecs; - - @ApiModelProperty(value = "换算值") - private BigDecimal conversionValue; - - @ApiModelProperty(value = "投入品说明") - private String inputsRemarks; - - @ApiModelProperty(value = "图片url，以','分割，最多6张", required = true) - private String inputsPhotoUrl; - - @ApiModelProperty(value = "保质期天数", required = true) - @NotNull(message = "保质期天数不能为空") - private Integer shelfLife; - - @ApiModelProperty(value = "所属商户id", required = true) - @NotNull(message = "所属商户id不能为空") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称", required = true) - @NotNull(message = "所属商户名称不能为空") - private String belongBusinessName; - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/vo/InputsInfoCreateReqVO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/vo/InputsInfoCreateReqVO.java deleted file mode 100644 index 8cda4d5..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/vo/InputsInfoCreateReqVO.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.iocoder.yudao.module.basic.controller.admin.inputsinfo.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -@ApiModel("管理后台 - 投入品创建 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class InputsInfoCreateReqVO extends InputsInfoBaseVO { - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/vo/InputsInfoExportReqVO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/vo/InputsInfoExportReqVO.java deleted file mode 100644 index 441b56d..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/vo/InputsInfoExportReqVO.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.iocoder.yudao.module.basic.controller.admin.inputsinfo.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -@ApiModel(value = "管理后台 - 投入品 Excel 导出 Request VO", description = "参数和 InputsInfoPageReqVO 是一致的") -@Data -public class InputsInfoExportReqVO { - - @ApiModelProperty(value = "投入品名称") - private String inputsName; - - @ApiModelProperty(value = "投入品id") - private String inputsId; - - @ApiModelProperty(value = "是否基础单位(kg)") - private Boolean isBaseUnit; - - @ApiModelProperty(value = "投入品单位id, 是基础单位(kg)时 该字段为0") - private Long inputsUnitId; - - @ApiModelProperty(value = "投入品规格, 换算之后写入的数值 如：5kg/袋 (或者kg)") - private String inputsSpecs; - - @ApiModelProperty(value = "换算值") - private BigDecimal conversionValue; - - @ApiModelProperty(value = "投入品说明") - private String inputsRemarks; - - @ApiModelProperty(value = "图片，；分割，最多6张") - private String inputsPhotoUrl; - - @ApiModelProperty(value = "保质期天") - private Integer shelfLife; - - @ApiModelProperty(value = "所属商户id") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称") - private String belongBusinessName; - - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT") - @ApiModelProperty(value = "创建时间") - private Date[] createTime; - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/vo/InputsInfoForTransferRespVO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/vo/InputsInfoForTransferRespVO.java deleted file mode 100644 index 9da339a..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/vo/InputsInfoForTransferRespVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.iocoder.yudao.module.basic.controller.admin.inputsinfo.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import javax.validation.constraints.NotNull; - -@ApiModel("管理后台 - 投入品 Response VO (精简版)") -@Data -public class InputsInfoForTransferRespVO { - - @ApiModelProperty(value = "编码", required = true) - private Long id; - - @ApiModelProperty(value = "投入品id", required = true) - private String inputsId; - - @ApiModelProperty(value = "投入品名称", required = true) - private String inputsName; - - @ApiModelProperty(value = "投入品单位", required = true) - private String inputsUnit; - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/vo/InputsInfoPageReqVO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/vo/InputsInfoPageReqVO.java deleted file mode 100644 index afc565a..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/vo/InputsInfoPageReqVO.java +++ /dev/null @@ -1,60 +0,0 @@ -package cn.iocoder.yudao.module.basic.controller.admin.inputsinfo.vo; - -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.math.BigDecimal; -import java.util.Date; - -@ApiModel("管理后台 - 投入品分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class InputsInfoPageReqVO extends PageParam { - - @ApiModelProperty(value = "投入品名称") - private String inputsName; - - @ApiModelProperty(value = "投入品id") - private String inputsId; - - @ApiModelProperty(value = "是否基础单位(kg)") - private Boolean isBaseUnit; - - @ApiModelProperty(value = "投入品单位id, 是基础单位(kg)时 该字段为0") - private Long inputsUnitId; - - @ApiModelProperty(value = "投入品规格, 换算之后写入的数值 如：5kg/袋 (或者kg)") - private String inputsSpecs; - - @ApiModelProperty(value = "换算值") - private BigDecimal conversionValue; - - @ApiModelProperty(value = "投入品单位名称") - private String inputsUnitName; - - @ApiModelProperty(value = "投入品说明") - private String inputsRemarks; - - @ApiModelProperty(value = "图片，；分割，最多6张") - private String inputsPhotoUrl; - - @ApiModelProperty(value = "保质期天") - private Integer shelfLife; - - @ApiModelProperty(value = "所属商户id") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称") - private String belongBusinessName; - - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT") - @ApiModelProperty(value = "创建时间") - private Date[] createTime; - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/vo/InputsInfoRespVO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/vo/InputsInfoRespVO.java deleted file mode 100644 index 0ebc843..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/vo/InputsInfoRespVO.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.iocoder.yudao.module.basic.controller.admin.inputsinfo.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.*; -import io.swagger.annotations.*; - -import java.util.Date; - -@ApiModel("管理后台 - 投入品 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class InputsInfoRespVO extends InputsInfoBaseVO { - - @ApiModelProperty(value = "编码", required = true) - private Long id; - - @ApiModelProperty(value = "投入品单位名称") - private String inputsUnitName; - - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT") - @ApiModelProperty(value = "创建时间") - private Date createTime; - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/vo/InputsInfoUpdateReqVO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/vo/InputsInfoUpdateReqVO.java deleted file mode 100644 index 3bdd493..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/admin/inputsinfo/vo/InputsInfoUpdateReqVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.iocoder.yudao.module.basic.controller.admin.inputsinfo.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -@ApiModel("管理后台 - 投入品更新 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class InputsInfoUpdateReqVO extends InputsInfoBaseVO { - - @ApiModelProperty(value = "编码", required = true) - @NotNull(message = "编码不能为空") - private Long id; - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/app/inputsinfo/InputsInfoAppController.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/app/inputsinfo/InputsInfoAppController.java deleted file mode 100644 index f886dc6..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/controller/app/inputsinfo/InputsInfoAppController.java +++ /dev/null @@ -1,39 +0,0 @@ -package cn.iocoder.yudao.module.basic.controller.app.inputsinfo; - -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.basic.controller.admin.inputsinfo.vo.InputsInfoRespVO; -import cn.iocoder.yudao.module.basic.convert.inputsinfo.InputsInfoConvert; -import cn.iocoder.yudao.module.basic.service.inputsinfo.InputsInfoService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import javax.annotation.security.PermitAll; -import java.util.List; - -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - -@Api(tags = "APP移动端 - 投入品信息") -@RestController -@RequestMapping("/basic/inputs-info") -@Validated -public class InputsInfoAppController { - - @Resource - private InputsInfoService inputsInfoService; - - @GetMapping("/getInputsInfoByBusinessInfoId") - @PermitAll // 无需登陆 - @ApiOperation("根据商户ID获得投入品列表") - @ApiImplicitParam(name = "id", value = "商户ID", required = true, example = "1", dataTypeClass = Long.class) - public CommonResult> getInputsInfoByBusinessInfoId(@RequestParam("id") Long id) { - return success(inputsInfoService.getInputsInfoByBusinessInfoId(id)); - } - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/convert/goodsinputrelational/GoodsInputRelationalConvert.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/convert/goodsinputrelational/GoodsInputRelationalConvert.java deleted file mode 100644 index 7ed7a1a..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/convert/goodsinputrelational/GoodsInputRelationalConvert.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.iocoder.yudao.module.basic.convert.goodsinputrelational; - -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * 投入品与商品映射 Convert - * - * @author 芋道源码 - */ -@Mapper -public interface GoodsInputRelationalConvert { - - GoodsInputRelationalConvert INSTANCE = Mappers.getMapper(GoodsInputRelationalConvert.class); - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/convert/inputsinfo/InputsInfoConvert.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/convert/inputsinfo/InputsInfoConvert.java deleted file mode 100644 index 15f5327..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/convert/inputsinfo/InputsInfoConvert.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.iocoder.yudao.module.basic.convert.inputsinfo; - - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.basic.api.goodsinputrelational.dto.InputInfoRelationalRespDTO; -import cn.iocoder.yudao.module.basic.api.inputsinfo.dto.InputsInfoRespDTO; -import cn.iocoder.yudao.module.basic.controller.admin.inputsinfo.vo.*; -import cn.iocoder.yudao.module.basic.dal.dataobject.inputsinfo.InputsInfoDO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * 投入品 Convert - * - * @author 芋道源码 - */ -@Mapper -public interface InputsInfoConvert { - - InputsInfoConvert INSTANCE = Mappers.getMapper(InputsInfoConvert.class); - - InputsInfoDO convert(InputsInfoCreateReqVO bean); - - InputsInfoDO convert(InputsInfoUpdateReqVO bean); - - InputsInfoRespVO convert(InputsInfoDO bean); - - List convertToDTOList(List list); - - InputsInfoRespDTO convertToDTO(InputsInfoDO bean); - - List convertList(List list); - - PageResult convertPage(PageResult page); - - List convertRelationalRespList(List list); - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/dataobject/goodsinputrelational/GoodsInputRelationalDO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/dataobject/goodsinputrelational/GoodsInputRelationalDO.java deleted file mode 100644 index 871ad12..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/dataobject/goodsinputrelational/GoodsInputRelationalDO.java +++ /dev/null @@ -1,37 +0,0 @@ -package cn.iocoder.yudao.module.basic.dal.dataobject.goodsinputrelational; - -import lombok.*; -import java.util.*; -import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; - -/** - * 投入品与商品映射 DO - * - * @author 芋道源码 - */ -@TableName("basic_goods_input_relational") -@KeySequence("basic_goods_input_relational_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class GoodsInputRelationalDO extends BaseDO { - - /** - * ID - */ - @TableId - private Long id; - /** - * 商品ID - */ - private String goodsId; - /** - * 投入品ID - */ - private String inputsId; - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/dataobject/inputsinfo/InputsInfoDO.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/dataobject/inputsinfo/InputsInfoDO.java deleted file mode 100644 index c2e6d0d..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/dataobject/inputsinfo/InputsInfoDO.java +++ /dev/null @@ -1,83 +0,0 @@ -package cn.iocoder.yudao.module.basic.dal.dataobject.inputsinfo; - -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; - -import java.math.BigDecimal; - -/** - * 投入品 DO - * - * @author 芋道源码 - */ -@TableName("basic_inputs_info") -@KeySequence("basic_inputs_info_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class InputsInfoDO extends BaseDO { - - /** - * 编码 - */ - @TableId - private Long id; - /** - * 投入品名称 - */ - private String inputsName; - /** - * 投入品id - */ - private String inputsId; - /** - * 是否基础单位(kg) - */ - private Boolean isBaseUnit; - /** - * 商品单位id, 是基础单位(kg)时 该字段为0 - */ - private Long inputsUnitId; - /** - * 商品规格, 换算之后写入的数值 如：5kg/袋 (或者kg) - */ - private String inputsSpecs; - /** - * 换算值 - */ - private BigDecimal conversionValue; - /** - * 投入品说明 - */ - private String inputsRemarks; - /** - * 图片，；分割，最多6张 - */ - private String inputsPhotoUrl; - /** - * 保质期天 - */ - private Integer shelfLife; - /** - * 所属商户id - */ - private Long belongBusinessId; - /** - * 所属商户名称 - */ - private String belongBusinessName; - - /** - * 单位 为了分页显示 - */ - @TableField(exist = false) - private String inputsUnitName; - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/mysql/goodsinfo/GoodsInfoMapper.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/mysql/goodsinfo/GoodsInfoMapper.java index bd26e3a..67cac46 100644 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/mysql/goodsinfo/GoodsInfoMapper.java +++ b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/mysql/goodsinfo/GoodsInfoMapper.java @@ -7,7 +7,6 @@ import cn.iocoder.yudao.module.basic.controller.admin.goodsinfo.vo.GoodsInfoForT import cn.iocoder.yudao.module.basic.controller.admin.goodsinfo.vo.GoodsInfoListReqVO; import cn.iocoder.yudao.module.basic.controller.admin.goodsinfo.vo.GoodsInfoPageReqVO; import cn.iocoder.yudao.module.basic.controller.admin.goodsinfo.vo.GoodsInfoRespVO; -import cn.iocoder.yudao.module.basic.controller.admin.inputsinfo.vo.InputsInfoForTransferRespVO; import cn.iocoder.yudao.module.basic.dal.dataobject.goodsinfo.GoodsInfoDO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/mysql/goodsinputrelational/GoodsInputRelationalMapper.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/mysql/goodsinputrelational/GoodsInputRelationalMapper.java deleted file mode 100644 index a7f5b22..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/mysql/goodsinputrelational/GoodsInputRelationalMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.iocoder.yudao.module.basic.dal.mysql.goodsinputrelational; - -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.basic.dal.dataobject.goodsinputrelational.GoodsInputRelationalDO; -import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.basic.controller.admin.goodsinputrelational.vo.*; - -/** - * 投入品与商品映射 Mapper - * - * @author 芋道源码 - */ -@Mapper -public interface GoodsInputRelationalMapper extends BaseMapperX { - - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/mysql/inputsinfo/InputsInfoMapper.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/mysql/inputsinfo/InputsInfoMapper.java deleted file mode 100644 index 14dea78..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/dal/mysql/inputsinfo/InputsInfoMapper.java +++ /dev/null @@ -1,70 +0,0 @@ -package cn.iocoder.yudao.module.basic.dal.mysql.inputsinfo; - -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.basic.dal.dataobject.inputsinfo.InputsInfoDO; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.basic.controller.admin.inputsinfo.vo.*; -import org.apache.ibatis.annotations.Param; - -/** - * 投入品 Mapper - * - * @author 芋道源码 - */ -@Mapper -public interface InputsInfoMapper extends BaseMapperX { - - default PageResult selectPage(InputsInfoPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(InputsInfoDO::getInputsName, reqVO.getInputsName()) - .eqIfPresent(InputsInfoDO::getInputsId, reqVO.getInputsId()) - .eqIfPresent(InputsInfoDO::getIsBaseUnit, reqVO.getIsBaseUnit()) - .eqIfPresent(InputsInfoDO::getInputsUnitId, reqVO.getInputsUnitId()) - .eqIfPresent(InputsInfoDO::getConversionValue, reqVO.getConversionValue()) - .eqIfPresent(InputsInfoDO::getInputsSpecs, reqVO.getInputsSpecs()) - .eqIfPresent(InputsInfoDO::getInputsRemarks, reqVO.getInputsRemarks()) - .eqIfPresent(InputsInfoDO::getInputsPhotoUrl, reqVO.getInputsPhotoUrl()) - .eqIfPresent(InputsInfoDO::getShelfLife, reqVO.getShelfLife()) - .eqIfPresent(InputsInfoDO::getBelongBusinessId, reqVO.getBelongBusinessId()) - .likeIfPresent(InputsInfoDO::getBelongBusinessName, reqVO.getBelongBusinessName()) - .betweenIfPresent(InputsInfoDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(InputsInfoDO::getId)); - } - - default List selectList(InputsInfoExportReqVO reqVO) { - return selectList(new LambdaQueryWrapperX() - .likeIfPresent(InputsInfoDO::getInputsName, reqVO.getInputsName()) - .eqIfPresent(InputsInfoDO::getInputsId, reqVO.getInputsId()) - .eqIfPresent(InputsInfoDO::getIsBaseUnit, reqVO.getIsBaseUnit()) - .eqIfPresent(InputsInfoDO::getInputsUnitId, reqVO.getInputsUnitId()) - .eqIfPresent(InputsInfoDO::getConversionValue, reqVO.getConversionValue()) - .eqIfPresent(InputsInfoDO::getInputsSpecs, reqVO.getInputsSpecs()) - .eqIfPresent(InputsInfoDO::getInputsRemarks, reqVO.getInputsRemarks()) - .eqIfPresent(InputsInfoDO::getInputsPhotoUrl, reqVO.getInputsPhotoUrl()) - .eqIfPresent(InputsInfoDO::getShelfLife, reqVO.getShelfLife()) - .eqIfPresent(InputsInfoDO::getBelongBusinessId, reqVO.getBelongBusinessId()) - .likeIfPresent(InputsInfoDO::getBelongBusinessName, reqVO.getBelongBusinessName()) - .betweenIfPresent(InputsInfoDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(InputsInfoDO::getId)); - } - - IPage selectPageByInfo(IPage page, @Param(Constants.WRAPPER) Wrapper queryWrapper); - - IPage selectInputsPageByInfo(Page page, - @Param("inputsName") String inputsName, - @Param("inputsId") String inputsId, - @Param("inputsUnitId") Long inputsUnitId, - @Param("belongBusinessName") String belongBusinessName); - - List queryListOfMiniResult(@Param("businessInfoId") Long businessInfoId); - - List getInputsInfoByBusinessInfoId(@Param("businessInfoId") Long businessInfoId); -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/framework/rpc/config/RpcConfiguration.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/framework/rpc/config/RpcConfiguration.java index 54a8f29..491fe33 100644 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/framework/rpc/config/RpcConfiguration.java +++ b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/framework/rpc/config/RpcConfiguration.java @@ -5,9 +5,6 @@ import cn.iocoder.yudao.module.flow.api.outbound.OutboundApi; import cn.iocoder.yudao.module.identity.api.businessrule.BusinessRuleApi; import cn.iocoder.yudao.module.infra.api.file.FileApi; import cn.iocoder.yudao.module.product.api.harvestbatch.HarvestBatchApi; -import cn.iocoder.yudao.module.product.api.inputsbatch.InputsBatchApi; -import cn.iocoder.yudao.module.product.api.inputsbuy.InputsBuyApi; -import cn.iocoder.yudao.module.product.api.landjob.LandJobApi; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Configuration; @@ -17,10 +14,7 @@ import org.springframework.context.annotation.Configuration; FileApi.class, UniTemplateApi.class, OutboundApi.class, - InputsBatchApi.class, - InputsBuyApi.class, HarvestBatchApi.class, - LandJobApi.class, }) public class RpcConfiguration { } diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/goodsinfo/GoodsInfoService.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/goodsinfo/GoodsInfoService.java index 7287e69..46cf504 100644 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/goodsinfo/GoodsInfoService.java +++ b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/goodsinfo/GoodsInfoService.java @@ -1,12 +1,11 @@ package cn.iocoder.yudao.module.basic.service.goodsinfo; -import java.util.*; -import javax.validation.*; +import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.basic.controller.admin.goodsinfo.vo.*; -import cn.iocoder.yudao.module.basic.controller.admin.inputsinfo.vo.InputsInfoForTransferRespVO; -import cn.iocoder.yudao.module.basic.dal.dataobject.businessinfo.BusinessInfoDO; import cn.iocoder.yudao.module.basic.dal.dataobject.goodsinfo.GoodsInfoDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.List; /** * 商品 Service 接口 diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/goodsinputrelational/GoodsInputRelationalService.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/goodsinputrelational/GoodsInputRelationalService.java deleted file mode 100644 index 0fbe087..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/goodsinputrelational/GoodsInputRelationalService.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.iocoder.yudao.module.basic.service.goodsinputrelational; - -import cn.iocoder.yudao.module.basic.api.goodsinputrelational.dto.RelationalRespDTO; -import cn.iocoder.yudao.module.basic.controller.admin.goodsinputrelational.vo.GoodsInputRelationalCreateBatchReqVO; -import cn.iocoder.yudao.module.basic.controller.admin.goodsinputrelational.vo.GoodsInputRelationalCreateReqVO; - -import java.util.List; - -/** - * 投入品与商品映射 Service 接口 - * - * @author 芋道源码 - */ -public interface GoodsInputRelationalService { - - /** - * 根据商品编码查询投入品信息 - * @param goodsIds - * @return - */ - RelationalRespDTO getInputInfoByGoodsId(List goodsIds); - - /** - * 创建 - * @param createReqVO - * @return - */ - void createGoodsInputRelationalBatch(GoodsInputRelationalCreateBatchReqVO createReqVO); - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/goodsinputrelational/GoodsInputRelationalServiceImpl.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/goodsinputrelational/GoodsInputRelationalServiceImpl.java deleted file mode 100644 index c8053a1..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/goodsinputrelational/GoodsInputRelationalServiceImpl.java +++ /dev/null @@ -1,178 +0,0 @@ -package cn.iocoder.yudao.module.basic.service.goodsinputrelational; - -import cn.iocoder.yudao.framework.common.enums.CodeEnum; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.basic.api.goodsinfo.dto.GoodsInfoRespDTO; -import cn.iocoder.yudao.module.basic.api.goodsinputrelational.dto.InputInfoRelationalRespDTO; -import cn.iocoder.yudao.module.basic.api.goodsinputrelational.dto.RelationalRespDTO; -import cn.iocoder.yudao.module.basic.controller.admin.goodsinputrelational.vo.GoodsInputRelationalCreateBatchReqVO; -import cn.iocoder.yudao.module.basic.controller.admin.goodsinputrelational.vo.GoodsInputRelationalCreateReqVO; -import cn.iocoder.yudao.module.basic.convert.goodsinfo.GoodsInfoConvert; -import cn.iocoder.yudao.module.basic.convert.inputsinfo.InputsInfoConvert; -import cn.iocoder.yudao.module.basic.dal.dataobject.goodsinfo.GoodsInfoDO; -import cn.iocoder.yudao.module.basic.dal.dataobject.goodsinputrelational.GoodsInputRelationalDO; -import cn.iocoder.yudao.module.basic.dal.dataobject.inputsinfo.InputsInfoDO; -import cn.iocoder.yudao.module.basic.dal.mysql.goodsinfo.GoodsInfoMapper; -import cn.iocoder.yudao.module.basic.dal.mysql.goodsinputrelational.GoodsInputRelationalMapper; -import cn.iocoder.yudao.module.basic.dal.mysql.inputsinfo.InputsInfoMapper; -import cn.iocoder.yudao.module.basic.enums.ErrorCodeConstants; -import cn.iocoder.yudao.module.basic.service.inputsinfo.InputsInfoService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; - -/** - * 投入品与商品映射 Service 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -public class GoodsInputRelationalServiceImpl implements GoodsInputRelationalService { - - @Resource - private GoodsInputRelationalMapper goodsInputRelationalMapper; - - @Resource - private GoodsInfoMapper goodsInfoMapper; - - @Resource - private InputsInfoMapper inputsInfoMapper; - - @Resource - private InputsInfoService inputsInfoService; - - /** - * 根据商品编码集合查询所有投入品信息 - * @param goodsIds - * @return - */ - @Override - public RelationalRespDTO getInputInfoByGoodsId(List goodsIds) { - List goodsInfos = goodsInfoMapper.selectList(new LambdaQueryWrapperX().in(GoodsInfoDO::getGoodsId, goodsIds)); - if(goodsInfos.size() != goodsIds.size()) { - throw exception(ErrorCodeConstants.GOODS_INFO_NOT_EXISTS); - } - - List relationals = goodsInputRelationalMapper.selectList( - new LambdaQueryWrapperX().in(GoodsInputRelationalDO::getGoodsId, goodsIds)); - Map relaIds = new HashMap<>();// 关联表键值对集合 <投入品编码, 商品编码> - List inRelaGoodsIds = new ArrayList<>();// 有在关联表里面的商品编码 - List inputsIds = new ArrayList<>(); - for (GoodsInputRelationalDO rela: relationals) { - relaIds.put(rela.getInputsId(), rela.getGoodsId()); - inputsIds.add(rela.getInputsId()); - inRelaGoodsIds.add(rela.getGoodsId()); - } - RelationalRespDTO result = new RelationalRespDTO(); - if(relationals.size() != goodsIds.size()) { - // 返回不在关联表里面的商品 - List notInRelaGoodsIds = goodsIds.stream().filter(ids -> !inRelaGoodsIds.contains(ids)).collect(Collectors.toList()); - List goodsInfoDOs = goodsInfoMapper.selectList(new LambdaQueryWrapperX().in(GoodsInfoDO::getGoodsId, notInRelaGoodsIds)); - List goodsInfoRespDTO = GoodsInfoConvert.INSTANCE.convertToDTOList(goodsInfoDOs); - result.setGoodsInfos(goodsInfoRespDTO); - return result; - } - - // 查询有关联的投入品 - List inputsInfos = inputsInfoMapper.selectList( - new LambdaQueryWrapperX().in(InputsInfoDO::getInputsId, inputsIds)); - List inputsInfoRespDTO = InputsInfoConvert.INSTANCE.convertRelationalRespList(inputsInfos); - for (InputInfoRelationalRespDTO respDTO: inputsInfoRespDTO) { - respDTO.setGoodsId(relaIds.get(respDTO.getInputsId())); - // respDTO.setGoodsName() - } - result.setInputsInfo(inputsInfoRespDTO); - return result; - } - - @Override - @Transactional - public void createGoodsInputRelationalBatch(GoodsInputRelationalCreateBatchReqVO createReqVO) { - List goodsIds = new ArrayList<>(); - // 需要绑定到已有投入品的商品集合 - List existInputsIds = new ArrayList<>(); - Map goodsInfoMap = new HashMap<>(); - for(GoodsInputRelationalCreateReqVO req: createReqVO.getGoodsInputRelationals()) { - goodsIds.add(req.getGoodsId()); - if(req.getInputsId() != null) { - existInputsIds.add(req.getInputsId()); - } - } - - // 判断是否已绑定过 - List goodsInputRelationalDO = goodsInputRelationalMapper.selectList( - new LambdaQueryWrapperX().in(GoodsInputRelationalDO::getGoodsId, goodsIds)); - if(!goodsInputRelationalDO.isEmpty()) { - throw exception(ErrorCodeConstants.EXIST_GOODS_HAS_BIND_INPUT); - } - - // 查询商品信息集合 - List goodsInfoDOs = goodsInfoMapper.selectList(new LambdaQueryWrapperX().in(GoodsInfoDO::getGoodsId, goodsIds)); - if(goodsInfoDOs.size() != goodsIds.size()) { - throw exception(ErrorCodeConstants.GOODS_INFO_NOT_EXISTS); - } - for(GoodsInfoDO goods: goodsInfoDOs) { - goodsInfoMap.put(goods.getGoodsId(), goods); - } - - // 查询投入品信息集合 - if(!existInputsIds.isEmpty()) { - List existInputs = inputsInfoMapper.selectList(new LambdaQueryWrapperX().in(InputsInfoDO::getInputsId, existInputsIds)); - if(existInputsIds.size() != existInputs.size()) { // 验证投入品 - throw exception(ErrorCodeConstants.INPUTS_INFO_NOT_EXISTS); - } - } - - List inputsInfoDOs = new ArrayList<>(); - List goodsInputRelationalDOs = new ArrayList<>(); - for(GoodsInputRelationalCreateReqVO item: createReqVO.getGoodsInputRelationals()) { - GoodsInputRelationalDO relationalDO = new GoodsInputRelationalDO(); - relationalDO.setGoodsId(item.getGoodsId()); - - // 判断是否传了投入品id - if (item.getInputsId() == null) { - // 新增投入品流程 - GoodsInfoDO tempGoods = goodsInfoMap.get(item.getGoodsId()); - InputsInfoDO inputsInfoDO = new InputsInfoDO(); - inputsInfoDO.setInputsName(tempGoods.getGoodsName()); - inputsInfoDO.setIsBaseUnit(tempGoods.getIsBaseUnit()); - inputsInfoDO.setInputsUnitId(tempGoods.getGoodsUnitId()); - inputsInfoDO.setInputsSpecs(tempGoods.getGoodsSpecs()); - inputsInfoDO.setConversionValue(tempGoods.getConversionValue()); - inputsInfoDO.setInputsId(CodeEnum.INPUTS_INFO_CODE.getCode()); - inputsInfoDO.setInputsRemarks(tempGoods.getGoodsRemarks()); - inputsInfoDO.setBelongBusinessId(tempGoods.getBelongBusinessId()); - inputsInfoDO.setBelongBusinessName(tempGoods.getBelongBusinessName()); - inputsInfoDO.setInputsPhotoUrl(tempGoods.getGoodsImgUrl()); - inputsInfoDO.setShelfLife(tempGoods.getShelfLife()); - inputsInfoDOs.add(inputsInfoDO); - - relationalDO.setInputsId(inputsInfoDO.getInputsId()); - } else { - // 绑定旧的投入品 - InputsInfoDO inputsInfoDO = inputsInfoMapper.selectOne(new LambdaQueryWrapperX().eq(InputsInfoDO::getInputsId, item.getInputsId())); - if (inputsInfoDO == null) { - throw exception(ErrorCodeConstants.INPUTS_INFO_NOT_EXISTS); - } - - relationalDO.setInputsId(inputsInfoDO.getInputsId()); - } - goodsInputRelationalDOs.add(relationalDO); - } - - // 批量插入新增的投入品 - inputsInfoMapper.insertBatch(inputsInfoDOs); - - goodsInputRelationalMapper.insertBatch(goodsInputRelationalDOs); - } -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/inputsinfo/InputsInfoService.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/inputsinfo/InputsInfoService.java deleted file mode 100644 index d76f34f..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/inputsinfo/InputsInfoService.java +++ /dev/null @@ -1,89 +0,0 @@ -package cn.iocoder.yudao.module.basic.service.inputsinfo; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.basic.controller.admin.inputsinfo.vo.*; -import cn.iocoder.yudao.module.basic.dal.dataobject.inputsinfo.InputsInfoDO; - -import javax.validation.Valid; -import java.util.List; - -/** - * 投入品 Service 接口 - * - * @author 芋道源码 - */ -public interface InputsInfoService { - - /** - * 创建投入品 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createInputsInfo(@Valid InputsInfoCreateReqVO createReqVO); - - /** - * 更新投入品 - * - * @param updateReqVO 更新信息 - */ - void updateInputsInfo(@Valid InputsInfoUpdateReqVO updateReqVO); - - /** - * 删除投入品 - * - * @param id 编号 - */ - void deleteInputsInfo(Long id); - - /** - * 获得投入品 - * - * @param id 编号 - * @return 投入品 - */ - InputsInfoDO getInputsInfo(Long id); - - /** - * 获得投入品分页 - * - * @param pageReqVO 分页查询 - * @return 投入品分页 - */ - PageResult getInputsInfoPage(InputsInfoPageReqVO pageReqVO); - - /** - * 获得投入品列表 - * - * @param exportReqVO 查询条件 - * @return 投入品列表 - */ - List getInputsInfoList(InputsInfoExportReqVO exportReqVO); - - /** - * 获取所有投入品 - * @return - */ - List getInputsInfoInputsInfoList(); - - /** - * 根据指定的商户id 获取所有名下多个投入品 - * @param belongBusinessId - * @return - */ - List getInputsInfoListByBelongBusinessId(List belongBusinessId); - - /** - * 根据商户ID 获取所属投入品 - * @param businessInfoId 商户ID - * @return 投入品 - */ - List getInputsInfoByBusinessInfoId(Long businessInfoId); - - /** - * 根据商户ID获得投入品列表 - * @param businessInfoId 商户ID - * @return 投入品 - */ - List queryListOfMiniResult(Long businessInfoId); -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/inputsinfo/InputsInfoServiceImpl.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/inputsinfo/InputsInfoServiceImpl.java deleted file mode 100644 index 9e4d652..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/inputsinfo/InputsInfoServiceImpl.java +++ /dev/null @@ -1,248 +0,0 @@ -package cn.iocoder.yudao.module.basic.service.inputsinfo; - -import cn.iocoder.yudao.framework.common.enums.CodeEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.basic.api.redis.RedisBasicInfoUtilApi; -import cn.iocoder.yudao.module.basic.controller.admin.inputsinfo.vo.*; -import cn.iocoder.yudao.module.basic.convert.inputsinfo.InputsInfoConvert; -import cn.iocoder.yudao.module.basic.dal.dataobject.inputsinfo.InputsInfoDO; -import cn.iocoder.yudao.module.basic.dal.dataobject.unit.UnitDO; -import cn.iocoder.yudao.module.basic.dal.mysql.inputsinfo.InputsInfoMapper; -import cn.iocoder.yudao.module.basic.dal.mysql.unit.UnitMapper; -import cn.iocoder.yudao.module.basic.enums.ErrorCodeConstants; -import cn.iocoder.yudao.module.basic.service.businessinfo.BusinessInfoServiceImpl; -import cn.iocoder.yudao.module.product.api.inputsbatch.InputsBatchApi; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.util.List; - -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.basic.enums.ErrorCodeConstants.*; - -/** - * 投入品 Service 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -public class InputsInfoServiceImpl implements InputsInfoService { - - @Resource - private InputsInfoMapper inputsInfoMapper; - - @Resource - private RedisBasicInfoUtilApi redisUtil; - - @Resource - private BusinessInfoServiceImpl businessInfoService; - - @Resource - private InputsBatchApi inputsBatchApi; - - @Resource - private UnitMapper unitMapper; - - /** - * 创建投入品 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - @Override - public Long createInputsInfo(InputsInfoCreateReqVO createReqVO) { - //校验所属商户是否存在 - businessInfoService.validateBusinessInfoExists(createReqVO.getBelongBusinessId()); - //校验投入品名称是否重复 - validateInputsInfoExists((long)0,createReqVO.getInputsName(),createReqVO.getBelongBusinessId()); - // 插入 - InputsInfoDO inputsInfo = InputsInfoConvert.INSTANCE.convert(createReqVO); - try { - inputsInfo.setInputsId(CodeEnum.INPUTS_INFO_CODE.getCode()); - // 设置商品规格 - if (inputsInfo.getIsBaseUnit()) { - inputsInfo.setInputsSpecs("kg"); - // 设置默认单位ID为0 - inputsInfo.setInputsUnitId(0L); - } else { - BigDecimal conversionValue = inputsInfo.getConversionValue(); - if (conversionValue != null) { - String inputsSpecs = String.format("%skg/%s", conversionValue, getUnitName(inputsInfo.getInputsUnitId())); - inputsInfo.setInputsSpecs(inputsSpecs); - } - } - inputsInfoMapper.insert(inputsInfo); - } catch(Exception e){ - e.printStackTrace(); - throw exception(INPUTS_INFO_FAIL_CREATE); - } - - redisUtil.updateInputsInfoRedis(inputsInfo.getId(),InputsInfoConvert.INSTANCE.convertToDTO(inputsInfo)); - // 返回 - return inputsInfo.getId(); - } - - // 根据商品单位ID获取单位名称 - private String getUnitName(Long unitId) { - UnitDO unit = unitMapper.selectById(unitId); - if (unit != null) { - return unit.getUnitName(); - } else { - throw new RuntimeException("无法找到对应的单位"); - } - } - /** - * 更新投入品 - * - * @param updateReqVO 更新信息 - */ - @Override - public void updateInputsInfo(InputsInfoUpdateReqVO updateReqVO) { - // 校验存在以及校验投入品名称是否重复 - validateInputsInfoExists(updateReqVO.getId(),updateReqVO.getInputsName(),updateReqVO.getBelongBusinessId()); - //校验所属商户是否存在 - businessInfoService.validateBusinessInfoExists(updateReqVO.getBelongBusinessId()); - //获取原始投入品信息 - InputsInfoDO inputsInfo = inputsInfoMapper.selectById(updateReqVO.getId()); - if (inputsInfo == null){ - throw exception(INPUTS_INFO_NOT_EXISTS); - } - // 更新 - InputsInfoDO updateObj = InputsInfoConvert.INSTANCE.convert(updateReqVO); - // 设置商品规格 - if (updateObj.getIsBaseUnit()) { - updateObj.setInputsSpecs("kg"); - updateObj.setInputsUnitId(0L); - } else { - String InputsSpecs = String.format("%skg/%s", updateObj.getConversionValue(), getUnitName(updateObj.getInputsUnitId())); - updateObj.setInputsSpecs(InputsSpecs); - } - try { - inputsInfoMapper.updateById(updateObj); - } catch (Exception e) { - e.printStackTrace(); - throw exception(INPUTS_INFO_FAIL_UPDATE); - } - redisUtil.updateInputsInfoRedis(updateObj.getId(),InputsInfoConvert.INSTANCE.convertToDTO(updateObj)); - } - - /** - * 删除投入品 - * - * @param id 编号 - */ - @Override - public void deleteInputsInfo(Long id) { - // 校验存在 - validateInputsInfoExists(id,null,(long)0); - //校验投入品是否存在关联投入品批次 - if(!inputsBatchApi.getInputsBatchListByInputId(inputsInfoMapper.selectById(id).getInputsId()).getData().isEmpty()){ - throw exception(INPUTS_INFO_FAIL_DEL_BELONG_INPUTS_BATCH_EXISTS); - } - // 删除 - try{ - inputsInfoMapper.deleteById(id); - }catch (Exception e){ - e.printStackTrace(); - throw exception(INPUTS_INFO_FAIL_DEL); - } - - redisUtil.delInputsInfoRedis(id); - } - - private void validateInputsInfoExists(Long id,String inputsName,Long belongBusinessId) { - if (!id.equals((long)0) && inputsInfoMapper.selectById(id) == null) { - throw exception(ErrorCodeConstants.INPUTS_INFO_NOT_EXISTS); - } - - if(StringUtils.hasText(inputsName) && !belongBusinessId.equals((long)0) && - !inputsInfoMapper.selectList(new LambdaQueryWrapperX() - .eq(InputsInfoDO::getInputsName,inputsName).eq(InputsInfoDO::getBelongBusinessId,belongBusinessId) - .ne(InputsInfoDO::getId,id)).isEmpty()){ - throw exception(ErrorCodeConstants.INPUTS_INFO_NAME_IS_EXISTS); - } - } - - @Override - public InputsInfoDO getInputsInfo(Long id) { - return inputsInfoMapper.selectById(id); - } - - /** - * 获得投入品分页 - * - * @param pageReqVO 分页查询 - * @return 投入品分页 - */ - @Override - public PageResult getInputsInfoPage(InputsInfoPageReqVO pageReqVO) { - Page page = new Page<>(pageReqVO.getPageNo(),pageReqVO.getPageSize()); - IPage inputsInfoDOIPage = inputsInfoMapper.selectInputsPageByInfo(page, pageReqVO.getInputsName(), - pageReqVO.getInputsId(), pageReqVO.getInputsUnitId(), pageReqVO.getBelongBusinessName()); - // 根据InputsUnitId设置InputsUnitName - List records = inputsInfoDOIPage.getRecords(); - for (InputsInfoDO inputsInfoDO : records) { - if (inputsInfoDO.getInputsUnitId() == 0) { - inputsInfoDO.setInputsUnitName("kg"); - } else { - inputsInfoDO.setInputsUnitName(getUnitName(inputsInfoDO.getInputsUnitId())); - } - } - PageResult inputsInfoDOPageResult = new PageResult().setList(records); - inputsInfoDOPageResult.setTotal(inputsInfoDOIPage.getTotal()); - return inputsInfoDOPageResult; - } - - /** - * 获得投入品列表 - * - * @param exportReqVO 查询条件 - * @return 投入品列表 - */ - @Override - public List getInputsInfoList(InputsInfoExportReqVO exportReqVO) { - return inputsInfoMapper.selectList(exportReqVO); - } - - /** - * 获取所有投入品 - * - * @return - */ - @Override - public List getInputsInfoInputsInfoList() { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - return inputsInfoMapper.selectList(wrapper); - } - - /** - * 根据指定的商户id 获取所有名下多个投入品 - * - * @param belongBusinessId 商户id列表 - * @return 返回投入品列表 - */ - @Override - public List getInputsInfoListByBelongBusinessId(List belongBusinessId) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(InputsInfoDO::getBelongBusinessId, belongBusinessId); - return inputsInfoMapper.selectList(queryWrapper); - } - - @Override - public List getInputsInfoByBusinessInfoId(Long businessInfoId) { - return inputsInfoMapper.getInputsInfoByBusinessInfoId(businessInfoId); - } - - @Override - public List queryListOfMiniResult(Long businessInfoId) { - return inputsInfoMapper.queryListOfMiniResult(businessInfoId); - } -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/vendorinfo/VendorInfoServiceImpl.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/vendorinfo/VendorInfoServiceImpl.java index e69778a..87bb7f1 100644 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/vendorinfo/VendorInfoServiceImpl.java +++ b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/vendorinfo/VendorInfoServiceImpl.java @@ -11,7 +11,6 @@ import cn.iocoder.yudao.module.basic.convert.vendorinfo.VendorInfoConvert; import cn.iocoder.yudao.module.basic.dal.dataobject.vendorinfo.VendorInfoDO; import cn.iocoder.yudao.module.basic.dal.mysql.vendorinfo.VendorInfoMapper; import cn.iocoder.yudao.module.basic.service.businessinfo.BusinessInfoServiceImpl; -import cn.iocoder.yudao.module.product.api.inputsbuy.InputsBuyApi; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -40,8 +39,6 @@ public class VendorInfoServiceImpl implements VendorInfoService { private RedisBasicInfoUtilApi redisUtil; @Resource private BusinessInfoServiceImpl businessInfoService; - @Resource - private InputsBuyApi inputsBuyApi; /** * 创建供应商实现 @@ -116,10 +113,6 @@ public class VendorInfoServiceImpl implements VendorInfoService { public void deleteVendorInfo(Long id) { // 校验存在 validateVendorInfoExists(id); - //校验是否存在供应商存在关联投入品采购 - if(!inputsBuyApi.getInputsBuyListByVendorId(vendorInfoMapper.selectById(id).getVendorId()).getData().isEmpty()){ - throw exception(VENDOR_INFO_FAIL_DEL_BELONG_INPUTS_BUY_EXISTS); - } // 删除 try{ vendorInfoMapper.deleteById(id); diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/workersinfo/WorkersInfoServiceImpl.java b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/workersinfo/WorkersInfoServiceImpl.java index 0d99d8d..ef9c0c4 100644 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/workersinfo/WorkersInfoServiceImpl.java +++ b/yudao-module-basic/yudao-module-basic-biz/src/main/java/cn/iocoder/yudao/module/basic/service/workersinfo/WorkersInfoServiceImpl.java @@ -15,8 +15,6 @@ import cn.iocoder.yudao.module.basic.dal.dataobject.workersinfo.WorkersInfoDO; import cn.iocoder.yudao.module.basic.dal.mysql.workersinfo.WorkersInfoMapper; import cn.iocoder.yudao.module.basic.service.businessinfo.BusinessInfoServiceImpl; import cn.iocoder.yudao.module.basic.util.WXUtils; -import cn.iocoder.yudao.module.product.api.landjob.LandJobApi; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -45,8 +43,6 @@ public class WorkersInfoServiceImpl implements WorkersInfoService { private RedisBasicInfoUtilApi redisUtil; @Resource private BusinessInfoServiceImpl businessInfoService; - @Resource - private LandJobApi landJobApi; @Override public Long createWorkersInfo(WorkersInfoCreateReqVO createReqVO) { @@ -90,10 +86,6 @@ public class WorkersInfoServiceImpl implements WorkersInfoService { public void deleteWorkersInfo(Long id) { // 校验存在 validateWorkersInfoExists(id); - //校验是否存在关联种植/养殖/畜牧作业 - if(!landJobApi.getLandJobListByJobWorkerId(id).getData().isEmpty()){ - throw exception(WORKERS_INFO_FAIL_DELETE_BELONG_LAND_JOB_EXISTS); - } // 删除 workersInfoMapper.deleteById(id); } diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/resources/mapper/goodsinputrelational/GoodsInputRelationalMapper.xml b/yudao-module-basic/yudao-module-basic-biz/src/main/resources/mapper/goodsinputrelational/GoodsInputRelationalMapper.xml deleted file mode 100644 index 7a710df..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/resources/mapper/goodsinputrelational/GoodsInputRelationalMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-basic/yudao-module-basic-biz/src/main/resources/mapper/inputsinfo/InputsInfoMapper.xml b/yudao-module-basic/yudao-module-basic-biz/src/main/resources/mapper/inputsinfo/InputsInfoMapper.xml deleted file mode 100644 index a0313ad..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/main/resources/mapper/inputsinfo/InputsInfoMapper.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-basic/yudao-module-basic-biz/src/test/java/cn/iocoder/yudao/module/basic/service/goodsinputrelational/GoodsInputRelationalServiceImplTest.java b/yudao-module-basic/yudao-module-basic-biz/src/test/java/cn/iocoder/yudao/module/basic/service/goodsinputrelational/GoodsInputRelationalServiceImplTest.java deleted file mode 100644 index 19db89c..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/test/java/cn/iocoder/yudao/module/basic/service/goodsinputrelational/GoodsInputRelationalServiceImplTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.iocoder.yudao.module.basic.service.goodsinputrelational; - -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import org.springframework.context.annotation.Import; - -/** -* {@link GoodsInputRelationalServiceImpl} 的单元测试类 -* -* @author 芋道源码 -*/ -@Import(GoodsInputRelationalServiceImpl.class) -public class GoodsInputRelationalServiceImplTest extends BaseDbUnitTest { - - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/src/test/java/cn/iocoder/yudao/module/basic/service/inputsinfo/InputsInfoServiceImplTest.java b/yudao-module-basic/yudao-module-basic-biz/src/test/java/cn/iocoder/yudao/module/basic/service/inputsinfo/InputsInfoServiceImplTest.java deleted file mode 100644 index cbed807..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/src/test/java/cn/iocoder/yudao/module/basic/service/inputsinfo/InputsInfoServiceImplTest.java +++ /dev/null @@ -1,234 +0,0 @@ -package cn.iocoder.yudao.module.basic.service.inputsinfo; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.basic.controller.admin.inputsinfo.vo.InputsInfoCreateReqVO; -import cn.iocoder.yudao.module.basic.controller.admin.inputsinfo.vo.InputsInfoExportReqVO; -import cn.iocoder.yudao.module.basic.controller.admin.inputsinfo.vo.InputsInfoPageReqVO; -import cn.iocoder.yudao.module.basic.controller.admin.inputsinfo.vo.InputsInfoUpdateReqVO; -import cn.iocoder.yudao.module.basic.dal.dataobject.inputsinfo.InputsInfoDO; -import cn.iocoder.yudao.module.basic.dal.mysql.inputsinfo.InputsInfoMapper; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.springframework.context.annotation.Import; - -import javax.annotation.Resource; -import java.util.List; - -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; -import static cn.iocoder.yudao.module.basic.enums.ErrorCodeConstants.INPUTS_INFO_NOT_EXISTS; -import static org.junit.jupiter.api.Assertions.*; - -/** -* {@link InputsInfoServiceImpl} 的单元测试类 -* -* @author 芋道源码 -*/ -@Import(InputsInfoServiceImpl.class) -public class InputsInfoServiceImplTest extends BaseDbUnitTest { - - @Resource - private InputsInfoServiceImpl inputsInfoService; - - @Resource - private InputsInfoMapper inputsInfoMapper; - - @Test - public void testCreateInputsInfo_success() { - // 准备参数 - InputsInfoCreateReqVO reqVO = randomPojo(InputsInfoCreateReqVO.class); - - // 调用 - Long inputsInfoId = inputsInfoService.createInputsInfo(reqVO); - // 断言 - assertNotNull(inputsInfoId); - // 校验记录的属性是否正确 - InputsInfoDO inputsInfo = inputsInfoMapper.selectById(inputsInfoId); - assertPojoEquals(reqVO, inputsInfo); - } - - @Test - public void testUpdateInputsInfo_success() { - // mock 数据 - InputsInfoDO dbInputsInfo = randomPojo(InputsInfoDO.class); - inputsInfoMapper.insert(dbInputsInfo);// @Sql: 先插入出一条存在的数据 - // 准备参数 - InputsInfoUpdateReqVO reqVO = randomPojo(InputsInfoUpdateReqVO.class, o -> { - o.setId(dbInputsInfo.getId()); // 设置更新的 ID - }); - - // 调用 - inputsInfoService.updateInputsInfo(reqVO); - // 校验是否更新正确 - InputsInfoDO inputsInfo = inputsInfoMapper.selectById(reqVO.getId()); // 获取最新的 - assertPojoEquals(reqVO, inputsInfo); - } - - @Test - public void testUpdateInputsInfo_notExists() { - // 准备参数 - InputsInfoUpdateReqVO reqVO = randomPojo(InputsInfoUpdateReqVO.class); - - // 调用, 并断言异常 - assertServiceException(() -> inputsInfoService.updateInputsInfo(reqVO), INPUTS_INFO_NOT_EXISTS); - } - - @Test - public void testDeleteInputsInfo_success() { - // mock 数据 - InputsInfoDO dbInputsInfo = randomPojo(InputsInfoDO.class); - inputsInfoMapper.insert(dbInputsInfo);// @Sql: 先插入出一条存在的数据 - // 准备参数 - Long id = dbInputsInfo.getId(); - - // 调用 - inputsInfoService.deleteInputsInfo(id); - // 校验数据不存在了 - assertNull(inputsInfoMapper.selectById(id)); - } - - @Test - public void testDeleteInputsInfo_notExists() { - // 准备参数 - Long id = randomLongId(); - - // 调用, 并断言异常 - assertServiceException(() -> inputsInfoService.deleteInputsInfo(id), INPUTS_INFO_NOT_EXISTS); - } - - @Test - @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 - public void testGetInputsInfoPage() { - // mock 数据 - InputsInfoDO dbInputsInfo = randomPojo(InputsInfoDO.class, o -> { // 等会查询到 - o.setInputsName(null); - o.setInputsId(null); - o.setInputsUnitId(null); - o.setConversionValue(null); - o.setIsBaseUnit(null); - o.setInputsSpecs(null); - o.setInputsRemarks(null); - o.setInputsPhotoUrl(null); - o.setShelfLife(null); - o.setBelongBusinessId(null); - o.setBelongBusinessName(null); - o.setCreateTime(null); - }); - inputsInfoMapper.insert(dbInputsInfo); - // 测试 inputsName 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setInputsName(null))); - // 测试 inputsId 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setInputsId(null))); - // 测试 inputsUnit 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setInputsUnitId(null))); - // 测试 inputsUnit 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setConversionValue(null))); - // 测试 inputsUnit 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setIsBaseUnit(null))); - // 测试 inputsSpecs 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setInputsSpecs(null))); - // 测试 inputsRemarks 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setInputsRemarks(null))); - // 测试 inputsPhotoUrl 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setInputsPhotoUrl(null))); - // 测试 shelfLife 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setShelfLife(null))); - // 测试 belongBusinessId 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setBelongBusinessId(null))); - // 测试 belongBusinessName 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setBelongBusinessName(null))); - // 测试 createTime 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setCreateTime(null))); - // 准备参数 - InputsInfoPageReqVO reqVO = new InputsInfoPageReqVO(); - reqVO.setInputsName(null); - reqVO.setInputsId(null); - reqVO.setInputsUnitId(null); - reqVO.setConversionValue(null); - reqVO.setIsBaseUnit(null); - reqVO.setInputsSpecs(null); - reqVO.setInputsRemarks(null); - reqVO.setInputsPhotoUrl(null); - reqVO.setShelfLife(null); - reqVO.setBelongBusinessId(null); - reqVO.setBelongBusinessName(null); -// reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - - // 调用 - PageResult pageResult = inputsInfoService.getInputsInfoPage(reqVO); - // 断言 - assertEquals(1, pageResult.getTotal()); - assertEquals(1, pageResult.getList().size()); - assertPojoEquals(dbInputsInfo, pageResult.getList().get(0)); - } - - @Test - @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 - public void testGetInputsInfoList() { - // mock 数据 - InputsInfoDO dbInputsInfo = randomPojo(InputsInfoDO.class, o -> { // 等会查询到 - o.setInputsName(null); - o.setInputsId(null); - o.setInputsUnitId(null); - o.setConversionValue(null); - o.setIsBaseUnit(null); - o.setInputsSpecs(null); - o.setInputsRemarks(null); - o.setInputsPhotoUrl(null); - o.setShelfLife(null); - o.setBelongBusinessId(null); - o.setBelongBusinessName(null); - o.setCreateTime(null); - }); - inputsInfoMapper.insert(dbInputsInfo); - // 测试 inputsName 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setInputsName(null))); - // 测试 inputsId 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setInputsId(null))); - // 测试 inputsUnit 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setInputsUnitId(null))); - // 测试 inputsUnit 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setConversionValue(null))); - // 测试 inputsUnit 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setIsBaseUnit(null))); - // 测试 inputsSpecs 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setInputsSpecs(null))); - // 测试 inputsRemarks 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setInputsRemarks(null))); - // 测试 inputsPhotoUrl 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setInputsPhotoUrl(null))); - // 测试 shelfLife 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setShelfLife(null))); - // 测试 belongBusinessId 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setBelongBusinessId(null))); - // 测试 belongBusinessName 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setBelongBusinessName(null))); - // 测试 createTime 不匹配 - inputsInfoMapper.insert(cloneIgnoreId(dbInputsInfo, o -> o.setCreateTime(null))); - // 准备参数 - InputsInfoExportReqVO reqVO = new InputsInfoExportReqVO(); - reqVO.setInputsName(null); - reqVO.setInputsId(null); - reqVO.setInputsUnitId(null); - reqVO.setConversionValue(null); - reqVO.setIsBaseUnit(null); - reqVO.setInputsSpecs(null); - reqVO.setInputsRemarks(null); - reqVO.setInputsPhotoUrl(null); - reqVO.setShelfLife(null); - reqVO.setBelongBusinessId(null); - reqVO.setBelongBusinessName(null); -// reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - - // 调用 - List list = inputsInfoService.getInputsInfoList(reqVO); - // 断言 - assertEquals(1, list.size()); - assertPojoEquals(dbInputsInfo, list.get(0)); - } - -} diff --git a/yudao-module-basic/yudao-module-basic-biz/target/classes/bootstrap-local.yaml b/yudao-module-basic/yudao-module-basic-biz/target/classes/bootstrap-local.yaml deleted file mode 100644 index 8463f02..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/classes/bootstrap-local.yaml +++ /dev/null @@ -1,31 +0,0 @@ -spring: - main: - allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 - allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Dubbo 或者 Feign 等会存在重复定义的服务 - ---- #################### 注册中心相关配置 #################### - -spring: - cloud: - nacos: - server-addr: 192.168.2.74:8848 - discovery: - namespace: dev # 命名空间。这里使用 dev 开发环境 - metadata: - version: 1.0.0 # 服务实例的版本号，可用于灰度发布 - ---- #################### 配置中心相关配置 #################### - -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: 192.168.2.74:8848 # Nacos 服务器地址 - namespace: dev # 命名空间。这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/yudao-module-basic/yudao-module-basic-biz/target/classes/bootstrap-prod.yaml b/yudao-module-basic/yudao-module-basic-biz/target/classes/bootstrap-prod.yaml deleted file mode 100644 index d0b3068..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/classes/bootstrap-prod.yaml +++ /dev/null @@ -1,31 +0,0 @@ -spring: - main: - allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 - allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Dubbo 或者 Feign 等会存在重复定义的服务 - ---- #################### 注册中心相关配置 #################### - -spring: - cloud: - nacos: - server-addr: 127.0.0.1:8848 - discovery: - namespace: prod # 命名空间。这里使用 dev 开发环境 - metadata: - version: 1.0.0 # 服务实例的版本号，可用于灰度发布 - ---- #################### 配置中心相关配置 #################### - -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: 127.0.0.1:8848 # Nacos 服务器地址 - namespace: prod # 命名空间。这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/yudao-module-basic/yudao-module-basic-biz/target/classes/bootstrap.yaml b/yudao-module-basic/yudao-module-basic-biz/target/classes/bootstrap.yaml deleted file mode 100644 index f07fc6f..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/classes/bootstrap.yaml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - application: - name: basic-server - - profiles: - active: local - -server: - port: 49081 - -# 日志文件配置。注意，如果 logging.file.name 不放在 bootstrap.yaml 配置文件，而是放在 application.yaml 中，会导致出现 LOG_FILE_IS_UNDEFINED 文件 -logging: - file: - name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径 diff --git a/yudao-module-basic/yudao-module-basic-biz/target/classes/logback-spring.xml b/yudao-module-basic/yudao-module-basic-biz/target/classes/logback-spring.xml deleted file mode 100644 index 5f4b30d..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/classes/logback-spring.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - 　　　　　 - - - ${PATTERN_DEFAULT} - - - - - - - - - - ${PATTERN_DEFAULT} - - - - ${LOG_FILE} - - - ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz} - - ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} - - ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB} - - ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0} - - ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30} - - - - - - 0 - - 256 - - - - - - - - ${PATTERN_DEFAULT} - - - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/businessinfo/BusinessInfoMapper.xml b/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/businessinfo/BusinessInfoMapper.xml deleted file mode 100644 index 60fd2ed..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/businessinfo/BusinessInfoMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/dealergoods/DealerGoodsMapper.xml b/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/dealergoods/DealerGoodsMapper.xml deleted file mode 100644 index 8354503..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/dealergoods/DealerGoodsMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/dealerinfo/DealerInfoMapper.xml b/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/dealerinfo/DealerInfoMapper.xml deleted file mode 100644 index e18ebb8..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/dealerinfo/DealerInfoMapper.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/goodscategory/GoodsCategoryMapper.xml b/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/goodscategory/GoodsCategoryMapper.xml deleted file mode 100644 index ffcc37f..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/goodscategory/GoodsCategoryMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/goodsinfo/GoodsInfoMapper.xml b/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/goodsinfo/GoodsInfoMapper.xml deleted file mode 100644 index 9f6f558..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/goodsinfo/GoodsInfoMapper.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/goodsinputrelational/GoodsInputRelationalMapper.xml b/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/goodsinputrelational/GoodsInputRelationalMapper.xml deleted file mode 100644 index 7a710df..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/goodsinputrelational/GoodsInputRelationalMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/goodsverify/GoodsVerifyMapper.xml b/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/goodsverify/GoodsVerifyMapper.xml deleted file mode 100644 index 0fd5f17..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/goodsverify/GoodsVerifyMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/inputsinfo/InputsInfoMapper.xml b/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/inputsinfo/InputsInfoMapper.xml deleted file mode 100644 index a0313ad..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/inputsinfo/InputsInfoMapper.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/unit/UnitMapper.xml b/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/unit/UnitMapper.xml deleted file mode 100644 index 7bcbcfe..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/unit/UnitMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/vendorinfo/VendorInfoMapper.xml b/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/vendorinfo/VendorInfoMapper.xml deleted file mode 100644 index bac9153..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/vendorinfo/VendorInfoMapper.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/workersinfo/WorkersInfoMapper.xml b/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/workersinfo/WorkersInfoMapper.xml deleted file mode 100644 index a29cb5c..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/classes/mapper/workersinfo/WorkersInfoMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/yudao-module-basic/yudao-module-basic-biz/target/classes/sql/clean.sql b/yudao-module-basic/yudao-module-basic-biz/target/classes/sql/clean.sql deleted file mode 100644 index cfc4478..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/classes/sql/clean.sql +++ /dev/null @@ -1,5 +0,0 @@ -DELETE FROM "basic_dealer_info"; -DELETE FROM "basic_goods_category"; -DELETE FROM "basic_goods_verify"; -DELETE FROM "basic_inputs_info"; -DELETE FROM "basic_unit"; diff --git a/yudao-module-basic/yudao-module-basic-biz/target/classes/sql/create_tables.sql b/yudao-module-basic/yudao-module-basic-biz/target/classes/sql/create_tables.sql deleted file mode 100644 index a5b364e..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/classes/sql/create_tables.sql +++ /dev/null @@ -1,86 +0,0 @@ -CREATE TABLE IF NOT EXISTS "basic_dealer_info" ( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "dealer_name" varchar NOT NULL, - "dealer_id" varchar NOT NULL, - "belong_business_id" bigint NOT NULL, - "belong_business_name" varchar NOT NULL, - "business_code" varchar, - "contact_phone" varchar, - "contact_name" varchar NOT NULL, - "common_sale_area" varchar, - "common_sale_area_id" bigint, - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - "remarks" varchar, - "tenant_id" bigint NOT NULL, - "deleted" bit NOT NULL DEFAULT FALSE, - "creator" varchar DEFAULT '', - "updater" varchar DEFAULT '', - PRIMARY KEY ("id") -) COMMENT '经销商'; -CREATE TABLE IF NOT EXISTS "basic_goods_category" ( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "name" varchar NOT NULL, - "pid" bigint NOT NULL, - "parent_id_path" varchar NOT NULL, - "level" varchar NOT NULL, - "sequence" varchar NOT NULL, - "tenant_id" bigint NOT NULL, - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - "deleted" bit NOT NULL DEFAULT FALSE, - "creator" varchar DEFAULT '', - "updater" varchar DEFAULT '', - PRIMARY KEY ("id") -) COMMENT '商品分类表'; -CREATE TABLE IF NOT EXISTS "basic_goods_verify" ( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "goods_name" varchar NOT NULL, - "goods_id" varchar NOT NULL, - "verify_name" varchar NOT NULL, - "verify_agencies" varchar NOT NULL, - "verify_start_time" datetime NOT NULL, - "verify_end_time" datetime, - "verify_data_url" varchar NOT NULL, - "verify_is_forver" bit NOT NULL, - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - "tenant_id" bigint NOT NULL, - "belong_business_id" bigint NOT NULL, - "belong_business_name" varchar NOT NULL, - "deleted" bit NOT NULL DEFAULT FALSE, - "creator" varchar DEFAULT '', - "updater" varchar DEFAULT '', - PRIMARY KEY ("id") -) COMMENT '商品认证'; -CREATE TABLE IF NOT EXISTS "basic_inputs_info" ( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "inputs_name" varchar NOT NULL, - "inputs_id" varchar NOT NULL, - "inputs_unit" varchar NOT NULL, - "inputs_specs" varchar, - "inputs_remarks" varchar NOT NULL, - "inputs_photo_url" varchar, - "shelf_life" int NOT NULL, - "belong_business_id" bigint NOT NULL, - "belong_business_name" varchar NOT NULL, - "tenant_id" bigint NOT NULL, - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - "deleted" bit NOT NULL DEFAULT FALSE, - "creator" varchar DEFAULT '', - "updater" varchar DEFAULT '', - PRIMARY KEY ("id") -) COMMENT '投入品'; -CREATE TABLE IF NOT EXISTS "basic_unit" ( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "unit_name" varchar NOT NULL, - "tenant_id" bigint NOT NULL, - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - "deleted" bit NOT NULL DEFAULT FALSE, - "creator" varchar DEFAULT '', - "updater" varchar DEFAULT '', - PRIMARY KEY ("id") -) COMMENT '商品'; - diff --git a/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/businessinfo/BusinessInfoConvertImpl.java b/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/businessinfo/BusinessInfoConvertImpl.java deleted file mode 100644 index fa18b85..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/businessinfo/BusinessInfoConvertImpl.java +++ /dev/null @@ -1,177 +0,0 @@ -package cn.iocoder.yudao.module.basic.convert.businessinfo; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.basic.api.redis.dto.BusinessInfoDTO; -import cn.iocoder.yudao.module.basic.controller.admin.businessinfo.vo.BusinessInfoCreateReqVO; -import cn.iocoder.yudao.module.basic.controller.admin.businessinfo.vo.BusinessInfoRespVO; -import cn.iocoder.yudao.module.basic.controller.admin.businessinfo.vo.BusinessInfoUpdateReqVO; -import cn.iocoder.yudao.module.basic.dal.dataobject.businessinfo.BusinessInfoDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:03:17+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class BusinessInfoConvertImpl implements BusinessInfoConvert { - - @Override - public BusinessInfoDO convert(BusinessInfoCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - BusinessInfoDO.BusinessInfoDOBuilder businessInfoDO = BusinessInfoDO.builder(); - - businessInfoDO.businessName( bean.getBusinessName() ); - businessInfoDO.companiesName( bean.getCompaniesName() ); - businessInfoDO.businessId( bean.getBusinessId() ); - businessInfoDO.codeRuleId( bean.getCodeRuleId() ); - businessInfoDO.area( bean.getArea() ); - businessInfoDO.businessCode( bean.getBusinessCode() ); - businessInfoDO.legalName( bean.getLegalName() ); - businessInfoDO.legalIdCard( bean.getLegalIdCard() ); - businessInfoDO.remarks( bean.getRemarks() ); - businessInfoDO.verifyState( bean.getVerifyState() ); - - return businessInfoDO.build(); - } - - @Override - public BusinessInfoDO convert(BusinessInfoUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - BusinessInfoDO.BusinessInfoDOBuilder businessInfoDO = BusinessInfoDO.builder(); - - businessInfoDO.id( bean.getId() ); - businessInfoDO.businessName( bean.getBusinessName() ); - businessInfoDO.companiesName( bean.getCompaniesName() ); - businessInfoDO.businessId( bean.getBusinessId() ); - businessInfoDO.codeRuleId( bean.getCodeRuleId() ); - businessInfoDO.area( bean.getArea() ); - businessInfoDO.businessCode( bean.getBusinessCode() ); - businessInfoDO.legalName( bean.getLegalName() ); - businessInfoDO.legalIdCard( bean.getLegalIdCard() ); - businessInfoDO.remarks( bean.getRemarks() ); - businessInfoDO.verifyState( bean.getVerifyState() ); - - return businessInfoDO.build(); - } - - @Override - public BusinessInfoDO convert(BusinessInfoDO bean) { - if ( bean == null ) { - return null; - } - - BusinessInfoDO.BusinessInfoDOBuilder businessInfoDO = BusinessInfoDO.builder(); - - businessInfoDO.id( bean.getId() ); - businessInfoDO.businessName( bean.getBusinessName() ); - businessInfoDO.companiesName( bean.getCompaniesName() ); - businessInfoDO.businessId( bean.getBusinessId() ); - businessInfoDO.codeRuleId( bean.getCodeRuleId() ); - businessInfoDO.area( bean.getArea() ); - businessInfoDO.businessCode( bean.getBusinessCode() ); - businessInfoDO.legalName( bean.getLegalName() ); - businessInfoDO.legalIdCard( bean.getLegalIdCard() ); - businessInfoDO.remarks( bean.getRemarks() ); - businessInfoDO.verifyState( bean.getVerifyState() ); - businessInfoDO.tenantId( bean.getTenantId() ); - - return businessInfoDO.build(); - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( BusinessInfoDO businessInfoDO : list ) { - list1.add( businessInfoDOToBusinessInfoRespVO( businessInfoDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public BusinessInfoDTO convertToDTO(BusinessInfoDO businessInfoDO) { - if ( businessInfoDO == null ) { - return null; - } - - BusinessInfoDTO.BusinessInfoDTOBuilder businessInfoDTO = BusinessInfoDTO.builder(); - - businessInfoDTO.id( businessInfoDO.getId() ); - businessInfoDTO.businessName( businessInfoDO.getBusinessName() ); - businessInfoDTO.companiesName( businessInfoDO.getCompaniesName() ); - businessInfoDTO.businessId( businessInfoDO.getBusinessId() ); - businessInfoDTO.codeRuleId( businessInfoDO.getCodeRuleId() ); - businessInfoDTO.area( businessInfoDO.getArea() ); - businessInfoDTO.businessCode( businessInfoDO.getBusinessCode() ); - businessInfoDTO.legalName( businessInfoDO.getLegalName() ); - businessInfoDTO.legalIdCard( businessInfoDO.getLegalIdCard() ); - businessInfoDTO.remarks( businessInfoDO.getRemarks() ); - businessInfoDTO.verifyState( businessInfoDO.getVerifyState() ); - businessInfoDTO.tenantId( businessInfoDO.getTenantId() ); - - return businessInfoDTO.build(); - } - - @Override - public List convertToDTOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( BusinessInfoDO businessInfoDO : list ) { - list1.add( convertToDTO( businessInfoDO ) ); - } - - return list1; - } - - protected BusinessInfoRespVO businessInfoDOToBusinessInfoRespVO(BusinessInfoDO businessInfoDO) { - if ( businessInfoDO == null ) { - return null; - } - - BusinessInfoRespVO businessInfoRespVO = new BusinessInfoRespVO(); - - businessInfoRespVO.setBusinessName( businessInfoDO.getBusinessName() ); - businessInfoRespVO.setCompaniesName( businessInfoDO.getCompaniesName() ); - businessInfoRespVO.setRemarks( businessInfoDO.getRemarks() ); - businessInfoRespVO.setId( businessInfoDO.getId() ); - businessInfoRespVO.setBusinessId( businessInfoDO.getBusinessId() ); - businessInfoRespVO.setCodeRuleId( businessInfoDO.getCodeRuleId() ); - if ( businessInfoDO.getVerifyState() != null ) { - businessInfoRespVO.setVerifyState( businessInfoDO.getVerifyState() ); - } - businessInfoRespVO.setLegalName( businessInfoDO.getLegalName() ); - businessInfoRespVO.setLegalIdCard( businessInfoDO.getLegalIdCard() ); - businessInfoRespVO.setArea( businessInfoDO.getArea() ); - - return businessInfoRespVO; - } -} diff --git a/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/dealergoods/DealerGoodsConvertImpl.java b/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/dealergoods/DealerGoodsConvertImpl.java deleted file mode 100644 index 54f2e9e..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/dealergoods/DealerGoodsConvertImpl.java +++ /dev/null @@ -1,149 +0,0 @@ -package cn.iocoder.yudao.module.basic.convert.dealergoods; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.basic.api.dealergoods.dto.DealerGoodsRespDTO; -import cn.iocoder.yudao.module.basic.controller.admin.dealergoods.vo.DealerGoodsCreateReqVO; -import cn.iocoder.yudao.module.basic.controller.admin.dealergoods.vo.DealerGoodsRespVO; -import cn.iocoder.yudao.module.basic.controller.admin.dealergoods.vo.DealerGoodsUpdateReqVO; -import cn.iocoder.yudao.module.basic.dal.dataobject.dealergoods.DealerGoodsDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:03:17+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class DealerGoodsConvertImpl implements DealerGoodsConvert { - - @Override - public DealerGoodsDO convert(DealerGoodsCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - DealerGoodsDO.DealerGoodsDOBuilder dealerGoodsDO = DealerGoodsDO.builder(); - - dealerGoodsDO.dealerId( bean.getDealerId() ); - dealerGoodsDO.dealerName( bean.getDealerName() ); - dealerGoodsDO.goodsId( bean.getGoodsId() ); - dealerGoodsDO.goodsName( bean.getGoodsName() ); - dealerGoodsDO.saleArea( bean.getSaleArea() ); - dealerGoodsDO.saleAreaId( bean.getSaleAreaId() ); - dealerGoodsDO.belongBusinessId( bean.getBelongBusinessId() ); - dealerGoodsDO.belongBusinessName( bean.getBelongBusinessName() ); - - return dealerGoodsDO.build(); - } - - @Override - public DealerGoodsDO convert(DealerGoodsUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - DealerGoodsDO.DealerGoodsDOBuilder dealerGoodsDO = DealerGoodsDO.builder(); - - dealerGoodsDO.id( bean.getId() ); - dealerGoodsDO.dealerId( bean.getDealerId() ); - dealerGoodsDO.dealerName( bean.getDealerName() ); - dealerGoodsDO.goodsId( bean.getGoodsId() ); - dealerGoodsDO.goodsName( bean.getGoodsName() ); - dealerGoodsDO.saleArea( bean.getSaleArea() ); - dealerGoodsDO.saleAreaId( bean.getSaleAreaId() ); - dealerGoodsDO.belongBusinessId( bean.getBelongBusinessId() ); - dealerGoodsDO.belongBusinessName( bean.getBelongBusinessName() ); - - return dealerGoodsDO.build(); - } - - @Override - public DealerGoodsRespVO convert(DealerGoodsDO bean) { - if ( bean == null ) { - return null; - } - - DealerGoodsRespVO dealerGoodsRespVO = new DealerGoodsRespVO(); - - dealerGoodsRespVO.setDealerId( bean.getDealerId() ); - dealerGoodsRespVO.setDealerName( bean.getDealerName() ); - dealerGoodsRespVO.setGoodsId( bean.getGoodsId() ); - dealerGoodsRespVO.setGoodsName( bean.getGoodsName() ); - dealerGoodsRespVO.setSaleArea( bean.getSaleArea() ); - dealerGoodsRespVO.setSaleAreaId( bean.getSaleAreaId() ); - dealerGoodsRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - dealerGoodsRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - dealerGoodsRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - dealerGoodsRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return dealerGoodsRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( DealerGoodsDO dealerGoodsDO : list ) { - list1.add( convert( dealerGoodsDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public DealerGoodsRespDTO convertToDTO(DealerGoodsDO bean) { - if ( bean == null ) { - return null; - } - - DealerGoodsRespDTO dealerGoodsRespDTO = new DealerGoodsRespDTO(); - - dealerGoodsRespDTO.setId( bean.getId() ); - dealerGoodsRespDTO.setDealerId( bean.getDealerId() ); - dealerGoodsRespDTO.setDealerName( bean.getDealerName() ); - dealerGoodsRespDTO.setGoodsId( bean.getGoodsId() ); - dealerGoodsRespDTO.setGoodsName( bean.getGoodsName() ); - dealerGoodsRespDTO.setSaleArea( bean.getSaleArea() ); - dealerGoodsRespDTO.setSaleAreaId( bean.getSaleAreaId() ); - dealerGoodsRespDTO.setBelongBusinessId( bean.getBelongBusinessId() ); - dealerGoodsRespDTO.setBelongBusinessName( bean.getBelongBusinessName() ); - - return dealerGoodsRespDTO; - } - - @Override - public List convertToDTOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( DealerGoodsDO dealerGoodsDO : list ) { - list1.add( convertToDTO( dealerGoodsDO ) ); - } - - return list1; - } -} diff --git a/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/dealerinfo/DealerInfoConvertImpl.java b/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/dealerinfo/DealerInfoConvertImpl.java deleted file mode 100644 index be0239c..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/dealerinfo/DealerInfoConvertImpl.java +++ /dev/null @@ -1,181 +0,0 @@ -package cn.iocoder.yudao.module.basic.convert.dealerinfo; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.basic.api.dealerinfo.dto.DealerInfoRespDTO; -import cn.iocoder.yudao.module.basic.api.redis.dto.DealerInfoDTO; -import cn.iocoder.yudao.module.basic.controller.admin.dealerinfo.vo.DealerInfoCreateReqVO; -import cn.iocoder.yudao.module.basic.controller.admin.dealerinfo.vo.DealerInfoRespVO; -import cn.iocoder.yudao.module.basic.controller.admin.dealerinfo.vo.DealerInfoUpdateReqVO; -import cn.iocoder.yudao.module.basic.dal.dataobject.dealerinfo.DealerInfoDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:03:17+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class DealerInfoConvertImpl implements DealerInfoConvert { - - @Override - public DealerInfoDO convert(DealerInfoCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - DealerInfoDO.DealerInfoDOBuilder dealerInfoDO = DealerInfoDO.builder(); - - dealerInfoDO.dealerName( bean.getDealerName() ); - dealerInfoDO.dealerId( bean.getDealerId() ); - dealerInfoDO.belongBusinessId( bean.getBelongBusinessId() ); - dealerInfoDO.belongBusinessName( bean.getBelongBusinessName() ); - dealerInfoDO.businessCode( bean.getBusinessCode() ); - dealerInfoDO.contactPhone( bean.getContactPhone() ); - dealerInfoDO.contactName( bean.getContactName() ); - dealerInfoDO.commonSaleArea( bean.getCommonSaleArea() ); - dealerInfoDO.commonSaleAreaId( bean.getCommonSaleAreaId() ); - dealerInfoDO.remarks( bean.getRemarks() ); - - return dealerInfoDO.build(); - } - - @Override - public DealerInfoDO convert(DealerInfoUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - DealerInfoDO.DealerInfoDOBuilder dealerInfoDO = DealerInfoDO.builder(); - - dealerInfoDO.id( bean.getId() ); - dealerInfoDO.dealerName( bean.getDealerName() ); - dealerInfoDO.dealerId( bean.getDealerId() ); - dealerInfoDO.belongBusinessId( bean.getBelongBusinessId() ); - dealerInfoDO.belongBusinessName( bean.getBelongBusinessName() ); - dealerInfoDO.businessCode( bean.getBusinessCode() ); - dealerInfoDO.contactPhone( bean.getContactPhone() ); - dealerInfoDO.contactName( bean.getContactName() ); - dealerInfoDO.commonSaleArea( bean.getCommonSaleArea() ); - dealerInfoDO.commonSaleAreaId( bean.getCommonSaleAreaId() ); - dealerInfoDO.remarks( bean.getRemarks() ); - - return dealerInfoDO.build(); - } - - @Override - public DealerInfoRespDTO convertToDTO(DealerInfoDO bean) { - if ( bean == null ) { - return null; - } - - DealerInfoRespDTO dealerInfoRespDTO = new DealerInfoRespDTO(); - - dealerInfoRespDTO.setId( bean.getId() ); - dealerInfoRespDTO.setDealerName( bean.getDealerName() ); - dealerInfoRespDTO.setDealerId( bean.getDealerId() ); - dealerInfoRespDTO.setBelongBusinessId( bean.getBelongBusinessId() ); - dealerInfoRespDTO.setBelongBusinessName( bean.getBelongBusinessName() ); - dealerInfoRespDTO.setBusinessCode( bean.getBusinessCode() ); - dealerInfoRespDTO.setContactPhone( bean.getContactPhone() ); - dealerInfoRespDTO.setContactName( bean.getContactName() ); - dealerInfoRespDTO.setCommonSaleArea( bean.getCommonSaleArea() ); - dealerInfoRespDTO.setCommonSaleAreaId( bean.getCommonSaleAreaId() ); - dealerInfoRespDTO.setRemarks( bean.getRemarks() ); - - return dealerInfoRespDTO; - } - - @Override - public DealerInfoRespVO convert(DealerInfoDO bean) { - if ( bean == null ) { - return null; - } - - DealerInfoRespVO dealerInfoRespVO = new DealerInfoRespVO(); - - dealerInfoRespVO.setDealerName( bean.getDealerName() ); - dealerInfoRespVO.setDealerId( bean.getDealerId() ); - dealerInfoRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - dealerInfoRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - dealerInfoRespVO.setBusinessCode( bean.getBusinessCode() ); - dealerInfoRespVO.setContactPhone( bean.getContactPhone() ); - dealerInfoRespVO.setContactName( bean.getContactName() ); - dealerInfoRespVO.setCommonSaleArea( bean.getCommonSaleArea() ); - dealerInfoRespVO.setCommonSaleAreaId( bean.getCommonSaleAreaId() ); - dealerInfoRespVO.setRemarks( bean.getRemarks() ); - dealerInfoRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - dealerInfoRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return dealerInfoRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( DealerInfoDO dealerInfoDO : list ) { - list1.add( convert( dealerInfoDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public DealerInfoDTO convertToDealerInfoDTO(DealerInfoDO dealerInfoDO) { - if ( dealerInfoDO == null ) { - return null; - } - - DealerInfoDTO.DealerInfoDTOBuilder dealerInfoDTO = DealerInfoDTO.builder(); - - dealerInfoDTO.id( dealerInfoDO.getId() ); - dealerInfoDTO.dealerName( dealerInfoDO.getDealerName() ); - dealerInfoDTO.dealerId( dealerInfoDO.getDealerId() ); - dealerInfoDTO.belongBusinessId( dealerInfoDO.getBelongBusinessId() ); - dealerInfoDTO.belongBusinessName( dealerInfoDO.getBelongBusinessName() ); - dealerInfoDTO.businessCode( dealerInfoDO.getBusinessCode() ); - dealerInfoDTO.contactPhone( dealerInfoDO.getContactPhone() ); - dealerInfoDTO.contactName( dealerInfoDO.getContactName() ); - dealerInfoDTO.commonSaleArea( dealerInfoDO.getCommonSaleArea() ); - dealerInfoDTO.commonSaleAreaId( dealerInfoDO.getCommonSaleAreaId() ); - dealerInfoDTO.remarks( dealerInfoDO.getRemarks() ); - - return dealerInfoDTO.build(); - } - - @Override - public List convertToDTOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( DealerInfoDO dealerInfoDO : list ) { - list1.add( convertToDealerInfoDTO( dealerInfoDO ) ); - } - - return list1; - } -} diff --git a/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/goodscategory/GoodsCategoryConvertImpl.java b/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/goodscategory/GoodsCategoryConvertImpl.java deleted file mode 100644 index 172c2ef..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/goodscategory/GoodsCategoryConvertImpl.java +++ /dev/null @@ -1,139 +0,0 @@ -package cn.iocoder.yudao.module.basic.convert.goodscategory; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.basic.controller.admin.goodscategory.vo.GoodsCategoryCreateReqVO; -import cn.iocoder.yudao.module.basic.controller.admin.goodscategory.vo.GoodsCategoryExcelVO; -import cn.iocoder.yudao.module.basic.controller.admin.goodscategory.vo.GoodsCategoryRespVO; -import cn.iocoder.yudao.module.basic.controller.admin.goodscategory.vo.GoodsCategoryUpdateReqVO; -import cn.iocoder.yudao.module.basic.dal.dataobject.goodscategory.GoodsCategoryDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:03:17+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class GoodsCategoryConvertImpl implements GoodsCategoryConvert { - - @Override - public GoodsCategoryDO convert(GoodsCategoryCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - GoodsCategoryDO.GoodsCategoryDOBuilder goodsCategoryDO = GoodsCategoryDO.builder(); - - goodsCategoryDO.name( bean.getName() ); - goodsCategoryDO.pid( bean.getPid() ); - goodsCategoryDO.parentIdPath( bean.getParentIdPath() ); - goodsCategoryDO.level( bean.getLevel() ); - goodsCategoryDO.sequence( bean.getSequence() ); - - return goodsCategoryDO.build(); - } - - @Override - public GoodsCategoryDO convert(GoodsCategoryUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - GoodsCategoryDO.GoodsCategoryDOBuilder goodsCategoryDO = GoodsCategoryDO.builder(); - - goodsCategoryDO.id( bean.getId() ); - goodsCategoryDO.name( bean.getName() ); - goodsCategoryDO.pid( bean.getPid() ); - goodsCategoryDO.parentIdPath( bean.getParentIdPath() ); - goodsCategoryDO.level( bean.getLevel() ); - goodsCategoryDO.sequence( bean.getSequence() ); - - return goodsCategoryDO.build(); - } - - @Override - public GoodsCategoryRespVO convert(GoodsCategoryDO bean) { - if ( bean == null ) { - return null; - } - - GoodsCategoryRespVO goodsCategoryRespVO = new GoodsCategoryRespVO(); - - goodsCategoryRespVO.setName( bean.getName() ); - goodsCategoryRespVO.setPid( bean.getPid() ); - goodsCategoryRespVO.setParentIdPath( bean.getParentIdPath() ); - goodsCategoryRespVO.setLevel( bean.getLevel() ); - goodsCategoryRespVO.setSequence( bean.getSequence() ); - goodsCategoryRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - goodsCategoryRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return goodsCategoryRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( GoodsCategoryDO goodsCategoryDO : list ) { - list1.add( convert( goodsCategoryDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( GoodsCategoryDO goodsCategoryDO : list ) { - list1.add( goodsCategoryDOToGoodsCategoryExcelVO( goodsCategoryDO ) ); - } - - return list1; - } - - protected GoodsCategoryExcelVO goodsCategoryDOToGoodsCategoryExcelVO(GoodsCategoryDO goodsCategoryDO) { - if ( goodsCategoryDO == null ) { - return null; - } - - GoodsCategoryExcelVO goodsCategoryExcelVO = new GoodsCategoryExcelVO(); - - goodsCategoryExcelVO.setId( goodsCategoryDO.getId() ); - goodsCategoryExcelVO.setName( goodsCategoryDO.getName() ); - goodsCategoryExcelVO.setPid( goodsCategoryDO.getPid() ); - goodsCategoryExcelVO.setParentIdPath( goodsCategoryDO.getParentIdPath() ); - goodsCategoryExcelVO.setLevel( goodsCategoryDO.getLevel() ); - goodsCategoryExcelVO.setSequence( goodsCategoryDO.getSequence() ); - if ( goodsCategoryDO.getCreateTime() != null ) { - goodsCategoryExcelVO.setCreateTime( Date.from( goodsCategoryDO.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return goodsCategoryExcelVO; - } -} diff --git a/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/goodsinfo/GoodsInfoConvertImpl.java b/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/goodsinfo/GoodsInfoConvertImpl.java deleted file mode 100644 index 6920690..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/goodsinfo/GoodsInfoConvertImpl.java +++ /dev/null @@ -1,204 +0,0 @@ -package cn.iocoder.yudao.module.basic.convert.goodsinfo; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.basic.api.goodsinfo.dto.GoodsInfoRespDTO; -import cn.iocoder.yudao.module.basic.api.redis.dto.GoodsInfoDTO; -import cn.iocoder.yudao.module.basic.controller.admin.goodsinfo.vo.GoodsInfoCreateReqVO; -import cn.iocoder.yudao.module.basic.controller.admin.goodsinfo.vo.GoodsInfoRespVO; -import cn.iocoder.yudao.module.basic.controller.admin.goodsinfo.vo.GoodsInfoUpdateReqVO; -import cn.iocoder.yudao.module.basic.dal.dataobject.goodsinfo.GoodsInfoDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:03:17+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class GoodsInfoConvertImpl implements GoodsInfoConvert { - - @Override - public GoodsInfoDO convert(GoodsInfoCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - GoodsInfoDO.GoodsInfoDOBuilder goodsInfoDO = GoodsInfoDO.builder(); - - goodsInfoDO.goodsName( bean.getGoodsName() ); - goodsInfoDO.goodsId( bean.getGoodsId() ); - goodsInfoDO.goodsType( bean.getGoodsType() ); - goodsInfoDO.goodsTypeId( bean.getGoodsTypeId() ); - goodsInfoDO.isBaseUnit( bean.getIsBaseUnit() ); - goodsInfoDO.goodsUnitId( bean.getGoodsUnitId() ); - goodsInfoDO.goodsSpecs( bean.getGoodsSpecs() ); - goodsInfoDO.conversionValue( bean.getConversionValue() ); - goodsInfoDO.goodsRemarks( bean.getGoodsRemarks() ); - goodsInfoDO.goodsImgUrl( bean.getGoodsImgUrl() ); - goodsInfoDO.shelfLife( bean.getShelfLife() ); - goodsInfoDO.belongBusinessId( bean.getBelongBusinessId() ); - goodsInfoDO.belongBusinessName( bean.getBelongBusinessName() ); - - return goodsInfoDO.build(); - } - - @Override - public GoodsInfoDO convert(GoodsInfoUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - GoodsInfoDO.GoodsInfoDOBuilder goodsInfoDO = GoodsInfoDO.builder(); - - goodsInfoDO.id( bean.getId() ); - goodsInfoDO.goodsName( bean.getGoodsName() ); - goodsInfoDO.goodsId( bean.getGoodsId() ); - goodsInfoDO.goodsType( bean.getGoodsType() ); - goodsInfoDO.goodsTypeId( bean.getGoodsTypeId() ); - goodsInfoDO.isBaseUnit( bean.getIsBaseUnit() ); - goodsInfoDO.goodsUnitId( bean.getGoodsUnitId() ); - goodsInfoDO.goodsSpecs( bean.getGoodsSpecs() ); - goodsInfoDO.conversionValue( bean.getConversionValue() ); - goodsInfoDO.goodsRemarks( bean.getGoodsRemarks() ); - goodsInfoDO.goodsImgUrl( bean.getGoodsImgUrl() ); - goodsInfoDO.shelfLife( bean.getShelfLife() ); - goodsInfoDO.belongBusinessId( bean.getBelongBusinessId() ); - goodsInfoDO.belongBusinessName( bean.getBelongBusinessName() ); - - return goodsInfoDO.build(); - } - - @Override - public GoodsInfoRespVO convert(GoodsInfoDO bean) { - if ( bean == null ) { - return null; - } - - GoodsInfoRespVO goodsInfoRespVO = new GoodsInfoRespVO(); - - goodsInfoRespVO.setGoodsName( bean.getGoodsName() ); - goodsInfoRespVO.setGoodsId( bean.getGoodsId() ); - goodsInfoRespVO.setGoodsType( bean.getGoodsType() ); - goodsInfoRespVO.setGoodsTypeId( bean.getGoodsTypeId() ); - goodsInfoRespVO.setIsBaseUnit( bean.getIsBaseUnit() ); - goodsInfoRespVO.setGoodsUnitId( bean.getGoodsUnitId() ); - goodsInfoRespVO.setGoodsSpecs( bean.getGoodsSpecs() ); - goodsInfoRespVO.setConversionValue( bean.getConversionValue() ); - goodsInfoRespVO.setGoodsRemarks( bean.getGoodsRemarks() ); - goodsInfoRespVO.setGoodsImgUrl( bean.getGoodsImgUrl() ); - goodsInfoRespVO.setShelfLife( bean.getShelfLife() ); - goodsInfoRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - goodsInfoRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - goodsInfoRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - goodsInfoRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - goodsInfoRespVO.setGoodsUnitName( bean.getGoodsUnitName() ); - - return goodsInfoRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( GoodsInfoDO goodsInfoDO : list ) { - list1.add( convert( goodsInfoDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertToDTOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( GoodsInfoDO goodsInfoDO : list ) { - list1.add( goodsInfoDOToGoodsInfoRespDTO( goodsInfoDO ) ); - } - - return list1; - } - - @Override - public GoodsInfoDTO convertToDTO(GoodsInfoDO bean) { - if ( bean == null ) { - return null; - } - - GoodsInfoDTO.GoodsInfoDTOBuilder goodsInfoDTO = GoodsInfoDTO.builder(); - - goodsInfoDTO.id( bean.getId() ); - goodsInfoDTO.goodsName( bean.getGoodsName() ); - goodsInfoDTO.goodsId( bean.getGoodsId() ); - goodsInfoDTO.goodsType( bean.getGoodsType() ); - goodsInfoDTO.goodsTypeId( bean.getGoodsTypeId() ); - goodsInfoDTO.goodsSpecs( bean.getGoodsSpecs() ); - goodsInfoDTO.goodsRemarks( bean.getGoodsRemarks() ); - goodsInfoDTO.goodsImgUrl( bean.getGoodsImgUrl() ); - goodsInfoDTO.shelfLife( bean.getShelfLife() ); - goodsInfoDTO.belongBusinessId( bean.getBelongBusinessId() ); - goodsInfoDTO.belongBusinessName( bean.getBelongBusinessName() ); - - return goodsInfoDTO.build(); - } - - @Override - public List convertToGoodsInfoDTOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( GoodsInfoDO goodsInfoDO : list ) { - list1.add( convertToDTO( goodsInfoDO ) ); - } - - return list1; - } - - protected GoodsInfoRespDTO goodsInfoDOToGoodsInfoRespDTO(GoodsInfoDO goodsInfoDO) { - if ( goodsInfoDO == null ) { - return null; - } - - GoodsInfoRespDTO goodsInfoRespDTO = new GoodsInfoRespDTO(); - - goodsInfoRespDTO.setId( goodsInfoDO.getId() ); - goodsInfoRespDTO.setGoodsName( goodsInfoDO.getGoodsName() ); - goodsInfoRespDTO.setGoodsId( goodsInfoDO.getGoodsId() ); - goodsInfoRespDTO.setGoodsType( goodsInfoDO.getGoodsType() ); - goodsInfoRespDTO.setGoodsTypeId( goodsInfoDO.getGoodsTypeId() ); - goodsInfoRespDTO.setGoodsSpecs( goodsInfoDO.getGoodsSpecs() ); - goodsInfoRespDTO.setGoodsRemarks( goodsInfoDO.getGoodsRemarks() ); - goodsInfoRespDTO.setGoodsImgUrl( goodsInfoDO.getGoodsImgUrl() ); - goodsInfoRespDTO.setShelfLife( goodsInfoDO.getShelfLife() ); - goodsInfoRespDTO.setBelongBusinessId( goodsInfoDO.getBelongBusinessId() ); - goodsInfoRespDTO.setBelongBusinessName( goodsInfoDO.getBelongBusinessName() ); - - return goodsInfoRespDTO; - } -} diff --git a/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/goodsinputrelational/GoodsInputRelationalConvertImpl.java b/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/goodsinputrelational/GoodsInputRelationalConvertImpl.java deleted file mode 100644 index 7e33caa..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/goodsinputrelational/GoodsInputRelationalConvertImpl.java +++ /dev/null @@ -1,11 +0,0 @@ -package cn.iocoder.yudao.module.basic.convert.goodsinputrelational; - -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:03:17+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class GoodsInputRelationalConvertImpl implements GoodsInputRelationalConvert { -} diff --git a/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/goodsverify/GoodsVerifyConvertImpl.java b/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/goodsverify/GoodsVerifyConvertImpl.java deleted file mode 100644 index 48b6279..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/goodsverify/GoodsVerifyConvertImpl.java +++ /dev/null @@ -1,156 +0,0 @@ -package cn.iocoder.yudao.module.basic.convert.goodsverify; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.basic.api.goodsverify.dto.GoodsVerifyRespDTO; -import cn.iocoder.yudao.module.basic.controller.admin.goodsverify.vo.GoodsVerifyCreateReqVO; -import cn.iocoder.yudao.module.basic.controller.admin.goodsverify.vo.GoodsVerifyRespVO; -import cn.iocoder.yudao.module.basic.controller.admin.goodsverify.vo.GoodsVerifyUpdateReqVO; -import cn.iocoder.yudao.module.basic.dal.dataobject.goodsverify.GoodsVerifyDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:03:17+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class GoodsVerifyConvertImpl implements GoodsVerifyConvert { - - @Override - public GoodsVerifyDO convert(GoodsVerifyCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - GoodsVerifyDO.GoodsVerifyDOBuilder goodsVerifyDO = GoodsVerifyDO.builder(); - - goodsVerifyDO.goodsName( bean.getGoodsName() ); - goodsVerifyDO.goodsId( bean.getGoodsId() ); - goodsVerifyDO.verifyName( bean.getVerifyName() ); - goodsVerifyDO.verifyAgencies( bean.getVerifyAgencies() ); - goodsVerifyDO.verifyStartTime( bean.getVerifyStartTime() ); - goodsVerifyDO.verifyEndTime( bean.getVerifyEndTime() ); - goodsVerifyDO.verifyDataUrl( bean.getVerifyDataUrl() ); - goodsVerifyDO.verifyIsForver( bean.getVerifyIsForver() ); - goodsVerifyDO.belongBusinessId( bean.getBelongBusinessId() ); - goodsVerifyDO.belongBusinessName( bean.getBelongBusinessName() ); - - return goodsVerifyDO.build(); - } - - @Override - public GoodsVerifyDO convert(GoodsVerifyUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - GoodsVerifyDO.GoodsVerifyDOBuilder goodsVerifyDO = GoodsVerifyDO.builder(); - - goodsVerifyDO.id( bean.getId() ); - goodsVerifyDO.goodsName( bean.getGoodsName() ); - goodsVerifyDO.goodsId( bean.getGoodsId() ); - goodsVerifyDO.verifyName( bean.getVerifyName() ); - goodsVerifyDO.verifyAgencies( bean.getVerifyAgencies() ); - goodsVerifyDO.verifyStartTime( bean.getVerifyStartTime() ); - goodsVerifyDO.verifyEndTime( bean.getVerifyEndTime() ); - goodsVerifyDO.verifyDataUrl( bean.getVerifyDataUrl() ); - goodsVerifyDO.verifyIsForver( bean.getVerifyIsForver() ); - goodsVerifyDO.belongBusinessId( bean.getBelongBusinessId() ); - goodsVerifyDO.belongBusinessName( bean.getBelongBusinessName() ); - - return goodsVerifyDO.build(); - } - - @Override - public GoodsVerifyRespVO convert(GoodsVerifyDO bean) { - if ( bean == null ) { - return null; - } - - GoodsVerifyRespVO goodsVerifyRespVO = new GoodsVerifyRespVO(); - - goodsVerifyRespVO.setGoodsName( bean.getGoodsName() ); - goodsVerifyRespVO.setGoodsId( bean.getGoodsId() ); - goodsVerifyRespVO.setVerifyName( bean.getVerifyName() ); - goodsVerifyRespVO.setVerifyAgencies( bean.getVerifyAgencies() ); - goodsVerifyRespVO.setVerifyStartTime( bean.getVerifyStartTime() ); - goodsVerifyRespVO.setVerifyEndTime( bean.getVerifyEndTime() ); - goodsVerifyRespVO.setVerifyDataUrl( bean.getVerifyDataUrl() ); - goodsVerifyRespVO.setVerifyIsForver( bean.getVerifyIsForver() ); - goodsVerifyRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - goodsVerifyRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - goodsVerifyRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - goodsVerifyRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return goodsVerifyRespVO; - } - - @Override - public List convertToDTOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( GoodsVerifyDO goodsVerifyDO : list ) { - list1.add( goodsVerifyDOToGoodsVerifyRespDTO( goodsVerifyDO ) ); - } - - return list1; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( GoodsVerifyDO goodsVerifyDO : list ) { - list1.add( convert( goodsVerifyDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - protected GoodsVerifyRespDTO goodsVerifyDOToGoodsVerifyRespDTO(GoodsVerifyDO goodsVerifyDO) { - if ( goodsVerifyDO == null ) { - return null; - } - - GoodsVerifyRespDTO goodsVerifyRespDTO = new GoodsVerifyRespDTO(); - - goodsVerifyRespDTO.setId( goodsVerifyDO.getId() ); - goodsVerifyRespDTO.setGoodsName( goodsVerifyDO.getGoodsName() ); - goodsVerifyRespDTO.setGoodsId( goodsVerifyDO.getGoodsId() ); - goodsVerifyRespDTO.setVerifyName( goodsVerifyDO.getVerifyName() ); - goodsVerifyRespDTO.setVerifyAgencies( goodsVerifyDO.getVerifyAgencies() ); - goodsVerifyRespDTO.setVerifyStartTime( goodsVerifyDO.getVerifyStartTime() ); - goodsVerifyRespDTO.setVerifyEndTime( goodsVerifyDO.getVerifyEndTime() ); - goodsVerifyRespDTO.setVerifyDataUrl( goodsVerifyDO.getVerifyDataUrl() ); - goodsVerifyRespDTO.setVerifyIsForver( goodsVerifyDO.getVerifyIsForver() ); - goodsVerifyRespDTO.setBelongBusinessId( goodsVerifyDO.getBelongBusinessId() ); - goodsVerifyRespDTO.setBelongBusinessName( goodsVerifyDO.getBelongBusinessName() ); - - return goodsVerifyRespDTO; - } -} diff --git a/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/inputsinfo/InputsInfoConvertImpl.java b/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/inputsinfo/InputsInfoConvertImpl.java deleted file mode 100644 index 680744f..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/inputsinfo/InputsInfoConvertImpl.java +++ /dev/null @@ -1,194 +0,0 @@ -package cn.iocoder.yudao.module.basic.convert.inputsinfo; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.basic.api.goodsinputrelational.dto.InputInfoRelationalRespDTO; -import cn.iocoder.yudao.module.basic.api.inputsinfo.dto.InputsInfoRespDTO; -import cn.iocoder.yudao.module.basic.controller.admin.inputsinfo.vo.InputsInfoCreateReqVO; -import cn.iocoder.yudao.module.basic.controller.admin.inputsinfo.vo.InputsInfoRespVO; -import cn.iocoder.yudao.module.basic.controller.admin.inputsinfo.vo.InputsInfoUpdateReqVO; -import cn.iocoder.yudao.module.basic.dal.dataobject.inputsinfo.InputsInfoDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:03:17+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class InputsInfoConvertImpl implements InputsInfoConvert { - - @Override - public InputsInfoDO convert(InputsInfoCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - InputsInfoDO.InputsInfoDOBuilder inputsInfoDO = InputsInfoDO.builder(); - - inputsInfoDO.inputsName( bean.getInputsName() ); - inputsInfoDO.inputsId( bean.getInputsId() ); - inputsInfoDO.isBaseUnit( bean.getIsBaseUnit() ); - inputsInfoDO.inputsUnitId( bean.getInputsUnitId() ); - inputsInfoDO.inputsSpecs( bean.getInputsSpecs() ); - inputsInfoDO.conversionValue( bean.getConversionValue() ); - inputsInfoDO.inputsRemarks( bean.getInputsRemarks() ); - inputsInfoDO.inputsPhotoUrl( bean.getInputsPhotoUrl() ); - inputsInfoDO.shelfLife( bean.getShelfLife() ); - inputsInfoDO.belongBusinessId( bean.getBelongBusinessId() ); - inputsInfoDO.belongBusinessName( bean.getBelongBusinessName() ); - - return inputsInfoDO.build(); - } - - @Override - public InputsInfoDO convert(InputsInfoUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - InputsInfoDO.InputsInfoDOBuilder inputsInfoDO = InputsInfoDO.builder(); - - inputsInfoDO.id( bean.getId() ); - inputsInfoDO.inputsName( bean.getInputsName() ); - inputsInfoDO.inputsId( bean.getInputsId() ); - inputsInfoDO.isBaseUnit( bean.getIsBaseUnit() ); - inputsInfoDO.inputsUnitId( bean.getInputsUnitId() ); - inputsInfoDO.inputsSpecs( bean.getInputsSpecs() ); - inputsInfoDO.conversionValue( bean.getConversionValue() ); - inputsInfoDO.inputsRemarks( bean.getInputsRemarks() ); - inputsInfoDO.inputsPhotoUrl( bean.getInputsPhotoUrl() ); - inputsInfoDO.shelfLife( bean.getShelfLife() ); - inputsInfoDO.belongBusinessId( bean.getBelongBusinessId() ); - inputsInfoDO.belongBusinessName( bean.getBelongBusinessName() ); - - return inputsInfoDO.build(); - } - - @Override - public InputsInfoRespVO convert(InputsInfoDO bean) { - if ( bean == null ) { - return null; - } - - InputsInfoRespVO inputsInfoRespVO = new InputsInfoRespVO(); - - inputsInfoRespVO.setInputsName( bean.getInputsName() ); - inputsInfoRespVO.setInputsId( bean.getInputsId() ); - inputsInfoRespVO.setIsBaseUnit( bean.getIsBaseUnit() ); - inputsInfoRespVO.setInputsUnitId( bean.getInputsUnitId() ); - inputsInfoRespVO.setInputsSpecs( bean.getInputsSpecs() ); - inputsInfoRespVO.setConversionValue( bean.getConversionValue() ); - inputsInfoRespVO.setInputsRemarks( bean.getInputsRemarks() ); - inputsInfoRespVO.setInputsPhotoUrl( bean.getInputsPhotoUrl() ); - inputsInfoRespVO.setShelfLife( bean.getShelfLife() ); - inputsInfoRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - inputsInfoRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - inputsInfoRespVO.setId( bean.getId() ); - inputsInfoRespVO.setInputsUnitName( bean.getInputsUnitName() ); - if ( bean.getCreateTime() != null ) { - inputsInfoRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return inputsInfoRespVO; - } - - @Override - public List convertToDTOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( InputsInfoDO inputsInfoDO : list ) { - list1.add( convertToDTO( inputsInfoDO ) ); - } - - return list1; - } - - @Override - public InputsInfoRespDTO convertToDTO(InputsInfoDO bean) { - if ( bean == null ) { - return null; - } - - InputsInfoRespDTO inputsInfoRespDTO = new InputsInfoRespDTO(); - - inputsInfoRespDTO.setId( bean.getId() ); - inputsInfoRespDTO.setInputsName( bean.getInputsName() ); - inputsInfoRespDTO.setInputsId( bean.getInputsId() ); - inputsInfoRespDTO.setInputsSpecs( bean.getInputsSpecs() ); - inputsInfoRespDTO.setInputsRemarks( bean.getInputsRemarks() ); - inputsInfoRespDTO.setInputsPhotoUrl( bean.getInputsPhotoUrl() ); - inputsInfoRespDTO.setShelfLife( bean.getShelfLife() ); - inputsInfoRespDTO.setBelongBusinessId( bean.getBelongBusinessId() ); - inputsInfoRespDTO.setBelongBusinessName( bean.getBelongBusinessName() ); - - return inputsInfoRespDTO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( InputsInfoDO inputsInfoDO : list ) { - list1.add( convert( inputsInfoDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertRelationalRespList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( InputsInfoDO inputsInfoDO : list ) { - list1.add( inputsInfoDOToInputInfoRelationalRespDTO( inputsInfoDO ) ); - } - - return list1; - } - - protected InputInfoRelationalRespDTO inputsInfoDOToInputInfoRelationalRespDTO(InputsInfoDO inputsInfoDO) { - if ( inputsInfoDO == null ) { - return null; - } - - InputInfoRelationalRespDTO inputInfoRelationalRespDTO = new InputInfoRelationalRespDTO(); - - inputInfoRelationalRespDTO.setId( inputsInfoDO.getId() ); - inputInfoRelationalRespDTO.setInputsName( inputsInfoDO.getInputsName() ); - inputInfoRelationalRespDTO.setInputsId( inputsInfoDO.getInputsId() ); - inputInfoRelationalRespDTO.setInputsSpecs( inputsInfoDO.getInputsSpecs() ); - inputInfoRelationalRespDTO.setInputsRemarks( inputsInfoDO.getInputsRemarks() ); - inputInfoRelationalRespDTO.setInputsPhotoUrl( inputsInfoDO.getInputsPhotoUrl() ); - inputInfoRelationalRespDTO.setShelfLife( inputsInfoDO.getShelfLife() ); - inputInfoRelationalRespDTO.setBelongBusinessId( inputsInfoDO.getBelongBusinessId() ); - inputInfoRelationalRespDTO.setBelongBusinessName( inputsInfoDO.getBelongBusinessName() ); - - return inputInfoRelationalRespDTO; - } -} diff --git a/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/unit/UnitConvertImpl.java b/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/unit/UnitConvertImpl.java deleted file mode 100644 index dba8819..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/unit/UnitConvertImpl.java +++ /dev/null @@ -1,123 +0,0 @@ -package cn.iocoder.yudao.module.basic.convert.unit; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.basic.controller.admin.unit.vo.UnitCreateReqVO; -import cn.iocoder.yudao.module.basic.controller.admin.unit.vo.UnitExcelVO; -import cn.iocoder.yudao.module.basic.controller.admin.unit.vo.UnitRespVO; -import cn.iocoder.yudao.module.basic.controller.admin.unit.vo.UnitUpdateReqVO; -import cn.iocoder.yudao.module.basic.dal.dataobject.unit.UnitDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:03:17+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class UnitConvertImpl implements UnitConvert { - - @Override - public UnitDO convert(UnitCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - UnitDO.UnitDOBuilder unitDO = UnitDO.builder(); - - unitDO.unitName( bean.getUnitName() ); - - return unitDO.build(); - } - - @Override - public UnitDO convert(UnitUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - UnitDO.UnitDOBuilder unitDO = UnitDO.builder(); - - unitDO.id( bean.getId() ); - unitDO.unitName( bean.getUnitName() ); - - return unitDO.build(); - } - - @Override - public UnitRespVO convert(UnitDO bean) { - if ( bean == null ) { - return null; - } - - UnitRespVO unitRespVO = new UnitRespVO(); - - unitRespVO.setUnitName( bean.getUnitName() ); - unitRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - unitRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return unitRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( UnitDO unitDO : list ) { - list1.add( convert( unitDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( UnitDO unitDO : list ) { - list1.add( unitDOToUnitExcelVO( unitDO ) ); - } - - return list1; - } - - protected UnitExcelVO unitDOToUnitExcelVO(UnitDO unitDO) { - if ( unitDO == null ) { - return null; - } - - UnitExcelVO unitExcelVO = new UnitExcelVO(); - - unitExcelVO.setId( unitDO.getId() ); - unitExcelVO.setUnitName( unitDO.getUnitName() ); - if ( unitDO.getCreateTime() != null ) { - unitExcelVO.setCreateTime( Date.from( unitDO.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return unitExcelVO; - } -} diff --git a/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/vendorinfo/VendorInfoConvertImpl.java b/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/vendorinfo/VendorInfoConvertImpl.java deleted file mode 100644 index db1903f..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/vendorinfo/VendorInfoConvertImpl.java +++ /dev/null @@ -1,194 +0,0 @@ -package cn.iocoder.yudao.module.basic.convert.vendorinfo; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.basic.api.vendorinfo.dto.VendorInfoRespDTO; -import cn.iocoder.yudao.module.basic.controller.admin.vendorinfo.vo.VendorInfoCreateReqVO; -import cn.iocoder.yudao.module.basic.controller.admin.vendorinfo.vo.VendorInfoOfOptionsRespVO; -import cn.iocoder.yudao.module.basic.controller.admin.vendorinfo.vo.VendorInfoRespVO; -import cn.iocoder.yudao.module.basic.controller.admin.vendorinfo.vo.VendorInfoUpdateReqVO; -import cn.iocoder.yudao.module.basic.dal.dataobject.vendorinfo.VendorInfoDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:03:17+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class VendorInfoConvertImpl implements VendorInfoConvert { - - @Override - public VendorInfoDO convert(VendorInfoCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - VendorInfoDO.VendorInfoDOBuilder vendorInfoDO = VendorInfoDO.builder(); - - vendorInfoDO.vendorName( bean.getVendorName() ); - vendorInfoDO.vendorId( bean.getVendorId() ); - vendorInfoDO.vendorType( bean.getVendorType() ); - vendorInfoDO.belongBusinessId( bean.getBelongBusinessId() ); - vendorInfoDO.belongBusinessName( bean.getBelongBusinessName() ); - vendorInfoDO.remarks( bean.getRemarks() ); - vendorInfoDO.businessCode( bean.getBusinessCode() ); - vendorInfoDO.contactPhone( bean.getContactPhone() ); - vendorInfoDO.contactName( bean.getContactName() ); - vendorInfoDO.area( bean.getArea() ); - vendorInfoDO.realName( bean.getRealName() ); - vendorInfoDO.idCard( bean.getIdCard() ); - - return vendorInfoDO.build(); - } - - @Override - public VendorInfoDO convert(VendorInfoUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - VendorInfoDO.VendorInfoDOBuilder vendorInfoDO = VendorInfoDO.builder(); - - vendorInfoDO.id( bean.getId() ); - vendorInfoDO.vendorName( bean.getVendorName() ); - vendorInfoDO.vendorId( bean.getVendorId() ); - vendorInfoDO.vendorType( bean.getVendorType() ); - vendorInfoDO.belongBusinessId( bean.getBelongBusinessId() ); - vendorInfoDO.belongBusinessName( bean.getBelongBusinessName() ); - vendorInfoDO.remarks( bean.getRemarks() ); - vendorInfoDO.businessCode( bean.getBusinessCode() ); - vendorInfoDO.contactPhone( bean.getContactPhone() ); - vendorInfoDO.contactName( bean.getContactName() ); - vendorInfoDO.area( bean.getArea() ); - vendorInfoDO.realName( bean.getRealName() ); - vendorInfoDO.idCard( bean.getIdCard() ); - - return vendorInfoDO.build(); - } - - @Override - public VendorInfoRespVO convert(VendorInfoDO bean) { - if ( bean == null ) { - return null; - } - - VendorInfoRespVO vendorInfoRespVO = new VendorInfoRespVO(); - - vendorInfoRespVO.setVendorName( bean.getVendorName() ); - vendorInfoRespVO.setVendorId( bean.getVendorId() ); - vendorInfoRespVO.setVendorType( bean.getVendorType() ); - vendorInfoRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - vendorInfoRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - vendorInfoRespVO.setRemarks( bean.getRemarks() ); - vendorInfoRespVO.setBusinessCode( bean.getBusinessCode() ); - vendorInfoRespVO.setContactPhone( bean.getContactPhone() ); - vendorInfoRespVO.setContactName( bean.getContactName() ); - vendorInfoRespVO.setArea( bean.getArea() ); - vendorInfoRespVO.setRealName( bean.getRealName() ); - vendorInfoRespVO.setIdCard( bean.getIdCard() ); - vendorInfoRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - vendorInfoRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return vendorInfoRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( VendorInfoDO vendorInfoDO : list ) { - list1.add( convert( vendorInfoDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertToOptionsList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( VendorInfoDO vendorInfoDO : list ) { - list1.add( vendorInfoDOToVendorInfoOfOptionsRespVO( vendorInfoDO ) ); - } - - return list1; - } - - @Override - public VendorInfoRespDTO convertToDTO(VendorInfoDO bean) { - if ( bean == null ) { - return null; - } - - VendorInfoRespDTO vendorInfoRespDTO = new VendorInfoRespDTO(); - - vendorInfoRespDTO.setId( bean.getId() ); - vendorInfoRespDTO.setVendorName( bean.getVendorName() ); - vendorInfoRespDTO.setVendorId( bean.getVendorId() ); - vendorInfoRespDTO.setVendorType( bean.getVendorType() ); - vendorInfoRespDTO.setBelongBusinessId( bean.getBelongBusinessId() ); - vendorInfoRespDTO.setBelongBusinessName( bean.getBelongBusinessName() ); - vendorInfoRespDTO.setRemarks( bean.getRemarks() ); - vendorInfoRespDTO.setBusinessCode( bean.getBusinessCode() ); - vendorInfoRespDTO.setContactPhone( bean.getContactPhone() ); - vendorInfoRespDTO.setContactName( bean.getContactName() ); - vendorInfoRespDTO.setArea( bean.getArea() ); - vendorInfoRespDTO.setRealName( bean.getRealName() ); - vendorInfoRespDTO.setIdCard( bean.getIdCard() ); - - return vendorInfoRespDTO; - } - - @Override - public List convertToDTOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( VendorInfoDO vendorInfoDO : list ) { - list1.add( convertToDTO( vendorInfoDO ) ); - } - - return list1; - } - - protected VendorInfoOfOptionsRespVO vendorInfoDOToVendorInfoOfOptionsRespVO(VendorInfoDO vendorInfoDO) { - if ( vendorInfoDO == null ) { - return null; - } - - VendorInfoOfOptionsRespVO vendorInfoOfOptionsRespVO = new VendorInfoOfOptionsRespVO(); - - vendorInfoOfOptionsRespVO.setVendorName( vendorInfoDO.getVendorName() ); - vendorInfoOfOptionsRespVO.setVendorId( vendorInfoDO.getVendorId() ); - vendorInfoOfOptionsRespVO.setBelongBusinessId( vendorInfoDO.getBelongBusinessId() ); - - return vendorInfoOfOptionsRespVO; - } -} diff --git a/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/workersinfo/WorkersInfoConvertImpl.java b/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/workersinfo/WorkersInfoConvertImpl.java deleted file mode 100644 index e7990b9..0000000 --- a/yudao-module-basic/yudao-module-basic-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/basic/convert/workersinfo/WorkersInfoConvertImpl.java +++ /dev/null @@ -1,130 +0,0 @@ -package cn.iocoder.yudao.module.basic.convert.workersinfo; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.basic.api.workersinfo.dto.WorkersInfoRespDTO; -import cn.iocoder.yudao.module.basic.controller.admin.workersinfo.vo.WorkersInfoCreateReqVO; -import cn.iocoder.yudao.module.basic.controller.admin.workersinfo.vo.WorkersInfoRespVO; -import cn.iocoder.yudao.module.basic.controller.admin.workersinfo.vo.WorkersInfoUpdateReqVO; -import cn.iocoder.yudao.module.basic.dal.dataobject.workersinfo.WorkersInfoDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:03:17+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class WorkersInfoConvertImpl implements WorkersInfoConvert { - - @Override - public WorkersInfoDO convert(WorkersInfoCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - WorkersInfoDO.WorkersInfoDOBuilder workersInfoDO = WorkersInfoDO.builder(); - - workersInfoDO.workersName( bean.getWorkersName() ); - workersInfoDO.workersCode( bean.getWorkersCode() ); - workersInfoDO.belongBusinessId( bean.getBelongBusinessId() ); - workersInfoDO.belongBusinessName( bean.getBelongBusinessName() ); - workersInfoDO.contactPhone( bean.getContactPhone() ); - workersInfoDO.remarks( bean.getRemarks() ); - workersInfoDO.openid( bean.getOpenid() ); - - return workersInfoDO.build(); - } - - @Override - public WorkersInfoDO convert(WorkersInfoUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - WorkersInfoDO.WorkersInfoDOBuilder workersInfoDO = WorkersInfoDO.builder(); - - workersInfoDO.id( bean.getId() ); - workersInfoDO.workersName( bean.getWorkersName() ); - workersInfoDO.workersCode( bean.getWorkersCode() ); - workersInfoDO.belongBusinessId( bean.getBelongBusinessId() ); - workersInfoDO.belongBusinessName( bean.getBelongBusinessName() ); - workersInfoDO.contactPhone( bean.getContactPhone() ); - workersInfoDO.remarks( bean.getRemarks() ); - workersInfoDO.openid( bean.getOpenid() ); - - return workersInfoDO.build(); - } - - @Override - public WorkersInfoRespVO convert(WorkersInfoDO bean) { - if ( bean == null ) { - return null; - } - - WorkersInfoRespVO workersInfoRespVO = new WorkersInfoRespVO(); - - workersInfoRespVO.setWorkersName( bean.getWorkersName() ); - workersInfoRespVO.setWorkersCode( bean.getWorkersCode() ); - workersInfoRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - workersInfoRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - workersInfoRespVO.setContactPhone( bean.getContactPhone() ); - workersInfoRespVO.setRemarks( bean.getRemarks() ); - workersInfoRespVO.setOpenid( bean.getOpenid() ); - workersInfoRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - workersInfoRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return workersInfoRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( WorkersInfoDO workersInfoDO : list ) { - list1.add( convert( workersInfoDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public WorkersInfoRespDTO convertToDTO(WorkersInfoDO bean) { - if ( bean == null ) { - return null; - } - - WorkersInfoRespDTO workersInfoRespDTO = new WorkersInfoRespDTO(); - - workersInfoRespDTO.setId( bean.getId() ); - workersInfoRespDTO.setWorkersName( bean.getWorkersName() ); - workersInfoRespDTO.setWorkersCode( bean.getWorkersCode() ); - workersInfoRespDTO.setBelongBusinessId( bean.getBelongBusinessId() ); - workersInfoRespDTO.setBelongBusinessName( bean.getBelongBusinessName() ); - workersInfoRespDTO.setContactPhone( bean.getContactPhone() ); - workersInfoRespDTO.setRemarks( bean.getRemarks() ); - - return workersInfoRespDTO; - } -} diff --git a/yudao-module-chain/yudao-module-chain-biz/target/classes/bootstrap-local.yaml b/yudao-module-chain/yudao-module-chain-biz/target/classes/bootstrap-local.yaml deleted file mode 100644 index fe4d3a5..0000000 --- a/yudao-module-chain/yudao-module-chain-biz/target/classes/bootstrap-local.yaml +++ /dev/null @@ -1,31 +0,0 @@ -spring: - main: - allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 - allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Dubbo 或者 Feign 等会存在重复定义的服务 - ---- #################### 注册中心相关配置 #################### - -spring: - cloud: - nacos: - server-addr: 192.168.233.128:8848 - discovery: - namespace: dev # 命名空间。这里使用 dev 开发环境 - metadata: - version: 1.0.0 # 服务实例的版本号，可用于灰度发布 - ---- #################### 配置中心相关配置 #################### - -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: 192.168.233.128:8848 # Nacos 服务器地址 - namespace: dev # 命名空间。这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/yudao-module-chain/yudao-module-chain-biz/target/classes/bootstrap-prod.yaml b/yudao-module-chain/yudao-module-chain-biz/target/classes/bootstrap-prod.yaml deleted file mode 100644 index d0b3068..0000000 --- a/yudao-module-chain/yudao-module-chain-biz/target/classes/bootstrap-prod.yaml +++ /dev/null @@ -1,31 +0,0 @@ -spring: - main: - allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 - allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Dubbo 或者 Feign 等会存在重复定义的服务 - ---- #################### 注册中心相关配置 #################### - -spring: - cloud: - nacos: - server-addr: 127.0.0.1:8848 - discovery: - namespace: prod # 命名空间。这里使用 dev 开发环境 - metadata: - version: 1.0.0 # 服务实例的版本号，可用于灰度发布 - ---- #################### 配置中心相关配置 #################### - -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: 127.0.0.1:8848 # Nacos 服务器地址 - namespace: prod # 命名空间。这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/yudao-module-chain/yudao-module-chain-biz/target/classes/bootstrap.yaml b/yudao-module-chain/yudao-module-chain-biz/target/classes/bootstrap.yaml deleted file mode 100644 index 3a38e22..0000000 --- a/yudao-module-chain/yudao-module-chain-biz/target/classes/bootstrap.yaml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - application: - name: chain-server - - profiles: - active: local - -server: - port: 49082 - -# 日志文件配置。注意，如果 logging.file.name 不放在 bootstrap.yaml 配置文件，而是放在 application.yaml 中，会导致出现 LOG_FILE_IS_UNDEFINED 文件 -logging: - file: - name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径 diff --git a/yudao-module-chain/yudao-module-chain-biz/target/classes/logback-spring.xml b/yudao-module-chain/yudao-module-chain-biz/target/classes/logback-spring.xml deleted file mode 100644 index 5f4b30d..0000000 --- a/yudao-module-chain/yudao-module-chain-biz/target/classes/logback-spring.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - 　　　　　 - - - ${PATTERN_DEFAULT} - - - - - - - - - - ${PATTERN_DEFAULT} - - - - ${LOG_FILE} - - - ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz} - - ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} - - ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB} - - ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0} - - ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30} - - - - - - 0 - - 256 - - - - - - - - ${PATTERN_DEFAULT} - - - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-chain/yudao-module-chain-biz/target/classes/mapper/blockcertificate/BlockCertificateMapper.xml b/yudao-module-chain/yudao-module-chain-biz/target/classes/mapper/blockcertificate/BlockCertificateMapper.xml deleted file mode 100644 index ffb76d7..0000000 --- a/yudao-module-chain/yudao-module-chain-biz/target/classes/mapper/blockcertificate/BlockCertificateMapper.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/yudao-module-chain/yudao-module-chain-biz/target/classes/mapper/operatedetail/OperateDetailMapper.xml b/yudao-module-chain/yudao-module-chain-biz/target/classes/mapper/operatedetail/OperateDetailMapper.xml deleted file mode 100644 index 0b8ec8e..0000000 --- a/yudao-module-chain/yudao-module-chain-biz/target/classes/mapper/operatedetail/OperateDetailMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-chain/yudao-module-chain-biz/target/classes/sql/clean.sql b/yudao-module-chain/yudao-module-chain-biz/target/classes/sql/clean.sql deleted file mode 100644 index c0f0bef..0000000 --- a/yudao-module-chain/yudao-module-chain-biz/target/classes/sql/clean.sql +++ /dev/null @@ -1,2 +0,0 @@ -DELETE FROM "chain_block_certificate"; -DELETE FROM "chain_operate_detail"; \ No newline at end of file diff --git a/yudao-module-chain/yudao-module-chain-biz/target/classes/sql/create_tables.sql b/yudao-module-chain/yudao-module-chain-biz/target/classes/sql/create_tables.sql deleted file mode 100644 index 187ef5f..0000000 --- a/yudao-module-chain/yudao-module-chain-biz/target/classes/sql/create_tables.sql +++ /dev/null @@ -1,49 +0,0 @@ -CREATE TABLE IF NOT EXISTS "chain_block_certificate" ( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "chain_operate_id" varchar NOT NULL, - "operate_type" varchar NOT NULL, - "operate_name" varchar, - "batch_id" varchar, - "batchType" varchar NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "link_id" varchar, - "link_name" varchar, - "chain_name" varchar, - "chain_block" varchar, - "block_time" datetime, - "chain_block_identity" varchar, - "chain_state" varchar NOT NULL, - "chain_status" varchar, - "remarks" varchar, - "upload_user" varchar, - "upload_verify" varchar, - "upload_time" datetime, - "upload_location" varchar, - "belong_business_id" bigint NOT NULL, - "belong_business_name" varchar NOT NULL, - "tenant_id" bigint NOT NULL, - "deleted" bit NOT NULL DEFAULT FALSE, - PRIMARY KEY ("id") -) COMMENT '区块证书'; - -CREATE TABLE IF NOT EXISTS "chain_operate_detail" ( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "chain_operate_id" varchar NOT NULL, - "title" varchar NOT NULL, - "type" int NOT NULL, - "content" varchar NOT NULL, - "link_text" varchar, - "operate_info" varchar NOT NULL, - "add_time" datetime, - "belong_business_id" bigint NOT NULL, - "belong_business_name" varchar NOT NULL, - "tenant_id" bigint NOT NULL, - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - "deleted" bit NOT NULL DEFAULT FALSE, - "creator" varchar DEFAULT '', - "updater" varchar DEFAULT '', - PRIMARY KEY ("id") -) COMMENT '区块上链操作具体上链信息'; - - - diff --git a/yudao-module-chain/yudao-module-chain-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/chain/convert/blockcertificate/BlockCertificateConvertImpl.java b/yudao-module-chain/yudao-module-chain-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/chain/convert/blockcertificate/BlockCertificateConvertImpl.java deleted file mode 100644 index 0b50fa6..0000000 --- a/yudao-module-chain/yudao-module-chain-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/chain/convert/blockcertificate/BlockCertificateConvertImpl.java +++ /dev/null @@ -1,377 +0,0 @@ -package cn.iocoder.yudao.module.chain.convert.blockcertificate; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.chain.api.blockcertificate.dto.BlockCertificateCreateReqDTO; -import cn.iocoder.yudao.module.chain.api.blockcertificate.dto.BlockCertificateReqDTO; -import cn.iocoder.yudao.module.chain.api.blockcertificate.dto.BlockCertificateRespDTO; -import cn.iocoder.yudao.module.chain.api.operatedetail.dto.OperateDetailRespDTO; -import cn.iocoder.yudao.module.chain.api.operatedetail.dto.OperateDetailSaveReqDTO; -import cn.iocoder.yudao.module.chain.controller.admin.blockcertificate.vo.BlockCertificateCreateReqVO; -import cn.iocoder.yudao.module.chain.controller.admin.blockcertificate.vo.BlockCertificateReqVO; -import cn.iocoder.yudao.module.chain.controller.admin.blockcertificate.vo.BlockCertificateRespVO; -import cn.iocoder.yudao.module.chain.controller.admin.blockcertificate.vo.BlockCertificateUpdateReqVO; -import cn.iocoder.yudao.module.chain.controller.admin.operatedetail.vo.OperateDetailRespVO; -import cn.iocoder.yudao.module.chain.controller.admin.operatedetail.vo.OperateDetailSaveReqVO; -import cn.iocoder.yudao.module.chain.dal.dataobject.blockcertificate.BlockCertificateDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:03:28+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class BlockCertificateConvertImpl implements BlockCertificateConvert { - - @Override - public BlockCertificateDO convert(BlockCertificateUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - BlockCertificateDO.BlockCertificateDOBuilder blockCertificateDO = BlockCertificateDO.builder(); - - blockCertificateDO.id( bean.getId() ); - blockCertificateDO.linkName( bean.getLinkName() ); - blockCertificateDO.chainState( bean.getChainState() ); - blockCertificateDO.scanShow( bean.getScanShow() ); - blockCertificateDO.sort( bean.getSort() ); - - return blockCertificateDO.build(); - } - - @Override - public BlockCertificateRespVO convert(BlockCertificateDO bean) { - if ( bean == null ) { - return null; - } - - BlockCertificateRespVO blockCertificateRespVO = new BlockCertificateRespVO(); - - blockCertificateRespVO.setChainOperateId( bean.getChainOperateId() ); - blockCertificateRespVO.setOperateType( bean.getOperateType() ); - blockCertificateRespVO.setOperateName( bean.getOperateName() ); - blockCertificateRespVO.setOperateObjId( bean.getOperateObjId() ); - blockCertificateRespVO.setBatchId( bean.getBatchId() ); - blockCertificateRespVO.setLinkId( bean.getLinkId() ); - blockCertificateRespVO.setLinkName( bean.getLinkName() ); - blockCertificateRespVO.setChainName( bean.getChainName() ); - blockCertificateRespVO.setChainBlock( bean.getChainBlock() ); - blockCertificateRespVO.setBlockTime( bean.getBlockTime() ); - blockCertificateRespVO.setChainBlockIdentity( bean.getChainBlockIdentity() ); - blockCertificateRespVO.setChainState( bean.getChainState() ); - blockCertificateRespVO.setChainStatus( bean.getChainStatus() ); - blockCertificateRespVO.setRemarks( bean.getRemarks() ); - blockCertificateRespVO.setScanShow( bean.getScanShow() ); - blockCertificateRespVO.setLanguageTypeId( bean.getLanguageTypeId() ); - blockCertificateRespVO.setSort( bean.getSort() ); - blockCertificateRespVO.setParentOperateId( bean.getParentOperateId() ); - blockCertificateRespVO.setUploadUser( bean.getUploadUser() ); - blockCertificateRespVO.setUploadVerify( bean.getUploadVerify() ); - blockCertificateRespVO.setUploadTime( bean.getUploadTime() ); - blockCertificateRespVO.setUploadLocation( bean.getUploadLocation() ); - blockCertificateRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - blockCertificateRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - blockCertificateRespVO.setId( bean.getId() ); - if ( bean.getBatchType() != null ) { - blockCertificateRespVO.setBatchType( bean.getBatchType().intValue() ); - } - - return blockCertificateRespVO; - } - - @Override - public BlockCertificateReqVO convertToReq(BlockCertificateReqDTO bean) { - if ( bean == null ) { - return null; - } - - BlockCertificateReqVO blockCertificateReqVO = new BlockCertificateReqVO(); - - blockCertificateReqVO.setId( bean.getId() ); - blockCertificateReqVO.setChainOperateId( bean.getChainOperateId() ); - blockCertificateReqVO.setOperateType( bean.getOperateType() ); - blockCertificateReqVO.setBatchType( bean.getBatchType() ); - blockCertificateReqVO.setBatchId( bean.getBatchId() ); - blockCertificateReqVO.setChainState( bean.getChainState() ); - blockCertificateReqVO.setChainStatus( bean.getChainStatus() ); - blockCertificateReqVO.setLanguageTypeId( bean.getLanguageTypeId() ); - blockCertificateReqVO.setParentOperateId( bean.getParentOperateId() ); - List list = bean.getOperateTypes(); - if ( list != null ) { - blockCertificateReqVO.setOperateTypes( new ArrayList( list ) ); - } - - return blockCertificateReqVO; - } - - @Override - public List convertToCreateReqList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( BlockCertificateCreateReqDTO blockCertificateCreateReqDTO : list ) { - list1.add( blockCertificateCreateReqDTOToBlockCertificateCreateReqVO( blockCertificateCreateReqDTO ) ); - } - - return list1; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( BlockCertificateDO blockCertificateDO : list ) { - list1.add( convert( blockCertificateDO ) ); - } - - return list1; - } - - @Override - public List convertDOToDTOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( BlockCertificateDO blockCertificateDO : list ) { - list1.add( blockCertificateDOToBlockCertificateRespDTO( blockCertificateDO ) ); - } - - return list1; - } - - @Override - public List convertToDTOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( BlockCertificateRespVO blockCertificateRespVO : list ) { - list1.add( blockCertificateRespVOToBlockCertificateRespDTO( blockCertificateRespVO ) ); - } - - return list1; - } - - @Override - public List convertToDOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( BlockCertificateUpdateReqVO blockCertificateUpdateReqVO : list ) { - list1.add( convert( blockCertificateUpdateReqVO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - protected OperateDetailSaveReqVO operateDetailSaveReqDTOToOperateDetailSaveReqVO(OperateDetailSaveReqDTO operateDetailSaveReqDTO) { - if ( operateDetailSaveReqDTO == null ) { - return null; - } - - OperateDetailSaveReqVO operateDetailSaveReqVO = new OperateDetailSaveReqVO(); - - operateDetailSaveReqVO.setId( operateDetailSaveReqDTO.getId() ); - operateDetailSaveReqVO.setChainOperateId( operateDetailSaveReqDTO.getChainOperateId() ); - operateDetailSaveReqVO.setTitle( operateDetailSaveReqDTO.getTitle() ); - operateDetailSaveReqVO.setType( operateDetailSaveReqDTO.getType() ); - operateDetailSaveReqVO.setContent( operateDetailSaveReqDTO.getContent() ); - operateDetailSaveReqVO.setLinkText( operateDetailSaveReqDTO.getLinkText() ); - operateDetailSaveReqVO.setOperateInfo( operateDetailSaveReqDTO.getOperateInfo() ); - operateDetailSaveReqVO.setScanShow( operateDetailSaveReqDTO.getScanShow() ); - operateDetailSaveReqVO.setSort( operateDetailSaveReqDTO.getSort() ); - operateDetailSaveReqVO.setAddTime( operateDetailSaveReqDTO.getAddTime() ); - operateDetailSaveReqVO.setBelongBusinessId( operateDetailSaveReqDTO.getBelongBusinessId() ); - operateDetailSaveReqVO.setBelongBusinessName( operateDetailSaveReqDTO.getBelongBusinessName() ); - - return operateDetailSaveReqVO; - } - - protected List operateDetailSaveReqDTOListToOperateDetailSaveReqVOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( OperateDetailSaveReqDTO operateDetailSaveReqDTO : list ) { - list1.add( operateDetailSaveReqDTOToOperateDetailSaveReqVO( operateDetailSaveReqDTO ) ); - } - - return list1; - } - - protected BlockCertificateCreateReqVO blockCertificateCreateReqDTOToBlockCertificateCreateReqVO(BlockCertificateCreateReqDTO blockCertificateCreateReqDTO) { - if ( blockCertificateCreateReqDTO == null ) { - return null; - } - - BlockCertificateCreateReqVO blockCertificateCreateReqVO = new BlockCertificateCreateReqVO(); - - blockCertificateCreateReqVO.setChainOperateId( blockCertificateCreateReqDTO.getChainOperateId() ); - blockCertificateCreateReqVO.setOperateType( blockCertificateCreateReqDTO.getOperateType() ); - blockCertificateCreateReqVO.setOperateName( blockCertificateCreateReqDTO.getOperateName() ); - blockCertificateCreateReqVO.setOperateObjId( blockCertificateCreateReqDTO.getOperateObjId() ); - blockCertificateCreateReqVO.setBatchId( blockCertificateCreateReqDTO.getBatchId() ); - blockCertificateCreateReqVO.setBatchType( blockCertificateCreateReqDTO.getBatchType() ); - blockCertificateCreateReqVO.setLinkId( blockCertificateCreateReqDTO.getLinkId() ); - blockCertificateCreateReqVO.setLinkName( blockCertificateCreateReqDTO.getLinkName() ); - blockCertificateCreateReqVO.setChainName( blockCertificateCreateReqDTO.getChainName() ); - blockCertificateCreateReqVO.setChainBlock( blockCertificateCreateReqDTO.getChainBlock() ); - blockCertificateCreateReqVO.setBlockTime( blockCertificateCreateReqDTO.getBlockTime() ); - blockCertificateCreateReqVO.setChainBlockIdentity( blockCertificateCreateReqDTO.getChainBlockIdentity() ); - blockCertificateCreateReqVO.setChainState( blockCertificateCreateReqDTO.getChainState() ); - blockCertificateCreateReqVO.setChainStatus( blockCertificateCreateReqDTO.getChainStatus() ); - blockCertificateCreateReqVO.setRemarks( blockCertificateCreateReqDTO.getRemarks() ); - blockCertificateCreateReqVO.setScanShow( blockCertificateCreateReqDTO.getScanShow() ); - blockCertificateCreateReqVO.setLanguageTypeId( blockCertificateCreateReqDTO.getLanguageTypeId() ); - blockCertificateCreateReqVO.setSort( blockCertificateCreateReqDTO.getSort() ); - blockCertificateCreateReqVO.setParentOperateId( blockCertificateCreateReqDTO.getParentOperateId() ); - blockCertificateCreateReqVO.setUploadUser( blockCertificateCreateReqDTO.getUploadUser() ); - blockCertificateCreateReqVO.setUploadVerify( blockCertificateCreateReqDTO.getUploadVerify() ); - blockCertificateCreateReqVO.setUploadTime( blockCertificateCreateReqDTO.getUploadTime() ); - blockCertificateCreateReqVO.setUploadLocation( blockCertificateCreateReqDTO.getUploadLocation() ); - blockCertificateCreateReqVO.setBelongBusinessId( blockCertificateCreateReqDTO.getBelongBusinessId() ); - blockCertificateCreateReqVO.setBelongBusinessName( blockCertificateCreateReqDTO.getBelongBusinessName() ); - blockCertificateCreateReqVO.setDetails( operateDetailSaveReqDTOListToOperateDetailSaveReqVOList( blockCertificateCreateReqDTO.getDetails() ) ); - - return blockCertificateCreateReqVO; - } - - protected BlockCertificateRespDTO blockCertificateDOToBlockCertificateRespDTO(BlockCertificateDO blockCertificateDO) { - if ( blockCertificateDO == null ) { - return null; - } - - BlockCertificateRespDTO blockCertificateRespDTO = new BlockCertificateRespDTO(); - - blockCertificateRespDTO.setId( blockCertificateDO.getId() ); - if ( blockCertificateDO.getBatchType() != null ) { - blockCertificateRespDTO.setBatchType( blockCertificateDO.getBatchType().intValue() ); - } - blockCertificateRespDTO.setChainOperateId( blockCertificateDO.getChainOperateId() ); - blockCertificateRespDTO.setOperateType( blockCertificateDO.getOperateType() ); - blockCertificateRespDTO.setOperateName( blockCertificateDO.getOperateName() ); - blockCertificateRespDTO.setOperateObjId( blockCertificateDO.getOperateObjId() ); - blockCertificateRespDTO.setBatchId( blockCertificateDO.getBatchId() ); - blockCertificateRespDTO.setLinkId( blockCertificateDO.getLinkId() ); - blockCertificateRespDTO.setLinkName( blockCertificateDO.getLinkName() ); - blockCertificateRespDTO.setChainName( blockCertificateDO.getChainName() ); - blockCertificateRespDTO.setChainBlock( blockCertificateDO.getChainBlock() ); - blockCertificateRespDTO.setBlockTime( blockCertificateDO.getBlockTime() ); - blockCertificateRespDTO.setChainBlockIdentity( blockCertificateDO.getChainBlockIdentity() ); - blockCertificateRespDTO.setChainState( blockCertificateDO.getChainState() ); - blockCertificateRespDTO.setChainStatus( blockCertificateDO.getChainStatus() ); - blockCertificateRespDTO.setRemarks( blockCertificateDO.getRemarks() ); - blockCertificateRespDTO.setScanShow( blockCertificateDO.getScanShow() ); - blockCertificateRespDTO.setSort( blockCertificateDO.getSort() ); - blockCertificateRespDTO.setParentOperateId( blockCertificateDO.getParentOperateId() ); - blockCertificateRespDTO.setUploadUser( blockCertificateDO.getUploadUser() ); - blockCertificateRespDTO.setUploadVerify( blockCertificateDO.getUploadVerify() ); - blockCertificateRespDTO.setUploadTime( blockCertificateDO.getUploadTime() ); - blockCertificateRespDTO.setUploadLocation( blockCertificateDO.getUploadLocation() ); - blockCertificateRespDTO.setBelongBusinessId( blockCertificateDO.getBelongBusinessId() ); - blockCertificateRespDTO.setBelongBusinessName( blockCertificateDO.getBelongBusinessName() ); - - return blockCertificateRespDTO; - } - - protected OperateDetailRespDTO operateDetailRespVOToOperateDetailRespDTO(OperateDetailRespVO operateDetailRespVO) { - if ( operateDetailRespVO == null ) { - return null; - } - - OperateDetailRespDTO operateDetailRespDTO = new OperateDetailRespDTO(); - - operateDetailRespDTO.setId( operateDetailRespVO.getId() ); - operateDetailRespDTO.setCreateTime( operateDetailRespVO.getCreateTime() ); - operateDetailRespDTO.setChainOperateId( operateDetailRespVO.getChainOperateId() ); - operateDetailRespDTO.setTitle( operateDetailRespVO.getTitle() ); - operateDetailRespDTO.setType( operateDetailRespVO.getType() ); - operateDetailRespDTO.setContent( operateDetailRespVO.getContent() ); - operateDetailRespDTO.setLinkText( operateDetailRespVO.getLinkText() ); - operateDetailRespDTO.setOperateInfo( operateDetailRespVO.getOperateInfo() ); - operateDetailRespDTO.setScanShow( operateDetailRespVO.getScanShow() ); - operateDetailRespDTO.setSort( operateDetailRespVO.getSort() ); - operateDetailRespDTO.setAddTime( operateDetailRespVO.getAddTime() ); - operateDetailRespDTO.setBelongBusinessId( operateDetailRespVO.getBelongBusinessId() ); - operateDetailRespDTO.setBelongBusinessName( operateDetailRespVO.getBelongBusinessName() ); - - return operateDetailRespDTO; - } - - protected List operateDetailRespVOListToOperateDetailRespDTOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( OperateDetailRespVO operateDetailRespVO : list ) { - list1.add( operateDetailRespVOToOperateDetailRespDTO( operateDetailRespVO ) ); - } - - return list1; - } - - protected BlockCertificateRespDTO blockCertificateRespVOToBlockCertificateRespDTO(BlockCertificateRespVO blockCertificateRespVO) { - if ( blockCertificateRespVO == null ) { - return null; - } - - BlockCertificateRespDTO blockCertificateRespDTO = new BlockCertificateRespDTO(); - - blockCertificateRespDTO.setId( blockCertificateRespVO.getId() ); - blockCertificateRespDTO.setBatchType( blockCertificateRespVO.getBatchType() ); - blockCertificateRespDTO.setChainOperateId( blockCertificateRespVO.getChainOperateId() ); - blockCertificateRespDTO.setOperateType( blockCertificateRespVO.getOperateType() ); - blockCertificateRespDTO.setOperateName( blockCertificateRespVO.getOperateName() ); - blockCertificateRespDTO.setOperateObjId( blockCertificateRespVO.getOperateObjId() ); - blockCertificateRespDTO.setBatchId( blockCertificateRespVO.getBatchId() ); - blockCertificateRespDTO.setLinkId( blockCertificateRespVO.getLinkId() ); - blockCertificateRespDTO.setLinkName( blockCertificateRespVO.getLinkName() ); - blockCertificateRespDTO.setChainName( blockCertificateRespVO.getChainName() ); - blockCertificateRespDTO.setChainBlock( blockCertificateRespVO.getChainBlock() ); - blockCertificateRespDTO.setBlockTime( blockCertificateRespVO.getBlockTime() ); - blockCertificateRespDTO.setChainBlockIdentity( blockCertificateRespVO.getChainBlockIdentity() ); - blockCertificateRespDTO.setChainState( blockCertificateRespVO.getChainState() ); - blockCertificateRespDTO.setChainStatus( blockCertificateRespVO.getChainStatus() ); - blockCertificateRespDTO.setRemarks( blockCertificateRespVO.getRemarks() ); - blockCertificateRespDTO.setScanShow( blockCertificateRespVO.getScanShow() ); - blockCertificateRespDTO.setSort( blockCertificateRespVO.getSort() ); - blockCertificateRespDTO.setParentOperateId( blockCertificateRespVO.getParentOperateId() ); - blockCertificateRespDTO.setUploadUser( blockCertificateRespVO.getUploadUser() ); - blockCertificateRespDTO.setUploadVerify( blockCertificateRespVO.getUploadVerify() ); - blockCertificateRespDTO.setUploadTime( blockCertificateRespVO.getUploadTime() ); - blockCertificateRespDTO.setUploadLocation( blockCertificateRespVO.getUploadLocation() ); - blockCertificateRespDTO.setBelongBusinessId( blockCertificateRespVO.getBelongBusinessId() ); - blockCertificateRespDTO.setBelongBusinessName( blockCertificateRespVO.getBelongBusinessName() ); - blockCertificateRespDTO.setOperateDetails( operateDetailRespVOListToOperateDetailRespDTOList( blockCertificateRespVO.getOperateDetails() ) ); - - return blockCertificateRespDTO; - } -} diff --git a/yudao-module-chain/yudao-module-chain-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/chain/convert/operatedetail/OperateDetailConvertImpl.java b/yudao-module-chain/yudao-module-chain-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/chain/convert/operatedetail/OperateDetailConvertImpl.java deleted file mode 100644 index 41fc946..0000000 --- a/yudao-module-chain/yudao-module-chain-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/chain/convert/operatedetail/OperateDetailConvertImpl.java +++ /dev/null @@ -1,211 +0,0 @@ -package cn.iocoder.yudao.module.chain.convert.operatedetail; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.chain.api.operatedetail.dto.OperateDetailRespDTO; -import cn.iocoder.yudao.module.chain.api.operatedetail.dto.OperateDetailSaveReqDTO; -import cn.iocoder.yudao.module.chain.controller.admin.operatedetail.vo.OperateDetailCreateReqVO; -import cn.iocoder.yudao.module.chain.controller.admin.operatedetail.vo.OperateDetailRespVO; -import cn.iocoder.yudao.module.chain.controller.admin.operatedetail.vo.OperateDetailSaveReqVO; -import cn.iocoder.yudao.module.chain.dal.dataobject.operatedetail.OperateDetailDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:03:28+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class OperateDetailConvertImpl implements OperateDetailConvert { - - @Override - public OperateDetailDO convert(OperateDetailCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - OperateDetailDO.OperateDetailDOBuilder operateDetailDO = OperateDetailDO.builder(); - - operateDetailDO.chainOperateId( bean.getChainOperateId() ); - operateDetailDO.title( bean.getTitle() ); - operateDetailDO.type( bean.getType() ); - operateDetailDO.content( bean.getContent() ); - operateDetailDO.linkText( bean.getLinkText() ); - operateDetailDO.operateInfo( bean.getOperateInfo() ); - operateDetailDO.scanShow( bean.getScanShow() ); - operateDetailDO.sort( bean.getSort() ); - operateDetailDO.belongBusinessId( bean.getBelongBusinessId() ); - operateDetailDO.belongBusinessName( bean.getBelongBusinessName() ); - - return operateDetailDO.build(); - } - - @Override - public OperateDetailDO convert(OperateDetailSaveReqVO bean) { - if ( bean == null ) { - return null; - } - - OperateDetailDO.OperateDetailDOBuilder operateDetailDO = OperateDetailDO.builder(); - - operateDetailDO.id( bean.getId() ); - operateDetailDO.chainOperateId( bean.getChainOperateId() ); - operateDetailDO.title( bean.getTitle() ); - operateDetailDO.type( bean.getType() ); - operateDetailDO.content( bean.getContent() ); - operateDetailDO.linkText( bean.getLinkText() ); - operateDetailDO.operateInfo( bean.getOperateInfo() ); - operateDetailDO.scanShow( bean.getScanShow() ); - operateDetailDO.sort( bean.getSort() ); - operateDetailDO.belongBusinessId( bean.getBelongBusinessId() ); - operateDetailDO.belongBusinessName( bean.getBelongBusinessName() ); - - return operateDetailDO.build(); - } - - @Override - public List convertToDOList(List bean) { - if ( bean == null ) { - return null; - } - - List list = new ArrayList( bean.size() ); - for ( OperateDetailSaveReqVO operateDetailSaveReqVO : bean ) { - list.add( convert( operateDetailSaveReqVO ) ); - } - - return list; - } - - @Override - public OperateDetailRespVO convert(OperateDetailDO bean) { - if ( bean == null ) { - return null; - } - - OperateDetailRespVO operateDetailRespVO = new OperateDetailRespVO(); - - operateDetailRespVO.setChainOperateId( bean.getChainOperateId() ); - operateDetailRespVO.setTitle( bean.getTitle() ); - operateDetailRespVO.setType( bean.getType() ); - operateDetailRespVO.setContent( bean.getContent() ); - operateDetailRespVO.setLinkText( bean.getLinkText() ); - operateDetailRespVO.setOperateInfo( bean.getOperateInfo() ); - operateDetailRespVO.setScanShow( bean.getScanShow() ); - operateDetailRespVO.setSort( bean.getSort() ); - operateDetailRespVO.setAddTime( bean.getAddTime() ); - operateDetailRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - operateDetailRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - operateDetailRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - operateDetailRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return operateDetailRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( OperateDetailDO operateDetailDO : list ) { - list1.add( convert( operateDetailDO ) ); - } - - return list1; - } - - @Override - public List convertToDTOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( OperateDetailRespVO operateDetailRespVO : list ) { - list1.add( operateDetailRespVOToOperateDetailRespDTO( operateDetailRespVO ) ); - } - - return list1; - } - - @Override - public List convertToSaveReqList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( OperateDetailSaveReqDTO operateDetailSaveReqDTO : list ) { - list1.add( operateDetailSaveReqDTOToOperateDetailSaveReqVO( operateDetailSaveReqDTO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - protected OperateDetailRespDTO operateDetailRespVOToOperateDetailRespDTO(OperateDetailRespVO operateDetailRespVO) { - if ( operateDetailRespVO == null ) { - return null; - } - - OperateDetailRespDTO operateDetailRespDTO = new OperateDetailRespDTO(); - - operateDetailRespDTO.setId( operateDetailRespVO.getId() ); - operateDetailRespDTO.setCreateTime( operateDetailRespVO.getCreateTime() ); - operateDetailRespDTO.setChainOperateId( operateDetailRespVO.getChainOperateId() ); - operateDetailRespDTO.setTitle( operateDetailRespVO.getTitle() ); - operateDetailRespDTO.setType( operateDetailRespVO.getType() ); - operateDetailRespDTO.setContent( operateDetailRespVO.getContent() ); - operateDetailRespDTO.setLinkText( operateDetailRespVO.getLinkText() ); - operateDetailRespDTO.setOperateInfo( operateDetailRespVO.getOperateInfo() ); - operateDetailRespDTO.setScanShow( operateDetailRespVO.getScanShow() ); - operateDetailRespDTO.setSort( operateDetailRespVO.getSort() ); - operateDetailRespDTO.setAddTime( operateDetailRespVO.getAddTime() ); - operateDetailRespDTO.setBelongBusinessId( operateDetailRespVO.getBelongBusinessId() ); - operateDetailRespDTO.setBelongBusinessName( operateDetailRespVO.getBelongBusinessName() ); - - return operateDetailRespDTO; - } - - protected OperateDetailSaveReqVO operateDetailSaveReqDTOToOperateDetailSaveReqVO(OperateDetailSaveReqDTO operateDetailSaveReqDTO) { - if ( operateDetailSaveReqDTO == null ) { - return null; - } - - OperateDetailSaveReqVO operateDetailSaveReqVO = new OperateDetailSaveReqVO(); - - operateDetailSaveReqVO.setId( operateDetailSaveReqDTO.getId() ); - operateDetailSaveReqVO.setChainOperateId( operateDetailSaveReqDTO.getChainOperateId() ); - operateDetailSaveReqVO.setTitle( operateDetailSaveReqDTO.getTitle() ); - operateDetailSaveReqVO.setType( operateDetailSaveReqDTO.getType() ); - operateDetailSaveReqVO.setContent( operateDetailSaveReqDTO.getContent() ); - operateDetailSaveReqVO.setLinkText( operateDetailSaveReqDTO.getLinkText() ); - operateDetailSaveReqVO.setOperateInfo( operateDetailSaveReqDTO.getOperateInfo() ); - operateDetailSaveReqVO.setScanShow( operateDetailSaveReqDTO.getScanShow() ); - operateDetailSaveReqVO.setSort( operateDetailSaveReqDTO.getSort() ); - operateDetailSaveReqVO.setAddTime( operateDetailSaveReqDTO.getAddTime() ); - operateDetailSaveReqVO.setBelongBusinessId( operateDetailSaveReqDTO.getBelongBusinessId() ); - operateDetailSaveReqVO.setBelongBusinessName( operateDetailSaveReqDTO.getBelongBusinessName() ); - - return operateDetailSaveReqVO; - } -} diff --git a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/tracecert/TraceCertController.java b/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/tracecert/TraceCertController.java deleted file mode 100644 index 4242361..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/tracecert/TraceCertController.java +++ /dev/null @@ -1,71 +0,0 @@ -package cn.iocoder.yudao.module.configure.controller.admin.tracecert; - -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.annotations.*; - -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; - -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*; - -import cn.iocoder.yudao.module.configure.controller.admin.tracecert.vo.*; -import cn.iocoder.yudao.module.configure.dal.dataobject.tracecert.TraceCertDO; -import cn.iocoder.yudao.module.configure.convert.tracecert.TraceCertConvert; -import cn.iocoder.yudao.module.configure.service.tracecert.TraceCertService; - -@Api(tags = "管理后台 - 溯源链证书配置") -@RestController -@RequestMapping("/configure/trace-cert") -@Validated -public class TraceCertController { - - @Resource - private TraceCertService traceCertService; - - @PostMapping("/create") - @ApiOperation("创建溯源链证书配置") - @PreAuthorize("@ss.hasPermission('configure:trace-cert:create')") - public CommonResult createTraceCert(@Valid @RequestBody TraceCertCreateReqVO createReqVO) { - return success(traceCertService.createTraceCert(createReqVO)); - } - - @PutMapping("/update") - @ApiOperation("更新溯源链证书配置") - @PreAuthorize("@ss.hasPermission('configure:trace-cert:update')") - public CommonResult updateTraceCert(@Valid @RequestBody TraceCertUpdateReqVO updateReqVO) { - traceCertService.updateTraceCert(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @ApiOperation("删除溯源链证书配置") - @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('configure:trace-cert:delete')") - public CommonResult deleteTraceCert(@RequestParam("id") Long id) { - traceCertService.deleteTraceCert(id); - return success(true); - } - - @GetMapping("/getByBelongBusinessId") - @ApiOperation("根据所属商户id,获得溯源链证书配置信息") - @ApiImplicitParam(name = "belongBusinessId", value = "所属商户id", required = true, example = "1024", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('configure:trace-cert:query')") - public CommonResult getByBelongBusinessId(@RequestParam("belongBusinessId") Long belongBusinessId) { - TraceCertDO traceCert = traceCertService.getTraceCertByBusinessId(belongBusinessId); - return success(TraceCertConvert.INSTANCE.convert(traceCert)); - } - -} diff --git a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/tracecert/vo/TraceCertBaseVO.java b/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/tracecert/vo/TraceCertBaseVO.java deleted file mode 100644 index f41e832..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/tracecert/vo/TraceCertBaseVO.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.iocoder.yudao.module.configure.controller.admin.tracecert.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -/** -* 溯源链证书配置 Base VO，提供给添加、修改、详细的子 VO 使用 -* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 -*/ -@Data -public class TraceCertBaseVO { - - @ApiModelProperty(value = "所在链名称", required = true) - @NotNull(message = "所在链名称不能为空") - private String chainName; - - @ApiModelProperty(value = "是否展示所在区块", required = true) - @NotNull(message = "是否展示所在区块不能为空") - private Boolean showBlock; - - @ApiModelProperty(value = "是否展示成块时间", required = true) - @NotNull(message = "是否展示成块时间不能为空") - private Boolean showBlockTime; - - @ApiModelProperty(value = "是否展示唯一编码", required = true) - @NotNull(message = "是否展示唯一编码不能为空") - private Boolean showIdentity; - - @ApiModelProperty(value = "是否展示上传主体证明", required = true) - @NotNull(message = "是否展示上传主体证明不能为空") - private Boolean showSubjectProof; - - @ApiModelProperty(value = "是否展示上传时间", required = true) - @NotNull(message = "是否展示上传时间不能为空") - private Boolean showUploadTime; - - @ApiModelProperty(value = "是否展示上传地点", required = true) - @NotNull(message = "是否展示上传地点不能为空") - private Boolean showUploadLocation; - - @ApiModelProperty(value = "上传者身份", required = true) - @NotNull(message = "上传者身份不能为空") - private String uploadUser; - - @ApiModelProperty(value = "所属商户id", required = true) - @NotNull(message = "所属商户id不能为空") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称", required = true) - @NotNull(message = "所属商户名称不能为空") - private String belongBusinessName; - -} diff --git a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/tracecert/vo/TraceCertCreateReqVO.java b/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/tracecert/vo/TraceCertCreateReqVO.java deleted file mode 100644 index d1fb1d0..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/tracecert/vo/TraceCertCreateReqVO.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.iocoder.yudao.module.configure.controller.admin.tracecert.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -@ApiModel("管理后台 - 溯源链证书配置创建 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class TraceCertCreateReqVO extends TraceCertBaseVO { - -} diff --git a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/tracecert/vo/TraceCertPageReqVO.java b/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/tracecert/vo/TraceCertPageReqVO.java deleted file mode 100644 index dd06fc7..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/tracecert/vo/TraceCertPageReqVO.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.iocoder.yudao.module.configure.controller.admin.tracecert.vo; - -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; - -@ApiModel("管理后台 - 溯源链证书配置分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class TraceCertPageReqVO extends PageParam { - - @ApiModelProperty(value = "所在链名称") - private String chainName; - - @ApiModelProperty(value = "是否展示所在区块") - private Boolean showBlock; - - @ApiModelProperty(value = "是否展示成块时间") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Boolean[] showBlockTime; - - @ApiModelProperty(value = "是否展示唯一编码") - private Boolean showIdentity; - - @ApiModelProperty(value = "是否展示上传主体证明") - private Boolean showSubjectProof; - - @ApiModelProperty(value = "是否展示上传时间") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Boolean[] showUploadTime; - - @ApiModelProperty(value = "是否展示上传地点") - private Boolean showUploadLocation; - - @ApiModelProperty(value = "上传者身份") - private String uploadUser; - - @ApiModelProperty(value = "所属商户id") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称") - private String belongBusinessName; - - @ApiModelProperty(value = "创建时间") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date[] createTime; - -} diff --git a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/tracecert/vo/TraceCertRespVO.java b/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/tracecert/vo/TraceCertRespVO.java deleted file mode 100644 index d5dd8e7..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/tracecert/vo/TraceCertRespVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.iocoder.yudao.module.configure.controller.admin.tracecert.vo; - -import lombok.*; -import io.swagger.annotations.*; - -import java.util.Date; - -@ApiModel("管理后台 - 溯源链证书配置 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class TraceCertRespVO extends TraceCertBaseVO { - - @ApiModelProperty(value = "编号", required = true) - private Long id; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - -} diff --git a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/tracecert/vo/TraceCertUpdateReqVO.java b/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/tracecert/vo/TraceCertUpdateReqVO.java deleted file mode 100644 index 2279255..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/tracecert/vo/TraceCertUpdateReqVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.iocoder.yudao.module.configure.controller.admin.tracecert.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -@ApiModel("管理后台 - 溯源链证书配置更新 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class TraceCertUpdateReqVO extends TraceCertBaseVO { - - @ApiModelProperty(value = "编号", required = true) - @NotNull(message = "编号不能为空") - private Long id; - -} diff --git a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/convert/tracecert/TraceCertConvert.java b/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/convert/tracecert/TraceCertConvert.java deleted file mode 100644 index 5bfdaf8..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/convert/tracecert/TraceCertConvert.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.iocoder.yudao.module.configure.convert.tracecert; - -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; -import cn.iocoder.yudao.module.configure.controller.admin.tracecert.vo.*; -import cn.iocoder.yudao.module.configure.dal.dataobject.tracecert.TraceCertDO; - -/** - * 溯源链证书配置 Convert - * - * @author 芋道源码 - */ -@Mapper -public interface TraceCertConvert { - - TraceCertConvert INSTANCE = Mappers.getMapper(TraceCertConvert.class); - - TraceCertDO convert(TraceCertCreateReqVO bean); - - TraceCertDO convert(TraceCertUpdateReqVO bean); - - TraceCertRespVO convert(TraceCertDO bean); - - List convertList(List list); - - PageResult convertPage(PageResult page); - -} diff --git a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/dal/dataobject/tracecert/TraceCertDO.java b/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/dal/dataobject/tracecert/TraceCertDO.java deleted file mode 100644 index a14b4b2..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/dal/dataobject/tracecert/TraceCertDO.java +++ /dev/null @@ -1,69 +0,0 @@ -package cn.iocoder.yudao.module.configure.dal.dataobject.tracecert; - -import lombok.*; -import java.util.*; -import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; - -/** - * 溯源链证书配置 DO - * - * @author 芋道源码 - */ -@TableName("configure_trace_cert") -@KeySequence("configure_trace_cert_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class TraceCertDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 所在链名称 - */ - private String chainName; - /** - * 是否展示所在区块 - */ - private Boolean showBlock; - /** - * 是否展示成块时间 - */ - private Boolean showBlockTime; - /** - * 是否展示唯一编码 - */ - private Boolean showIdentity; - /** - * 是否展示上传主体证明 - */ - private Boolean showSubjectProof; - /** - * 是否展示上传时间 - */ - private Boolean showUploadTime; - /** - * 是否展示上传地点 - */ - private Boolean showUploadLocation; - /** - * 上传者身份 - */ - private String uploadUser; - /** - * 所属商户id - */ - private Long belongBusinessId; - /** - * 所属商户名称 - */ - private String belongBusinessName; - -} diff --git a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/dal/mysql/tracecert/TraceCertMapper.java b/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/dal/mysql/tracecert/TraceCertMapper.java deleted file mode 100644 index 28b43e5..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/dal/mysql/tracecert/TraceCertMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.iocoder.yudao.module.configure.dal.mysql.tracecert; - -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.configure.dal.dataobject.tracecert.TraceCertDO; -import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.configure.controller.admin.tracecert.vo.*; - -/** - * 溯源链证书配置 Mapper - * - * @author 芋道源码 - */ -@Mapper -public interface TraceCertMapper extends BaseMapperX { - - default PageResult selectPage(TraceCertPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(TraceCertDO::getChainName, reqVO.getChainName()) - .eqIfPresent(TraceCertDO::getShowBlock, reqVO.getShowBlock()) - .betweenIfPresent(TraceCertDO::getShowBlockTime, reqVO.getShowBlockTime()) - .eqIfPresent(TraceCertDO::getShowIdentity, reqVO.getShowIdentity()) - .eqIfPresent(TraceCertDO::getShowSubjectProof, reqVO.getShowSubjectProof()) - .betweenIfPresent(TraceCertDO::getShowUploadTime, reqVO.getShowUploadTime()) - .eqIfPresent(TraceCertDO::getShowUploadLocation, reqVO.getShowUploadLocation()) - .eqIfPresent(TraceCertDO::getUploadUser, reqVO.getUploadUser()) - .eqIfPresent(TraceCertDO::getBelongBusinessId, reqVO.getBelongBusinessId()) - .likeIfPresent(TraceCertDO::getBelongBusinessName, reqVO.getBelongBusinessName()) - .betweenIfPresent(TraceCertDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(TraceCertDO::getId)); - } - -} diff --git a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/service/tracecert/TraceCertService.java b/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/service/tracecert/TraceCertService.java deleted file mode 100644 index bb22506..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/service/tracecert/TraceCertService.java +++ /dev/null @@ -1,46 +0,0 @@ -package cn.iocoder.yudao.module.configure.service.tracecert; - -import java.util.*; -import javax.validation.*; -import cn.iocoder.yudao.module.configure.controller.admin.tracecert.vo.*; -import cn.iocoder.yudao.module.configure.dal.dataobject.tracecert.TraceCertDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -/** - * 溯源链证书配置 Service 接口 - * - * @author 芋道源码 - */ -public interface TraceCertService { - - /** - * 创建溯源链证书配置 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createTraceCert(@Valid TraceCertCreateReqVO createReqVO); - - /** - * 更新溯源链证书配置 - * - * @param updateReqVO 更新信息 - */ - void updateTraceCert(@Valid TraceCertUpdateReqVO updateReqVO); - - /** - * 删除溯源链证书配置 - * - * @param id 编号 - */ - void deleteTraceCert(Long id); - - /** - * 获得溯源链证书配置 - * - * @param belongBusinessId 所属商户id - * @return 溯源链证书配置 - */ - TraceCertDO getTraceCertByBusinessId(Long belongBusinessId); - -} diff --git a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/service/tracecert/TraceCertServiceImpl.java b/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/service/tracecert/TraceCertServiceImpl.java deleted file mode 100644 index bed4c52..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/service/tracecert/TraceCertServiceImpl.java +++ /dev/null @@ -1,82 +0,0 @@ -package cn.iocoder.yudao.module.configure.service.tracecert; - -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import java.util.*; -import cn.iocoder.yudao.module.configure.controller.admin.tracecert.vo.*; -import cn.iocoder.yudao.module.configure.dal.dataobject.tracecert.TraceCertDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -import cn.iocoder.yudao.module.configure.convert.tracecert.TraceCertConvert; -import cn.iocoder.yudao.module.configure.dal.mysql.tracecert.TraceCertMapper; - -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.configure.enums.ErrorCodeConstants.*; - -/** - * 溯源链证书配置 Service 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -public class TraceCertServiceImpl implements TraceCertService { - - @Resource - private TraceCertMapper traceCertMapper; - - @Override - public Long createTraceCert(TraceCertCreateReqVO createReqVO) { - // 校验存在 所属商户对应的溯源链证书配置信息是否存在 如果存在则不能再进行创建 - validateTraceCertExists((long)0,createReqVO.getBelongBusinessId()); - // 插入 - TraceCertDO traceCert = TraceCertConvert.INSTANCE.convert(createReqVO); - traceCertMapper.insert(traceCert); - // 返回 - return traceCert.getId(); - } - - @Override - public void updateTraceCert(TraceCertUpdateReqVO updateReqVO) { - // 校验存在 - validateTraceCertExists(updateReqVO.getId(),(long)0); - // 更新 - TraceCertDO updateObj = TraceCertConvert.INSTANCE.convert(updateReqVO); - traceCertMapper.updateById(updateObj); - } - - @Override - public void deleteTraceCert(Long id) { - // 校验存在 - validateTraceCertExists(id,(long)0); - // 删除 - traceCertMapper.deleteById(id); - } - - /** - * 获得溯源链证书配置 - * - * @param belongBusinessId 所属商户id - * @return 溯源链证书配置 - */ - @Override - public TraceCertDO getTraceCertByBusinessId(Long belongBusinessId) { - return traceCertMapper.selectOne(TraceCertDO::getBelongBusinessId,belongBusinessId); - } - - private void validateTraceCertExists(Long id,Long belongBusinessId) { - if(id != 0){ - if (traceCertMapper.selectById(id) == null) { - throw exception(TRACE_CERT_NOT_EXISTS); - } - } - if(belongBusinessId != 0){ - if (traceCertMapper.selectOne(TraceCertDO::getBelongBusinessId,belongBusinessId) != null) { - throw exception(TRACE_CERT_IS_EXISTS_BY_BELONG_BUSINESS); - } - } - } - -} diff --git a/yudao-module-configure/yudao-module-configure-biz/target/classes/bootstrap-local.yaml b/yudao-module-configure/yudao-module-configure-biz/target/classes/bootstrap-local.yaml deleted file mode 100644 index fe4d3a5..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/target/classes/bootstrap-local.yaml +++ /dev/null @@ -1,31 +0,0 @@ -spring: - main: - allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 - allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Dubbo 或者 Feign 等会存在重复定义的服务 - ---- #################### 注册中心相关配置 #################### - -spring: - cloud: - nacos: - server-addr: 192.168.233.128:8848 - discovery: - namespace: dev # 命名空间。这里使用 dev 开发环境 - metadata: - version: 1.0.0 # 服务实例的版本号，可用于灰度发布 - ---- #################### 配置中心相关配置 #################### - -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: 192.168.233.128:8848 # Nacos 服务器地址 - namespace: dev # 命名空间。这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/yudao-module-configure/yudao-module-configure-biz/target/classes/bootstrap-prod.yaml b/yudao-module-configure/yudao-module-configure-biz/target/classes/bootstrap-prod.yaml deleted file mode 100644 index d0b3068..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/target/classes/bootstrap-prod.yaml +++ /dev/null @@ -1,31 +0,0 @@ -spring: - main: - allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 - allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Dubbo 或者 Feign 等会存在重复定义的服务 - ---- #################### 注册中心相关配置 #################### - -spring: - cloud: - nacos: - server-addr: 127.0.0.1:8848 - discovery: - namespace: prod # 命名空间。这里使用 dev 开发环境 - metadata: - version: 1.0.0 # 服务实例的版本号，可用于灰度发布 - ---- #################### 配置中心相关配置 #################### - -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: 127.0.0.1:8848 # Nacos 服务器地址 - namespace: prod # 命名空间。这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/yudao-module-configure/yudao-module-configure-biz/target/classes/bootstrap.yaml b/yudao-module-configure/yudao-module-configure-biz/target/classes/bootstrap.yaml deleted file mode 100644 index 7886ff3..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/target/classes/bootstrap.yaml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - application: - name: configure-server - - profiles: - active: local - -server: - port: 49083 - -# 日志文件配置。注意，如果 logging.file.name 不放在 bootstrap.yaml 配置文件，而是放在 application.yaml 中，会导致出现 LOG_FILE_IS_UNDEFINED 文件 -logging: - file: - name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径 diff --git a/yudao-module-configure/yudao-module-configure-biz/target/classes/logback-spring.xml b/yudao-module-configure/yudao-module-configure-biz/target/classes/logback-spring.xml deleted file mode 100644 index 5f4b30d..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/target/classes/logback-spring.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - 　　　　　 - - - ${PATTERN_DEFAULT} - - - - - - - - - - ${PATTERN_DEFAULT} - - - - ${LOG_FILE} - - - ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz} - - ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} - - ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB} - - ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0} - - ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30} - - - - - - 0 - - 256 - - - - - - - - ${PATTERN_DEFAULT} - - - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/deviceenvtype/DeviceEnvTypeMapper.xml b/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/deviceenvtype/DeviceEnvTypeMapper.xml deleted file mode 100644 index 55e5706..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/deviceenvtype/DeviceEnvTypeMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/inspectionitem/InspectionItemMapper.xml b/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/inspectionitem/InspectionItemMapper.xml deleted file mode 100644 index 6724744..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/inspectionitem/InspectionItemMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/inspectiontemplate/InspectionTemplateMapper.xml b/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/inspectiontemplate/InspectionTemplateMapper.xml deleted file mode 100644 index b029a07..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/inspectiontemplate/InspectionTemplateMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - diff --git a/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/tracelink/TraceLinkMapper.xml b/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/tracelink/TraceLinkMapper.xml deleted file mode 100644 index a330ace..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/tracelink/TraceLinkMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - diff --git a/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/tracelinkitem/TraceLinkItemMapper.xml b/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/tracelinkitem/TraceLinkItemMapper.xml deleted file mode 100644 index 83fefb7..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/tracelinkitem/TraceLinkItemMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/tracetemplate/TraceTemplateMapper.xml b/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/tracetemplate/TraceTemplateMapper.xml deleted file mode 100644 index d2d4887..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/tracetemplate/TraceTemplateMapper.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/unitemplate/UniTemplateMapper.xml b/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/unitemplate/UniTemplateMapper.xml deleted file mode 100644 index c3a4b2f..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/unitemplate/UniTemplateMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/deviceenvtype/DeviceEnvTypeConvertImpl.java b/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/deviceenvtype/DeviceEnvTypeConvertImpl.java deleted file mode 100644 index 1433a8f..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/deviceenvtype/DeviceEnvTypeConvertImpl.java +++ /dev/null @@ -1,95 +0,0 @@ -package cn.iocoder.yudao.module.configure.convert.deviceenvtype; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.configure.controller.admin.deviceenvtype.vo.DeviceEnvTypeCreateReqVO; -import cn.iocoder.yudao.module.configure.controller.admin.deviceenvtype.vo.DeviceEnvTypeRespVO; -import cn.iocoder.yudao.module.configure.controller.admin.deviceenvtype.vo.DeviceEnvTypeUpdateReqVO; -import cn.iocoder.yudao.module.configure.dal.dataobject.deviceenvtype.DeviceEnvTypeDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T16:01:16+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class DeviceEnvTypeConvertImpl implements DeviceEnvTypeConvert { - - @Override - public DeviceEnvTypeDO convert(DeviceEnvTypeCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - DeviceEnvTypeDO.DeviceEnvTypeDOBuilder deviceEnvTypeDO = DeviceEnvTypeDO.builder(); - - deviceEnvTypeDO.landId( bean.getLandId() ); - deviceEnvTypeDO.envTypeId( bean.getEnvTypeId() ); - - return deviceEnvTypeDO.build(); - } - - @Override - public DeviceEnvTypeDO convert(DeviceEnvTypeUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - DeviceEnvTypeDO.DeviceEnvTypeDOBuilder deviceEnvTypeDO = DeviceEnvTypeDO.builder(); - - deviceEnvTypeDO.id( bean.getId() ); - deviceEnvTypeDO.landId( bean.getLandId() ); - deviceEnvTypeDO.envTypeId( bean.getEnvTypeId() ); - - return deviceEnvTypeDO.build(); - } - - @Override - public DeviceEnvTypeRespVO convert(DeviceEnvTypeDO bean) { - if ( bean == null ) { - return null; - } - - DeviceEnvTypeRespVO deviceEnvTypeRespVO = new DeviceEnvTypeRespVO(); - - deviceEnvTypeRespVO.setLandId( bean.getLandId() ); - deviceEnvTypeRespVO.setEnvTypeId( bean.getEnvTypeId() ); - deviceEnvTypeRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - deviceEnvTypeRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return deviceEnvTypeRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( DeviceEnvTypeDO deviceEnvTypeDO : list ) { - list1.add( convert( deviceEnvTypeDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } -} diff --git a/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/inspectionitem/InspectionItemConvertImpl.java b/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/inspectionitem/InspectionItemConvertImpl.java deleted file mode 100644 index 444db88..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/inspectionitem/InspectionItemConvertImpl.java +++ /dev/null @@ -1,108 +0,0 @@ -package cn.iocoder.yudao.module.configure.convert.inspectionitem; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.configure.controller.admin.inspectionitem.vo.InspectionItemCreateReqVO; -import cn.iocoder.yudao.module.configure.controller.admin.inspectionitem.vo.InspectionItemRespVO; -import cn.iocoder.yudao.module.configure.controller.admin.inspectionitem.vo.InspectionItemSaveReqVO; -import cn.iocoder.yudao.module.configure.dal.dataobject.inspectionitem.InspectionItemDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T16:01:16+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class InspectionItemConvertImpl implements InspectionItemConvert { - - @Override - public InspectionItemDO convert(InspectionItemCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - InspectionItemDO.InspectionItemDOBuilder inspectionItemDO = InspectionItemDO.builder(); - - inspectionItemDO.templateId( bean.getTemplateId() ); - inspectionItemDO.templateName( bean.getTemplateName() ); - inspectionItemDO.inspectionItem( bean.getInspectionItem() ); - inspectionItemDO.inspectionItemId( bean.getInspectionItemId() ); - inspectionItemDO.inspectionUnit( bean.getInspectionUnit() ); - inspectionItemDO.inspectionRequire( bean.getInspectionRequire() ); - inspectionItemDO.belongBusinessId( bean.getBelongBusinessId() ); - inspectionItemDO.belongBusinessName( bean.getBelongBusinessName() ); - - return inspectionItemDO.build(); - } - - @Override - public InspectionItemDO convert(InspectionItemSaveReqVO bean) { - if ( bean == null ) { - return null; - } - - InspectionItemDO.InspectionItemDOBuilder inspectionItemDO = InspectionItemDO.builder(); - - inspectionItemDO.id( bean.getId() ); - inspectionItemDO.inspectionItem( bean.getInspectionItem() ); - inspectionItemDO.inspectionUnit( bean.getInspectionUnit() ); - inspectionItemDO.inspectionRequire( bean.getInspectionRequire() ); - - return inspectionItemDO.build(); - } - - @Override - public InspectionItemRespVO convert(InspectionItemDO bean) { - if ( bean == null ) { - return null; - } - - InspectionItemRespVO inspectionItemRespVO = new InspectionItemRespVO(); - - inspectionItemRespVO.setTemplateId( bean.getTemplateId() ); - inspectionItemRespVO.setTemplateName( bean.getTemplateName() ); - inspectionItemRespVO.setInspectionItem( bean.getInspectionItem() ); - inspectionItemRespVO.setInspectionItemId( bean.getInspectionItemId() ); - inspectionItemRespVO.setInspectionUnit( bean.getInspectionUnit() ); - inspectionItemRespVO.setInspectionRequire( bean.getInspectionRequire() ); - inspectionItemRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - inspectionItemRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - inspectionItemRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - inspectionItemRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return inspectionItemRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( InspectionItemDO inspectionItemDO : list ) { - list1.add( convert( inspectionItemDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } -} diff --git a/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/inspectiontemplate/InspectionTemplateConvertImpl.java b/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/inspectiontemplate/InspectionTemplateConvertImpl.java deleted file mode 100644 index 224a578..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/inspectiontemplate/InspectionTemplateConvertImpl.java +++ /dev/null @@ -1,95 +0,0 @@ -package cn.iocoder.yudao.module.configure.convert.inspectiontemplate; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.configure.controller.admin.inspectiontemplate.vo.InspectionTemplateCreateReqVO; -import cn.iocoder.yudao.module.configure.controller.admin.inspectiontemplate.vo.InspectionTemplateRespVO; -import cn.iocoder.yudao.module.configure.controller.admin.inspectiontemplate.vo.InspectionTemplateUpdateReqVO; -import cn.iocoder.yudao.module.configure.dal.dataobject.inspectiontemplate.InspectionTemplateDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T16:01:16+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class InspectionTemplateConvertImpl implements InspectionTemplateConvert { - - @Override - public InspectionTemplateDO convert(InspectionTemplateCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - InspectionTemplateDO.InspectionTemplateDOBuilder inspectionTemplateDO = InspectionTemplateDO.builder(); - - inspectionTemplateDO.templateName( bean.getTemplateName() ); - inspectionTemplateDO.belongBusinessId( bean.getBelongBusinessId() ); - - return inspectionTemplateDO.build(); - } - - @Override - public InspectionTemplateDO convert(InspectionTemplateUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - InspectionTemplateDO.InspectionTemplateDOBuilder inspectionTemplateDO = InspectionTemplateDO.builder(); - - inspectionTemplateDO.id( bean.getId() ); - - return inspectionTemplateDO.build(); - } - - @Override - public InspectionTemplateRespVO convert(InspectionTemplateDO bean) { - if ( bean == null ) { - return null; - } - - InspectionTemplateRespVO inspectionTemplateRespVO = new InspectionTemplateRespVO(); - - inspectionTemplateRespVO.setTemplateName( bean.getTemplateName() ); - inspectionTemplateRespVO.setTemplateId( bean.getTemplateId() ); - inspectionTemplateRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - inspectionTemplateRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - inspectionTemplateRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - inspectionTemplateRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return inspectionTemplateRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( InspectionTemplateDO inspectionTemplateDO : list ) { - list1.add( convert( inspectionTemplateDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } -} diff --git a/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/tracecert/TraceCertConvertImpl.java b/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/tracecert/TraceCertConvertImpl.java deleted file mode 100644 index 2bbe87c..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/tracecert/TraceCertConvertImpl.java +++ /dev/null @@ -1,119 +0,0 @@ -package cn.iocoder.yudao.module.configure.convert.tracecert; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.configure.controller.admin.tracecert.vo.TraceCertCreateReqVO; -import cn.iocoder.yudao.module.configure.controller.admin.tracecert.vo.TraceCertRespVO; -import cn.iocoder.yudao.module.configure.controller.admin.tracecert.vo.TraceCertUpdateReqVO; -import cn.iocoder.yudao.module.configure.dal.dataobject.tracecert.TraceCertDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T16:01:16+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class TraceCertConvertImpl implements TraceCertConvert { - - @Override - public TraceCertDO convert(TraceCertCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - TraceCertDO.TraceCertDOBuilder traceCertDO = TraceCertDO.builder(); - - traceCertDO.chainName( bean.getChainName() ); - traceCertDO.showBlock( bean.getShowBlock() ); - traceCertDO.showBlockTime( bean.getShowBlockTime() ); - traceCertDO.showIdentity( bean.getShowIdentity() ); - traceCertDO.showSubjectProof( bean.getShowSubjectProof() ); - traceCertDO.showUploadTime( bean.getShowUploadTime() ); - traceCertDO.showUploadLocation( bean.getShowUploadLocation() ); - traceCertDO.uploadUser( bean.getUploadUser() ); - traceCertDO.belongBusinessId( bean.getBelongBusinessId() ); - traceCertDO.belongBusinessName( bean.getBelongBusinessName() ); - - return traceCertDO.build(); - } - - @Override - public TraceCertDO convert(TraceCertUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - TraceCertDO.TraceCertDOBuilder traceCertDO = TraceCertDO.builder(); - - traceCertDO.id( bean.getId() ); - traceCertDO.chainName( bean.getChainName() ); - traceCertDO.showBlock( bean.getShowBlock() ); - traceCertDO.showBlockTime( bean.getShowBlockTime() ); - traceCertDO.showIdentity( bean.getShowIdentity() ); - traceCertDO.showSubjectProof( bean.getShowSubjectProof() ); - traceCertDO.showUploadTime( bean.getShowUploadTime() ); - traceCertDO.showUploadLocation( bean.getShowUploadLocation() ); - traceCertDO.uploadUser( bean.getUploadUser() ); - traceCertDO.belongBusinessId( bean.getBelongBusinessId() ); - traceCertDO.belongBusinessName( bean.getBelongBusinessName() ); - - return traceCertDO.build(); - } - - @Override - public TraceCertRespVO convert(TraceCertDO bean) { - if ( bean == null ) { - return null; - } - - TraceCertRespVO traceCertRespVO = new TraceCertRespVO(); - - traceCertRespVO.setChainName( bean.getChainName() ); - traceCertRespVO.setShowBlock( bean.getShowBlock() ); - traceCertRespVO.setShowBlockTime( bean.getShowBlockTime() ); - traceCertRespVO.setShowIdentity( bean.getShowIdentity() ); - traceCertRespVO.setShowSubjectProof( bean.getShowSubjectProof() ); - traceCertRespVO.setShowUploadTime( bean.getShowUploadTime() ); - traceCertRespVO.setShowUploadLocation( bean.getShowUploadLocation() ); - traceCertRespVO.setUploadUser( bean.getUploadUser() ); - traceCertRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - traceCertRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - traceCertRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - traceCertRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return traceCertRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( TraceCertDO traceCertDO : list ) { - list1.add( convert( traceCertDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } -} diff --git a/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/tracelink/TraceLinkConvertImpl.java b/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/tracelink/TraceLinkConvertImpl.java deleted file mode 100644 index 25e8479..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/tracelink/TraceLinkConvertImpl.java +++ /dev/null @@ -1,125 +0,0 @@ -package cn.iocoder.yudao.module.configure.convert.tracelink; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.configure.controller.admin.tracelink.vo.TraceLinkCreateReqVO; -import cn.iocoder.yudao.module.configure.controller.admin.tracelink.vo.TraceLinkExcelVO; -import cn.iocoder.yudao.module.configure.controller.admin.tracelink.vo.TraceLinkRespVO; -import cn.iocoder.yudao.module.configure.dal.dataobject.tracelink.TraceLinkDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T16:01:16+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class TraceLinkConvertImpl implements TraceLinkConvert { - - @Override - public TraceLinkDO convert(TraceLinkCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - TraceLinkDO.TraceLinkDOBuilder traceLinkDO = TraceLinkDO.builder(); - - traceLinkDO.traceTemplateId( bean.getTraceTemplateId() ); - traceLinkDO.traceTemplateName( bean.getTraceTemplateName() ); - traceLinkDO.linkId( bean.getLinkId() ); - traceLinkDO.linkName( bean.getLinkName() ); - traceLinkDO.sort( bean.getSort() ); - traceLinkDO.belongBusinessId( bean.getBelongBusinessId() ); - traceLinkDO.belongBusinessName( bean.getBelongBusinessName() ); - - return traceLinkDO.build(); - } - - @Override - public TraceLinkRespVO convert(TraceLinkDO bean) { - if ( bean == null ) { - return null; - } - - TraceLinkRespVO traceLinkRespVO = new TraceLinkRespVO(); - - traceLinkRespVO.setTraceTemplateId( bean.getTraceTemplateId() ); - traceLinkRespVO.setTraceTemplateName( bean.getTraceTemplateName() ); - traceLinkRespVO.setLinkId( bean.getLinkId() ); - traceLinkRespVO.setLinkName( bean.getLinkName() ); - traceLinkRespVO.setSort( bean.getSort() ); - traceLinkRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - traceLinkRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - traceLinkRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - traceLinkRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return traceLinkRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( TraceLinkDO traceLinkDO : list ) { - list1.add( convert( traceLinkDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( TraceLinkDO traceLinkDO : list ) { - list1.add( traceLinkDOToTraceLinkExcelVO( traceLinkDO ) ); - } - - return list1; - } - - protected TraceLinkExcelVO traceLinkDOToTraceLinkExcelVO(TraceLinkDO traceLinkDO) { - if ( traceLinkDO == null ) { - return null; - } - - TraceLinkExcelVO traceLinkExcelVO = new TraceLinkExcelVO(); - - traceLinkExcelVO.setId( traceLinkDO.getId() ); - traceLinkExcelVO.setTraceTemplateId( traceLinkDO.getTraceTemplateId() ); - traceLinkExcelVO.setTraceTemplateName( traceLinkDO.getTraceTemplateName() ); - traceLinkExcelVO.setLinkId( traceLinkDO.getLinkId() ); - traceLinkExcelVO.setLinkName( traceLinkDO.getLinkName() ); - traceLinkExcelVO.setBelongBusinessId( traceLinkDO.getBelongBusinessId() ); - traceLinkExcelVO.setBelongBusinessName( traceLinkDO.getBelongBusinessName() ); - if ( traceLinkDO.getCreateTime() != null ) { - traceLinkExcelVO.setCreateTime( Date.from( traceLinkDO.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return traceLinkExcelVO; - } -} diff --git a/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/tracelinkitem/TraceLinkItemConvertImpl.java b/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/tracelinkitem/TraceLinkItemConvertImpl.java deleted file mode 100644 index c254da3..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/tracelinkitem/TraceLinkItemConvertImpl.java +++ /dev/null @@ -1,130 +0,0 @@ -package cn.iocoder.yudao.module.configure.convert.tracelinkitem; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.configure.controller.admin.tracelinkitem.vo.TraceLinkItemCreateReqVO; -import cn.iocoder.yudao.module.configure.controller.admin.tracelinkitem.vo.TraceLinkItemExcelVO; -import cn.iocoder.yudao.module.configure.controller.admin.tracelinkitem.vo.TraceLinkItemRespVO; -import cn.iocoder.yudao.module.configure.dal.dataobject.tracelinkitem.TraceLinkItemDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T16:01:16+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class TraceLinkItemConvertImpl implements TraceLinkItemConvert { - - @Override - public TraceLinkItemDO convert(TraceLinkItemCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - TraceLinkItemDO.TraceLinkItemDOBuilder traceLinkItemDO = TraceLinkItemDO.builder(); - - traceLinkItemDO.title( bean.getTitle() ); - traceLinkItemDO.type( bean.getType() ); - traceLinkItemDO.content( bean.getContent() ); - traceLinkItemDO.linkText( bean.getLinkText() ); - traceLinkItemDO.linkName( bean.getLinkName() ); - traceLinkItemDO.linkId( bean.getLinkId() ); - traceLinkItemDO.belongBusinessId( bean.getBelongBusinessId() ); - traceLinkItemDO.belongBusinessName( bean.getBelongBusinessName() ); - - return traceLinkItemDO.build(); - } - - @Override - public TraceLinkItemRespVO convert(TraceLinkItemDO bean) { - if ( bean == null ) { - return null; - } - - TraceLinkItemRespVO traceLinkItemRespVO = new TraceLinkItemRespVO(); - - traceLinkItemRespVO.setTitle( bean.getTitle() ); - traceLinkItemRespVO.setType( bean.getType() ); - traceLinkItemRespVO.setContent( bean.getContent() ); - traceLinkItemRespVO.setLinkText( bean.getLinkText() ); - traceLinkItemRespVO.setAddTime( bean.getAddTime() ); - traceLinkItemRespVO.setLinkName( bean.getLinkName() ); - traceLinkItemRespVO.setLinkId( bean.getLinkId() ); - traceLinkItemRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - traceLinkItemRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - traceLinkItemRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - traceLinkItemRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return traceLinkItemRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( TraceLinkItemDO traceLinkItemDO : list ) { - list1.add( convert( traceLinkItemDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( TraceLinkItemDO traceLinkItemDO : list ) { - list1.add( traceLinkItemDOToTraceLinkItemExcelVO( traceLinkItemDO ) ); - } - - return list1; - } - - protected TraceLinkItemExcelVO traceLinkItemDOToTraceLinkItemExcelVO(TraceLinkItemDO traceLinkItemDO) { - if ( traceLinkItemDO == null ) { - return null; - } - - TraceLinkItemExcelVO traceLinkItemExcelVO = new TraceLinkItemExcelVO(); - - traceLinkItemExcelVO.setId( traceLinkItemDO.getId() ); - traceLinkItemExcelVO.setTitle( traceLinkItemDO.getTitle() ); - traceLinkItemExcelVO.setType( traceLinkItemDO.getType() ); - traceLinkItemExcelVO.setContent( traceLinkItemDO.getContent() ); - traceLinkItemExcelVO.setAddTime( traceLinkItemDO.getAddTime() ); - traceLinkItemExcelVO.setLinkName( traceLinkItemDO.getLinkName() ); - traceLinkItemExcelVO.setLinkId( traceLinkItemDO.getLinkId() ); - traceLinkItemExcelVO.setBelongBusinessId( traceLinkItemDO.getBelongBusinessId() ); - traceLinkItemExcelVO.setBelongBusinessName( traceLinkItemDO.getBelongBusinessName() ); - if ( traceLinkItemDO.getCreateTime() != null ) { - traceLinkItemExcelVO.setCreateTime( Date.from( traceLinkItemDO.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return traceLinkItemExcelVO; - } -} diff --git a/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/tracetemplate/TraceTemplateConvertImpl.java b/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/tracetemplate/TraceTemplateConvertImpl.java deleted file mode 100644 index 71f9d40..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/tracetemplate/TraceTemplateConvertImpl.java +++ /dev/null @@ -1,145 +0,0 @@ -package cn.iocoder.yudao.module.configure.convert.tracetemplate; - -import cn.iocoder.yudao.module.configure.controller.admin.tracelink.vo.TraceLinkRespVO; -import cn.iocoder.yudao.module.configure.controller.admin.tracelinkitem.vo.TraceLinkItemRespVO; -import cn.iocoder.yudao.module.configure.controller.admin.tracetemplate.vo.LinkFileVO; -import cn.iocoder.yudao.module.configure.controller.admin.tracetemplate.vo.LinkItemFileVO; -import cn.iocoder.yudao.module.configure.controller.admin.tracetemplate.vo.TraceTemplateCreateReqVO; -import cn.iocoder.yudao.module.configure.controller.admin.tracetemplate.vo.TraceTemplateRespVO; -import cn.iocoder.yudao.module.configure.controller.admin.tracetemplate.vo.TraceTemplateUpdateReqVO; -import cn.iocoder.yudao.module.configure.dal.dataobject.tracetemplate.TraceTemplateDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T16:01:16+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class TraceTemplateConvertImpl implements TraceTemplateConvert { - - @Override - public TraceTemplateDO convert(TraceTemplateCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - TraceTemplateDO.TraceTemplateDOBuilder traceTemplateDO = TraceTemplateDO.builder(); - - traceTemplateDO.templateName( bean.getTemplateName() ); - traceTemplateDO.goodsId( bean.getGoodsId() ); - traceTemplateDO.belongBusinessId( bean.getBelongBusinessId() ); - - return traceTemplateDO.build(); - } - - @Override - public TraceTemplateDO convert(TraceTemplateUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - TraceTemplateDO.TraceTemplateDOBuilder traceTemplateDO = TraceTemplateDO.builder(); - - traceTemplateDO.id( bean.getId() ); - traceTemplateDO.templateName( bean.getTemplateName() ); - traceTemplateDO.goodsId( bean.getGoodsId() ); - traceTemplateDO.belongBusinessId( bean.getBelongBusinessId() ); - - return traceTemplateDO.build(); - } - - @Override - public TraceTemplateRespVO convert(TraceTemplateDO bean) { - if ( bean == null ) { - return null; - } - - TraceTemplateRespVO traceTemplateRespVO = new TraceTemplateRespVO(); - - traceTemplateRespVO.setTemplateId( bean.getTemplateId() ); - traceTemplateRespVO.setTemplateName( bean.getTemplateName() ); - traceTemplateRespVO.setGoodsId( bean.getGoodsId() ); - traceTemplateRespVO.setGoodsName( bean.getGoodsName() ); - traceTemplateRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - traceTemplateRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - traceTemplateRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - traceTemplateRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return traceTemplateRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( TraceTemplateDO traceTemplateDO : list ) { - list1.add( convert( traceTemplateDO ) ); - } - - return list1; - } - - @Override - public List convertToFileVOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( TraceLinkRespVO traceLinkRespVO : list ) { - list1.add( traceLinkRespVOToLinkFileVO( traceLinkRespVO ) ); - } - - return list1; - } - - protected LinkItemFileVO traceLinkItemRespVOToLinkItemFileVO(TraceLinkItemRespVO traceLinkItemRespVO) { - if ( traceLinkItemRespVO == null ) { - return null; - } - - LinkItemFileVO linkItemFileVO = new LinkItemFileVO(); - - linkItemFileVO.setTitle( traceLinkItemRespVO.getTitle() ); - linkItemFileVO.setType( traceLinkItemRespVO.getType() ); - linkItemFileVO.setContent( traceLinkItemRespVO.getContent() ); - linkItemFileVO.setLinkText( traceLinkItemRespVO.getLinkText() ); - - return linkItemFileVO; - } - - protected List traceLinkItemRespVOListToLinkItemFileVOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( TraceLinkItemRespVO traceLinkItemRespVO : list ) { - list1.add( traceLinkItemRespVOToLinkItemFileVO( traceLinkItemRespVO ) ); - } - - return list1; - } - - protected LinkFileVO traceLinkRespVOToLinkFileVO(TraceLinkRespVO traceLinkRespVO) { - if ( traceLinkRespVO == null ) { - return null; - } - - LinkFileVO linkFileVO = new LinkFileVO(); - - linkFileVO.setLinkName( traceLinkRespVO.getLinkName() ); - linkFileVO.setTraceLinkItems( traceLinkItemRespVOListToLinkItemFileVOList( traceLinkRespVO.getTraceLinkItems() ) ); - - return linkFileVO; - } -} diff --git a/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/unitemplate/UniTemplateConvertImpl.java b/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/unitemplate/UniTemplateConvertImpl.java deleted file mode 100644 index a7d30cb..0000000 --- a/yudao-module-configure/yudao-module-configure-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/configure/convert/unitemplate/UniTemplateConvertImpl.java +++ /dev/null @@ -1,77 +0,0 @@ -package cn.iocoder.yudao.module.configure.convert.unitemplate; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.configure.controller.admin.unitemplate.vo.UniTemplateRespVO; -import cn.iocoder.yudao.module.configure.dal.dataobject.unitemplate.UniTemplateDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T16:01:16+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class UniTemplateConvertImpl implements UniTemplateConvert { - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( UniTemplateDO uniTemplateDO : list ) { - list1.add( uniTemplateDOToUniTemplateRespVO( uniTemplateDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - protected UniTemplateRespVO uniTemplateDOToUniTemplateRespVO(UniTemplateDO uniTemplateDO) { - if ( uniTemplateDO == null ) { - return null; - } - - UniTemplateRespVO uniTemplateRespVO = new UniTemplateRespVO(); - - uniTemplateRespVO.setTemplateName( uniTemplateDO.getTemplateName() ); - uniTemplateRespVO.setTemplateType( uniTemplateDO.getTemplateType() ); - uniTemplateRespVO.setBgUrl( uniTemplateDO.getBgUrl() ); - uniTemplateRespVO.setFontColor( uniTemplateDO.getFontColor() ); - uniTemplateRespVO.setDefaultTemplate( uniTemplateDO.getDefaultTemplate() ); - uniTemplateRespVO.setShowPop( uniTemplateDO.getShowPop() ); - uniTemplateRespVO.setShowScanRecord( uniTemplateDO.getShowScanRecord() ); - uniTemplateRespVO.setScanRecordIconUrl( uniTemplateDO.getScanRecordIconUrl() ); - uniTemplateRespVO.setShowChangeLanguage( uniTemplateDO.getShowChangeLanguage() ); - uniTemplateRespVO.setChangeLanguageIconUrl( uniTemplateDO.getChangeLanguageIconUrl() ); - uniTemplateRespVO.setId( uniTemplateDO.getId() ); - uniTemplateRespVO.setShowGoodsDetail( uniTemplateDO.getShowGoodsDetail() ); - uniTemplateRespVO.setGoodsDetailIconUrl( uniTemplateDO.getGoodsDetailIconUrl() ); - uniTemplateRespVO.setShowAi( uniTemplateDO.getShowAi() ); - uniTemplateRespVO.setAiIconUrl( uniTemplateDO.getAiIconUrl() ); - uniTemplateRespVO.setShowShop( uniTemplateDO.getShowShop() ); - uniTemplateRespVO.setShopIconUrl( uniTemplateDO.getShopIconUrl() ); - if ( uniTemplateDO.getCreateTime() != null ) { - uniTemplateRespVO.setCreateTime( Date.from( uniTemplateDO.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return uniTemplateRespVO; - } -} diff --git a/yudao-module-flow/yudao-module-flow-biz/target/classes/bootstrap-local.yaml b/yudao-module-flow/yudao-module-flow-biz/target/classes/bootstrap-local.yaml deleted file mode 100644 index fe4d3a5..0000000 --- a/yudao-module-flow/yudao-module-flow-biz/target/classes/bootstrap-local.yaml +++ /dev/null @@ -1,31 +0,0 @@ -spring: - main: - allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 - allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Dubbo 或者 Feign 等会存在重复定义的服务 - ---- #################### 注册中心相关配置 #################### - -spring: - cloud: - nacos: - server-addr: 192.168.233.128:8848 - discovery: - namespace: dev # 命名空间。这里使用 dev 开发环境 - metadata: - version: 1.0.0 # 服务实例的版本号，可用于灰度发布 - ---- #################### 配置中心相关配置 #################### - -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: 192.168.233.128:8848 # Nacos 服务器地址 - namespace: dev # 命名空间。这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/yudao-module-flow/yudao-module-flow-biz/target/classes/bootstrap-prod.yaml b/yudao-module-flow/yudao-module-flow-biz/target/classes/bootstrap-prod.yaml deleted file mode 100644 index d0b3068..0000000 --- a/yudao-module-flow/yudao-module-flow-biz/target/classes/bootstrap-prod.yaml +++ /dev/null @@ -1,31 +0,0 @@ -spring: - main: - allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 - allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Dubbo 或者 Feign 等会存在重复定义的服务 - ---- #################### 注册中心相关配置 #################### - -spring: - cloud: - nacos: - server-addr: 127.0.0.1:8848 - discovery: - namespace: prod # 命名空间。这里使用 dev 开发环境 - metadata: - version: 1.0.0 # 服务实例的版本号，可用于灰度发布 - ---- #################### 配置中心相关配置 #################### - -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: 127.0.0.1:8848 # Nacos 服务器地址 - namespace: prod # 命名空间。这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/yudao-module-flow/yudao-module-flow-biz/target/classes/bootstrap.yaml b/yudao-module-flow/yudao-module-flow-biz/target/classes/bootstrap.yaml deleted file mode 100644 index 48e3593..0000000 --- a/yudao-module-flow/yudao-module-flow-biz/target/classes/bootstrap.yaml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - application: - name: flow-server - - profiles: - active: local - -server: - port: 49084 - -# 日志文件配置。注意，如果 logging.file.name 不放在 bootstrap.yaml 配置文件，而是放在 application.yaml 中，会导致出现 LOG_FILE_IS_UNDEFINED 文件 -logging: - file: - name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径 diff --git a/yudao-module-flow/yudao-module-flow-biz/target/classes/logback-spring.xml b/yudao-module-flow/yudao-module-flow-biz/target/classes/logback-spring.xml deleted file mode 100644 index 5f4b30d..0000000 --- a/yudao-module-flow/yudao-module-flow-biz/target/classes/logback-spring.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - 　　　　　 - - - ${PATTERN_DEFAULT} - - - - - - - - - - ${PATTERN_DEFAULT} - - - - ${LOG_FILE} - - - ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz} - - ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} - - ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB} - - ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0} - - ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30} - - - - - - 0 - - 256 - - - - - - - - ${PATTERN_DEFAULT} - - - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-flow/yudao-module-flow-biz/target/classes/mapper/outbound/OutboundMapper.xml b/yudao-module-flow/yudao-module-flow-biz/target/classes/mapper/outbound/OutboundMapper.xml deleted file mode 100644 index 37e5215..0000000 --- a/yudao-module-flow/yudao-module-flow-biz/target/classes/mapper/outbound/OutboundMapper.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - diff --git a/yudao-module-flow/yudao-module-flow-biz/target/classes/mapper/outboundgoods/OutboundGoodsMapper.xml b/yudao-module-flow/yudao-module-flow-biz/target/classes/mapper/outboundgoods/OutboundGoodsMapper.xml deleted file mode 100644 index f797b87..0000000 --- a/yudao-module-flow/yudao-module-flow-biz/target/classes/mapper/outboundgoods/OutboundGoodsMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-flow/yudao-module-flow-biz/target/classes/sql/clean.sql b/yudao-module-flow/yudao-module-flow-biz/target/classes/sql/clean.sql deleted file mode 100644 index b9f5d64..0000000 --- a/yudao-module-flow/yudao-module-flow-biz/target/classes/sql/clean.sql +++ /dev/null @@ -1,2 +0,0 @@ -DELETE FROM "flow_outbound"; -DELETE FROM "flow_outbound_goods"; \ No newline at end of file diff --git a/yudao-module-flow/yudao-module-flow-biz/target/classes/sql/create_tables.sql b/yudao-module-flow/yudao-module-flow-biz/target/classes/sql/create_tables.sql deleted file mode 100644 index 6724a97..0000000 --- a/yudao-module-flow/yudao-module-flow-biz/target/classes/sql/create_tables.sql +++ /dev/null @@ -1,44 +0,0 @@ -CREATE TABLE IF NOT EXISTS "flow_outbound" ( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "vendor_id" varchar NOT NULL, - "vendor_name" varchar NOT NULL, - "out_bound_id" varchar NOT NULL, - "out_bound_time" datetime NOT NULL, - "carrier_vehicles" varchar, - "carrier" varchar, - "carrier_contact" varchar, - "block_state" bit NOT NULL, - "block_chain_id" varchar, - "block_chain_block_identity" varchar, - "belong_business_id" bigint NOT NULL, - "belong_business_name" varchar NOT NULL, - "tenant_id" bigint NOT NULL, - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - "deleted" bit NOT NULL DEFAULT FALSE, - "creator" varchar DEFAULT '', - "updater" varchar DEFAULT '', - PRIMARY KEY ("id") -) COMMENT '出库单'; -CREATE TABLE IF NOT EXISTS "flow_outbound_goods" ( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "bind_id" varchar NOT NULL, - "goods_id" varchar NOT NULL, - "goods_name" varchar NOT NULL, - "out_bound_id" varchar NOT NULL, - "harvest_batch_id" varchar NOT NULL, - "identity_code_num" int, - "goods_unit" varchar, - "goods_weight" varchar, - "goods_unit_price" varchar, - "total_price" varchar, - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - "belong_business_id" bigint NOT NULL, - "belong_business_name" varchar NOT NULL, - "tenant_id" bigint NOT NULL, - "deleted" bit NOT NULL DEFAULT FALSE, - "creator" varchar DEFAULT '', - "updater" varchar DEFAULT '', - PRIMARY KEY ("id") -) COMMENT '出库单商品'; \ No newline at end of file diff --git a/yudao-module-flow/yudao-module-flow-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/flow/convert/outbound/OutboundConvertImpl.java b/yudao-module-flow/yudao-module-flow-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/flow/convert/outbound/OutboundConvertImpl.java deleted file mode 100644 index c676070..0000000 --- a/yudao-module-flow/yudao-module-flow-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/flow/convert/outbound/OutboundConvertImpl.java +++ /dev/null @@ -1,236 +0,0 @@ -package cn.iocoder.yudao.module.flow.convert.outbound; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.flow.api.outbound.dto.OutboundRespDTO; -import cn.iocoder.yudao.module.flow.controller.admin.outbound.vo.OutboundCreateReqVO; -import cn.iocoder.yudao.module.flow.controller.admin.outbound.vo.OutboundExcelVO; -import cn.iocoder.yudao.module.flow.controller.admin.outbound.vo.OutboundRespVO; -import cn.iocoder.yudao.module.flow.controller.admin.outbound.vo.OutboundUpdateReqVO; -import cn.iocoder.yudao.module.flow.controller.admin.outboundgoods.vo.OutboundGoodsSaveReqVO; -import cn.iocoder.yudao.module.flow.dal.dataobject.outbound.OutboundDO; -import cn.iocoder.yudao.module.flow.dal.dataobject.outboundgoods.OutboundGoodsDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-07-12T09:16:18+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class OutboundConvertImpl implements OutboundConvert { - - @Override - public OutboundDO convert(OutboundCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - OutboundDO.OutboundDOBuilder outboundDO = OutboundDO.builder(); - - outboundDO.vendorId( bean.getVendorId() ); - outboundDO.vendorName( bean.getVendorName() ); - outboundDO.outBoundId( bean.getOutBoundId() ); - outboundDO.outBoundTime( bean.getOutBoundTime() ); - outboundDO.carrierVehicles( bean.getCarrierVehicles() ); - outboundDO.carrier( bean.getCarrier() ); - outboundDO.carrierContact( bean.getCarrierContact() ); - - return outboundDO.build(); - } - - @Override - public OutboundDO convert(OutboundUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - OutboundDO.OutboundDOBuilder outboundDO = OutboundDO.builder(); - - outboundDO.id( bean.getId() ); - outboundDO.vendorId( bean.getVendorId() ); - outboundDO.vendorName( bean.getVendorName() ); - outboundDO.outBoundId( bean.getOutBoundId() ); - outboundDO.outBoundTime( bean.getOutBoundTime() ); - outboundDO.carrierVehicles( bean.getCarrierVehicles() ); - outboundDO.carrier( bean.getCarrier() ); - outboundDO.carrierContact( bean.getCarrierContact() ); - - return outboundDO.build(); - } - - @Override - public OutboundRespVO convert(OutboundDO bean) { - if ( bean == null ) { - return null; - } - - OutboundRespVO outboundRespVO = new OutboundRespVO(); - - outboundRespVO.setVendorId( bean.getVendorId() ); - outboundRespVO.setVendorName( bean.getVendorName() ); - outboundRespVO.setOutBoundId( bean.getOutBoundId() ); - outboundRespVO.setOutBoundTime( bean.getOutBoundTime() ); - outboundRespVO.setCarrierVehicles( bean.getCarrierVehicles() ); - outboundRespVO.setCarrier( bean.getCarrier() ); - outboundRespVO.setCarrierContact( bean.getCarrierContact() ); - outboundRespVO.setBlockState( bean.getBlockState() ); - outboundRespVO.setBlockChainId( bean.getBlockChainId() ); - outboundRespVO.setBlockChainBlockIdentity( bean.getBlockChainBlockIdentity() ); - outboundRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - outboundRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - outboundRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - outboundRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return outboundRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( OutboundDO outboundDO : list ) { - list1.add( convert( outboundDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( OutboundDO outboundDO : list ) { - list1.add( outboundDOToOutboundExcelVO( outboundDO ) ); - } - - return list1; - } - - @Override - public List convertListCreate(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( OutboundGoodsSaveReqVO outboundGoodsSaveReqVO : list ) { - list1.add( outboundGoodsSaveReqVOToOutboundGoodsDO( outboundGoodsSaveReqVO ) ); - } - - return list1; - } - - @Override - public List convertToRespDTOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( OutboundDO outboundDO : list ) { - list1.add( outboundDOToOutboundRespDTO( outboundDO ) ); - } - - return list1; - } - - protected OutboundExcelVO outboundDOToOutboundExcelVO(OutboundDO outboundDO) { - if ( outboundDO == null ) { - return null; - } - - OutboundExcelVO outboundExcelVO = new OutboundExcelVO(); - - outboundExcelVO.setId( outboundDO.getId() ); - outboundExcelVO.setVendorId( outboundDO.getVendorId() ); - outboundExcelVO.setVendorName( outboundDO.getVendorName() ); - outboundExcelVO.setOutBoundId( outboundDO.getOutBoundId() ); - outboundExcelVO.setOutBoundTime( outboundDO.getOutBoundTime() ); - outboundExcelVO.setCarrierVehicles( outboundDO.getCarrierVehicles() ); - outboundExcelVO.setCarrier( outboundDO.getCarrier() ); - outboundExcelVO.setCarrierContact( outboundDO.getCarrierContact() ); - outboundExcelVO.setBlockState( outboundDO.getBlockState() ); - outboundExcelVO.setBlockChainId( outboundDO.getBlockChainId() ); - outboundExcelVO.setBlockChainBlockIdentity( outboundDO.getBlockChainBlockIdentity() ); - outboundExcelVO.setBelongBusinessId( outboundDO.getBelongBusinessId() ); - outboundExcelVO.setBelongBusinessName( outboundDO.getBelongBusinessName() ); - if ( outboundDO.getCreateTime() != null ) { - outboundExcelVO.setCreateTime( Date.from( outboundDO.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return outboundExcelVO; - } - - protected OutboundGoodsDO outboundGoodsSaveReqVOToOutboundGoodsDO(OutboundGoodsSaveReqVO outboundGoodsSaveReqVO) { - if ( outboundGoodsSaveReqVO == null ) { - return null; - } - - OutboundGoodsDO.OutboundGoodsDOBuilder outboundGoodsDO = OutboundGoodsDO.builder(); - - outboundGoodsDO.id( outboundGoodsSaveReqVO.getId() ); - outboundGoodsDO.goodsId( outboundGoodsSaveReqVO.getGoodsId() ); - outboundGoodsDO.goodsName( outboundGoodsSaveReqVO.getGoodsName() ); - outboundGoodsDO.outBoundId( outboundGoodsSaveReqVO.getOutBoundId() ); - outboundGoodsDO.harvestBatchId( outboundGoodsSaveReqVO.getHarvestBatchId() ); - outboundGoodsDO.identityCodeNum( outboundGoodsSaveReqVO.getIdentityCodeNum() ); - outboundGoodsDO.goodsNum( outboundGoodsSaveReqVO.getGoodsNum() ); - outboundGoodsDO.goodsUnit( outboundGoodsSaveReqVO.getGoodsUnit() ); - outboundGoodsDO.goodsWeight( outboundGoodsSaveReqVO.getGoodsWeight() ); - outboundGoodsDO.goodsUnitPrice( outboundGoodsSaveReqVO.getGoodsUnitPrice() ); - outboundGoodsDO.totalPrice( outboundGoodsSaveReqVO.getTotalPrice() ); - outboundGoodsDO.belongBusinessId( outboundGoodsSaveReqVO.getBelongBusinessId() ); - outboundGoodsDO.belongBusinessName( outboundGoodsSaveReqVO.getBelongBusinessName() ); - - return outboundGoodsDO.build(); - } - - protected OutboundRespDTO outboundDOToOutboundRespDTO(OutboundDO outboundDO) { - if ( outboundDO == null ) { - return null; - } - - OutboundRespDTO outboundRespDTO = new OutboundRespDTO(); - - outboundRespDTO.setId( outboundDO.getId() ); - outboundRespDTO.setVendorId( outboundDO.getVendorId() ); - outboundRespDTO.setVendorName( outboundDO.getVendorName() ); - outboundRespDTO.setOutBoundId( outboundDO.getOutBoundId() ); - outboundRespDTO.setOutBoundTime( outboundDO.getOutBoundTime() ); - outboundRespDTO.setCarrierVehicles( outboundDO.getCarrierVehicles() ); - outboundRespDTO.setCarrier( outboundDO.getCarrier() ); - outboundRespDTO.setCarrierContact( outboundDO.getCarrierContact() ); - outboundRespDTO.setBlockState( outboundDO.getBlockState() ); - outboundRespDTO.setBlockChainId( outboundDO.getBlockChainId() ); - outboundRespDTO.setBlockChainBlockIdentity( outboundDO.getBlockChainBlockIdentity() ); - outboundRespDTO.setBelongBusinessId( outboundDO.getBelongBusinessId() ); - outboundRespDTO.setBelongBusinessName( outboundDO.getBelongBusinessName() ); - - return outboundRespDTO; - } -} diff --git a/yudao-module-flow/yudao-module-flow-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/flow/convert/outboundgoods/OutboundGoodsConvertImpl.java b/yudao-module-flow/yudao-module-flow-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/flow/convert/outboundgoods/OutboundGoodsConvertImpl.java deleted file mode 100644 index 9a5b77b..0000000 --- a/yudao-module-flow/yudao-module-flow-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/flow/convert/outboundgoods/OutboundGoodsConvertImpl.java +++ /dev/null @@ -1,241 +0,0 @@ -package cn.iocoder.yudao.module.flow.convert.outboundgoods; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.flow.api.outboundgoods.dto.OutboundgoodsRespDTO; -import cn.iocoder.yudao.module.flow.controller.admin.outboundgoods.vo.OutboundGoodsCreateReqVO; -import cn.iocoder.yudao.module.flow.controller.admin.outboundgoods.vo.OutboundGoodsExcelVO; -import cn.iocoder.yudao.module.flow.controller.admin.outboundgoods.vo.OutboundGoodsRespVO; -import cn.iocoder.yudao.module.flow.controller.admin.outboundgoods.vo.OutboundGoodsSaveReqVO; -import cn.iocoder.yudao.module.flow.controller.admin.outboundgoods.vo.OutboundGoodsUpdateReqVO; -import cn.iocoder.yudao.module.flow.dal.dataobject.outboundgoods.OutboundGoodsDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-07-12T09:16:18+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class OutboundGoodsConvertImpl implements OutboundGoodsConvert { - - @Override - public OutboundGoodsDO convert(OutboundGoodsCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - OutboundGoodsDO.OutboundGoodsDOBuilder outboundGoodsDO = OutboundGoodsDO.builder(); - - outboundGoodsDO.goodsId( bean.getGoodsId() ); - outboundGoodsDO.goodsName( bean.getGoodsName() ); - outboundGoodsDO.outBoundId( bean.getOutBoundId() ); - outboundGoodsDO.harvestBatchId( bean.getHarvestBatchId() ); - outboundGoodsDO.belongBusinessId( bean.getBelongBusinessId() ); - outboundGoodsDO.belongBusinessName( bean.getBelongBusinessName() ); - - return outboundGoodsDO.build(); - } - - @Override - public OutboundGoodsDO convert(OutboundGoodsSaveReqVO bean) { - if ( bean == null ) { - return null; - } - - OutboundGoodsDO.OutboundGoodsDOBuilder outboundGoodsDO = OutboundGoodsDO.builder(); - - outboundGoodsDO.id( bean.getId() ); - outboundGoodsDO.goodsId( bean.getGoodsId() ); - outboundGoodsDO.goodsName( bean.getGoodsName() ); - outboundGoodsDO.outBoundId( bean.getOutBoundId() ); - outboundGoodsDO.harvestBatchId( bean.getHarvestBatchId() ); - outboundGoodsDO.identityCodeNum( bean.getIdentityCodeNum() ); - outboundGoodsDO.goodsNum( bean.getGoodsNum() ); - outboundGoodsDO.goodsUnit( bean.getGoodsUnit() ); - outboundGoodsDO.goodsWeight( bean.getGoodsWeight() ); - outboundGoodsDO.goodsUnitPrice( bean.getGoodsUnitPrice() ); - outboundGoodsDO.totalPrice( bean.getTotalPrice() ); - outboundGoodsDO.belongBusinessId( bean.getBelongBusinessId() ); - outboundGoodsDO.belongBusinessName( bean.getBelongBusinessName() ); - - return outboundGoodsDO.build(); - } - - @Override - public OutboundGoodsDO convert(OutboundGoodsUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - OutboundGoodsDO.OutboundGoodsDOBuilder outboundGoodsDO = OutboundGoodsDO.builder(); - - outboundGoodsDO.id( bean.getId() ); - outboundGoodsDO.goodsId( bean.getGoodsId() ); - outboundGoodsDO.goodsName( bean.getGoodsName() ); - outboundGoodsDO.outBoundId( bean.getOutBoundId() ); - outboundGoodsDO.harvestBatchId( bean.getHarvestBatchId() ); - outboundGoodsDO.identityCodeNum( bean.getIdentityCodeNum() ); - outboundGoodsDO.goodsNum( bean.getGoodsNum() ); - outboundGoodsDO.goodsUnit( bean.getGoodsUnit() ); - outboundGoodsDO.goodsWeight( bean.getGoodsWeight() ); - outboundGoodsDO.goodsUnitPrice( bean.getGoodsUnitPrice() ); - outboundGoodsDO.totalPrice( bean.getTotalPrice() ); - outboundGoodsDO.belongBusinessId( bean.getBelongBusinessId() ); - outboundGoodsDO.belongBusinessName( bean.getBelongBusinessName() ); - - return outboundGoodsDO.build(); - } - - @Override - public OutboundGoodsRespVO convert(OutboundGoodsDO bean) { - if ( bean == null ) { - return null; - } - - OutboundGoodsRespVO outboundGoodsRespVO = new OutboundGoodsRespVO(); - - outboundGoodsRespVO.setGoodsId( bean.getGoodsId() ); - outboundGoodsRespVO.setGoodsName( bean.getGoodsName() ); - outboundGoodsRespVO.setOutBoundId( bean.getOutBoundId() ); - outboundGoodsRespVO.setHarvestBatchId( bean.getHarvestBatchId() ); - outboundGoodsRespVO.setIdentityCodeNum( bean.getIdentityCodeNum() ); - outboundGoodsRespVO.setGoodsNum( bean.getGoodsNum() ); - outboundGoodsRespVO.setGoodsUnit( bean.getGoodsUnit() ); - outboundGoodsRespVO.setGoodsWeight( bean.getGoodsWeight() ); - outboundGoodsRespVO.setGoodsUnitPrice( bean.getGoodsUnitPrice() ); - outboundGoodsRespVO.setTotalPrice( bean.getTotalPrice() ); - outboundGoodsRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - outboundGoodsRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - outboundGoodsRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - outboundGoodsRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return outboundGoodsRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( OutboundGoodsDO outboundGoodsDO : list ) { - list1.add( convert( outboundGoodsDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( OutboundGoodsDO outboundGoodsDO : list ) { - list1.add( outboundGoodsDOToOutboundGoodsExcelVO( outboundGoodsDO ) ); - } - - return list1; - } - - @Override - public List convertListCreate(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( OutboundGoodsSaveReqVO outboundGoodsSaveReqVO : list ) { - list1.add( convert( outboundGoodsSaveReqVO ) ); - } - - return list1; - } - - @Override - public List convertToDTOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( OutboundGoodsDO outboundGoodsDO : list ) { - list1.add( outboundGoodsDOToOutboundgoodsRespDTO( outboundGoodsDO ) ); - } - - return list1; - } - - protected OutboundGoodsExcelVO outboundGoodsDOToOutboundGoodsExcelVO(OutboundGoodsDO outboundGoodsDO) { - if ( outboundGoodsDO == null ) { - return null; - } - - OutboundGoodsExcelVO outboundGoodsExcelVO = new OutboundGoodsExcelVO(); - - outboundGoodsExcelVO.setId( outboundGoodsDO.getId() ); - outboundGoodsExcelVO.setBindId( outboundGoodsDO.getBindId() ); - outboundGoodsExcelVO.setGoodsId( outboundGoodsDO.getGoodsId() ); - outboundGoodsExcelVO.setGoodsName( outboundGoodsDO.getGoodsName() ); - outboundGoodsExcelVO.setOutBoundId( outboundGoodsDO.getOutBoundId() ); - outboundGoodsExcelVO.setHarvestBatchId( outboundGoodsDO.getHarvestBatchId() ); - outboundGoodsExcelVO.setIdentityCodeNum( outboundGoodsDO.getIdentityCodeNum() ); - outboundGoodsExcelVO.setGoodsNum( outboundGoodsDO.getGoodsNum() ); - outboundGoodsExcelVO.setGoodsUnit( outboundGoodsDO.getGoodsUnit() ); - outboundGoodsExcelVO.setGoodsWeight( outboundGoodsDO.getGoodsWeight() ); - outboundGoodsExcelVO.setGoodsUnitPrice( outboundGoodsDO.getGoodsUnitPrice() ); - outboundGoodsExcelVO.setTotalPrice( outboundGoodsDO.getTotalPrice() ); - if ( outboundGoodsDO.getCreateTime() != null ) { - outboundGoodsExcelVO.setCreateTime( Date.from( outboundGoodsDO.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - outboundGoodsExcelVO.setBelongBusinessId( outboundGoodsDO.getBelongBusinessId() ); - outboundGoodsExcelVO.setBelongBusinessName( outboundGoodsDO.getBelongBusinessName() ); - - return outboundGoodsExcelVO; - } - - protected OutboundgoodsRespDTO outboundGoodsDOToOutboundgoodsRespDTO(OutboundGoodsDO outboundGoodsDO) { - if ( outboundGoodsDO == null ) { - return null; - } - - OutboundgoodsRespDTO outboundgoodsRespDTO = new OutboundgoodsRespDTO(); - - outboundgoodsRespDTO.setId( outboundGoodsDO.getId() ); - outboundgoodsRespDTO.setGoodsId( outboundGoodsDO.getGoodsId() ); - outboundgoodsRespDTO.setGoodsName( outboundGoodsDO.getGoodsName() ); - outboundgoodsRespDTO.setOutBoundId( outboundGoodsDO.getOutBoundId() ); - outboundgoodsRespDTO.setHarvestBatchId( outboundGoodsDO.getHarvestBatchId() ); - outboundgoodsRespDTO.setIdentityCodeNum( outboundGoodsDO.getIdentityCodeNum() ); - outboundgoodsRespDTO.setGoodsNum( outboundGoodsDO.getGoodsNum() ); - outboundgoodsRespDTO.setGoodsUnit( outboundGoodsDO.getGoodsUnit() ); - outboundgoodsRespDTO.setGoodsWeight( outboundGoodsDO.getGoodsWeight() ); - outboundgoodsRespDTO.setGoodsUnitPrice( outboundGoodsDO.getGoodsUnitPrice() ); - outboundgoodsRespDTO.setTotalPrice( outboundGoodsDO.getTotalPrice() ); - outboundgoodsRespDTO.setBelongBusinessId( outboundGoodsDO.getBelongBusinessId() ); - outboundgoodsRespDTO.setBelongBusinessName( outboundGoodsDO.getBelongBusinessName() ); - - return outboundgoodsRespDTO; - } -} diff --git a/yudao-module-identity/yudao-module-identity-biz/target/classes/META-INF/spring-configuration-metadata.json b/yudao-module-identity/yudao-module-identity-biz/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index a9b6404..0000000 --- a/yudao-module-identity/yudao-module-identity-biz/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "groups": [ - { - "name": "yudao.qrcode", - "type": "cn.iocoder.yudao.module.identity.qrcode.QRCodeProperties", - "sourceType": "cn.iocoder.yudao.module.identity.qrcode.QRCodeProperties" - } - ], - "properties": [ - { - "name": "yudao.qrcode.url", - "type": "java.lang.String", - "description": "域名", - "sourceType": "cn.iocoder.yudao.module.identity.qrcode.QRCodeProperties" - } - ], - "hints": [] -} \ No newline at end of file diff --git a/yudao-module-identity/yudao-module-identity-biz/target/classes/bootstrap-local.yaml b/yudao-module-identity/yudao-module-identity-biz/target/classes/bootstrap-local.yaml deleted file mode 100644 index fe4d3a5..0000000 --- a/yudao-module-identity/yudao-module-identity-biz/target/classes/bootstrap-local.yaml +++ /dev/null @@ -1,31 +0,0 @@ -spring: - main: - allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 - allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Dubbo 或者 Feign 等会存在重复定义的服务 - ---- #################### 注册中心相关配置 #################### - -spring: - cloud: - nacos: - server-addr: 192.168.233.128:8848 - discovery: - namespace: dev # 命名空间。这里使用 dev 开发环境 - metadata: - version: 1.0.0 # 服务实例的版本号，可用于灰度发布 - ---- #################### 配置中心相关配置 #################### - -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: 192.168.233.128:8848 # Nacos 服务器地址 - namespace: dev # 命名空间。这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/yudao-module-identity/yudao-module-identity-biz/target/classes/bootstrap-prod.yaml b/yudao-module-identity/yudao-module-identity-biz/target/classes/bootstrap-prod.yaml deleted file mode 100644 index d0b3068..0000000 --- a/yudao-module-identity/yudao-module-identity-biz/target/classes/bootstrap-prod.yaml +++ /dev/null @@ -1,31 +0,0 @@ -spring: - main: - allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 - allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Dubbo 或者 Feign 等会存在重复定义的服务 - ---- #################### 注册中心相关配置 #################### - -spring: - cloud: - nacos: - server-addr: 127.0.0.1:8848 - discovery: - namespace: prod # 命名空间。这里使用 dev 开发环境 - metadata: - version: 1.0.0 # 服务实例的版本号，可用于灰度发布 - ---- #################### 配置中心相关配置 #################### - -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: 127.0.0.1:8848 # Nacos 服务器地址 - namespace: prod # 命名空间。这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/yudao-module-identity/yudao-module-identity-biz/target/classes/bootstrap.yaml b/yudao-module-identity/yudao-module-identity-biz/target/classes/bootstrap.yaml deleted file mode 100644 index b880ba0..0000000 --- a/yudao-module-identity/yudao-module-identity-biz/target/classes/bootstrap.yaml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - application: - name: identity-server - - profiles: - active: local - -server: - port: 49085 - -# 日志文件配置。注意，如果 logging.file.name 不放在 bootstrap.yaml 配置文件，而是放在 application.yaml 中，会导致出现 LOG_FILE_IS_UNDEFINED 文件 -logging: - file: - name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径 diff --git a/yudao-module-identity/yudao-module-identity-biz/target/classes/logback-spring.xml b/yudao-module-identity/yudao-module-identity-biz/target/classes/logback-spring.xml deleted file mode 100644 index 5f4b30d..0000000 --- a/yudao-module-identity/yudao-module-identity-biz/target/classes/logback-spring.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - 　　　　　 - - - ${PATTERN_DEFAULT} - - - - - - - - - - ${PATTERN_DEFAULT} - - - - ${LOG_FILE} - - - ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz} - - ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} - - ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB} - - ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0} - - ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30} - - - - - - 0 - - 256 - - - - - - - - ${PATTERN_DEFAULT} - - - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-identity/yudao-module-identity-biz/target/classes/mapper/businessrule/BusinessRuleMapper.xml b/yudao-module-identity/yudao-module-identity-biz/target/classes/mapper/businessrule/BusinessRuleMapper.xml deleted file mode 100644 index 37226ac..0000000 --- a/yudao-module-identity/yudao-module-identity-biz/target/classes/mapper/businessrule/BusinessRuleMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-identity/yudao-module-identity-biz/target/classes/mapper/code/CodeMapper.xml b/yudao-module-identity/yudao-module-identity-biz/target/classes/mapper/code/CodeMapper.xml deleted file mode 100644 index fbf9d85..0000000 --- a/yudao-module-identity/yudao-module-identity-biz/target/classes/mapper/code/CodeMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - diff --git a/yudao-module-identity/yudao-module-identity-biz/target/classes/mapper/diversionrecord/DiversionRecordMapper.xml b/yudao-module-identity/yudao-module-identity-biz/target/classes/mapper/diversionrecord/DiversionRecordMapper.xml deleted file mode 100644 index 71b8ac5..0000000 --- a/yudao-module-identity/yudao-module-identity-biz/target/classes/mapper/diversionrecord/DiversionRecordMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - diff --git a/yudao-module-identity/yudao-module-identity-biz/target/classes/mapper/diversionstats/DiversionStatsMapper.xml b/yudao-module-identity/yudao-module-identity-biz/target/classes/mapper/diversionstats/DiversionStatsMapper.xml deleted file mode 100644 index 1abe945..0000000 --- a/yudao-module-identity/yudao-module-identity-biz/target/classes/mapper/diversionstats/DiversionStatsMapper.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - diff --git a/yudao-module-identity/yudao-module-identity-biz/target/classes/mapper/generatebatch/GenerateBatchMapper.xml b/yudao-module-identity/yudao-module-identity-biz/target/classes/mapper/generatebatch/GenerateBatchMapper.xml deleted file mode 100644 index 814360d..0000000 --- a/yudao-module-identity/yudao-module-identity-biz/target/classes/mapper/generatebatch/GenerateBatchMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-identity/yudao-module-identity-biz/target/classes/mapper/generaterecord/GenerateRecordMapper.xml b/yudao-module-identity/yudao-module-identity-biz/target/classes/mapper/generaterecord/GenerateRecordMapper.xml deleted file mode 100644 index 7c1c39d..0000000 --- a/yudao-module-identity/yudao-module-identity-biz/target/classes/mapper/generaterecord/GenerateRecordMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - diff --git a/yudao-module-identity/yudao-module-identity-biz/target/classes/mapper/scanrecord/ScanRecordMapper.xml b/yudao-module-identity/yudao-module-identity-biz/target/classes/mapper/scanrecord/ScanRecordMapper.xml deleted file mode 100644 index b84b515..0000000 --- a/yudao-module-identity/yudao-module-identity-biz/target/classes/mapper/scanrecord/ScanRecordMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - diff --git a/yudao-module-identity/yudao-module-identity-biz/target/classes/sql/clean.sql b/yudao-module-identity/yudao-module-identity-biz/target/classes/sql/clean.sql deleted file mode 100644 index 64029ff..0000000 --- a/yudao-module-identity/yudao-module-identity-biz/target/classes/sql/clean.sql +++ /dev/null @@ -1,6 +0,0 @@ -DELETE FROM "identity_diversion_record"; -DELETE FROM "identity_diversion_stats"; -DELETE FROM "identity_generate_record"; -DELETE FROM "identity_code"; -DELETE FROM "identity_scan_record"; -DELETE FROM "identity_business_rule"; \ No newline at end of file diff --git a/yudao-module-identity/yudao-module-identity-biz/target/classes/sql/create_tables.sql b/yudao-module-identity/yudao-module-identity-biz/target/classes/sql/create_tables.sql deleted file mode 100644 index a1fb312..0000000 --- a/yudao-module-identity/yudao-module-identity-biz/target/classes/sql/create_tables.sql +++ /dev/null @@ -1,127 +0,0 @@ -CREATE TABLE IF NOT EXISTS "identity_diversion_record" ( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "dealer_id" varchar NOT NULL, - "dealer_name" varchar NOT NULL, - "batch_id" varchar NOT NULL, - "goods_id" varchar NOT NULL, - "goods_name" varchar NOT NULL, - "scan_location" varchar NOT NULL, - "scan_time" datetime NOT NULL, - "diversion_state" varchar NOT NULL, - "diversion_level" varchar, - "status" varchar NOT NULL, - "remarks" varchar, - "belong_business_id" bigint NOT NULL, - "belong_business_name" varchar NOT NULL, - "tenant_id" bigint NOT NULL, - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - "deleted" bit NOT NULL DEFAULT FALSE, - "creator" varchar DEFAULT '', - "updater" varchar DEFAULT '', - PRIMARY KEY ("id") -) COMMENT '疑似窜货记录'; -CREATE TABLE IF NOT EXISTS "identity_diversion_stats" ( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "dealer_id" varchar NOT NULL, - "dealer_name" varchar NOT NULL, - "batch_id" varchar NOT NULL, - "goods_id" varchar NOT NULL, - "goods_name" varchar NOT NULL, - "num" int NOT NULL, - "belong_business_id" bigint NOT NULL, - "belong_business_name" varchar NOT NULL, - "tenant_id" bigint NOT NULL, - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - "deleted" bit NOT NULL DEFAULT FALSE, - "creator" varchar DEFAULT '', - "updater" varchar DEFAULT '', - PRIMARY KEY ("id") -) COMMENT '窜货统计'; -CREATE TABLE IF NOT EXISTS "identity_generate_record" ( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "generate_record_id" varchar NOT NULL, - "rule_id" bigint NOT NULL, - "code_rule_format" varchar, - "code_type" varchar NOT NULL, - "char_length" int NOT NULL, - "char_type" varchar NOT NULL, - "code_num" int NOT NULL, - "operate_user" varchar, - "operate_user_id" bigint, - "state" varchar NOT NULL, - "belong_business_id" bigint NOT NULL, - "belong_business_name" varchar NOT NULL, - "tenant_id" bigint NOT NULL, - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - "deleted" bit NOT NULL DEFAULT FALSE, - "creator" varchar DEFAULT '', - "updater" varchar DEFAULT '', - PRIMARY KEY ("id") -) COMMENT '标识码生成记录'; -CREATE TABLE IF NOT EXISTS "identity_code" ( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "generate_record_id" varchar NOT NULL, - "identity_code" varchar NOT NULL, - "verfiy_code" varchar, - "rule_id" bigint NOT NULL, - "code_rule_format" varchar NOT NULL, - "code_type" varchar NOT NULL, - "char_length" int NOT NULL, - "char_type" varchar NOT NULL, - "batch_id" varchar NOT NULL, - "batch_type" varchar NOT NULL, - "goods_id" varchar, - "goods_name" varchar, - "dealer_name" varchar, - "dealer_id" varchar, - "belong_business_id" bigint NOT NULL, - "belong_business_name" varchar NOT NULL, - "tenant_id" bigint NOT NULL, - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - "scan_count" int, - "limit_count" int, - "deleted" bit NOT NULL DEFAULT FALSE, - "creator" varchar DEFAULT '', - "updater" varchar DEFAULT '', - PRIMARY KEY ("id") -) COMMENT '标识码'; -CREATE TABLE IF NOT EXISTS "identity_scan_record" ( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "generate_record_id" varchar NOT NULL, - "identity_url" varchar NOT NULL, - "batch_id" varchar NOT NULL, - "goods_id" varchar NOT NULL, - "goods_name" varchar NOT NULL, - "scan_ip" varchar, - "batch_type" varchar NOT NULL, - "scan_area" varchar, - "scan_time" datetime, - "scan_location" varchar, - "belong_business_id" bigint NOT NULL, - "belong_business_name" varchar NOT NULL, - "tenant_id" bigint NOT NULL, - "deleted" bit NOT NULL DEFAULT FALSE, - "creator" varchar DEFAULT '', - "updater" varchar DEFAULT '', - PRIMARY KEY ("id") -) COMMENT '扫码记录'; -CREATE TABLE IF NOT EXISTS "identity_business_rule" ( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "business_id" varchar, - "business_name" varchar, - "code_rule_id" varchar NOT NULL, - "code_rule_name" varchar, - "code_type" varchar, - "code_rule_format" varchar, - "tenant_id" bigint NOT NULL, - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - "deleted" bit NOT NULL DEFAULT FALSE, - "creator" varchar DEFAULT '', - "updater" varchar DEFAULT '', - PRIMARY KEY ("id") -) COMMENT '码规则'; diff --git a/yudao-module-identity/yudao-module-identity-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/identity/convert/businessrule/BusinessRuleConvertImpl.java b/yudao-module-identity/yudao-module-identity-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/identity/convert/businessrule/BusinessRuleConvertImpl.java deleted file mode 100644 index 0df428a..0000000 --- a/yudao-module-identity/yudao-module-identity-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/identity/convert/businessrule/BusinessRuleConvertImpl.java +++ /dev/null @@ -1,143 +0,0 @@ -package cn.iocoder.yudao.module.identity.convert.businessrule; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.identity.controller.admin.businessrule.vo.BusinessRuleCreateReqVO; -import cn.iocoder.yudao.module.identity.controller.admin.businessrule.vo.BusinessRuleExcelVO; -import cn.iocoder.yudao.module.identity.controller.admin.businessrule.vo.BusinessRuleRespVO; -import cn.iocoder.yudao.module.identity.controller.admin.businessrule.vo.BusinessRuleUpdateReqVO; -import cn.iocoder.yudao.module.identity.dal.dataobject.businessrule.BusinessRuleDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:21+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class BusinessRuleConvertImpl implements BusinessRuleConvert { - - @Override - public BusinessRuleDO convert(BusinessRuleCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - BusinessRuleDO.BusinessRuleDOBuilder businessRuleDO = BusinessRuleDO.builder(); - - businessRuleDO.businessId( bean.getBusinessId() ); - businessRuleDO.businessName( bean.getBusinessName() ); - businessRuleDO.codeRuleId( bean.getCodeRuleId() ); - businessRuleDO.codeRuleName( bean.getCodeRuleName() ); - businessRuleDO.codeType( bean.getCodeType() ); - businessRuleDO.codeRuleFormat( bean.getCodeRuleFormat() ); - - return businessRuleDO.build(); - } - - @Override - public BusinessRuleDO convert(BusinessRuleUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - BusinessRuleDO.BusinessRuleDOBuilder businessRuleDO = BusinessRuleDO.builder(); - - businessRuleDO.id( bean.getId() ); - businessRuleDO.businessId( bean.getBusinessId() ); - businessRuleDO.businessName( bean.getBusinessName() ); - businessRuleDO.codeRuleId( bean.getCodeRuleId() ); - businessRuleDO.codeRuleName( bean.getCodeRuleName() ); - businessRuleDO.codeType( bean.getCodeType() ); - businessRuleDO.codeRuleFormat( bean.getCodeRuleFormat() ); - - return businessRuleDO.build(); - } - - @Override - public BusinessRuleRespVO convert(BusinessRuleDO bean) { - if ( bean == null ) { - return null; - } - - BusinessRuleRespVO businessRuleRespVO = new BusinessRuleRespVO(); - - businessRuleRespVO.setBusinessId( bean.getBusinessId() ); - businessRuleRespVO.setBusinessName( bean.getBusinessName() ); - businessRuleRespVO.setCodeRuleId( bean.getCodeRuleId() ); - businessRuleRespVO.setCodeRuleName( bean.getCodeRuleName() ); - businessRuleRespVO.setCodeType( bean.getCodeType() ); - businessRuleRespVO.setCodeRuleFormat( bean.getCodeRuleFormat() ); - businessRuleRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - businessRuleRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return businessRuleRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( BusinessRuleDO businessRuleDO : list ) { - list1.add( convert( businessRuleDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( BusinessRuleDO businessRuleDO : list ) { - list1.add( businessRuleDOToBusinessRuleExcelVO( businessRuleDO ) ); - } - - return list1; - } - - protected BusinessRuleExcelVO businessRuleDOToBusinessRuleExcelVO(BusinessRuleDO businessRuleDO) { - if ( businessRuleDO == null ) { - return null; - } - - BusinessRuleExcelVO businessRuleExcelVO = new BusinessRuleExcelVO(); - - businessRuleExcelVO.setId( businessRuleDO.getId() ); - businessRuleExcelVO.setBusinessId( businessRuleDO.getBusinessId() ); - businessRuleExcelVO.setBusinessName( businessRuleDO.getBusinessName() ); - businessRuleExcelVO.setCodeRuleId( businessRuleDO.getCodeRuleId() ); - businessRuleExcelVO.setCodeRuleName( businessRuleDO.getCodeRuleName() ); - businessRuleExcelVO.setCodeType( businessRuleDO.getCodeType() ); - businessRuleExcelVO.setCodeRuleFormat( businessRuleDO.getCodeRuleFormat() ); - if ( businessRuleDO.getCreateTime() != null ) { - businessRuleExcelVO.setCreateTime( Date.from( businessRuleDO.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return businessRuleExcelVO; - } -} diff --git a/yudao-module-identity/yudao-module-identity-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/identity/convert/code/CodeConvertImpl.java b/yudao-module-identity/yudao-module-identity-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/identity/convert/code/CodeConvertImpl.java deleted file mode 100644 index 054a742..0000000 --- a/yudao-module-identity/yudao-module-identity-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/identity/convert/code/CodeConvertImpl.java +++ /dev/null @@ -1,213 +0,0 @@ -package cn.iocoder.yudao.module.identity.convert.code; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.identity.controller.admin.code.vo.CodeCreateReqVO; -import cn.iocoder.yudao.module.identity.controller.admin.code.vo.CodeExcelVO; -import cn.iocoder.yudao.module.identity.controller.admin.code.vo.CodeRespVO; -import cn.iocoder.yudao.module.identity.controller.admin.code.vo.CodeUpdateReqVO; -import cn.iocoder.yudao.module.identity.controller.admin.code.vo.ThirdCodeExcelVO; -import cn.iocoder.yudao.module.identity.dal.dataobject.code.CodeDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:21+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class CodeConvertImpl implements CodeConvert { - - @Override - public CodeDO convert(CodeCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - CodeDO.CodeDOBuilder codeDO = CodeDO.builder(); - - codeDO.generateRecordId( bean.getGenerateRecordId() ); - codeDO.identityCode( bean.getIdentityCode() ); - codeDO.verfiyCode( bean.getVerfiyCode() ); - codeDO.ruleId( bean.getRuleId() ); - codeDO.codeRuleFormat( bean.getCodeRuleFormat() ); - codeDO.codeType( bean.getCodeType() ); - codeDO.charLength( bean.getCharLength() ); - codeDO.charType( bean.getCharType() ); - codeDO.batchId( bean.getBatchId() ); - codeDO.batchType( bean.getBatchType() ); - codeDO.goodsId( bean.getGoodsId() ); - codeDO.goodsName( bean.getGoodsName() ); - codeDO.dealerName( bean.getDealerName() ); - codeDO.dealerId( bean.getDealerId() ); - codeDO.belongBusinessId( bean.getBelongBusinessId() ); - codeDO.belongBusinessName( bean.getBelongBusinessName() ); - codeDO.scanCount( bean.getScanCount() ); - codeDO.limitCount( bean.getLimitCount() ); - - return codeDO.build(); - } - - @Override - public CodeDO convert(CodeUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - CodeDO.CodeDOBuilder codeDO = CodeDO.builder(); - - codeDO.id( bean.getId() ); - codeDO.generateRecordId( bean.getGenerateRecordId() ); - codeDO.identityCode( bean.getIdentityCode() ); - codeDO.verfiyCode( bean.getVerfiyCode() ); - codeDO.ruleId( bean.getRuleId() ); - codeDO.codeRuleFormat( bean.getCodeRuleFormat() ); - codeDO.codeType( bean.getCodeType() ); - codeDO.charLength( bean.getCharLength() ); - codeDO.charType( bean.getCharType() ); - codeDO.batchId( bean.getBatchId() ); - codeDO.batchType( bean.getBatchType() ); - codeDO.goodsId( bean.getGoodsId() ); - codeDO.goodsName( bean.getGoodsName() ); - codeDO.dealerName( bean.getDealerName() ); - codeDO.dealerId( bean.getDealerId() ); - codeDO.belongBusinessId( bean.getBelongBusinessId() ); - codeDO.belongBusinessName( bean.getBelongBusinessName() ); - codeDO.scanCount( bean.getScanCount() ); - codeDO.limitCount( bean.getLimitCount() ); - - return codeDO.build(); - } - - @Override - public CodeRespVO convert(CodeDO bean) { - if ( bean == null ) { - return null; - } - - CodeRespVO codeRespVO = new CodeRespVO(); - - codeRespVO.setGenerateRecordId( bean.getGenerateRecordId() ); - codeRespVO.setIdentityCode( bean.getIdentityCode() ); - codeRespVO.setVerfiyCode( bean.getVerfiyCode() ); - codeRespVO.setRuleId( bean.getRuleId() ); - codeRespVO.setCodeRuleFormat( bean.getCodeRuleFormat() ); - codeRespVO.setCodeType( bean.getCodeType() ); - codeRespVO.setCharLength( bean.getCharLength() ); - codeRespVO.setCharType( bean.getCharType() ); - codeRespVO.setBatchId( bean.getBatchId() ); - codeRespVO.setBatchType( bean.getBatchType() ); - codeRespVO.setGoodsId( bean.getGoodsId() ); - codeRespVO.setGoodsName( bean.getGoodsName() ); - codeRespVO.setDealerName( bean.getDealerName() ); - codeRespVO.setDealerId( bean.getDealerId() ); - codeRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - codeRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - codeRespVO.setScanCount( bean.getScanCount() ); - codeRespVO.setLimitCount( bean.getLimitCount() ); - codeRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - codeRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return codeRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( CodeDO codeDO : list ) { - list1.add( convert( codeDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( CodeDO codeDO : list ) { - list1.add( codeDOToCodeExcelVO( codeDO ) ); - } - - return list1; - } - - @Override - public List convert2ThirdExcel(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( CodeDO codeDO : list ) { - list1.add( codeDOToThirdCodeExcelVO( codeDO ) ); - } - - return list1; - } - - protected CodeExcelVO codeDOToCodeExcelVO(CodeDO codeDO) { - if ( codeDO == null ) { - return null; - } - - CodeExcelVO codeExcelVO = new CodeExcelVO(); - - codeExcelVO.setGenerateRecordId( codeDO.getGenerateRecordId() ); - codeExcelVO.setIdentityCode( codeDO.getIdentityCode() ); - codeExcelVO.setRuleId( codeDO.getRuleId() ); - codeExcelVO.setCodeRuleFormat( codeDO.getCodeRuleFormat() ); - codeExcelVO.setCharLength( codeDO.getCharLength() ); - codeExcelVO.setCharType( codeDO.getCharType() ); - codeExcelVO.setBatchId( codeDO.getBatchId() ); - codeExcelVO.setGoodsId( codeDO.getGoodsId() ); - codeExcelVO.setGoodsName( codeDO.getGoodsName() ); - codeExcelVO.setDealerName( codeDO.getDealerName() ); - codeExcelVO.setDealerId( codeDO.getDealerId() ); - codeExcelVO.setBelongBusinessId( codeDO.getBelongBusinessId() ); - codeExcelVO.setBelongBusinessName( codeDO.getBelongBusinessName() ); - if ( codeDO.getCreateTime() != null ) { - codeExcelVO.setCreateTime( Date.from( codeDO.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return codeExcelVO; - } - - protected ThirdCodeExcelVO codeDOToThirdCodeExcelVO(CodeDO codeDO) { - if ( codeDO == null ) { - return null; - } - - ThirdCodeExcelVO thirdCodeExcelVO = new ThirdCodeExcelVO(); - - thirdCodeExcelVO.setGenerateRecordId( codeDO.getGenerateRecordId() ); - thirdCodeExcelVO.setIdentityCode( codeDO.getIdentityCode() ); - - return thirdCodeExcelVO; - } -} diff --git a/yudao-module-identity/yudao-module-identity-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/identity/convert/diversionrecord/DiversionRecordConvertImpl.java b/yudao-module-identity/yudao-module-identity-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/identity/convert/diversionrecord/DiversionRecordConvertImpl.java deleted file mode 100644 index c58ed3f..0000000 --- a/yudao-module-identity/yudao-module-identity-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/identity/convert/diversionrecord/DiversionRecordConvertImpl.java +++ /dev/null @@ -1,169 +0,0 @@ -package cn.iocoder.yudao.module.identity.convert.diversionrecord; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.identity.controller.admin.diversionrecord.vo.DiversionRecordCreateReqVO; -import cn.iocoder.yudao.module.identity.controller.admin.diversionrecord.vo.DiversionRecordExcelVO; -import cn.iocoder.yudao.module.identity.controller.admin.diversionrecord.vo.DiversionRecordRespVO; -import cn.iocoder.yudao.module.identity.controller.admin.diversionrecord.vo.DiversionRecordUpdateReqVO; -import cn.iocoder.yudao.module.identity.dal.dataobject.diversionrecord.DiversionRecordDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:21+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class DiversionRecordConvertImpl implements DiversionRecordConvert { - - @Override - public DiversionRecordDO convert(DiversionRecordCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - DiversionRecordDO.DiversionRecordDOBuilder diversionRecordDO = DiversionRecordDO.builder(); - - diversionRecordDO.dealerId( bean.getDealerId() ); - diversionRecordDO.dealerName( bean.getDealerName() ); - diversionRecordDO.batchId( bean.getBatchId() ); - diversionRecordDO.goodsId( bean.getGoodsId() ); - diversionRecordDO.goodsName( bean.getGoodsName() ); - diversionRecordDO.scanLocation( bean.getScanLocation() ); - diversionRecordDO.scanTime( bean.getScanTime() ); - diversionRecordDO.diversionState( bean.getDiversionState() ); - diversionRecordDO.diversionLevel( bean.getDiversionLevel() ); - diversionRecordDO.status( bean.getStatus() ); - diversionRecordDO.remarks( bean.getRemarks() ); - diversionRecordDO.belongBusinessId( bean.getBelongBusinessId() ); - diversionRecordDO.belongBusinessName( bean.getBelongBusinessName() ); - - return diversionRecordDO.build(); - } - - @Override - public DiversionRecordDO convert(DiversionRecordUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - DiversionRecordDO.DiversionRecordDOBuilder diversionRecordDO = DiversionRecordDO.builder(); - - diversionRecordDO.id( bean.getId() ); - diversionRecordDO.dealerId( bean.getDealerId() ); - diversionRecordDO.dealerName( bean.getDealerName() ); - diversionRecordDO.batchId( bean.getBatchId() ); - diversionRecordDO.goodsId( bean.getGoodsId() ); - diversionRecordDO.goodsName( bean.getGoodsName() ); - diversionRecordDO.scanLocation( bean.getScanLocation() ); - diversionRecordDO.scanTime( bean.getScanTime() ); - diversionRecordDO.diversionState( bean.getDiversionState() ); - diversionRecordDO.diversionLevel( bean.getDiversionLevel() ); - diversionRecordDO.status( bean.getStatus() ); - diversionRecordDO.remarks( bean.getRemarks() ); - diversionRecordDO.belongBusinessId( bean.getBelongBusinessId() ); - diversionRecordDO.belongBusinessName( bean.getBelongBusinessName() ); - - return diversionRecordDO.build(); - } - - @Override - public DiversionRecordRespVO convert(DiversionRecordDO bean) { - if ( bean == null ) { - return null; - } - - DiversionRecordRespVO diversionRecordRespVO = new DiversionRecordRespVO(); - - diversionRecordRespVO.setDealerId( bean.getDealerId() ); - diversionRecordRespVO.setDealerName( bean.getDealerName() ); - diversionRecordRespVO.setBatchId( bean.getBatchId() ); - diversionRecordRespVO.setGoodsId( bean.getGoodsId() ); - diversionRecordRespVO.setGoodsName( bean.getGoodsName() ); - diversionRecordRespVO.setScanLocation( bean.getScanLocation() ); - diversionRecordRespVO.setScanTime( bean.getScanTime() ); - diversionRecordRespVO.setDiversionState( bean.getDiversionState() ); - diversionRecordRespVO.setDiversionLevel( bean.getDiversionLevel() ); - diversionRecordRespVO.setStatus( bean.getStatus() ); - diversionRecordRespVO.setRemarks( bean.getRemarks() ); - diversionRecordRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - diversionRecordRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - diversionRecordRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - diversionRecordRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return diversionRecordRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( DiversionRecordDO diversionRecordDO : list ) { - list1.add( convert( diversionRecordDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( DiversionRecordDO diversionRecordDO : list ) { - list1.add( diversionRecordDOToDiversionRecordExcelVO( diversionRecordDO ) ); - } - - return list1; - } - - protected DiversionRecordExcelVO diversionRecordDOToDiversionRecordExcelVO(DiversionRecordDO diversionRecordDO) { - if ( diversionRecordDO == null ) { - return null; - } - - DiversionRecordExcelVO diversionRecordExcelVO = new DiversionRecordExcelVO(); - - diversionRecordExcelVO.setDealerId( diversionRecordDO.getDealerId() ); - diversionRecordExcelVO.setDealerName( diversionRecordDO.getDealerName() ); - diversionRecordExcelVO.setBatchId( diversionRecordDO.getBatchId() ); - diversionRecordExcelVO.setGoodsId( diversionRecordDO.getGoodsId() ); - diversionRecordExcelVO.setGoodsName( diversionRecordDO.getGoodsName() ); - diversionRecordExcelVO.setScanLocation( diversionRecordDO.getScanLocation() ); - diversionRecordExcelVO.setScanTime( diversionRecordDO.getScanTime() ); - diversionRecordExcelVO.setDiversionStateText( diversionRecordDO.getDiversionStateText() ); - diversionRecordExcelVO.setDiversionLevelText( diversionRecordDO.getDiversionLevelText() ); - diversionRecordExcelVO.setStatusText( diversionRecordDO.getStatusText() ); - diversionRecordExcelVO.setRemarks( diversionRecordDO.getRemarks() ); - diversionRecordExcelVO.setBelongBusinessName( diversionRecordDO.getBelongBusinessName() ); - if ( diversionRecordDO.getCreateTime() != null ) { - diversionRecordExcelVO.setCreateTime( Date.from( diversionRecordDO.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return diversionRecordExcelVO; - } -} diff --git a/yudao-module-identity/yudao-module-identity-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/identity/convert/diversionstats/DiversionStatsConvertImpl.java b/yudao-module-identity/yudao-module-identity-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/identity/convert/diversionstats/DiversionStatsConvertImpl.java deleted file mode 100644 index 8dd1d3b..0000000 --- a/yudao-module-identity/yudao-module-identity-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/identity/convert/diversionstats/DiversionStatsConvertImpl.java +++ /dev/null @@ -1,148 +0,0 @@ -package cn.iocoder.yudao.module.identity.convert.diversionstats; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.identity.controller.admin.diversionstats.vo.DiversionStatsCreateReqVO; -import cn.iocoder.yudao.module.identity.controller.admin.diversionstats.vo.DiversionStatsExcelVO; -import cn.iocoder.yudao.module.identity.controller.admin.diversionstats.vo.DiversionStatsRespVO; -import cn.iocoder.yudao.module.identity.controller.admin.diversionstats.vo.DiversionStatsUpdateReqVO; -import cn.iocoder.yudao.module.identity.dal.dataobject.diversionstats.DiversionStatsDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:21+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class DiversionStatsConvertImpl implements DiversionStatsConvert { - - @Override - public DiversionStatsDO convert(DiversionStatsCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - DiversionStatsDO.DiversionStatsDOBuilder diversionStatsDO = DiversionStatsDO.builder(); - - diversionStatsDO.dealerId( bean.getDealerId() ); - diversionStatsDO.dealerName( bean.getDealerName() ); - diversionStatsDO.batchId( bean.getBatchId() ); - diversionStatsDO.goodsId( bean.getGoodsId() ); - diversionStatsDO.goodsName( bean.getGoodsName() ); - diversionStatsDO.num( bean.getNum() ); - diversionStatsDO.belongBusinessId( bean.getBelongBusinessId() ); - diversionStatsDO.belongBusinessName( bean.getBelongBusinessName() ); - - return diversionStatsDO.build(); - } - - @Override - public DiversionStatsDO convert(DiversionStatsUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - DiversionStatsDO.DiversionStatsDOBuilder diversionStatsDO = DiversionStatsDO.builder(); - - diversionStatsDO.id( bean.getId() ); - diversionStatsDO.dealerId( bean.getDealerId() ); - diversionStatsDO.dealerName( bean.getDealerName() ); - diversionStatsDO.batchId( bean.getBatchId() ); - diversionStatsDO.goodsId( bean.getGoodsId() ); - diversionStatsDO.goodsName( bean.getGoodsName() ); - diversionStatsDO.num( bean.getNum() ); - diversionStatsDO.belongBusinessId( bean.getBelongBusinessId() ); - diversionStatsDO.belongBusinessName( bean.getBelongBusinessName() ); - - return diversionStatsDO.build(); - } - - @Override - public DiversionStatsRespVO convert(DiversionStatsDO bean) { - if ( bean == null ) { - return null; - } - - DiversionStatsRespVO diversionStatsRespVO = new DiversionStatsRespVO(); - - diversionStatsRespVO.setDealerId( bean.getDealerId() ); - diversionStatsRespVO.setDealerName( bean.getDealerName() ); - diversionStatsRespVO.setBatchId( bean.getBatchId() ); - diversionStatsRespVO.setGoodsId( bean.getGoodsId() ); - diversionStatsRespVO.setGoodsName( bean.getGoodsName() ); - diversionStatsRespVO.setNum( bean.getNum() ); - diversionStatsRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - diversionStatsRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - diversionStatsRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - diversionStatsRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return diversionStatsRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( DiversionStatsDO diversionStatsDO : list ) { - list1.add( convert( diversionStatsDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( DiversionStatsDO diversionStatsDO : list ) { - list1.add( diversionStatsDOToDiversionStatsExcelVO( diversionStatsDO ) ); - } - - return list1; - } - - protected DiversionStatsExcelVO diversionStatsDOToDiversionStatsExcelVO(DiversionStatsDO diversionStatsDO) { - if ( diversionStatsDO == null ) { - return null; - } - - DiversionStatsExcelVO diversionStatsExcelVO = new DiversionStatsExcelVO(); - - diversionStatsExcelVO.setDealerId( diversionStatsDO.getDealerId() ); - diversionStatsExcelVO.setDealerName( diversionStatsDO.getDealerName() ); - diversionStatsExcelVO.setGoodsId( diversionStatsDO.getGoodsId() ); - diversionStatsExcelVO.setGoodsName( diversionStatsDO.getGoodsName() ); - diversionStatsExcelVO.setNum( diversionStatsDO.getNum() ); - diversionStatsExcelVO.setBelongBusinessName( diversionStatsDO.getBelongBusinessName() ); - if ( diversionStatsDO.getCreateTime() != null ) { - diversionStatsExcelVO.setCreateTime( Date.from( diversionStatsDO.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return diversionStatsExcelVO; - } -} diff --git a/yudao-module-identity/yudao-module-identity-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/identity/convert/generatebatch/GenerateBatchConvertImpl.java b/yudao-module-identity/yudao-module-identity-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/identity/convert/generatebatch/GenerateBatchConvertImpl.java deleted file mode 100644 index 90d2624..0000000 --- a/yudao-module-identity/yudao-module-identity-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/identity/convert/generatebatch/GenerateBatchConvertImpl.java +++ /dev/null @@ -1,176 +0,0 @@ -package cn.iocoder.yudao.module.identity.convert.generatebatch; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.identity.controller.admin.generatebatch.vo.GenerateBatchCreateReqVO; -import cn.iocoder.yudao.module.identity.controller.admin.generatebatch.vo.GenerateBatchExcelVO; -import cn.iocoder.yudao.module.identity.controller.admin.generatebatch.vo.GenerateBatchRespVO; -import cn.iocoder.yudao.module.identity.controller.admin.generatebatch.vo.GenerateBatchSaveReqVO; -import cn.iocoder.yudao.module.identity.controller.admin.generatebatch.vo.GenerateBatchUpdateReqVO; -import cn.iocoder.yudao.module.identity.dal.dataobject.generatebatch.GenerateBatchDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:21+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class GenerateBatchConvertImpl implements GenerateBatchConvert { - - @Override - public GenerateBatchDO convert(GenerateBatchCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - GenerateBatchDO.GenerateBatchDOBuilder generateBatchDO = GenerateBatchDO.builder(); - - generateBatchDO.generateRecordId( bean.getGenerateRecordId() ); - generateBatchDO.batchId( bean.getBatchId() ); - generateBatchDO.num( bean.getNum() ); - generateBatchDO.batchType( bean.getBatchType() ); - generateBatchDO.belongBusinessId( bean.getBelongBusinessId() ); - generateBatchDO.belongBusinessName( bean.getBelongBusinessName() ); - - return generateBatchDO.build(); - } - - @Override - public GenerateBatchDO convert(GenerateBatchUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - GenerateBatchDO.GenerateBatchDOBuilder generateBatchDO = GenerateBatchDO.builder(); - - generateBatchDO.id( bean.getId() ); - generateBatchDO.generateRecordId( bean.getGenerateRecordId() ); - generateBatchDO.batchId( bean.getBatchId() ); - generateBatchDO.num( bean.getNum() ); - generateBatchDO.batchType( bean.getBatchType() ); - generateBatchDO.belongBusinessId( bean.getBelongBusinessId() ); - generateBatchDO.belongBusinessName( bean.getBelongBusinessName() ); - - return generateBatchDO.build(); - } - - @Override - public GenerateBatchRespVO convert(GenerateBatchDO bean) { - if ( bean == null ) { - return null; - } - - GenerateBatchRespVO generateBatchRespVO = new GenerateBatchRespVO(); - - generateBatchRespVO.setGenerateRecordId( bean.getGenerateRecordId() ); - generateBatchRespVO.setBatchId( bean.getBatchId() ); - generateBatchRespVO.setNum( bean.getNum() ); - generateBatchRespVO.setBatchType( bean.getBatchType() ); - generateBatchRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - generateBatchRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - generateBatchRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - generateBatchRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return generateBatchRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( GenerateBatchDO generateBatchDO : list ) { - list1.add( convert( generateBatchDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( GenerateBatchDO generateBatchDO : list ) { - list1.add( generateBatchDOToGenerateBatchExcelVO( generateBatchDO ) ); - } - - return list1; - } - - @Override - public List convertListCreate(List generateRecordIds) { - if ( generateRecordIds == null ) { - return null; - } - - List list = new ArrayList( generateRecordIds.size() ); - for ( GenerateBatchSaveReqVO generateBatchSaveReqVO : generateRecordIds ) { - list.add( generateBatchSaveReqVOToGenerateBatchDO( generateBatchSaveReqVO ) ); - } - - return list; - } - - protected GenerateBatchExcelVO generateBatchDOToGenerateBatchExcelVO(GenerateBatchDO generateBatchDO) { - if ( generateBatchDO == null ) { - return null; - } - - GenerateBatchExcelVO generateBatchExcelVO = new GenerateBatchExcelVO(); - - generateBatchExcelVO.setId( generateBatchDO.getId() ); - generateBatchExcelVO.setGenerateRecordId( generateBatchDO.getGenerateRecordId() ); - generateBatchExcelVO.setBatchId( generateBatchDO.getBatchId() ); - generateBatchExcelVO.setNum( generateBatchDO.getNum() ); - generateBatchExcelVO.setBatchType( generateBatchDO.getBatchType() ); - generateBatchExcelVO.setBelongBusinessId( generateBatchDO.getBelongBusinessId() ); - generateBatchExcelVO.setBelongBusinessName( generateBatchDO.getBelongBusinessName() ); - if ( generateBatchDO.getCreateTime() != null ) { - generateBatchExcelVO.setCreateTime( Date.from( generateBatchDO.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return generateBatchExcelVO; - } - - protected GenerateBatchDO generateBatchSaveReqVOToGenerateBatchDO(GenerateBatchSaveReqVO generateBatchSaveReqVO) { - if ( generateBatchSaveReqVO == null ) { - return null; - } - - GenerateBatchDO.GenerateBatchDOBuilder generateBatchDO = GenerateBatchDO.builder(); - - generateBatchDO.id( generateBatchSaveReqVO.getId() ); - generateBatchDO.generateRecordId( generateBatchSaveReqVO.getGenerateRecordId() ); - generateBatchDO.batchId( generateBatchSaveReqVO.getBatchId() ); - generateBatchDO.num( generateBatchSaveReqVO.getNum() ); - generateBatchDO.batchType( generateBatchSaveReqVO.getBatchType() ); - generateBatchDO.belongBusinessId( generateBatchSaveReqVO.getBelongBusinessId() ); - generateBatchDO.belongBusinessName( generateBatchSaveReqVO.getBelongBusinessName() ); - - return generateBatchDO.build(); - } -} diff --git a/yudao-module-identity/yudao-module-identity-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/identity/convert/generaterecord/GenerateRecordConvertImpl.java b/yudao-module-identity/yudao-module-identity-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/identity/convert/generaterecord/GenerateRecordConvertImpl.java deleted file mode 100644 index 4be5261..0000000 --- a/yudao-module-identity/yudao-module-identity-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/identity/convert/generaterecord/GenerateRecordConvertImpl.java +++ /dev/null @@ -1,169 +0,0 @@ -package cn.iocoder.yudao.module.identity.convert.generaterecord; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.identity.controller.admin.generaterecord.vo.GenerateRecordCreateReqVO; -import cn.iocoder.yudao.module.identity.controller.admin.generaterecord.vo.GenerateRecordExcelVO; -import cn.iocoder.yudao.module.identity.controller.admin.generaterecord.vo.GenerateRecordRespVO; -import cn.iocoder.yudao.module.identity.controller.admin.generaterecord.vo.GenerateRecordUpdateReqVO; -import cn.iocoder.yudao.module.identity.dal.dataobject.generaterecord.GenerateRecordDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:21+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class GenerateRecordConvertImpl implements GenerateRecordConvert { - - @Override - public GenerateRecordDO convert(GenerateRecordCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - GenerateRecordDO.GenerateRecordDOBuilder generateRecordDO = GenerateRecordDO.builder(); - - generateRecordDO.ruleId( bean.getRuleId() ); - generateRecordDO.codeType( bean.getCodeType() ); - generateRecordDO.charLength( bean.getCharLength() ); - generateRecordDO.charType( bean.getCharType() ); - generateRecordDO.codeNum( bean.getCodeNum() ); - generateRecordDO.batchId( bean.getBatchId() ); - - return generateRecordDO.build(); - } - - @Override - public GenerateRecordDO convert(GenerateRecordUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - GenerateRecordDO.GenerateRecordDOBuilder generateRecordDO = GenerateRecordDO.builder(); - - generateRecordDO.id( bean.getId() ); - generateRecordDO.generateRecordId( bean.getGenerateRecordId() ); - generateRecordDO.ruleId( bean.getRuleId() ); - generateRecordDO.codeRuleFormat( bean.getCodeRuleFormat() ); - generateRecordDO.codeType( bean.getCodeType() ); - generateRecordDO.charLength( bean.getCharLength() ); - generateRecordDO.charType( bean.getCharType() ); - generateRecordDO.codeNum( bean.getCodeNum() ); - generateRecordDO.fileUrl( bean.getFileUrl() ); - generateRecordDO.imageFileUrl( bean.getImageFileUrl() ); - generateRecordDO.operateUser( bean.getOperateUser() ); - generateRecordDO.operateUserId( bean.getOperateUserId() ); - generateRecordDO.state( bean.getState() ); - generateRecordDO.belongBusinessId( bean.getBelongBusinessId() ); - generateRecordDO.belongBusinessName( bean.getBelongBusinessName() ); - generateRecordDO.batchId( bean.getBatchId() ); - generateRecordDO.goodsName( bean.getGoodsName() ); - - return generateRecordDO.build(); - } - - @Override - public GenerateRecordRespVO convert(GenerateRecordDO bean) { - if ( bean == null ) { - return null; - } - - GenerateRecordRespVO generateRecordRespVO = new GenerateRecordRespVO(); - - generateRecordRespVO.setGenerateRecordId( bean.getGenerateRecordId() ); - generateRecordRespVO.setRuleId( bean.getRuleId() ); - generateRecordRespVO.setCodeRuleFormat( bean.getCodeRuleFormat() ); - generateRecordRespVO.setCodeType( bean.getCodeType() ); - generateRecordRespVO.setCharLength( bean.getCharLength() ); - generateRecordRespVO.setFileUrl( bean.getFileUrl() ); - generateRecordRespVO.setImageFileUrl( bean.getImageFileUrl() ); - generateRecordRespVO.setCharType( bean.getCharType() ); - generateRecordRespVO.setCodeNum( bean.getCodeNum() ); - generateRecordRespVO.setOperateUser( bean.getOperateUser() ); - generateRecordRespVO.setOperateUserId( bean.getOperateUserId() ); - generateRecordRespVO.setState( bean.getState() ); - generateRecordRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - generateRecordRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - generateRecordRespVO.setBatchId( bean.getBatchId() ); - generateRecordRespVO.setGoodsName( bean.getGoodsName() ); - generateRecordRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - generateRecordRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return generateRecordRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( GenerateRecordDO generateRecordDO : list ) { - list1.add( convert( generateRecordDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( GenerateRecordDO generateRecordDO : list ) { - list1.add( generateRecordDOToGenerateRecordExcelVO( generateRecordDO ) ); - } - - return list1; - } - - protected GenerateRecordExcelVO generateRecordDOToGenerateRecordExcelVO(GenerateRecordDO generateRecordDO) { - if ( generateRecordDO == null ) { - return null; - } - - GenerateRecordExcelVO generateRecordExcelVO = new GenerateRecordExcelVO(); - - generateRecordExcelVO.setId( generateRecordDO.getId() ); - generateRecordExcelVO.setGenerateRecordId( generateRecordDO.getGenerateRecordId() ); - generateRecordExcelVO.setRuleId( generateRecordDO.getRuleId() ); - generateRecordExcelVO.setCodeRuleFormat( generateRecordDO.getCodeRuleFormat() ); - generateRecordExcelVO.setCodeType( generateRecordDO.getCodeType() ); - generateRecordExcelVO.setCharLength( generateRecordDO.getCharLength() ); - generateRecordExcelVO.setCharType( generateRecordDO.getCharType() ); - generateRecordExcelVO.setCodeNum( generateRecordDO.getCodeNum() ); - generateRecordExcelVO.setOperateUser( generateRecordDO.getOperateUser() ); - generateRecordExcelVO.setOperateUserId( generateRecordDO.getOperateUserId() ); - generateRecordExcelVO.setState( generateRecordDO.getState() ); - generateRecordExcelVO.setBelongBusinessId( generateRecordDO.getBelongBusinessId() ); - generateRecordExcelVO.setBelongBusinessName( generateRecordDO.getBelongBusinessName() ); - if ( generateRecordDO.getCreateTime() != null ) { - generateRecordExcelVO.setCreateTime( Date.from( generateRecordDO.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return generateRecordExcelVO; - } -} diff --git a/yudao-module-identity/yudao-module-identity-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/identity/convert/scanrecord/ScanRecordConvertImpl.java b/yudao-module-identity/yudao-module-identity-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/identity/convert/scanrecord/ScanRecordConvertImpl.java deleted file mode 100644 index 27d9717..0000000 --- a/yudao-module-identity/yudao-module-identity-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/identity/convert/scanrecord/ScanRecordConvertImpl.java +++ /dev/null @@ -1,168 +0,0 @@ -package cn.iocoder.yudao.module.identity.convert.scanrecord; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.identity.controller.admin.scanrecord.vo.ScanRecordCreateReqVO; -import cn.iocoder.yudao.module.identity.controller.admin.scanrecord.vo.ScanRecordExcelVO; -import cn.iocoder.yudao.module.identity.controller.admin.scanrecord.vo.ScanRecordRespVO; -import cn.iocoder.yudao.module.identity.controller.admin.scanrecord.vo.ScanRecordUpdateReqVO; -import cn.iocoder.yudao.module.identity.dal.dataobject.scanrecord.ScanRecordDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:21+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class ScanRecordConvertImpl implements ScanRecordConvert { - - @Override - public ScanRecordDO convert(ScanRecordCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - ScanRecordDO.ScanRecordDOBuilder scanRecordDO = ScanRecordDO.builder(); - - scanRecordDO.generateRecordId( bean.getGenerateRecordId() ); - scanRecordDO.identityUrl( bean.getIdentityUrl() ); - scanRecordDO.batchId( bean.getBatchId() ); - scanRecordDO.goodsId( bean.getGoodsId() ); - scanRecordDO.goodsName( bean.getGoodsName() ); - scanRecordDO.scanIp( bean.getScanIp() ); - if ( bean.getBatchType() != null ) { - scanRecordDO.batchType( bean.getBatchType().byteValue() ); - } - scanRecordDO.scanArea( bean.getScanArea() ); - scanRecordDO.scanTime( bean.getScanTime() ); - scanRecordDO.scanLocation( bean.getScanLocation() ); - scanRecordDO.belongBusinessId( bean.getBelongBusinessId() ); - scanRecordDO.belongBusinessName( bean.getBelongBusinessName() ); - - return scanRecordDO.build(); - } - - @Override - public ScanRecordDO convert(ScanRecordUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - ScanRecordDO.ScanRecordDOBuilder scanRecordDO = ScanRecordDO.builder(); - - scanRecordDO.id( bean.getId() ); - scanRecordDO.generateRecordId( bean.getGenerateRecordId() ); - scanRecordDO.identityUrl( bean.getIdentityUrl() ); - scanRecordDO.batchId( bean.getBatchId() ); - scanRecordDO.goodsId( bean.getGoodsId() ); - scanRecordDO.goodsName( bean.getGoodsName() ); - scanRecordDO.scanIp( bean.getScanIp() ); - if ( bean.getBatchType() != null ) { - scanRecordDO.batchType( bean.getBatchType().byteValue() ); - } - scanRecordDO.scanArea( bean.getScanArea() ); - scanRecordDO.scanTime( bean.getScanTime() ); - scanRecordDO.scanLocation( bean.getScanLocation() ); - scanRecordDO.belongBusinessId( bean.getBelongBusinessId() ); - scanRecordDO.belongBusinessName( bean.getBelongBusinessName() ); - - return scanRecordDO.build(); - } - - @Override - public ScanRecordRespVO convert(ScanRecordDO bean) { - if ( bean == null ) { - return null; - } - - ScanRecordRespVO scanRecordRespVO = new ScanRecordRespVO(); - - scanRecordRespVO.setGenerateRecordId( bean.getGenerateRecordId() ); - scanRecordRespVO.setIdentityUrl( bean.getIdentityUrl() ); - scanRecordRespVO.setBatchId( bean.getBatchId() ); - scanRecordRespVO.setGoodsId( bean.getGoodsId() ); - scanRecordRespVO.setGoodsName( bean.getGoodsName() ); - scanRecordRespVO.setScanIp( bean.getScanIp() ); - if ( bean.getBatchType() != null ) { - scanRecordRespVO.setBatchType( bean.getBatchType().intValue() ); - } - scanRecordRespVO.setScanArea( bean.getScanArea() ); - scanRecordRespVO.setScanLocation( bean.getScanLocation() ); - scanRecordRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - scanRecordRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - scanRecordRespVO.setId( bean.getId() ); - scanRecordRespVO.setScanTime( bean.getScanTime() ); - scanRecordRespVO.setBrokenResult( bean.getBrokenResult() ); - - return scanRecordRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( ScanRecordDO scanRecordDO : list ) { - list1.add( convert( scanRecordDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( ScanRecordDO scanRecordDO : list ) { - list1.add( scanRecordDOToScanRecordExcelVO( scanRecordDO ) ); - } - - return list1; - } - - protected ScanRecordExcelVO scanRecordDOToScanRecordExcelVO(ScanRecordDO scanRecordDO) { - if ( scanRecordDO == null ) { - return null; - } - - ScanRecordExcelVO scanRecordExcelVO = new ScanRecordExcelVO(); - - scanRecordExcelVO.setId( scanRecordDO.getId() ); - scanRecordExcelVO.setGenerateRecordId( scanRecordDO.getGenerateRecordId() ); - scanRecordExcelVO.setIdentityUrl( scanRecordDO.getIdentityUrl() ); - scanRecordExcelVO.setBatchId( scanRecordDO.getBatchId() ); - scanRecordExcelVO.setGoodsId( scanRecordDO.getGoodsId() ); - scanRecordExcelVO.setGoodsName( scanRecordDO.getGoodsName() ); - scanRecordExcelVO.setScanIp( scanRecordDO.getScanIp() ); - if ( scanRecordDO.getBatchType() != null ) { - scanRecordExcelVO.setBatchType( scanRecordDO.getBatchType().intValue() ); - } - scanRecordExcelVO.setScanArea( scanRecordDO.getScanArea() ); - scanRecordExcelVO.setScanTime( scanRecordDO.getScanTime() ); - scanRecordExcelVO.setScanLocation( scanRecordDO.getScanLocation() ); - scanRecordExcelVO.setBelongBusinessId( scanRecordDO.getBelongBusinessId() ); - scanRecordExcelVO.setBelongBusinessName( scanRecordDO.getBelongBusinessName() ); - - return scanRecordExcelVO; - } -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/META-INF/spring-configuration-metadata.json b/yudao-module-infra/yudao-module-infra-biz/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index 8161c24..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "groups": [ - { - "name": "yudao.codegen", - "type": "cn.iocoder.yudao.module.infra.framework.codegen.config.CodegenProperties", - "sourceType": "cn.iocoder.yudao.module.infra.framework.codegen.config.CodegenProperties" - } - ], - "properties": [ - { - "name": "yudao.codegen.base-package", - "type": "java.lang.String", - "description": "生成的 Java 代码的基础包", - "sourceType": "cn.iocoder.yudao.module.infra.framework.codegen.config.CodegenProperties" - }, - { - "name": "yudao.codegen.db-schemas", - "type": "java.util.Collection", - "description": "数据库名数组", - "sourceType": "cn.iocoder.yudao.module.infra.framework.codegen.config.CodegenProperties" - } - ], - "hints": [] -} \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/bootstrap-local.yaml b/yudao-module-infra/yudao-module-infra-biz/target/classes/bootstrap-local.yaml deleted file mode 100644 index fe4d3a5..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/bootstrap-local.yaml +++ /dev/null @@ -1,31 +0,0 @@ -spring: - main: - allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 - allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Dubbo 或者 Feign 等会存在重复定义的服务 - ---- #################### 注册中心相关配置 #################### - -spring: - cloud: - nacos: - server-addr: 192.168.233.128:8848 - discovery: - namespace: dev # 命名空间。这里使用 dev 开发环境 - metadata: - version: 1.0.0 # 服务实例的版本号，可用于灰度发布 - ---- #################### 配置中心相关配置 #################### - -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: 192.168.233.128:8848 # Nacos 服务器地址 - namespace: dev # 命名空间。这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/bootstrap-prod.yaml b/yudao-module-infra/yudao-module-infra-biz/target/classes/bootstrap-prod.yaml deleted file mode 100644 index d0b3068..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/bootstrap-prod.yaml +++ /dev/null @@ -1,31 +0,0 @@ -spring: - main: - allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 - allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Dubbo 或者 Feign 等会存在重复定义的服务 - ---- #################### 注册中心相关配置 #################### - -spring: - cloud: - nacos: - server-addr: 127.0.0.1:8848 - discovery: - namespace: prod # 命名空间。这里使用 dev 开发环境 - metadata: - version: 1.0.0 # 服务实例的版本号，可用于灰度发布 - ---- #################### 配置中心相关配置 #################### - -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: 127.0.0.1:8848 # Nacos 服务器地址 - namespace: prod # 命名空间。这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/bootstrap.yaml b/yudao-module-infra/yudao-module-infra-biz/target/classes/bootstrap.yaml deleted file mode 100644 index a276ad4..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/bootstrap.yaml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - application: - name: infra-server - - profiles: - active: local - -server: - port: 48082 - -# 日志文件配置。注意，如果 logging.file.name 不放在 bootstrap.yaml 配置文件，而是放在 application.yaml 中，会导致出现 LOG_FILE_IS_UNDEFINED 文件 -logging: - file: - name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径 diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/controller.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/controller.vm deleted file mode 100644 index 5b05467..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/controller.vm +++ /dev/null @@ -1,109 +0,0 @@ -package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}; - -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -#if ($sceneEnum.scene == 1)import org.springframework.security.access.prepost.PreAuthorize;#end - -import io.swagger.annotations.*; - -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import ${PageResultClassName}; -import ${CommonResultClassName}; -import static ${CommonResultClassName}.success; - -import ${ExcelUtilsClassName}; - -import ${OperateLogClassName}; -import static ${OperateTypeEnumClassName}.*; - -import ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}.vo.*; -import ${basePackage}.module.${table.moduleName}.dal.dataobject.${table.businessName}.${table.className}DO; -import ${basePackage}.module.${table.moduleName}.convert.${table.businessName}.${table.className}Convert; -import ${basePackage}.module.${table.moduleName}.service.${table.businessName}.${table.className}Service; - -@Api(tags = "${sceneEnum.name} - ${table.classComment}") -@RestController -##二级的 businessName 暂时不算在 HTTP 路径上，可以根据需要写 -@RequestMapping("/${table.moduleName}/${simpleClassName_strikeCase}") -@Validated -public class ${sceneEnum.prefixClass}${table.className}Controller { - - @Resource - private ${table.className}Service ${classNameVar}Service; - - @PostMapping("/create") - @ApiOperation("创建${table.classComment}") -#if ($sceneEnum.scene == 1) @PreAuthorize("@ss.hasPermission('${permissionPrefix}:create')")#end - - public CommonResult<${primaryColumn.javaType}> create${simpleClassName}(@Valid @RequestBody ${sceneEnum.prefixClass}${table.className}CreateReqVO createReqVO) { - return success(${classNameVar}Service.create${simpleClassName}(createReqVO)); - } - - @PutMapping("/update") - @ApiOperation("更新${table.classComment}") -#if ($sceneEnum.scene == 1) @PreAuthorize("@ss.hasPermission('${permissionPrefix}:update')")#end - - public CommonResult update${simpleClassName}(@Valid @RequestBody ${sceneEnum.prefixClass}${table.className}UpdateReqVO updateReqVO) { - ${classNameVar}Service.update${simpleClassName}(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @ApiOperation("删除${table.classComment}") - @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = ${primaryColumn.javaType}.class) -#if ($sceneEnum.scene == 1) @PreAuthorize("@ss.hasPermission('${permissionPrefix}:delete')")#end - - public CommonResult delete${simpleClassName}(@RequestParam("id") ${primaryColumn.javaType} id) { - ${classNameVar}Service.delete${simpleClassName}(id); - return success(true); - } - - @GetMapping("/get") - @ApiOperation("获得${table.classComment}") - @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = ${primaryColumn.javaType}.class) -#if ($sceneEnum.scene == 1) @PreAuthorize("@ss.hasPermission('${permissionPrefix}:query')")#end - - public CommonResult<${sceneEnum.prefixClass}${table.className}RespVO> get${simpleClassName}(@RequestParam("id") ${primaryColumn.javaType} id) { - ${table.className}DO ${classNameVar} = ${classNameVar}Service.get${simpleClassName}(id); - return success(${table.className}Convert.INSTANCE.convert(${classNameVar})); - } - - @GetMapping("/list") - @ApiOperation("获得${table.classComment}列表") - @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class) -#if ($sceneEnum.scene == 1) @PreAuthorize("@ss.hasPermission('${permissionPrefix}:query')")#end - - public CommonResult> get${simpleClassName}List(@RequestParam("ids") Collection<${primaryColumn.javaType}> ids) { - List<${table.className}DO> list = ${classNameVar}Service.get${simpleClassName}List(ids); - return success(${table.className}Convert.INSTANCE.convertList(list)); - } - - @GetMapping("/page") - @ApiOperation("获得${table.classComment}分页") -#if ($sceneEnum.scene == 1) @PreAuthorize("@ss.hasPermission('${permissionPrefix}:query')")#end - - public CommonResult> get${simpleClassName}Page(@Valid ${sceneEnum.prefixClass}${table.className}PageReqVO pageVO) { - PageResult<${table.className}DO> pageResult = ${classNameVar}Service.get${simpleClassName}Page(pageVO); - return success(${table.className}Convert.INSTANCE.convertPage(pageResult)); - } - - @GetMapping("/export-excel") - @ApiOperation("导出${table.classComment} Excel") -#if ($sceneEnum.scene == 1) @PreAuthorize("@ss.hasPermission('${permissionPrefix}:export')")#end - - @OperateLog(type = EXPORT) - public void export${simpleClassName}Excel(@Valid ${sceneEnum.prefixClass}${table.className}ExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { - List<${table.className}DO> list = ${classNameVar}Service.get${simpleClassName}List(exportReqVO); - // 导出 Excel - List<${sceneEnum.prefixClass}${table.className}ExcelVO> datas = ${table.className}Convert.INSTANCE.convertList02(list); - ExcelUtils.write(response, "${table.classComment}.xls", "数据", ${sceneEnum.prefixClass}${table.className}ExcelVO.class, datas); - } - -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/_column.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/_column.vm deleted file mode 100644 index 69477d4..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/_column.vm +++ /dev/null @@ -1,13 +0,0 @@ -## 提供给 baseVO、createVO、updateVO 生成字段 - @ApiModelProperty(value = "${column.columnComment}"#if (!${column.nullable}), required = true#end#if ("$!column.example" != ""), example = "${column.example}"#end) -#if (!${column.nullable})## 判断 @NotEmpty 和 @NotNull 注解 -#if (${field.fieldType} == 'String') - @NotEmpty(message = "${column.columnComment}不能为空") -#else - @NotNull(message = "${column.columnComment}不能为空") -#end -#end -#if (${column.javaType} == "LocalDateTime")## 时间类型 - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) -#end - private ${column.javaType} ${column.javaField}; diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/baseVO.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/baseVO.vm deleted file mode 100644 index a0ad48d..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/baseVO.vm +++ /dev/null @@ -1,39 +0,0 @@ -package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}.vo; - -import lombok.*; -import java.util.*; -#foreach ($column in $columns) -#if (${column.javaType} == "BigDecimal") -import java.math.BigDecimal; -#end -#if (${column.javaType} == "LocalDateTime") -import java.time.LocalDateTime; -#end -#end -import io.swagger.annotations.*; -import javax.validation.constraints.*; -## 处理 Date 字段的引入 -#foreach ($column in $columns) -#if (${column.createOperation} && ${column.updateOperation} && ${column.listOperationResult} - && ${column.javaType} == "LocalDateTime")## 时间类型 -import org.springframework.format.annotation.DateTimeFormat; - -import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -#break -#end -#end - -/** -* ${table.classComment} Base VO，提供给添加、修改、详细的子 VO 使用 -* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 -*/ -@Data -public class ${sceneEnum.prefixClass}${table.className}BaseVO { - -#foreach ($column in $columns) -#if (${column.createOperation} && ${column.updateOperation} && ${column.listOperationResult})##通用操作 - #parse("codegen/java/controller/vo/_column.vm") - -#end -#end -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/createReqVO.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/createReqVO.vm deleted file mode 100644 index bf6408c..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/createReqVO.vm +++ /dev/null @@ -1,30 +0,0 @@ -package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; -## 处理 Date 字段的引入 -#foreach ($column in $columns) -#if (${column.createOperation} && (!${column.updateOperation} || !${column.listOperationResult}) - && ${column.javaType} == "LocalDateTime")## 时间类型 -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -#break -#end -#end - -@ApiModel("${sceneEnum.name} - ${table.classComment}创建 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class ${sceneEnum.prefixClass}${table.className}CreateReqVO extends ${sceneEnum.prefixClass}${table.className}BaseVO { - -#foreach ($column in $columns) -#if (${column.createOperation} && (!${column.updateOperation} || !${column.listOperationResult}))##不是通用字段 - #parse("codegen/java/controller/vo/_column.vm") - -#end -#end -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/excelVO.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/excelVO.vm deleted file mode 100644 index 8bfd92b..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/excelVO.vm +++ /dev/null @@ -1,45 +0,0 @@ -package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}.vo; - -import lombok.*; -import java.util.*; -#foreach ($column in $columns) -#if (${column.javaType} == "BigDecimal") -import java.math.BigDecimal; -#end -#if (${column.javaType} == "LocalDateTime") -import java.time.LocalDateTime; -#end -#end -import io.swagger.annotations.*; - -import com.alibaba.excel.annotation.ExcelProperty; -#foreach ($column in $columns) -#if ("$!column.dictType" != "")## 有设置数据字典 -import ${DictFormatClassName}; -import ${DictConvertClassName}; - -#break -#end -#end - -/** - * ${table.classComment} Excel VO - * - * @author ${table.author} - */ -@Data -public class ${sceneEnum.prefixClass}${table.className}ExcelVO { - -#foreach ($column in $columns) - #if (${column.listOperationResult})##返回字段 - #if ("$!column.dictType" != "")##处理枚举值 - @ExcelProperty(value = "${column.columnComment}", converter = DictConvert.class) - @DictFormat("${column.dictType}") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 - #else - @ExcelProperty("${column.columnComment}") - #end - private ${column.javaType} ${column.javaField}; - - #end -#end -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/exportReqVO.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/exportReqVO.vm deleted file mode 100644 index cd68dd8..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/exportReqVO.vm +++ /dev/null @@ -1,39 +0,0 @@ -package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import ${PageParamClassName}; -## 处理 Date 字段的引入 -#foreach ($column in $columns) -#if (${column.listOperation} && ${column.javaType} == "LocalDateTime")## 时间类型 -import java.time.LocalDateTime; -import org.springframework.format.annotation.DateTimeFormat; - -import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -#break -#end -#end -## 字段模板 -#macro(columnTpl $prefix $prefixStr) - @ApiModelProperty(value = "${prefixStr}${column.columnComment}"#if ("$!column.example" != ""), example = "${column.example}"#end) - private ${column.javaType}#if ("$!prefix" != "") ${prefix}${JavaField}#else ${column.javaField}#end; -#end - -@ApiModel(value = "${sceneEnum.name} - ${table.classComment} Excel 导出 Request VO", description = "参数和 ${table.className}PageReqVO 是一致的") -@Data -public class ${sceneEnum.prefixClass}${table.className}ExportReqVO { - -#foreach ($column in $columns) -#if (${column.listOperation})##查询操作 -#if (${column.listOperationCondition} == "BETWEEN")## 情况一，Between 的时候 - @ApiModelProperty(value = "${column.columnComment}"#if ("$!column.example" != ""), example = "${column.example}"#end) - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private ${column.javaType}[] ${column.javaField}; -#else##情况二，非 Between 的时间 - #columnTpl('', '') -#end - -#end -#end -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/pageReqVO.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/pageReqVO.vm deleted file mode 100644 index f266439..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/pageReqVO.vm +++ /dev/null @@ -1,41 +0,0 @@ -package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import ${PageParamClassName}; -## 处理 Date 字段的引入 -#foreach ($column in $columns) -#if (${column.listOperation} && ${column.javaType} == "LocalDateTime")## 时间类型 -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -#break -#end -#end -## 字段模板 -#macro(columnTpl $prefix $prefixStr) - @ApiModelProperty(value = "${prefixStr}${column.columnComment}"#if ("$!column.example" != ""), example = "${column.example}"#end) - private ${column.javaType}#if ("$!prefix" != "") ${prefix}${JavaField}#else ${column.javaField}#end; -#end - -@ApiModel("${sceneEnum.name} - ${table.classComment}分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class ${sceneEnum.prefixClass}${table.className}PageReqVO extends PageParam { - -#foreach ($column in $columns) -#if (${column.listOperation})##查询操作 -#if (${column.listOperationCondition} == "BETWEEN")## 情况一，Between 的时候 - @ApiModelProperty(value = "${column.columnComment}"#if ("$!column.example" != ""), example = "${column.example}"#end) - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private ${column.javaType}[] ${column.javaField}; -#else##情况二，非 Between 的时间 - #columnTpl('', '') -#end - -#end -#end -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/respVO.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/respVO.vm deleted file mode 100644 index 19bc32d..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/respVO.vm +++ /dev/null @@ -1,25 +0,0 @@ -package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}.vo; - -import lombok.*; -#foreach ($column in $columns) -#if (${column.javaType} == "LocalDateTime") -import java.time.LocalDateTime; -#break -#end -#end -import io.swagger.annotations.*; - -@ApiModel("${sceneEnum.name} - ${table.classComment} Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class ${sceneEnum.prefixClass}${table.className}RespVO extends ${sceneEnum.prefixClass}${table.className}BaseVO { - -#foreach ($column in $columns) -#if (${column.listOperationResult} && (!${column.createOperation} || !${column.updateOperation}))##不是通用字段 - @ApiModelProperty(value = "${column.columnComment}"#if (!${column.nullable}), required = true#end#if ("$!column.example" != ""), example = "${column.example}"#end) - private ${column.javaType} ${column.javaField}; - -#end -#end -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/updateReqVO.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/updateReqVO.vm deleted file mode 100644 index 6369915..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/controller/vo/updateReqVO.vm +++ /dev/null @@ -1,30 +0,0 @@ -package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; -## 处理 Date 字段的引入 -#foreach ($column in $columns) -#if (${column.updateOperation} && (!${column.createOperation} || !${column.listOperationResult}) - && ${column.javaType} == "LocalDateTime")## 时间类型 -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -#break -#end -#end - -@ApiModel("${sceneEnum.name} - ${table.classComment}更新 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class ${sceneEnum.prefixClass}${table.className}UpdateReqVO extends ${sceneEnum.prefixClass}${table.className}BaseVO { - -#foreach ($column in $columns) -#if (${column.updateOperation} && (!${column.createOperation} || !${column.listOperationResult}))##不是通用字段 - #parse("codegen/java/controller/vo/_column.vm") - -#end -#end -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/convert/convert.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/convert/convert.vm deleted file mode 100644 index 6176e0f..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/convert/convert.vm +++ /dev/null @@ -1,34 +0,0 @@ -package ${basePackage}.module.${table.moduleName}.convert.${table.businessName}; - -import java.util.*; - -import ${PageResultClassName}; - -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; -import ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}.vo.*; -import ${basePackage}.module.${table.moduleName}.dal.dataobject.${table.businessName}.${table.className}DO; - -/** - * ${table.classComment} Convert - * - * @author ${table.author} - */ -@Mapper -public interface ${table.className}Convert { - - ${table.className}Convert INSTANCE = Mappers.getMapper(${table.className}Convert.class); - - ${table.className}DO convert(${sceneEnum.prefixClass}${table.className}CreateReqVO bean); - - ${table.className}DO convert(${sceneEnum.prefixClass}${table.className}UpdateReqVO bean); - - ${sceneEnum.prefixClass}${table.className}RespVO convert(${table.className}DO bean); - - List<${sceneEnum.prefixClass}${table.className}RespVO> convertList(List<${table.className}DO> list); - - PageResult<${sceneEnum.prefixClass}${table.className}RespVO> convertPage(PageResult<${table.className}DO> page); - - List<${sceneEnum.prefixClass}${table.className}ExcelVO> convertList02(List<${table.className}DO> list); - -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/dal/do.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/dal/do.vm deleted file mode 100644 index d551d4b..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/dal/do.vm +++ /dev/null @@ -1,47 +0,0 @@ -package ${basePackage}.module.${table.moduleName}.dal.dataobject.${table.businessName}; - -import lombok.*; -import java.util.*; -#foreach ($column in $columns) -#if (${column.javaType} == "BigDecimal") -import java.math.BigDecimal; -#end -#if (${column.javaType} == "LocalDateTime") -import java.time.LocalDateTime; -#end -#end -import com.baomidou.mybatisplus.annotation.*; -import ${BaseDOClassName}; - -/** - * ${table.classComment} DO - * - * @author ${table.author} - */ -@TableName("${table.tableName.toLowerCase()}") -@KeySequence("${table.tableName.toLowerCase()}_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class ${table.className}DO extends BaseDO { - -#foreach ($column in $columns) -#if (!${baseDOFields.contains(${column.javaField})})##排除 BaseDO 的字段 - /** - * ${column.columnComment} - #if ("$!column.dictType" != "")##处理枚举值 - * - * 枚举 {@link TODO ${column.dictType} 对应的类} - #end - */ - #if (${column.primaryKey})##处理主键 - @TableId#if (${column.javaType} == 'String')(type = IdType.INPUT)#end - #end - private ${column.javaType} ${column.javaField}; -#end -#end - -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/dal/mapper.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/dal/mapper.vm deleted file mode 100644 index 615ae33..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/dal/mapper.vm +++ /dev/null @@ -1,66 +0,0 @@ -package ${basePackage}.module.${table.moduleName}.dal.mysql.${table.businessName}; - -import java.util.*; - -import ${PageResultClassName}; -import ${QueryWrapperClassName}; -import ${BaseMapperClassName}; -import ${basePackage}.module.${table.moduleName}.dal.dataobject.${table.businessName}.${table.className}DO; -import org.apache.ibatis.annotations.Mapper; -import ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}.vo.*; - -## 字段模板 -#macro(listCondition) -#foreach ($column in $columns) -#if (${column.listOperation}) -#set ($JavaField = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})##首字母大写 -#if (${column.listOperationCondition} == "=")##情况一，= 的时候 - .eqIfPresent(${table.className}DO::get${JavaField}, reqVO.get${JavaField}()) -#end -#if (${column.listOperationCondition} == "!=")##情况二，!= 的时候 - .neIfPresent(${table.className}DO::get${JavaField}, reqVO.get${JavaField}()) -#end -#if (${column.listOperationCondition} == ">")##情况三，> 的时候 - .gtIfPresent(${table.className}DO::get${JavaField}, reqVO.get${JavaField}()) -#end -#if (${column.listOperationCondition} == ">=")##情况四，>= 的时候 - .geIfPresent(${table.className}DO::get${JavaField}, reqVO.get${JavaField}()) -#end -#if (${column.listOperationCondition} == "<")##情况五，< 的时候 - .ltIfPresent(${table.className}DO::get${JavaField}, reqVO.get${JavaField}()) -#end -#if (${column.listOperationCondition} == "<=")##情况五，<= 的时候 - .leIfPresent(${table.className}DO::get${JavaField}, reqVO.get${JavaField}()) -#end -#if (${column.listOperationCondition} == "LIKE")##情况七，Like 的时候 - .likeIfPresent(${table.className}DO::get${JavaField}, reqVO.get${JavaField}()) -#end -#if (${column.listOperationCondition} == "BETWEEN")##情况八，Between 的时候 - .betweenIfPresent(${table.className}DO::get${JavaField}, reqVO.get${JavaField}()) -#end -#end -#end -#end -/** - * ${table.classComment} Mapper - * - * @author ${table.author} - */ -@Mapper -public interface ${table.className}Mapper extends BaseMapperX<${table.className}DO> { - - default PageResult<${table.className}DO> selectPage(${sceneEnum.prefixClass}${table.className}PageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX<${table.className}DO>() - #listCondition() - .orderByDesc(${table.className}DO::getId));## 大多数情况下，id 倒序 - - } - - default List<${table.className}DO> selectList(${sceneEnum.prefixClass}${table.className}ExportReqVO reqVO) { - return selectList(new LambdaQueryWrapperX<${table.className}DO>() - #listCondition() - .orderByDesc(${table.className}DO::getId));## 大多数情况下，id 倒序 - - } - -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/dal/mapper.xml.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/dal/mapper.xml.vm deleted file mode 100644 index d930db9..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/dal/mapper.xml.vm +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/enums/errorcode.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/enums/errorcode.vm deleted file mode 100644 index a9a6daf..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/enums/errorcode.vm +++ /dev/null @@ -1,3 +0,0 @@ -// TODO 待办：请将下面的错误码复制到 yudao-module-${table.moduleName}-api 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！ -// ========== ${table.classComment} TODO 补充编号 ========== -ErrorCode ${simpleClassName_underlineCase.toUpperCase()}_NOT_EXISTS = new ErrorCode(TODO 补充编号, "${table.classComment}不存在"); diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/service/service.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/service/service.vm deleted file mode 100644 index b8c6376..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/service/service.vm +++ /dev/null @@ -1,70 +0,0 @@ -package ${basePackage}.module.${table.moduleName}.service.${table.businessName}; - -import java.util.*; -import javax.validation.*; -import ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}.vo.*; -import ${basePackage}.module.${table.moduleName}.dal.dataobject.${table.businessName}.${table.className}DO; -import ${PageResultClassName}; - -/** - * ${table.classComment} Service 接口 - * - * @author ${table.author} - */ -public interface ${table.className}Service { - - /** - * 创建${table.classComment} - * - * @param createReqVO 创建信息 - * @return 编号 - */ - ${primaryColumn.javaType} create${simpleClassName}(@Valid ${sceneEnum.prefixClass}${table.className}CreateReqVO createReqVO); - - /** - * 更新${table.classComment} - * - * @param updateReqVO 更新信息 - */ - void update${simpleClassName}(@Valid ${sceneEnum.prefixClass}${table.className}UpdateReqVO updateReqVO); - - /** - * 删除${table.classComment} - * - * @param id 编号 - */ - void delete${simpleClassName}(${primaryColumn.javaType} id); - - /** - * 获得${table.classComment} - * - * @param id 编号 - * @return ${table.classComment} - */ - ${table.className}DO get${simpleClassName}(${primaryColumn.javaType} id); - - /** - * 获得${table.classComment}列表 - * - * @param ids 编号 - * @return ${table.classComment}列表 - */ - List<${table.className}DO> get${simpleClassName}List(Collection<${primaryColumn.javaType}> ids); - - /** - * 获得${table.classComment}分页 - * - * @param pageReqVO 分页查询 - * @return ${table.classComment}分页 - */ - PageResult<${table.className}DO> get${simpleClassName}Page(${sceneEnum.prefixClass}${table.className}PageReqVO pageReqVO); - - /** - * 获得${table.classComment}列表, 用于 Excel 导出 - * - * @param exportReqVO 查询条件 - * @return ${table.classComment}列表 - */ - List<${table.className}DO> get${simpleClassName}List(${sceneEnum.prefixClass}${table.className}ExportReqVO exportReqVO); - -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/service/serviceImpl.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/service/serviceImpl.vm deleted file mode 100644 index a732039..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/service/serviceImpl.vm +++ /dev/null @@ -1,82 +0,0 @@ -package ${basePackage}.module.${table.moduleName}.service.${table.businessName}; - -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import java.util.*; -import ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}.vo.*; -import ${basePackage}.module.${table.moduleName}.dal.dataobject.${table.businessName}.${table.className}DO; -import ${PageResultClassName}; - -import ${basePackage}.module.${table.moduleName}.convert.${table.businessName}.${table.className}Convert; -import ${basePackage}.module.${table.moduleName}.dal.mysql.${table.businessName}.${table.className}Mapper; - -import static ${ServiceExceptionUtilClassName}.exception; -import static ${basePackage}.module.${table.moduleName}.enums.ErrorCodeConstants.*; - -/** - * ${table.classComment} Service 实现类 - * - * @author ${table.author} - */ -@Service -@Validated -public class ${table.className}ServiceImpl implements ${table.className}Service { - - @Resource - private ${table.className}Mapper ${classNameVar}Mapper; - - @Override - public ${primaryColumn.javaType} create${simpleClassName}(${sceneEnum.prefixClass}${table.className}CreateReqVO createReqVO) { - // 插入 - ${table.className}DO ${classNameVar} = ${table.className}Convert.INSTANCE.convert(createReqVO); - ${classNameVar}Mapper.insert(${classNameVar}); - // 返回 - return ${classNameVar}.getId(); - } - - @Override - public void update${simpleClassName}(${sceneEnum.prefixClass}${table.className}UpdateReqVO updateReqVO) { - // 校验存在 - validate${simpleClassName}Exists(updateReqVO.getId()); - // 更新 - ${table.className}DO updateObj = ${table.className}Convert.INSTANCE.convert(updateReqVO); - ${classNameVar}Mapper.updateById(updateObj); - } - - @Override - public void delete${simpleClassName}(${primaryColumn.javaType} id) { - // 校验存在 - validate${simpleClassName}Exists(id); - // 删除 - ${classNameVar}Mapper.deleteById(id); - } - - private void validate${simpleClassName}Exists(${primaryColumn.javaType} id) { - if (${classNameVar}Mapper.selectById(id) == null) { - throw exception(${simpleClassName_underlineCase.toUpperCase()}_NOT_EXISTS); - } - } - - @Override - public ${table.className}DO get${simpleClassName}(${primaryColumn.javaType} id) { - return ${classNameVar}Mapper.selectById(id); - } - - @Override - public List<${table.className}DO> get${simpleClassName}List(Collection<${primaryColumn.javaType}> ids) { - return ${classNameVar}Mapper.selectBatchIds(ids); - } - - @Override - public PageResult<${table.className}DO> get${simpleClassName}Page(${sceneEnum.prefixClass}${table.className}PageReqVO pageReqVO) { - return ${classNameVar}Mapper.selectPage(pageReqVO); - } - - @Override - public List<${table.className}DO> get${simpleClassName}List(${sceneEnum.prefixClass}${table.className}ExportReqVO exportReqVO) { - return ${classNameVar}Mapper.selectList(exportReqVO); - } - -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/test/serviceTest.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/test/serviceTest.vm deleted file mode 100644 index 67a44e9..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/java/test/serviceTest.vm +++ /dev/null @@ -1,164 +0,0 @@ -package ${basePackage}.module.${table.moduleName}.service.${table.businessName}; - -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.mock.mockito.MockBean; - -import javax.annotation.Resource; - -import ${baseFrameworkPackage}.test.core.ut.BaseDbUnitTest; - -import ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}.vo.*; -import ${basePackage}.module.${table.moduleName}.dal.dataobject.${table.businessName}.${table.className}DO; -import ${basePackage}.module.${table.moduleName}.dal.mysql.${table.businessName}.${table.className}Mapper; -import ${PageResultClassName}; - -import javax.annotation.Resource; -import org.springframework.context.annotation.Import; -import java.util.*; -import java.time.LocalDateTime; - -import static cn.hutool.core.util.RandomUtil.*; -import static ${basePackage}.module.${table.moduleName}.enums.ErrorCodeConstants.*; -import static ${baseFrameworkPackage}.test.core.util.AssertUtils.*; -import static ${baseFrameworkPackage}.test.core.util.RandomUtils.*; -import static ${ObjectUtilsClassName}.*; -import static ${DateUtilsClassName}.*; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; - -## 字段模板 -#macro(getPageCondition $VO) - // mock 数据 - ${table.className}DO db${simpleClassName} = randomPojo(${table.className}DO.class, o -> { // 等会查询到 - #foreach ($column in $columns) - #if (${column.listOperation}) - #set ($JavaField = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})##首字母大写 - o.set$JavaField(null); - #end - #end - }); - ${classNameVar}Mapper.insert(db${simpleClassName}); - #foreach ($column in $columns) - #if (${column.listOperation}) - #set ($JavaField = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})##首字母大写 - // 测试 ${column.javaField} 不匹配 - ${classNameVar}Mapper.insert(cloneIgnoreId(db${simpleClassName}, o -> o.set$JavaField(null))); - #end - #end - // 准备参数 - ${sceneEnum.prefixClass}${table.className}${VO} reqVO = new ${sceneEnum.prefixClass}${table.className}${VO}(); - #foreach ($column in $columns) - #if (${column.listOperation}) - #set ($JavaField = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})##首字母大写 - #if (${column.listOperationCondition} == "BETWEEN")## BETWEEN 的情况 - reqVO.set${JavaField}(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - #else - reqVO.set$JavaField(null); - #end - #end - #end -#end -/** -* {@link ${table.className}ServiceImpl} 的单元测试类 -* -* @author ${table.author} -*/ -@Import(${table.className}ServiceImpl.class) -public class ${table.className}ServiceImplTest extends BaseDbUnitTest { - - @Resource - private ${table.className}ServiceImpl ${classNameVar}Service; - - @Resource - private ${table.className}Mapper ${classNameVar}Mapper; - - @Test - public void testCreate${simpleClassName}_success() { - // 准备参数 - ${sceneEnum.prefixClass}${table.className}CreateReqVO reqVO = randomPojo(${sceneEnum.prefixClass}${table.className}CreateReqVO.class); - - // 调用 - ${primaryColumn.javaType} ${classNameVar}Id = ${classNameVar}Service.create${simpleClassName}(reqVO); - // 断言 - assertNotNull(${classNameVar}Id); - // 校验记录的属性是否正确 - ${table.className}DO ${classNameVar} = ${classNameVar}Mapper.selectById(${classNameVar}Id); - assertPojoEquals(reqVO, ${classNameVar}); - } - - @Test - public void testUpdate${simpleClassName}_success() { - // mock 数据 - ${table.className}DO db${simpleClassName} = randomPojo(${table.className}DO.class); - ${classNameVar}Mapper.insert(db${simpleClassName});// @Sql: 先插入出一条存在的数据 - // 准备参数 - ${sceneEnum.prefixClass}${table.className}UpdateReqVO reqVO = randomPojo(${sceneEnum.prefixClass}${table.className}UpdateReqVO.class, o -> { - o.setId(db${simpleClassName}.getId()); // 设置更新的 ID - }); - - // 调用 - ${classNameVar}Service.update${simpleClassName}(reqVO); - // 校验是否更新正确 - ${table.className}DO ${classNameVar} = ${classNameVar}Mapper.selectById(reqVO.getId()); // 获取最新的 - assertPojoEquals(reqVO, ${classNameVar}); - } - - @Test - public void testUpdate${simpleClassName}_notExists() { - // 准备参数 - ${sceneEnum.prefixClass}${table.className}UpdateReqVO reqVO = randomPojo(${sceneEnum.prefixClass}${table.className}UpdateReqVO.class); - - // 调用, 并断言异常 - assertServiceException(() -> ${classNameVar}Service.update${simpleClassName}(reqVO), ${simpleClassName_underlineCase.toUpperCase()}_NOT_EXISTS); - } - - @Test - public void testDelete${simpleClassName}_success() { - // mock 数据 - ${table.className}DO db${simpleClassName} = randomPojo(${table.className}DO.class); - ${classNameVar}Mapper.insert(db${simpleClassName});// @Sql: 先插入出一条存在的数据 - // 准备参数 - ${primaryColumn.javaType} id = db${simpleClassName}.getId(); - - // 调用 - ${classNameVar}Service.delete${simpleClassName}(id); - // 校验数据不存在了 - assertNull(${classNameVar}Mapper.selectById(id)); - } - - @Test - public void testDelete${simpleClassName}_notExists() { - // 准备参数 - ${primaryColumn.javaType} id = random${primaryColumn.javaType}Id(); - - // 调用, 并断言异常 - assertServiceException(() -> ${classNameVar}Service.delete${simpleClassName}(id), ${simpleClassName_underlineCase.toUpperCase()}_NOT_EXISTS); - } - - @Test - @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 - public void testGet${simpleClassName}Page() { - #getPageCondition("PageReqVO") - - // 调用 - PageResult<${table.className}DO> pageResult = ${classNameVar}Service.get${simpleClassName}Page(reqVO); - // 断言 - assertEquals(1, pageResult.getTotal()); - assertEquals(1, pageResult.getList().size()); - assertPojoEquals(db${simpleClassName}, pageResult.getList().get(0)); - } - - @Test - @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 - public void testGet${simpleClassName}List() { - #getPageCondition("ExportReqVO") - - // 调用 - List<${table.className}DO> list = ${classNameVar}Service.get${simpleClassName}List(reqVO); - // 断言 - assertEquals(1, list.size()); - assertPojoEquals(db${simpleClassName}, list.get(0)); - } - -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/sql/h2.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/sql/h2.vm deleted file mode 100644 index 20c33ad..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/sql/h2.vm +++ /dev/null @@ -1,35 +0,0 @@ --- 将该建表 SQL 语句，添加到 yudao-module-${table.moduleName}-biz 模块的 test/resources/sql/create_tables.sql 文件里 -CREATE TABLE IF NOT EXISTS "${table.tableName.toLowerCase()}" ( -#foreach ($column in $columns) -#if (${column.javaType} == 'Long') - #set ($dataType='bigint') -#elseif (${column.javaType} == 'Integer') - #set ($dataType='int') -#elseif (${column.javaType} == 'Boolean') - #set ($dataType='bit') -#elseif (${column.javaType} == 'Date') - #set ($dataType='datetime') -#else - #set ($dataType='varchar') -#end - #if (${column.primaryKey})##处理主键 - "${column.javaField}"#if (${column.javaType} == 'String') ${dataType} NOT NULL#else ${dataType} NOT NULL GENERATED BY DEFAULT AS IDENTITY#end, - #else - #if (${column.columnName} == 'create_time') - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - #elseif (${column.columnName} == 'update_time') - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - #elseif (${column.columnName} == 'creator' || ${column.columnName} == 'updater') - "${column.columnName}" ${dataType} DEFAULT '', - #elseif (${column.columnName} == 'deleted') - "deleted" bit NOT NULL DEFAULT FALSE, - #else - "${column.columnName.toLowerCase()}" ${dataType}#if (${column.nullable} == false) NOT NULL#end, - #end - #end -#end - PRIMARY KEY ("${primaryColumn.columnName.toLowerCase()}") -) COMMENT '${table.tableComment}'; - --- 将该删表 SQL 语句，添加到 yudao-module-${table.moduleName}-biz 模块的 test/resources/sql/clean.sql 文件里 -DELETE FROM "${table.tableName}"; diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/sql/sql.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/sql/sql.vm deleted file mode 100644 index 0edbdc1..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/sql/sql.vm +++ /dev/null @@ -1,28 +0,0 @@ --- 菜单 SQL -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '${table.classComment}管理', '', 2, 0, ${table.parentMenuId}, - '${simpleClassName_strikeCase}', '', '${table.moduleName}/${classNameVar}/index', 0 -); - --- 按钮父菜单ID --- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码 -SELECT @parentId := LAST_INSERT_ID(); - --- 按钮 SQL -#set ($functionNames = ['查询', '创建', '更新', '删除', '导出']) -#set ($functionOps = ['query', 'create', 'update', 'delete', 'export']) -#foreach ($functionName in $functionNames) -#set ($index = $foreach.count - 1) -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '${table.classComment}${functionName}', '${permissionPrefix}:${functionOps.get($index)}', 3, $foreach.count, @parentId, - '', '', '', 0 -); -#end diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/vue/api/api.js.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/vue/api/api.js.vm deleted file mode 100644 index 5e9da32..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/vue/api/api.js.vm +++ /dev/null @@ -1,55 +0,0 @@ -import request from '@/utils/request' -#set ($baseURL = "/${table.moduleName}/${simpleClassName_strikeCase}") - -// 创建${table.classComment} -export function create${simpleClassName}(data) { - return request({ - url: '${baseURL}/create', - method: 'post', - data: data - }) -} - -// 更新${table.classComment} -export function update${simpleClassName}(data) { - return request({ - url: '${baseURL}/update', - method: 'put', - data: data - }) -} - -// 删除${table.classComment} -export function delete${simpleClassName}(id) { - return request({ - url: '${baseURL}/delete?id=' + id, - method: 'delete' - }) -} - -// 获得${table.classComment} -export function get${simpleClassName}(id) { - return request({ - url: '${baseURL}/get?id=' + id, - method: 'get' - }) -} - -// 获得${table.classComment}分页 -export function get${simpleClassName}Page(query) { - return request({ - url: '${baseURL}/page', - method: 'get', - params: query - }) -} - -// 导出${table.classComment} Excel -export function export${simpleClassName}Excel(query) { - return request({ - url: '${baseURL}/export-excel', - method: 'get', - params: query, - responseType: 'blob' - }) -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/vue/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/vue/views/index.vue.vm deleted file mode 100644 index 7a6add6..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/vue/views/index.vue.vm +++ /dev/null @@ -1,369 +0,0 @@ - - - diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/vue3/api/api.ts.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/vue3/api/api.ts.vm deleted file mode 100644 index df49a00..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/vue3/api/api.ts.vm +++ /dev/null @@ -1,74 +0,0 @@ -import request from '@/config/axios' - -export interface ${simpleClassName}VO { -#foreach ($column in $columns) -#if ($column.createOperation || $column.updateOperation) -#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double" || ${column.javaType.toLowerCase()} == "bigdecimal") - ${column.javaField}: number -#elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime") - ${column.javaField}: Date -#else - ${column.javaField}: ${column.javaType.toLowerCase()} -#end -#end -#end -} - -export interface ${simpleClassName}PageReqVO extends PageParam { -#foreach ($column in $columns) -#if (${column.listOperation})##查询操作 -#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double" || ${column.javaType.toLowerCase()} == "bigdecimal") - ${column.javaField}?: number -#elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime") - ${column.javaField}?: Date[] -#else - ${column.javaField}?: ${column.javaType.toLowerCase()} -#end -#end -#end -} - -export interface ${simpleClassName}ExcelReqVO { -#foreach ($column in $columns) -#if (${column.listOperation})##查询操作 -#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double" || ${column.javaType.toLowerCase()} == "bigdecimal") - ${column.javaField}?: number -#elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime") - ${column.javaField}?: Date[] -#else - ${column.javaField}?: ${column.javaType.toLowerCase()} -#end -#end -#end -} -#set ($baseURL = "/${table.moduleName}/${simpleClassName_strikeCase}") - -// 查询${table.classComment}列表 -export const get${simpleClassName}PageApi = async (params: ${simpleClassName}PageReqVO) => { - return await request.get({ url: '${baseURL}/page', params }) -} - -// 查询${table.classComment}详情 -export const get${simpleClassName}Api = async (id: number) => { - return await request.get({ url: '${baseURL}/get?id=' + id }) -} - -// 新增${table.classComment} -export const create${simpleClassName}Api = async (data: ${simpleClassName}VO) => { - return await request.post({ url: '${baseURL}/create', data }) -} - -// 修改${table.classComment} -export const update${simpleClassName}Api = async (data: ${simpleClassName}VO) => { - return await request.put({ url: '${baseURL}/update', data }) -} - -// 删除${table.classComment} -export const delete${simpleClassName}Api = async (id: number) => { - return await request.delete({ url: '${baseURL}/delete?id=' + id }) -} - -// 导出${table.classComment} Excel -export const export${simpleClassName}Api = async (params: ${simpleClassName}ExcelReqVO) => { - return await request.download({ url: '${baseURL}/export-excel', params }) -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/vue3/api/types.ts.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/vue3/api/types.ts.vm deleted file mode 100644 index 54ab47e..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/vue3/api/types.ts.vm +++ /dev/null @@ -1,41 +0,0 @@ -export type ${simpleClassName}VO = { -#foreach ($column in $columns) -#if ($column.createOperation || $column.updateOperation) -#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer") - ${column.javaField}: number -#elseif(${column.javaType.toLowerCase()} == "date") - ${column.javaField}: string -#else - ${column.javaField}: ${column.javaType.toLowerCase()} -#end -#end -#end -} - -export type ${simpleClassName}PageReqVO = { -#foreach ($column in $columns) -#if (${column.listOperation})##查询操作 -#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer") - ${column.javaField}: number -#elseif(${column.javaType.toLowerCase()} == "date") - ${column.javaField}: string -#else - ${column.javaField}: ${column.javaType.toLowerCase()} -#end -#end -#end -} - -export type ${simpleClassName}ExcelReqVO = { -#foreach ($column in $columns) -#if (${column.listOperation})##查询操作 -#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer") - ${column.javaField}: number -#elseif(${column.javaType.toLowerCase()} == "date") - ${column.javaField}: string -#else - ${column.javaField}: ${column.javaType.toLowerCase()} -#end -#end -#end -} \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/vue3/views/data.ts.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/vue3/views/data.ts.vm deleted file mode 100644 index 33e204a..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/vue3/views/data.ts.vm +++ /dev/null @@ -1,110 +0,0 @@ -import { reactive } from 'vue' -import { useI18n } from '@/hooks/web/useI18n' -import { DICT_TYPE } from '@/utils/dict' -import { required } from '@/utils/formRules' -import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas' -const { t } = useI18n() // 国际化 -// 表单校验 -export const rules = reactive({ -#foreach ($column in $columns) -#if (($column.createOperation || $column.updateOperation) && !$column.nullable && !${column.primaryKey})## 创建或者更新操作 && 要求非空 && 非主键 -#set($comment=$column.columnComment) - $column.javaField: [required], -#end -#end -}) -// CrudSchema -const crudSchemas = reactive({ - primaryKey: 'id', // 默认的主键ID - primaryTitle: t('common.index'), // 默认显示的值 - primaryType: 'seq', // 默认为seq，序号模式 - action: true, - actionWidth: '200', // 3个按钮默认200，如有删减对应增减即可 - columns: [ - #foreach($column in $columns) - #if ($column.listOperation || $column.listOperationResult || $column.createOperation || $column.updateOperation) - #set ($dictType = $column.dictType) - #if(!$column.primaryKey) - { - title: '${column.columnComment}', - field: '${column.javaField}', - #if (!$column.listOperationResult) - isTable: false, - #end - #if ("" != $dictType)## 有数据字典 - dictType: DICT_TYPE.$dictType.toUpperCase(), - #if (${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer") - dictClass: 'number', - #else - dictClass: 'string', - #end - #end - #if (!$column.createOperation && !$column.updateOperation) - isForm: false, - #elseif(!("" != $column.dictType)) - #if (${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime") - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, - #elseif($column.htmlType == "editor")## 文本编辑器 - form: { - component: 'Editor', - colProps: { - span: 24 - }, - componentProps: { - valueHtml: '' - } - }, - #elseif($column.htmlType == "textarea")## 文本框 - form: { - component: 'Input', - componentProps: { - type: 'textarea', - rows: 4 - }, - colProps: { - span: 24 - } - }, - #elseif(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer")## 数字类型 - form: { - component: 'InputNumber', - value: 0 - }, - #elseif($column.htmlType == "imageUpload")## 图片上传 - form: { - component: 'UploadImg' // 单图上传，多图为UploadImgs - }, - #elseif($column.htmlType == "fileUpload")## 图片上传 - form: { - component: 'UploadFile' - }, - #end - #end - #if ($column.listOperation) - #if($column.htmlType == "input") - isSearch: true, - #elseif("" != $dictType) - isSearch: true, - #elseif($column.htmlType == "datetime") - formatter: 'formatDate', - search: { - show: true, - itemRender: { - name: 'XDataTimePicker' - } - }, - #end - #end - }, - #end - #end - #end - ] -}) -export const { allSchemas } = useVxeCrudSchemas(crudSchemas) \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/vue3/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/vue3/views/index.vue.vm deleted file mode 100644 index 06fe300..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/codegen/vue3/views/index.vue.vm +++ /dev/null @@ -1,177 +0,0 @@ - - diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/file/erweima.jpg b/yudao-module-infra/yudao-module-infra-biz/target/classes/file/erweima.jpg deleted file mode 100644 index 1447283..0000000 Binary files a/yudao-module-infra/yudao-module-infra-biz/target/classes/file/erweima.jpg and /dev/null differ diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/logback-spring.xml b/yudao-module-infra/yudao-module-infra-biz/target/classes/logback-spring.xml deleted file mode 100644 index 5f4b30d..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/logback-spring.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - 　　　　　 - - - ${PATTERN_DEFAULT} - - - - - - - - - - ${PATTERN_DEFAULT} - - - - ${LOG_FILE} - - - ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz} - - ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} - - ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB} - - ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0} - - ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30} - - - - - - 0 - - 256 - - - - - - - - ${PATTERN_DEFAULT} - - - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/mapper/test/TestDemoMapper.xml b/yudao-module-infra/yudao-module-infra-biz/target/classes/mapper/test/TestDemoMapper.xml deleted file mode 100644 index d65f213..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/classes/mapper/test/TestDemoMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - diff --git a/yudao-module-infra/yudao-module-infra-biz/target/classes/mapper/占位 b/yudao-module-infra/yudao-module-infra-biz/target/classes/mapper/占位 deleted file mode 100644 index e69de29..0000000 diff --git a/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/codegen/CodegenConvertImpl.java b/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/codegen/CodegenConvertImpl.java deleted file mode 100644 index 7c5a9e1..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/codegen/CodegenConvertImpl.java +++ /dev/null @@ -1,314 +0,0 @@ -package cn.iocoder.yudao.module.infra.convert.codegen; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.CodegenUpdateReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.column.CodegenColumnRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.table.CodegenTableRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.table.DatabaseTableRespVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenColumnDO; -import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO; -import com.baomidou.mybatisplus.generator.config.po.TableField; -import com.baomidou.mybatisplus.generator.config.po.TableInfo; -import com.baomidou.mybatisplus.generator.config.rules.IColumnType; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; -import org.apache.ibatis.type.JdbcType; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:03:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class CodegenConvertImpl implements CodegenConvert { - - @Override - public CodegenTableDO convert(TableInfo bean) { - if ( bean == null ) { - return null; - } - - CodegenTableDO codegenTableDO = new CodegenTableDO(); - - codegenTableDO.setTableName( bean.getName() ); - codegenTableDO.setTableComment( bean.getComment() ); - - return codegenTableDO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( TableField tableField : list ) { - list1.add( convert( tableField ) ); - } - - return list1; - } - - @Override - public CodegenColumnDO convert(TableField bean) { - if ( bean == null ) { - return null; - } - - CodegenColumnDO codegenColumnDO = new CodegenColumnDO(); - - codegenColumnDO.setColumnName( bean.getName() ); - codegenColumnDO.setDataType( getDataType( beanMetaInfoJdbcType( bean ) ) ); - codegenColumnDO.setColumnComment( bean.getComment() ); - codegenColumnDO.setNullable( beanMetaInfoNullable( bean ) ); - codegenColumnDO.setPrimaryKey( bean.isKeyFlag() ); - codegenColumnDO.setAutoIncrement( bean.isKeyIdentityFlag() ); - codegenColumnDO.setJavaType( beanColumnTypeType( bean ) ); - codegenColumnDO.setJavaField( bean.getPropertyName() ); - - return codegenColumnDO; - } - - @Override - public CodegenTableRespVO convert(CodegenTableDO bean) { - if ( bean == null ) { - return null; - } - - CodegenTableRespVO codegenTableRespVO = new CodegenTableRespVO(); - - codegenTableRespVO.setScene( bean.getScene() ); - codegenTableRespVO.setTableName( bean.getTableName() ); - codegenTableRespVO.setTableComment( bean.getTableComment() ); - codegenTableRespVO.setRemark( bean.getRemark() ); - codegenTableRespVO.setModuleName( bean.getModuleName() ); - codegenTableRespVO.setBusinessName( bean.getBusinessName() ); - codegenTableRespVO.setClassName( bean.getClassName() ); - codegenTableRespVO.setClassComment( bean.getClassComment() ); - codegenTableRespVO.setAuthor( bean.getAuthor() ); - codegenTableRespVO.setTemplateType( bean.getTemplateType() ); - codegenTableRespVO.setParentMenuId( bean.getParentMenuId() ); - codegenTableRespVO.setId( bean.getId() ); - if ( bean.getDataSourceConfigId() != null ) { - codegenTableRespVO.setDataSourceConfigId( bean.getDataSourceConfigId().intValue() ); - } - codegenTableRespVO.setCreateTime( bean.getCreateTime() ); - codegenTableRespVO.setUpdateTime( bean.getUpdateTime() ); - - return codegenTableRespVO; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( codegenTableDOListToCodegenTableRespVOList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( CodegenColumnDO codegenColumnDO : list ) { - list1.add( codegenColumnDOToCodegenColumnRespVO( codegenColumnDO ) ); - } - - return list1; - } - - @Override - public CodegenTableDO convert(CodegenUpdateReqVO.Table bean) { - if ( bean == null ) { - return null; - } - - CodegenTableDO codegenTableDO = new CodegenTableDO(); - - codegenTableDO.setId( bean.getId() ); - codegenTableDO.setScene( bean.getScene() ); - codegenTableDO.setTableName( bean.getTableName() ); - codegenTableDO.setTableComment( bean.getTableComment() ); - codegenTableDO.setRemark( bean.getRemark() ); - codegenTableDO.setModuleName( bean.getModuleName() ); - codegenTableDO.setBusinessName( bean.getBusinessName() ); - codegenTableDO.setClassName( bean.getClassName() ); - codegenTableDO.setClassComment( bean.getClassComment() ); - codegenTableDO.setAuthor( bean.getAuthor() ); - codegenTableDO.setTemplateType( bean.getTemplateType() ); - codegenTableDO.setParentMenuId( bean.getParentMenuId() ); - - return codegenTableDO; - } - - @Override - public List convertList03(List columns) { - if ( columns == null ) { - return null; - } - - List list = new ArrayList( columns.size() ); - for ( CodegenUpdateReqVO.Column column : columns ) { - list.add( columnToCodegenColumnDO( column ) ); - } - - return list; - } - - @Override - public List convertList04(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( TableInfo tableInfo : list ) { - list1.add( tableInfoToDatabaseTableRespVO( tableInfo ) ); - } - - return list1; - } - - private JdbcType beanMetaInfoJdbcType(TableField tableField) { - if ( tableField == null ) { - return null; - } - TableField.MetaInfo metaInfo = tableField.getMetaInfo(); - if ( metaInfo == null ) { - return null; - } - JdbcType jdbcType = metaInfo.getJdbcType(); - if ( jdbcType == null ) { - return null; - } - return jdbcType; - } - - private Boolean beanMetaInfoNullable(TableField tableField) { - if ( tableField == null ) { - return null; - } - TableField.MetaInfo metaInfo = tableField.getMetaInfo(); - if ( metaInfo == null ) { - return null; - } - boolean nullable = metaInfo.isNullable(); - return nullable; - } - - private String beanColumnTypeType(TableField tableField) { - if ( tableField == null ) { - return null; - } - IColumnType columnType = tableField.getColumnType(); - if ( columnType == null ) { - return null; - } - String type = columnType.getType(); - if ( type == null ) { - return null; - } - return type; - } - - protected List codegenTableDOListToCodegenTableRespVOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( CodegenTableDO codegenTableDO : list ) { - list1.add( convert( codegenTableDO ) ); - } - - return list1; - } - - protected CodegenColumnRespVO codegenColumnDOToCodegenColumnRespVO(CodegenColumnDO codegenColumnDO) { - if ( codegenColumnDO == null ) { - return null; - } - - CodegenColumnRespVO codegenColumnRespVO = new CodegenColumnRespVO(); - - codegenColumnRespVO.setTableId( codegenColumnDO.getTableId() ); - codegenColumnRespVO.setColumnName( codegenColumnDO.getColumnName() ); - codegenColumnRespVO.setDataType( codegenColumnDO.getDataType() ); - codegenColumnRespVO.setColumnComment( codegenColumnDO.getColumnComment() ); - codegenColumnRespVO.setNullable( codegenColumnDO.getNullable() ); - codegenColumnRespVO.setPrimaryKey( codegenColumnDO.getPrimaryKey() ); - if ( codegenColumnDO.getAutoIncrement() != null ) { - codegenColumnRespVO.setAutoIncrement( String.valueOf( codegenColumnDO.getAutoIncrement() ) ); - } - codegenColumnRespVO.setOrdinalPosition( codegenColumnDO.getOrdinalPosition() ); - codegenColumnRespVO.setJavaType( codegenColumnDO.getJavaType() ); - codegenColumnRespVO.setJavaField( codegenColumnDO.getJavaField() ); - codegenColumnRespVO.setDictType( codegenColumnDO.getDictType() ); - codegenColumnRespVO.setExample( codegenColumnDO.getExample() ); - codegenColumnRespVO.setCreateOperation( codegenColumnDO.getCreateOperation() ); - codegenColumnRespVO.setUpdateOperation( codegenColumnDO.getUpdateOperation() ); - codegenColumnRespVO.setListOperation( codegenColumnDO.getListOperation() ); - codegenColumnRespVO.setListOperationCondition( codegenColumnDO.getListOperationCondition() ); - codegenColumnRespVO.setListOperationResult( codegenColumnDO.getListOperationResult() ); - codegenColumnRespVO.setHtmlType( codegenColumnDO.getHtmlType() ); - codegenColumnRespVO.setId( codegenColumnDO.getId() ); - codegenColumnRespVO.setCreateTime( codegenColumnDO.getCreateTime() ); - - return codegenColumnRespVO; - } - - protected CodegenColumnDO columnToCodegenColumnDO(CodegenUpdateReqVO.Column column) { - if ( column == null ) { - return null; - } - - CodegenColumnDO codegenColumnDO = new CodegenColumnDO(); - - codegenColumnDO.setId( column.getId() ); - codegenColumnDO.setTableId( column.getTableId() ); - codegenColumnDO.setColumnName( column.getColumnName() ); - codegenColumnDO.setDataType( column.getDataType() ); - codegenColumnDO.setColumnComment( column.getColumnComment() ); - codegenColumnDO.setNullable( column.getNullable() ); - codegenColumnDO.setPrimaryKey( column.getPrimaryKey() ); - if ( column.getAutoIncrement() != null ) { - codegenColumnDO.setAutoIncrement( Boolean.parseBoolean( column.getAutoIncrement() ) ); - } - codegenColumnDO.setOrdinalPosition( column.getOrdinalPosition() ); - codegenColumnDO.setJavaType( column.getJavaType() ); - codegenColumnDO.setJavaField( column.getJavaField() ); - codegenColumnDO.setDictType( column.getDictType() ); - codegenColumnDO.setExample( column.getExample() ); - codegenColumnDO.setCreateOperation( column.getCreateOperation() ); - codegenColumnDO.setUpdateOperation( column.getUpdateOperation() ); - codegenColumnDO.setListOperation( column.getListOperation() ); - codegenColumnDO.setListOperationCondition( column.getListOperationCondition() ); - codegenColumnDO.setListOperationResult( column.getListOperationResult() ); - codegenColumnDO.setHtmlType( column.getHtmlType() ); - - return codegenColumnDO; - } - - protected DatabaseTableRespVO tableInfoToDatabaseTableRespVO(TableInfo tableInfo) { - if ( tableInfo == null ) { - return null; - } - - DatabaseTableRespVO databaseTableRespVO = new DatabaseTableRespVO(); - - databaseTableRespVO.setName( tableInfo.getName() ); - databaseTableRespVO.setComment( tableInfo.getComment() ); - - return databaseTableRespVO; - } -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/config/ConfigConvertImpl.java b/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/config/ConfigConvertImpl.java deleted file mode 100644 index 7538b2c..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/config/ConfigConvertImpl.java +++ /dev/null @@ -1,134 +0,0 @@ -package cn.iocoder.yudao.module.infra.convert.config; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigCreateReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigExcelVO; -import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigUpdateReqVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.config.ConfigDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:03:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class ConfigConvertImpl implements ConfigConvert { - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( configDOListToConfigRespVOList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public ConfigRespVO convert(ConfigDO bean) { - if ( bean == null ) { - return null; - } - - ConfigRespVO configRespVO = new ConfigRespVO(); - - configRespVO.setKey( bean.getConfigKey() ); - configRespVO.setCategory( bean.getCategory() ); - configRespVO.setName( bean.getName() ); - configRespVO.setValue( bean.getValue() ); - configRespVO.setVisible( bean.getVisible() ); - configRespVO.setRemark( bean.getRemark() ); - configRespVO.setId( bean.getId() ); - configRespVO.setType( bean.getType() ); - configRespVO.setCreateTime( bean.getCreateTime() ); - - return configRespVO; - } - - @Override - public ConfigDO convert(ConfigCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - ConfigDO configDO = new ConfigDO(); - - configDO.setConfigKey( bean.getKey() ); - configDO.setCategory( bean.getCategory() ); - configDO.setName( bean.getName() ); - configDO.setValue( bean.getValue() ); - configDO.setVisible( bean.getVisible() ); - configDO.setRemark( bean.getRemark() ); - - return configDO; - } - - @Override - public ConfigDO convert(ConfigUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - ConfigDO configDO = new ConfigDO(); - - configDO.setId( bean.getId() ); - configDO.setCategory( bean.getCategory() ); - configDO.setName( bean.getName() ); - configDO.setValue( bean.getValue() ); - configDO.setVisible( bean.getVisible() ); - configDO.setRemark( bean.getRemark() ); - - return configDO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( ConfigDO configDO : list ) { - list1.add( configDOToConfigExcelVO( configDO ) ); - } - - return list1; - } - - protected List configDOListToConfigRespVOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( ConfigDO configDO : list ) { - list1.add( convert( configDO ) ); - } - - return list1; - } - - protected ConfigExcelVO configDOToConfigExcelVO(ConfigDO configDO) { - if ( configDO == null ) { - return null; - } - - ConfigExcelVO configExcelVO = new ConfigExcelVO(); - - configExcelVO.setId( configDO.getId() ); - configExcelVO.setName( configDO.getName() ); - configExcelVO.setValue( configDO.getValue() ); - configExcelVO.setType( configDO.getType() ); - configExcelVO.setRemark( configDO.getRemark() ); - configExcelVO.setCreateTime( configDO.getCreateTime() ); - - return configExcelVO; - } -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/db/DataSourceConfigConvertImpl.java b/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/db/DataSourceConfigConvertImpl.java deleted file mode 100644 index 6f6cf20..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/db/DataSourceConfigConvertImpl.java +++ /dev/null @@ -1,83 +0,0 @@ -package cn.iocoder.yudao.module.infra.convert.db; - -import cn.iocoder.yudao.module.infra.controller.admin.db.vo.DataSourceConfigCreateReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.db.vo.DataSourceConfigRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.db.vo.DataSourceConfigUpdateReqVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.db.DataSourceConfigDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:03:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class DataSourceConfigConvertImpl implements DataSourceConfigConvert { - - @Override - public DataSourceConfigDO convert(DataSourceConfigCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - DataSourceConfigDO dataSourceConfigDO = new DataSourceConfigDO(); - - dataSourceConfigDO.setName( bean.getName() ); - dataSourceConfigDO.setUrl( bean.getUrl() ); - dataSourceConfigDO.setUsername( bean.getUsername() ); - dataSourceConfigDO.setPassword( bean.getPassword() ); - - return dataSourceConfigDO; - } - - @Override - public DataSourceConfigDO convert(DataSourceConfigUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - DataSourceConfigDO dataSourceConfigDO = new DataSourceConfigDO(); - - dataSourceConfigDO.setId( bean.getId() ); - dataSourceConfigDO.setName( bean.getName() ); - dataSourceConfigDO.setUrl( bean.getUrl() ); - dataSourceConfigDO.setUsername( bean.getUsername() ); - dataSourceConfigDO.setPassword( bean.getPassword() ); - - return dataSourceConfigDO; - } - - @Override - public DataSourceConfigRespVO convert(DataSourceConfigDO bean) { - if ( bean == null ) { - return null; - } - - DataSourceConfigRespVO dataSourceConfigRespVO = new DataSourceConfigRespVO(); - - dataSourceConfigRespVO.setName( bean.getName() ); - dataSourceConfigRespVO.setUrl( bean.getUrl() ); - dataSourceConfigRespVO.setUsername( bean.getUsername() ); - if ( bean.getId() != null ) { - dataSourceConfigRespVO.setId( bean.getId().intValue() ); - } - dataSourceConfigRespVO.setCreateTime( bean.getCreateTime() ); - - return dataSourceConfigRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( DataSourceConfigDO dataSourceConfigDO : list ) { - list1.add( convert( dataSourceConfigDO ) ); - } - - return list1; - } -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/file/FileConfigConvertImpl.java b/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/file/FileConfigConvertImpl.java deleted file mode 100644 index c02c07a..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/file/FileConfigConvertImpl.java +++ /dev/null @@ -1,95 +0,0 @@ -package cn.iocoder.yudao.module.infra.convert.file; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigCreateReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigUpdateReqVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileConfigDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:03:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class FileConfigConvertImpl implements FileConfigConvert { - - @Override - public FileConfigDO convert(FileConfigCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - FileConfigDO.FileConfigDOBuilder fileConfigDO = FileConfigDO.builder(); - - fileConfigDO.name( bean.getName() ); - fileConfigDO.storage( bean.getStorage() ); - fileConfigDO.remark( bean.getRemark() ); - - return fileConfigDO.build(); - } - - @Override - public FileConfigDO convert(FileConfigUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - FileConfigDO.FileConfigDOBuilder fileConfigDO = FileConfigDO.builder(); - - fileConfigDO.id( bean.getId() ); - fileConfigDO.name( bean.getName() ); - fileConfigDO.remark( bean.getRemark() ); - - return fileConfigDO.build(); - } - - @Override - public FileConfigRespVO convert(FileConfigDO bean) { - if ( bean == null ) { - return null; - } - - FileConfigRespVO fileConfigRespVO = new FileConfigRespVO(); - - fileConfigRespVO.setName( bean.getName() ); - fileConfigRespVO.setRemark( bean.getRemark() ); - fileConfigRespVO.setId( bean.getId() ); - fileConfigRespVO.setStorage( bean.getStorage() ); - fileConfigRespVO.setMaster( bean.getMaster() ); - fileConfigRespVO.setConfig( bean.getConfig() ); - fileConfigRespVO.setCreateTime( bean.getCreateTime() ); - - return fileConfigRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( FileConfigDO fileConfigDO : list ) { - list1.add( convert( fileConfigDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/file/FileConvertImpl.java b/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/file/FileConvertImpl.java deleted file mode 100644 index 9a3876d..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/file/FileConvertImpl.java +++ /dev/null @@ -1,61 +0,0 @@ -package cn.iocoder.yudao.module.infra.convert.file; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FileRespVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:03:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class FileConvertImpl implements FileConvert { - - @Override - public FileRespVO convert(FileDO bean) { - if ( bean == null ) { - return null; - } - - FileRespVO fileRespVO = new FileRespVO(); - - fileRespVO.setId( bean.getId() ); - fileRespVO.setPath( bean.getPath() ); - fileRespVO.setUrl( bean.getUrl() ); - fileRespVO.setType( bean.getType() ); - fileRespVO.setSize( bean.getSize() ); - fileRespVO.setCreateTime( bean.getCreateTime() ); - - return fileRespVO; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( fileDOListToFileRespVOList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - protected List fileDOListToFileRespVOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( FileDO fileDO : list ) { - list1.add( convert( fileDO ) ); - } - - return list1; - } -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/logger/ApiAccessLogConvertImpl.java b/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/logger/ApiAccessLogConvertImpl.java deleted file mode 100644 index d9a4441..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/logger/ApiAccessLogConvertImpl.java +++ /dev/null @@ -1,140 +0,0 @@ -package cn.iocoder.yudao.module.infra.convert.logger; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExcelVO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogRespVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiAccessLogDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:03:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class ApiAccessLogConvertImpl implements ApiAccessLogConvert { - - @Override - public ApiAccessLogRespVO convert(ApiAccessLogDO bean) { - if ( bean == null ) { - return null; - } - - ApiAccessLogRespVO apiAccessLogRespVO = new ApiAccessLogRespVO(); - - apiAccessLogRespVO.setTraceId( bean.getTraceId() ); - apiAccessLogRespVO.setUserId( bean.getUserId() ); - apiAccessLogRespVO.setUserType( bean.getUserType() ); - apiAccessLogRespVO.setApplicationName( bean.getApplicationName() ); - apiAccessLogRespVO.setRequestMethod( bean.getRequestMethod() ); - apiAccessLogRespVO.setRequestUrl( bean.getRequestUrl() ); - apiAccessLogRespVO.setRequestParams( bean.getRequestParams() ); - apiAccessLogRespVO.setUserIp( bean.getUserIp() ); - apiAccessLogRespVO.setUserAgent( bean.getUserAgent() ); - apiAccessLogRespVO.setBeginTime( bean.getBeginTime() ); - apiAccessLogRespVO.setEndTime( bean.getEndTime() ); - apiAccessLogRespVO.setDuration( bean.getDuration() ); - apiAccessLogRespVO.setResultCode( bean.getResultCode() ); - apiAccessLogRespVO.setResultMsg( bean.getResultMsg() ); - apiAccessLogRespVO.setId( bean.getId() ); - apiAccessLogRespVO.setCreateTime( bean.getCreateTime() ); - - return apiAccessLogRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( ApiAccessLogDO apiAccessLogDO : list ) { - list1.add( convert( apiAccessLogDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( ApiAccessLogDO apiAccessLogDO : list ) { - list1.add( apiAccessLogDOToApiAccessLogExcelVO( apiAccessLogDO ) ); - } - - return list1; - } - - @Override - public ApiAccessLogDO convert(ApiAccessLogCreateReqDTO bean) { - if ( bean == null ) { - return null; - } - - ApiAccessLogDO.ApiAccessLogDOBuilder apiAccessLogDO = ApiAccessLogDO.builder(); - - apiAccessLogDO.traceId( bean.getTraceId() ); - apiAccessLogDO.userId( bean.getUserId() ); - apiAccessLogDO.userType( bean.getUserType() ); - apiAccessLogDO.applicationName( bean.getApplicationName() ); - apiAccessLogDO.requestMethod( bean.getRequestMethod() ); - apiAccessLogDO.requestUrl( bean.getRequestUrl() ); - apiAccessLogDO.requestParams( bean.getRequestParams() ); - apiAccessLogDO.userIp( bean.getUserIp() ); - apiAccessLogDO.userAgent( bean.getUserAgent() ); - apiAccessLogDO.beginTime( bean.getBeginTime() ); - apiAccessLogDO.endTime( bean.getEndTime() ); - apiAccessLogDO.duration( bean.getDuration() ); - apiAccessLogDO.resultCode( bean.getResultCode() ); - apiAccessLogDO.resultMsg( bean.getResultMsg() ); - - return apiAccessLogDO.build(); - } - - protected ApiAccessLogExcelVO apiAccessLogDOToApiAccessLogExcelVO(ApiAccessLogDO apiAccessLogDO) { - if ( apiAccessLogDO == null ) { - return null; - } - - ApiAccessLogExcelVO apiAccessLogExcelVO = new ApiAccessLogExcelVO(); - - apiAccessLogExcelVO.setId( apiAccessLogDO.getId() ); - apiAccessLogExcelVO.setTraceId( apiAccessLogDO.getTraceId() ); - apiAccessLogExcelVO.setUserId( apiAccessLogDO.getUserId() ); - apiAccessLogExcelVO.setUserType( apiAccessLogDO.getUserType() ); - apiAccessLogExcelVO.setApplicationName( apiAccessLogDO.getApplicationName() ); - apiAccessLogExcelVO.setRequestMethod( apiAccessLogDO.getRequestMethod() ); - apiAccessLogExcelVO.setRequestUrl( apiAccessLogDO.getRequestUrl() ); - apiAccessLogExcelVO.setRequestParams( apiAccessLogDO.getRequestParams() ); - apiAccessLogExcelVO.setUserIp( apiAccessLogDO.getUserIp() ); - apiAccessLogExcelVO.setUserAgent( apiAccessLogDO.getUserAgent() ); - apiAccessLogExcelVO.setBeginTime( apiAccessLogDO.getBeginTime() ); - apiAccessLogExcelVO.setEndTime( apiAccessLogDO.getEndTime() ); - apiAccessLogExcelVO.setDuration( apiAccessLogDO.getDuration() ); - apiAccessLogExcelVO.setResultCode( apiAccessLogDO.getResultCode() ); - apiAccessLogExcelVO.setResultMsg( apiAccessLogDO.getResultMsg() ); - - return apiAccessLogExcelVO; - } -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/logger/ApiErrorLogConvertImpl.java b/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/logger/ApiErrorLogConvertImpl.java deleted file mode 100644 index 10eaca3..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/logger/ApiErrorLogConvertImpl.java +++ /dev/null @@ -1,170 +0,0 @@ -package cn.iocoder.yudao.module.infra.convert.logger; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExcelVO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogRespVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiErrorLogDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:03:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class ApiErrorLogConvertImpl implements ApiErrorLogConvert { - - @Override - public ApiErrorLogRespVO convert(ApiErrorLogDO bean) { - if ( bean == null ) { - return null; - } - - ApiErrorLogRespVO apiErrorLogRespVO = new ApiErrorLogRespVO(); - - apiErrorLogRespVO.setTraceId( bean.getTraceId() ); - if ( bean.getUserId() != null ) { - apiErrorLogRespVO.setUserId( bean.getUserId().intValue() ); - } - apiErrorLogRespVO.setUserType( bean.getUserType() ); - apiErrorLogRespVO.setApplicationName( bean.getApplicationName() ); - apiErrorLogRespVO.setRequestMethod( bean.getRequestMethod() ); - apiErrorLogRespVO.setRequestUrl( bean.getRequestUrl() ); - apiErrorLogRespVO.setRequestParams( bean.getRequestParams() ); - apiErrorLogRespVO.setUserIp( bean.getUserIp() ); - apiErrorLogRespVO.setUserAgent( bean.getUserAgent() ); - apiErrorLogRespVO.setExceptionTime( bean.getExceptionTime() ); - apiErrorLogRespVO.setExceptionName( bean.getExceptionName() ); - apiErrorLogRespVO.setExceptionMessage( bean.getExceptionMessage() ); - apiErrorLogRespVO.setExceptionRootCauseMessage( bean.getExceptionRootCauseMessage() ); - apiErrorLogRespVO.setExceptionStackTrace( bean.getExceptionStackTrace() ); - apiErrorLogRespVO.setExceptionClassName( bean.getExceptionClassName() ); - apiErrorLogRespVO.setExceptionFileName( bean.getExceptionFileName() ); - apiErrorLogRespVO.setExceptionMethodName( bean.getExceptionMethodName() ); - apiErrorLogRespVO.setExceptionLineNumber( bean.getExceptionLineNumber() ); - apiErrorLogRespVO.setProcessStatus( bean.getProcessStatus() ); - if ( bean.getId() != null ) { - apiErrorLogRespVO.setId( bean.getId().intValue() ); - } - apiErrorLogRespVO.setCreateTime( bean.getCreateTime() ); - apiErrorLogRespVO.setProcessTime( bean.getProcessTime() ); - if ( bean.getProcessUserId() != null ) { - apiErrorLogRespVO.setProcessUserId( bean.getProcessUserId().intValue() ); - } - - return apiErrorLogRespVO; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( apiErrorLogDOListToApiErrorLogRespVOList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( ApiErrorLogDO apiErrorLogDO : list ) { - list1.add( apiErrorLogDOToApiErrorLogExcelVO( apiErrorLogDO ) ); - } - - return list1; - } - - @Override - public ApiErrorLogDO convert(ApiErrorLogCreateReqDTO bean) { - if ( bean == null ) { - return null; - } - - ApiErrorLogDO.ApiErrorLogDOBuilder apiErrorLogDO = ApiErrorLogDO.builder(); - - apiErrorLogDO.userId( bean.getUserId() ); - apiErrorLogDO.traceId( bean.getTraceId() ); - apiErrorLogDO.userType( bean.getUserType() ); - apiErrorLogDO.applicationName( bean.getApplicationName() ); - apiErrorLogDO.requestMethod( bean.getRequestMethod() ); - apiErrorLogDO.requestUrl( bean.getRequestUrl() ); - apiErrorLogDO.requestParams( bean.getRequestParams() ); - apiErrorLogDO.userIp( bean.getUserIp() ); - apiErrorLogDO.userAgent( bean.getUserAgent() ); - apiErrorLogDO.exceptionTime( bean.getExceptionTime() ); - apiErrorLogDO.exceptionName( bean.getExceptionName() ); - apiErrorLogDO.exceptionMessage( bean.getExceptionMessage() ); - apiErrorLogDO.exceptionRootCauseMessage( bean.getExceptionRootCauseMessage() ); - apiErrorLogDO.exceptionStackTrace( bean.getExceptionStackTrace() ); - apiErrorLogDO.exceptionClassName( bean.getExceptionClassName() ); - apiErrorLogDO.exceptionFileName( bean.getExceptionFileName() ); - apiErrorLogDO.exceptionMethodName( bean.getExceptionMethodName() ); - apiErrorLogDO.exceptionLineNumber( bean.getExceptionLineNumber() ); - - return apiErrorLogDO.build(); - } - - protected List apiErrorLogDOListToApiErrorLogRespVOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( ApiErrorLogDO apiErrorLogDO : list ) { - list1.add( convert( apiErrorLogDO ) ); - } - - return list1; - } - - protected ApiErrorLogExcelVO apiErrorLogDOToApiErrorLogExcelVO(ApiErrorLogDO apiErrorLogDO) { - if ( apiErrorLogDO == null ) { - return null; - } - - ApiErrorLogExcelVO apiErrorLogExcelVO = new ApiErrorLogExcelVO(); - - if ( apiErrorLogDO.getId() != null ) { - apiErrorLogExcelVO.setId( apiErrorLogDO.getId().intValue() ); - } - apiErrorLogExcelVO.setTraceId( apiErrorLogDO.getTraceId() ); - if ( apiErrorLogDO.getUserId() != null ) { - apiErrorLogExcelVO.setUserId( apiErrorLogDO.getUserId().intValue() ); - } - apiErrorLogExcelVO.setUserType( apiErrorLogDO.getUserType() ); - apiErrorLogExcelVO.setApplicationName( apiErrorLogDO.getApplicationName() ); - apiErrorLogExcelVO.setRequestMethod( apiErrorLogDO.getRequestMethod() ); - apiErrorLogExcelVO.setRequestUrl( apiErrorLogDO.getRequestUrl() ); - apiErrorLogExcelVO.setRequestParams( apiErrorLogDO.getRequestParams() ); - apiErrorLogExcelVO.setUserIp( apiErrorLogDO.getUserIp() ); - apiErrorLogExcelVO.setUserAgent( apiErrorLogDO.getUserAgent() ); - apiErrorLogExcelVO.setExceptionTime( apiErrorLogDO.getExceptionTime() ); - apiErrorLogExcelVO.setExceptionName( apiErrorLogDO.getExceptionName() ); - apiErrorLogExcelVO.setExceptionMessage( apiErrorLogDO.getExceptionMessage() ); - apiErrorLogExcelVO.setExceptionRootCauseMessage( apiErrorLogDO.getExceptionRootCauseMessage() ); - apiErrorLogExcelVO.setExceptionStackTrace( apiErrorLogDO.getExceptionStackTrace() ); - apiErrorLogExcelVO.setExceptionClassName( apiErrorLogDO.getExceptionClassName() ); - apiErrorLogExcelVO.setExceptionFileName( apiErrorLogDO.getExceptionFileName() ); - apiErrorLogExcelVO.setExceptionMethodName( apiErrorLogDO.getExceptionMethodName() ); - apiErrorLogExcelVO.setExceptionLineNumber( apiErrorLogDO.getExceptionLineNumber() ); - apiErrorLogExcelVO.setCreateTime( apiErrorLogDO.getCreateTime() ); - apiErrorLogExcelVO.setProcessStatus( apiErrorLogDO.getProcessStatus() ); - apiErrorLogExcelVO.setProcessTime( apiErrorLogDO.getProcessTime() ); - if ( apiErrorLogDO.getProcessUserId() != null ) { - apiErrorLogExcelVO.setProcessUserId( apiErrorLogDO.getProcessUserId().intValue() ); - } - - return apiErrorLogExcelVO; - } -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/redis/RedisConvertImpl.java b/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/redis/RedisConvertImpl.java deleted file mode 100644 index b3f8ee3..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/redis/RedisConvertImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -package cn.iocoder.yudao.module.infra.convert.redis; - -import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine; -import cn.iocoder.yudao.module.infra.controller.admin.redis.vo.RedisKeyDefineRespVO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:03:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class RedisConvertImpl implements RedisConvert { - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( RedisKeyDefine redisKeyDefine : list ) { - list1.add( redisKeyDefineToRedisKeyDefineRespVO( redisKeyDefine ) ); - } - - return list1; - } - - protected RedisKeyDefineRespVO redisKeyDefineToRedisKeyDefineRespVO(RedisKeyDefine redisKeyDefine) { - if ( redisKeyDefine == null ) { - return null; - } - - RedisKeyDefineRespVO.RedisKeyDefineRespVOBuilder redisKeyDefineRespVO = RedisKeyDefineRespVO.builder(); - - redisKeyDefineRespVO.keyTemplate( redisKeyDefine.getKeyTemplate() ); - redisKeyDefineRespVO.keyType( redisKeyDefine.getKeyType() ); - redisKeyDefineRespVO.valueType( redisKeyDefine.getValueType() ); - redisKeyDefineRespVO.timeoutType( redisKeyDefine.getTimeoutType() ); - redisKeyDefineRespVO.timeout( redisKeyDefine.getTimeout() ); - redisKeyDefineRespVO.memo( redisKeyDefine.getMemo() ); - - return redisKeyDefineRespVO.build(); - } -} diff --git a/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/test/TestDemoConvertImpl.java b/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/test/TestDemoConvertImpl.java deleted file mode 100644 index 5bc1ed1..0000000 --- a/yudao-module-infra/yudao-module-infra-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/infra/convert/test/TestDemoConvertImpl.java +++ /dev/null @@ -1,133 +0,0 @@ -package cn.iocoder.yudao.module.infra.convert.test; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.controller.admin.test.vo.TestDemoCreateReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.test.vo.TestDemoExcelVO; -import cn.iocoder.yudao.module.infra.controller.admin.test.vo.TestDemoRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.test.vo.TestDemoUpdateReqVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.test.TestDemoDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:03:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class TestDemoConvertImpl implements TestDemoConvert { - - @Override - public TestDemoDO convert(TestDemoCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - TestDemoDO.TestDemoDOBuilder testDemoDO = TestDemoDO.builder(); - - testDemoDO.name( bean.getName() ); - testDemoDO.status( bean.getStatus() ); - testDemoDO.type( bean.getType() ); - testDemoDO.category( bean.getCategory() ); - testDemoDO.remark( bean.getRemark() ); - - return testDemoDO.build(); - } - - @Override - public TestDemoDO convert(TestDemoUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - TestDemoDO.TestDemoDOBuilder testDemoDO = TestDemoDO.builder(); - - testDemoDO.id( bean.getId() ); - testDemoDO.name( bean.getName() ); - testDemoDO.status( bean.getStatus() ); - testDemoDO.type( bean.getType() ); - testDemoDO.category( bean.getCategory() ); - testDemoDO.remark( bean.getRemark() ); - - return testDemoDO.build(); - } - - @Override - public TestDemoRespVO convert(TestDemoDO bean) { - if ( bean == null ) { - return null; - } - - TestDemoRespVO testDemoRespVO = new TestDemoRespVO(); - - testDemoRespVO.setName( bean.getName() ); - testDemoRespVO.setStatus( bean.getStatus() ); - testDemoRespVO.setType( bean.getType() ); - testDemoRespVO.setCategory( bean.getCategory() ); - testDemoRespVO.setRemark( bean.getRemark() ); - testDemoRespVO.setId( bean.getId() ); - testDemoRespVO.setCreateTime( bean.getCreateTime() ); - - return testDemoRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( TestDemoDO testDemoDO : list ) { - list1.add( convert( testDemoDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( TestDemoDO testDemoDO : list ) { - list1.add( testDemoDOToTestDemoExcelVO( testDemoDO ) ); - } - - return list1; - } - - protected TestDemoExcelVO testDemoDOToTestDemoExcelVO(TestDemoDO testDemoDO) { - if ( testDemoDO == null ) { - return null; - } - - TestDemoExcelVO testDemoExcelVO = new TestDemoExcelVO(); - - testDemoExcelVO.setId( testDemoDO.getId() ); - testDemoExcelVO.setName( testDemoDO.getName() ); - testDemoExcelVO.setStatus( testDemoDO.getStatus() ); - testDemoExcelVO.setType( testDemoDO.getType() ); - testDemoExcelVO.setCategory( testDemoDO.getCategory() ); - testDemoExcelVO.setRemark( testDemoDO.getRemark() ); - testDemoExcelVO.setCreateTime( testDemoDO.getCreateTime() ); - - return testDemoExcelVO; - } -} diff --git a/yudao-module-product/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/inputsbatch/InputsBatchApi.java b/yudao-module-product/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/inputsbatch/InputsBatchApi.java deleted file mode 100644 index d23d14a..0000000 --- a/yudao-module-product/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/inputsbatch/InputsBatchApi.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.iocoder.yudao.module.product.api.inputsbatch; - -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.product.api.inputsbatch.dto.InputsBatchDTO; -import cn.iocoder.yudao.module.product.enums.ApiConstants; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import java.util.List; - - -@FeignClient(name = ApiConstants.NAME) -@Api(tags = "管理后台 - 采收批次") -public interface InputsBatchApi { - String PREFIX = ApiConstants.PRODUCT + "/inputs-batch"; - - @GetMapping(PREFIX + "/getInputsBatchListByInputId") - @ApiOperation("获得投入品批次列表") - @ApiImplicitParam(name = "inputsId", value = "投入品编码", required = true, example = "INCD202304061557C3VM", dataTypeClass = String.class) - CommonResult> getInputsBatchListByInputId(@RequestParam("inputsId") String inputsId); - -} diff --git a/yudao-module-product/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/inputsbatch/dto/InputsBatchDTO.java b/yudao-module-product/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/inputsbatch/dto/InputsBatchDTO.java deleted file mode 100644 index 4c4a3e3..0000000 --- a/yudao-module-product/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/inputsbatch/dto/InputsBatchDTO.java +++ /dev/null @@ -1,87 +0,0 @@ -package cn.iocoder.yudao.module.product.api.inputsbatch.dto; - -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * @ClassName inputsBuyDTO - * @Description TODO - * @Author q5932 - * @Date 2023/5/22 13:13 - * @Version 1.0 - **/ -@Data -public class InputsBatchDTO { - - /** - * 编号 - */ - private Long id; - /** - * 投入品名称 - */ - private String inputsName; - /** - * 投入品ID - */ - private String inputsId; - /** - * 投入品批次ID - */ - private String inputsBatchId; - /** - * 投入品采购单号 - */ - private String inputsBuyId; - /** - * 生产日期 - */ - private Date productData; - /** - * 投入品数量 - */ - private Integer inputsNum; - /** - * 投入品单位 - */ - private String inputsUnit; - /** - * 投入品总量 - */ - private BigDecimal inputsWeight; - /** - * 投入品单价 - */ - private BigDecimal inputsUnitPrice; - /** - * 投入品总价 - */ - private BigDecimal totalPrice; - /** - * 备注 - */ - private String remarks; - /** - * 上链状态 0：未上链 1：激活状态 2：冻结状态 - */ - private Integer blockState; - /** - * 批次上链区块id - */ - private String blockChainId; - /** - * 批次上链区块唯一识别码 - */ - private String blockChainBlockIdentity; - /** - * 所属商户id - */ - private Long belongBusinessId; - /** - * 所属商户名称 - */ - private String belongBusinessName; - -} diff --git a/yudao-module-product/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/inputsbuy/InputsBuyApi.java b/yudao-module-product/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/inputsbuy/InputsBuyApi.java deleted file mode 100644 index 76a94f1..0000000 --- a/yudao-module-product/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/inputsbuy/InputsBuyApi.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.iocoder.yudao.module.product.api.inputsbuy; - -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.product.api.inputsbuy.dto.InputsBuyDTO; -import cn.iocoder.yudao.module.product.enums.ApiConstants; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import java.util.List; - -@FeignClient(name = ApiConstants.NAME) -@Api(tags = "管理后台 - 采收批次") -public interface InputsBuyApi { - String PREFIX = ApiConstants.PRODUCT + "/inputs-buy"; - - @GetMapping(PREFIX + "/getInputsBuyListByVendorId") - @ApiOperation("获得投入品批次列表") - @ApiImplicitParam(name = "vendorId", value = "供应商编码", required = true, example = "BYPJOE202304131134306BSBXTMP", dataTypeClass = String.class) - CommonResult> getInputsBuyListByVendorId(@RequestParam("vendorId") String vendorId); - -} - diff --git a/yudao-module-product/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/inputsbuy/dto/InputsBuyDTO.java b/yudao-module-product/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/inputsbuy/dto/InputsBuyDTO.java deleted file mode 100644 index 7de68d0..0000000 --- a/yudao-module-product/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/inputsbuy/dto/InputsBuyDTO.java +++ /dev/null @@ -1,49 +0,0 @@ -package cn.iocoder.yudao.module.product.api.inputsbuy.dto; - -import lombok.Data; - -import java.util.Date; - -/** - * @ClassName InputsBuyDTO - * @Description TODO - * @Author q5932 - * @Date 2023/5/22 18:00 - * @Version 1.0 - **/ -@Data -public class InputsBuyDTO { - /** - * 编号 - */ - private Long id; - /** - * 投入品采购单号 - */ - private String inputsBuyId; - /** - * 关联出库单号 - */ - private String relateOutboundId; - /** - * 供应商名称 - */ - private String vendorName; - /** - * 供应商id - */ - private String vendorId; - /** - * 入库时间 - */ - private Date inputsBuyTime; - /** - * 所属商户id - */ - private Long belongBusinessId; - /** - * 所属商户名称 - */ - private String belongBusinessName; - -} diff --git a/yudao-module-product/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/landjob/LandJobApi.java b/yudao-module-product/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/landjob/LandJobApi.java deleted file mode 100644 index 268429a..0000000 --- a/yudao-module-product/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/landjob/LandJobApi.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.iocoder.yudao.module.product.api.landjob; - -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.product.api.landjob.dto.LandJobDTO; -import cn.iocoder.yudao.module.product.enums.ApiConstants; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import java.util.List; - -@FeignClient(name = ApiConstants.NAME) -@Api(tags = "管理后台 - 采收批次") -public interface LandJobApi { - String PREFIX = ApiConstants.PRODUCT + "/land-job"; - - @GetMapping(PREFIX + "/getLandJobListByJobWorkerId") - @ApiOperation("获得投入品批次列表") - @ApiImplicitParam(name = "jobWorkerId", value = "作业员工ID", required = true, example = "6", dataTypeClass = Long.class) - CommonResult> getLandJobListByJobWorkerId(@RequestParam("jobWorkerId") Long jobWorkerId); - -} diff --git a/yudao-module-product/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/landjob/dto/LandJobDTO.java b/yudao-module-product/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/landjob/dto/LandJobDTO.java deleted file mode 100644 index e2eabd3..0000000 --- a/yudao-module-product/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/landjob/dto/LandJobDTO.java +++ /dev/null @@ -1,64 +0,0 @@ -package cn.iocoder.yudao.module.product.api.landjob.dto; - - -import lombok.*; - -import java.util.Date; - -@Data -public class LandJobDTO { - - /** - * 编号 - */ - private Long id; - /** - * 地块ID - */ - private String landId; - /** - * 地块名称 - */ - private String landName; - /** - * 种植作业ID - */ - private String landJobId; - /** - * 类型：0：地块 1：鱼塘 2：牧场 - */ - private Integer landType; - /** - * 任务类型 - */ - private Long jobType; - /** - * 作业员工 - */ - private String jobWorker; - /** - * 作业ID - */ - private Long jobWorkerId; - /** - * 作业日期 - */ - private Date jobDate; - /** - * 备注 - */ - private String remarks; - /** - * 所属商户id - */ - private Long belongBusinessId; - /** - * 所属商户名称 - */ - private String belongBusinessName; - /** - * 上链状态 0：未上链 1：激活状态 2：冻结状态 - */ - private Integer blockState; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/inputsbatch/InputsBatchApiImpl.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/inputsbatch/InputsBatchApiImpl.java deleted file mode 100644 index 5b4d3eb..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/inputsbatch/InputsBatchApiImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.iocoder.yudao.module.product.api.inputsbatch; - -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.product.api.inputsbatch.dto.InputsBatchDTO; -import cn.iocoder.yudao.module.product.convert.inputsbatch.InputsBatchConvert; -import cn.iocoder.yudao.module.product.dal.dataobject.inputsbatch.InputsBatchDO; -import cn.iocoder.yudao.module.product.dal.mysql.inputsbatch.InputsBatchMapper; -import cn.iocoder.yudao.module.system.enums.ApiConstants; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; - -@RestController // 提供 RESTful API 接口，给 Feign 调用 -@DubboService(version = ApiConstants.VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 -public class InputsBatchApiImpl implements InputsBatchApi { - @Resource - private InputsBatchMapper inputsBatchMapper; - - - @Override - public CommonResult> getInputsBatchListByInputId(String inputsId) { - return CommonResult.success(InputsBatchConvert.INSTANCE.convertInputsBatchDOToDTOList(inputsBatchMapper.selectList(InputsBatchDO::getInputsId,inputsId))); - } -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/inputsbuy/InputsBuyApiImpl.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/inputsbuy/InputsBuyApiImpl.java deleted file mode 100644 index 629d65c..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/inputsbuy/InputsBuyApiImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.iocoder.yudao.module.product.api.inputsbuy; - -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.product.api.inputsbuy.dto.InputsBuyDTO; -import cn.iocoder.yudao.module.product.convert.inputsbuy.InputsBuyConvert; -import cn.iocoder.yudao.module.product.dal.dataobject.inputsbuy.InputsBuyDO; -import cn.iocoder.yudao.module.product.dal.mysql.inputsbuy.InputsBuyMapper; -import cn.iocoder.yudao.module.system.enums.ApiConstants; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; - -@RestController // 提供 RESTful API 接口，给 Feign 调用 -@DubboService(version = ApiConstants.VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 -public class InputsBuyApiImpl implements InputsBuyApi{ - @Resource - private InputsBuyMapper inputsBuyMapper; - - @Override - public CommonResult> getInputsBuyListByVendorId(String vendorId) { - return CommonResult.success(InputsBuyConvert.INSTANCE.convertToInputsBuyDTOList(inputsBuyMapper.selectList(InputsBuyDO::getVendorId,vendorId))); - } -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/landjob/LandJobApiImpl.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/landjob/LandJobApiImpl.java deleted file mode 100644 index e16200d..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/landjob/LandJobApiImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.iocoder.yudao.module.product.api.landjob; - -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.product.api.landjob.dto.LandJobDTO; -import cn.iocoder.yudao.module.product.convert.landjob.LandJobConvert; -import cn.iocoder.yudao.module.product.dal.dataobject.landjob.LandJobDO; -import cn.iocoder.yudao.module.product.dal.mysql.landjob.LandJobMapper; -import cn.iocoder.yudao.module.system.enums.ApiConstants; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; - - -@RestController // 提供 RESTful API 接口，给 Feign 调用 -@DubboService(version = ApiConstants.VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 -public class LandJobApiImpl implements LandJobApi{ - @Resource - private LandJobMapper landJobMapper; - - - @Override - public CommonResult> getLandJobListByJobWorkerId(Long jobWorkerId) { - return CommonResult.success(LandJobConvert.INSTANCE.convertToLandJobDTOList(landJobMapper.selectList(LandJobDO::getJobWorkerId,jobWorkerId))); - } -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/deviceinfo/vo/DeviceInfoPageReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/deviceinfo/vo/DeviceInfoPageReqVO.java index 1c547f5..a82b947 100644 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/deviceinfo/vo/DeviceInfoPageReqVO.java +++ b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/deviceinfo/vo/DeviceInfoPageReqVO.java @@ -16,9 +16,6 @@ public class DeviceInfoPageReqVO extends PageParam { @ApiModelProperty(value = "设备名称") private String deviceName; - @ApiModelProperty(value = "地块/鱼塘/牧场名称") - private String landName; - @ApiModelProperty(value = "网关类型： 1：必联 2：有人") private Integer gatewayType; diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/InputsBatchController.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/InputsBatchController.java deleted file mode 100644 index 2a9178c..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/InputsBatchController.java +++ /dev/null @@ -1,146 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.inputsbatch; - -import cn.iocoder.yudao.framework.common.enums.BlockStateEnum; -import cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.annotations.*; - -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; - -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; - -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; - -import cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo.*; -import cn.iocoder.yudao.module.product.dal.dataobject.inputsbatch.InputsBatchDO; -import cn.iocoder.yudao.module.product.convert.inputsbatch.InputsBatchConvert; -import cn.iocoder.yudao.module.product.service.inputsbatch.InputsBatchService; - -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - -@Api(tags = "管理后台 - 投入品批次") -@RestController -@RequestMapping("/product/inputs-batch") -@Validated -public class InputsBatchController { - - @Resource - private InputsBatchService inputsBatchService; - - @PostMapping("/create") - @ApiOperation("创建投入品批次") - @PreAuthorize("@ss.hasPermission('product:inputs-batch:create')") - public CommonResult createInputsBatch(@Valid @RequestBody InputsBatchCreateReqVO createReqVO) { - return CommonResult.success(inputsBatchService.createInputsBatch(createReqVO)); - } - - @PutMapping("/update") - @ApiOperation("更新投入品批次") - @PreAuthorize("@ss.hasPermission('product:inputs-batch:update')") - public CommonResult updateInputsBatch(@Valid @RequestBody InputsBatchSaveReqVO updateReqVO) { - inputsBatchService.updateInputsBatch(updateReqVO); - return CommonResult.success(true); - } - - @DeleteMapping("/delete") - @ApiOperation("删除投入品批次") - @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:inputs-batch:delete')") - public CommonResult deleteInputsBatch(@RequestParam("id") Long id) { - inputsBatchService.deleteInputsBatch(id); - return CommonResult.success(true); - } - - @GetMapping("/get") - @ApiOperation("获得投入品批次") - @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:inputs-batch:query')") - public CommonResult getInputsBatch(@RequestParam("id") Long id) { - InputsBatchDO inputsBatch = inputsBatchService.getInputsBatch(id); - return CommonResult.success(InputsBatchConvert.INSTANCE.convert(inputsBatch)); - } - - @GetMapping("/list") - @ApiOperation("获得投入品批次列表") - @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class) - @PreAuthorize("@ss.hasPermission('product:inputs-batch:query')") - public CommonResult> getInputsBatchList(@RequestParam("ids") Collection ids) { - List list = inputsBatchService.getInputsBatchList(ids); - return CommonResult.success(InputsBatchConvert.INSTANCE.convertList(list)); - } - - @GetMapping("/page") - @ApiOperation("获得投入品批次分页") - @PreAuthorize("@ss.hasPermission('product:inputs-batch:query')") - public CommonResult> getInputsBatchPage(@Valid InputsBatchPageReqVO pageVO) { - PageResult pageResult = inputsBatchService.getInputsBatchPage(pageVO); - return CommonResult.success(InputsBatchConvert.INSTANCE.convertPage(pageResult)); - } - - @GetMapping("/export-excel") - @ApiOperation("导出投入品批次 Excel") - @PreAuthorize("@ss.hasPermission('product:inputs-batch:export')") - @OperateLog(type = OperateTypeEnum.EXPORT) - public void exportInputsBatchExcel(@Valid InputsBatchExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { - List list = inputsBatchService.getInputsBatchList(exportReqVO); - // 导出 Excel - List datas = InputsBatchConvert.INSTANCE.convertList02(list); - ExcelUtils.write(response, "投入品批次.xls", "数据", InputsBatchExcelVO.class, datas); - } - - @GetMapping("/getInputsBatchNumberList") - @ApiOperation("获得投入品批次编号列表") - @ApiImplicitParam(name = "count", value = "数量", required = true, example = "1", dataTypeClass = Integer.class) - @PreAuthorize("@ss.hasPermission('product:inputs-batch:query')") - public CommonResult> getInputsBatchNumberList(@RequestParam("count") @NotNull Integer count) { - return CommonResult.success(inputsBatchService.getInputsBatchNumberList(count)); - } - - @DeleteMapping("/deleteBatch") - @ApiOperation("批量删除投入品批次") - @ApiImplicitParam(name = "ids", value = "编号集合", required = true, dataTypeClass = Arrays.class) - @PreAuthorize("@ss.hasPermission('product:inputs-batch:delete')") - public CommonResult deleteBatch(@RequestParam("ids") @NotEmpty List ids) { - inputsBatchService.deleteBatch(ids); - return CommonResult.success(true); - } - - @GetMapping("/getInputsBatchInputsBatchIdList") - @ApiOperation("根据投入品id获取所有投入品批次") - @ApiImplicitParam(name = "inputsId", value = "投入品id", required = true, example = "1", dataTypeClass = Integer.class) - @PreAuthorize("@ss.hasPermission('product:inputs-batch:query')") - public CommonResult> getInputsBatchInputsBatchIdList(@RequestParam("inputsId") String inputsId) { - List inputsBatchInputsBatchIdList = inputsBatchService.getInputsBatchInputsBatchIdList(inputsId); - return CommonResult.success(inputsBatchInputsBatchIdList); - } - - @PutMapping("/freeze") - @ApiOperation("冻结") - @ApiImplicitParam(name = "id", value = "ID", required = true, example = "1024", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:inputs-batch:freeze')") - public CommonResult freeze(@RequestParam("id") Long id) { - inputsBatchService.updateChainStatus(id, BlockStateEnum.FREEZE.getBlockState()); - return success(Boolean.TRUE); - } - - @PutMapping("/active") - @ApiOperation("激活") - @ApiImplicitParam(name = "id", value = "ID", required = true, example = "1024", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:inputs-batch:active')") - public CommonResult active(@RequestParam("id") Long id) { - inputsBatchService.updateChainStatus(id, BlockStateEnum.ACTIVATION.getBlockState()); - return success(Boolean.TRUE); - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/vo/InputsBatchBaseVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/vo/InputsBatchBaseVO.java deleted file mode 100644 index d848e9a..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/vo/InputsBatchBaseVO.java +++ /dev/null @@ -1,75 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo; - -import lombok.*; -import java.util.*; -import java.math.BigDecimal; -import java.math.BigDecimal; -import java.math.BigDecimal; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -/** -* 投入品批次 Base VO，提供给添加、修改、详细的子 VO 使用 -* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 -*/ -@Data -public class InputsBatchBaseVO { - - @ApiModelProperty(value = "投入品名称", required = true) - @NotNull(message = "投入品名称不能为空") - private String inputsName; - - @ApiModelProperty(value = "投入品ID", required = true) - @NotNull(message = "投入品ID不能为空") - private String inputsId; - - @ApiModelProperty(value = "投入品批次ID", required = true) - @NotNull(message = "投入品批次ID不能为空") - private String inputsBatchId; - - @ApiModelProperty(value = "投入品采购单号", required = true) - @NotNull(message = "投入品采购单号不能为空") - private String inputsBuyId; - - @ApiModelProperty(value = "生产日期", required = true) - @NotNull(message = "生产日期不能为空") - private Date productData; - - @ApiModelProperty(value = "投入品数量", required = true) - @NotNull(message = "投入品数量不能为空") - private Integer inputsNum; - - @ApiModelProperty(value = "投入品单位") - private String inputsUnit; - - @ApiModelProperty(value = "投入品总量") - private BigDecimal inputsWeight; - - @ApiModelProperty(value = "投入品单价") - private BigDecimal inputsUnitPrice; - - @ApiModelProperty(value = "投入品总价") - private BigDecimal totalPrice; - - @ApiModelProperty(value = "备注") - private String remarks; - - @ApiModelProperty(value = "上链状态 0：未上链 1：激活状态 2：冻结状态", required = true) - @NotNull(message = "上链状态 0：未上链 1：激活状态 2：冻结状态不能为空") - private Integer blockState; - - @ApiModelProperty(value = "批次上链区块id") - private String blockChainId; - - @ApiModelProperty(value = "批次上链区块唯一识别码") - private String blockChainBlockIdentity; - - @ApiModelProperty(value = "所属商户id", required = true) - @NotNull(message = "所属商户id不能为空") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称", required = true) - @NotNull(message = "所属商户名称不能为空") - private String belongBusinessName; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/vo/InputsBatchCreateReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/vo/InputsBatchCreateReqVO.java deleted file mode 100644 index be24909..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/vo/InputsBatchCreateReqVO.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo; - -import lombok.*; - -import java.math.BigDecimal; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -@ApiModel("管理后台 - 投入品批次创建 Request VO") -@Data -public class InputsBatchCreateReqVO { - - @ApiModelProperty(value = "投入品名称") - private String inputsName; - - @ApiModelProperty(value = "投入品ID", required = true) - @NotNull(message = "投入品ID不能为空") - private String inputsId; - - @ApiModelProperty(value = "投入品批次ID", required = true) - @NotNull(message = "投入品批次ID不能为空") - private String inputsBatchId; - -// @ApiModelProperty(value = "投入品采购单号", required = true) -// @NotNull(message = "投入品采购单号不能为空") -// private String inputsBuyId; - - @ApiModelProperty(value = "生产日期", required = true) - @NotNull(message = "生产日期不能为空") - private Date productData; - - @ApiModelProperty(value = "投入品数量", required = true) - @NotNull(message = "投入品数量不能为空") - private Integer inputsNum; - - @ApiModelProperty(value = "投入品单位") - private String inputsUnit; - - @ApiModelProperty(value = "投入品总量") - private BigDecimal inputsWeight; - - @ApiModelProperty(value = "投入品单价") - private BigDecimal inputsUnitPrice; - - @ApiModelProperty(value = "投入品总价") - private BigDecimal totalPrice; - - @ApiModelProperty(value = "备注") - private String remarks; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/vo/InputsBatchExcelVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/vo/InputsBatchExcelVO.java deleted file mode 100644 index 5e235cf..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/vo/InputsBatchExcelVO.java +++ /dev/null @@ -1,74 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo; - -import lombok.*; -import java.util.*; -import java.math.BigDecimal; -import java.math.BigDecimal; -import java.math.BigDecimal; -import io.swagger.annotations.*; - -import com.alibaba.excel.annotation.ExcelProperty; - -/** - * 投入品批次 Excel VO - * - * @author 芋道源码 - */ -@Data -public class InputsBatchExcelVO { - - @ExcelProperty("编号") - private Long id; - - @ExcelProperty("投入品名称") - private String inputsName; - - @ExcelProperty("投入品ID") - private String inputsId; - - @ExcelProperty("投入品批次ID") - private String inputsBatchId; - - @ExcelProperty("投入品采购单号") - private String inputsBuyId; - - @ExcelProperty("生产日期") - private Date productData; - - @ExcelProperty("投入品数量") - private Integer inputsNum; - - @ExcelProperty("投入品单位") - private String inputsUnit; - - @ExcelProperty("投入品总量") - private BigDecimal inputsWeight; - - @ExcelProperty("投入品单价") - private BigDecimal inputsUnitPrice; - - @ExcelProperty("投入品总价") - private BigDecimal totalPrice; - - @ExcelProperty("备注") - private String remarks; - - @ExcelProperty("上链状态 0：未上链 1：激活状态 2：冻结状态") - private Integer blockState; - - @ExcelProperty("批次上链区块id") - private String blockChainId; - - @ExcelProperty("批次上链区块唯一识别码") - private String blockChainBlockIdentity; - - @ExcelProperty("所属商户id") - private Long belongBusinessId; - - @ExcelProperty("所属商户名称") - private String belongBusinessName; - - @ExcelProperty("创建时间") - private Date createTime; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/vo/InputsBatchExportReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/vo/InputsBatchExportReqVO.java deleted file mode 100644 index 290d959..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/vo/InputsBatchExportReqVO.java +++ /dev/null @@ -1,68 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo; - -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import lombok.*; - -import java.math.BigDecimal; -import java.util.*; -import io.swagger.annotations.*; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; - -@ApiModel(value = "管理后台 - 投入品批次 Excel 导出 Request VO", description = "参数和 InputsBatchPageReqVO 是一致的") -@Data -public class InputsBatchExportReqVO { - - @ApiModelProperty(value = "投入品名称") - private String inputsName; - - @ApiModelProperty(value = "投入品ID") - private String inputsId; - - @ApiModelProperty(value = "投入品批次ID") - private String inputsBatchId; - - @ApiModelProperty(value = "投入品采购单号") - private String inputsBuyId; - - @ApiModelProperty(value = "生产日期") - private Date productData; - - @ApiModelProperty(value = "投入品数量") - private Integer inputsNum; - - @ApiModelProperty(value = "投入品单位") - private String inputsUnit; - - @ApiModelProperty(value = "投入品总量") - private BigDecimal inputsWeight; - - @ApiModelProperty(value = "投入品单价") - private BigDecimal inputsUnitPrice; - - @ApiModelProperty(value = "投入品总价") - private BigDecimal totalPrice; - - @ApiModelProperty(value = "备注") - private String remarks; - - @ApiModelProperty(value = "上链状态 0：未上链 1：激活状态 2：冻结状态") - private Integer blockState; - - @ApiModelProperty(value = "批次上链区块id") - private String blockChainId; - - @ApiModelProperty(value = "批次上链区块唯一识别码") - private String blockChainBlockIdentity; - - @ApiModelProperty(value = "所属商户id") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称") - private String belongBusinessName; - - @ApiModelProperty(value = "创建时间") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date[] createTime; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/vo/InputsBatchPageReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/vo/InputsBatchPageReqVO.java deleted file mode 100644 index 73172f4..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/vo/InputsBatchPageReqVO.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo; - -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import lombok.*; - -import java.math.BigDecimal; -import java.util.*; -import io.swagger.annotations.*; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; - -@ApiModel("管理后台 - 投入品批次分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class InputsBatchPageReqVO extends PageParam { - - @ApiModelProperty(value = "投入品名称") - private String inputsName; - - @ApiModelProperty(value = "投入品批次ID") - private String inputsBatchId; - - @ApiModelProperty(value = "投入品采购单号") - private String inputsBuyId; - - @ApiModelProperty(value = "生产日期") - private Date productData; - - @ApiModelProperty(value = "上链状态 0：未上链 1：激活状态 2：冻结状态") - private Integer blockState; - - @ApiModelProperty(value = "所属商户名称") - private String belongBusinessName; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/vo/InputsBatchRespVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/vo/InputsBatchRespVO.java deleted file mode 100644 index b731bd6..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/vo/InputsBatchRespVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo; - -import lombok.*; -import io.swagger.annotations.*; - -import java.util.Date; - -@ApiModel("管理后台 - 投入品批次 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class InputsBatchRespVO extends InputsBatchBaseVO { - - @ApiModelProperty(value = "编号", required = true) - private Long id; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/vo/InputsBatchSaveReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/vo/InputsBatchSaveReqVO.java deleted file mode 100644 index f9cace9..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbatch/vo/InputsBatchSaveReqVO.java +++ /dev/null @@ -1,63 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo; - -import cn.iocoder.yudao.framework.common.serializer.BigDecimalSerializer; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import lombok.*; - -import java.math.BigDecimal; -import java.util.*; -import io.swagger.annotations.*; -import org.hibernate.validator.constraints.Length; - -import javax.validation.constraints.*; - -@ApiModel("管理后台 - 投入品批次更新 Request VO") -@Data -public class InputsBatchSaveReqVO { - - @ApiModelProperty(value = "编号") - private Long id; - - @ApiModelProperty(value = "投入品名称") - private String inputsName; - - @ApiModelProperty(value = "投入品ID", required = true) - @NotNull(message = "投入品ID不能为空") - private String inputsId; - - @ApiModelProperty(value = "投入品批次ID", required = true) - @NotNull(message = "投入品批次ID不能为空") - private String inputsBatchId; - -// @ApiModelProperty(value = "投入品采购单号", required = true) -// @NotNull(message = "投入品采购单号不能为空") -// private String inputsBuyId; - - @ApiModelProperty(value = "生产日期", required = true) - @NotNull(message = "生产日期不能为空") - private Date productData; - - @ApiModelProperty(value = "投入品数量", required = true) - @NotNull(message = "投入品数量不能为空") - @Min(value = 1, message = "投入品数量至少为1") - private Integer inputsNum; - - @ApiModelProperty(value = "投入品单位") - private String inputsUnit; - - @ApiModelProperty(value = "投入品重量") - @JsonSerialize(using = BigDecimalSerializer.class) // 四舍五入 自动保留2位小数 - private BigDecimal inputsWeight; - - @ApiModelProperty(value = "投入品单价") - @JsonSerialize(using = BigDecimalSerializer.class) // 四舍五入 自动保留2位小数 - private BigDecimal inputsUnitPrice; - - @ApiModelProperty(value = "投入品总价") - private BigDecimal totalPrice; - - @ApiModelProperty(value = "备注") - @Length(max = 255) - private String remarks; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/InputsBuyController.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/InputsBuyController.java deleted file mode 100644 index 5f2062e..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/InputsBuyController.java +++ /dev/null @@ -1,129 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.inputsbuy; - -import cn.iocoder.yudao.framework.common.enums.BlockStateEnum; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo.InputsBuyCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo.InputsBuyPageReqVO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo.InputsBuyRespVO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo.InputsBuyUpdateReqVO; -import cn.iocoder.yudao.module.product.convert.inputsbuy.InputsBuyConvert; -import cn.iocoder.yudao.module.product.dal.dataobject.inputsbuy.InputsBuyDO; -import cn.iocoder.yudao.module.product.service.inputsbuy.InputsBuyService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import java.util.Collection; -import java.util.List; - -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - - -@Api(tags = "管理后台 - 投入品采购") -@RestController -@RequestMapping("/product/inputs-buy") -@Validated -public class InputsBuyController { - - @Resource - private InputsBuyService inputsBuyService; - - @PostMapping("/create") - @ApiOperation("创建投入品采购") - @PreAuthorize("@ss.hasPermission('product:inputs-buy:create')") - public CommonResult createInputsBuy(@Valid @RequestBody InputsBuyCreateReqVO createReqVO) { - return CommonResult.success(inputsBuyService.createInputsBuy(createReqVO)); - } - - @PutMapping("/update") - @ApiOperation("更新投入品采购") - @PreAuthorize("@ss.hasPermission('product:inputs-buy:update')") - public CommonResult updateInputsBuy(@Valid @RequestBody InputsBuyUpdateReqVO updateReqVO) { - inputsBuyService.updateInputsBuy(updateReqVO); - return CommonResult.success(true); - } - - @DeleteMapping("/delete") - @ApiOperation("删除投入品采购") - @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:inputs-buy:delete')") - public CommonResult deleteInputsBuy(@RequestParam("id") Long id) { - inputsBuyService.deleteInputsBuy(id); - return CommonResult.success(true); - } - - @GetMapping("/get") - @ApiOperation("获得投入品采购") - @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:inputs-buy:query')") - public CommonResult getInputsBuy(@RequestParam("id") Long id) { - return CommonResult.success(inputsBuyService.getInputsBuy(id)); - } - - @GetMapping("/list") - @ApiOperation("获得投入品采购列表") - @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class) - @PreAuthorize("@ss.hasPermission('product:inputs-buy:query')") - public CommonResult> getInputsBuyList(@RequestParam("ids") Collection ids) { - List list = inputsBuyService.getInputsBuyList(ids); - return CommonResult.success(InputsBuyConvert.INSTANCE.convertList(list)); - } - - @GetMapping("/page") - @ApiOperation("获得投入品采购分页") - @PreAuthorize("@ss.hasPermission('product:inputs-buy:query')") - public CommonResult> getInputsBuyPage(@Valid InputsBuyPageReqVO pageVO) { - return CommonResult.success(inputsBuyService.getInputsBuyPage(pageVO)); - } - - @GetMapping("/getInputsBuyNumberList") - @ApiOperation("获得投入品批次编号列表") - @ApiImplicitParam(name = "count", value = "数量", required = true, example = "1", dataTypeClass = Integer.class) - @PreAuthorize("@ss.hasPermission('product:inputs-buy:query')") - public CommonResult> getInputsBuyNumberList(@RequestParam("count") @NotNull Integer count) { - return CommonResult.success(inputsBuyService.getInputsBuyNumberList(count)); - } - - @GetMapping("/getInputsBuyByOutbound") - @ApiOperation("获得投入品采购（通过出库单号，用于新增）") - @ApiImplicitParam(name = "outBoundId", value = "出库单号", required = true, example = "OUPJOE20230420153938958B81W0", dataTypeClass = String.class) - @PreAuthorize("@ss.hasPermission('product:inputs-buy:query')") - public CommonResult getInputsBuyByOutbound(@RequestParam("outBoundId") String outBoundId) { - return CommonResult.success(inputsBuyService.getInputsBuyByOutbound(outBoundId)); - } - - @PutMapping("/upChain") - @ApiOperation("上链") - @ApiImplicitParam(name = "id", value = "id", required = true, example = "1", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:inputs-buy:upChain')") - public CommonResult upChain(@RequestParam("id") Long id) { - inputsBuyService.upChain(id); - return CommonResult.success(true); - } - - @PutMapping("/freeze") - @ApiOperation("冻结") - @ApiImplicitParam(name = "id", value = "ID", required = true, example = "1024", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:inputs-buy:freeze')") - public CommonResult freeze(@RequestParam("id") Long id) { - inputsBuyService.updateChainStatus(id, BlockStateEnum.FREEZE.getBlockState()); - return success(Boolean.TRUE); - } - - @PutMapping("/active") - @ApiOperation("激活") - @ApiImplicitParam(name = "id", value = "ID", required = true, example = "1024", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:inputs-buy:active')") - public CommonResult active(@RequestParam("id") Long id) { - inputsBuyService.updateChainStatus(id, BlockStateEnum.ACTIVATION.getBlockState()); - return success(Boolean.TRUE); - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/vo/GoodsInfoReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/vo/GoodsInfoReqVO.java deleted file mode 100644 index a8c5fe5..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/vo/GoodsInfoReqVO.java +++ /dev/null @@ -1,11 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo; - -import lombok.Data; - -@Data -public class GoodsInfoReqVO { - - private String goodsId; - - private String goodsName; -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/vo/InputBuyForOutBoundRespVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/vo/InputBuyForOutBoundRespVO.java deleted file mode 100644 index 4797443..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/vo/InputBuyForOutBoundRespVO.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.util.List; - -@ApiModel("管理后台 - 投入品采购 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class InputBuyForOutBoundRespVO extends InputsBuyRespVO { - - /** - * 是否需要先关联投入品信息 - * 如果为true - * 则 GoodsInfos 中有商品信息 - */ - @ApiModelProperty(value = "是否需要先关联投入品信息") - private Boolean needRelaInputInfo; - - @ApiModelProperty(value = "商品信息集合") - private List GoodsInfos; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/vo/InputsBuyBaseVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/vo/InputsBuyBaseVO.java deleted file mode 100644 index d1ec2a8..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/vo/InputsBuyBaseVO.java +++ /dev/null @@ -1,46 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -/** -* 投入品采购 Base VO，提供给添加、修改、详细的子 VO 使用 -* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 -*/ -@Data -public class InputsBuyBaseVO { - - @ApiModelProperty(value = "投入品采购单号", required = true) - @NotNull(message = "投入品采购单号不能为空") - private String inputsBuyId; - - @ApiModelProperty(value = "关联出库单号") - private String relateOutboundId; - - @ApiModelProperty(value = "供应商名称", required = true) - @NotNull(message = "供应商名称不能为空") - private String vendorName; - - @ApiModelProperty(value = "供应商id", required = true) - @NotNull(message = "供应商id不能为空") - private String vendorId; - - @ApiModelProperty(value = "入库时间", required = true) - @NotNull(message = "入库时间不能为空") - private Date inputsBuyTime; - - @ApiModelProperty(value = "上链状态 0：未上链 1：激活状态 2：冻结状态", required = true) - @NotNull(message = "上链状态 0：未上链 1：激活状态 2：冻结状态不能为空") - private Integer blockState; - - @ApiModelProperty(value = "所属商户id", required = true) - @NotNull(message = "所属商户id不能为空") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称", required = true) - @NotNull(message = "所属商户名称不能为空") - private String belongBusinessName; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/vo/InputsBuyCreateReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/vo/InputsBuyCreateReqVO.java deleted file mode 100644 index 3e4fb35..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/vo/InputsBuyCreateReqVO.java +++ /dev/null @@ -1,38 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo; - -import cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo.InputsBatchSaveReqVO; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.util.Date; -import java.util.List; - -@ApiModel("管理后台 - 投入品采购创建 Request VO") -@Data -public class InputsBuyCreateReqVO { - - @ApiModelProperty(value = "投入品采购单号", required = true) - @NotNull(message = "投入品采购单号不能为空") - private String inputsBuyId; - - @ApiModelProperty(value = "关联出库单号") - private String relateOutboundId; - - @ApiModelProperty(value = "供应商id", required = true) - @NotNull(message = "供应商id不能为空") - private String vendorId; - - @ApiModelProperty(value = "入库时间", required = true) - @NotNull(message = "入库时间不能为空") - private Date inputsBuyTime; - - @ApiModelProperty(value = "投入品", required = true) - @NotEmpty(message = "投入品不能为空") - @Valid - private List inputsBatchs; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/vo/InputsBuyPageReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/vo/InputsBuyPageReqVO.java deleted file mode 100644 index 61fe8a8..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/vo/InputsBuyPageReqVO.java +++ /dev/null @@ -1,49 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo; - -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -@ApiModel("管理后台 - 投入品采购分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class InputsBuyPageReqVO extends PageParam { - - @ApiModelProperty(value = "投入品采购单号") - private String inputsBuyId; - - @ApiModelProperty(value = "关联出库单号") - private String relateOutboundId; - - @ApiModelProperty(value = "供应商名称") - private String vendorName; - - @ApiModelProperty(value = "供应商id") - private String vendorId; - - @ApiModelProperty(value = "入库时间") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date[] inputsBuyTime; - - @ApiModelProperty(value = "创建时间") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date[] createTime; - - @ApiModelProperty(value = "上链状态") - private Integer blockState; - - @ApiModelProperty(value = "所属商户id") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称") - private String belongBusinessName; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/vo/InputsBuyRespVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/vo/InputsBuyRespVO.java deleted file mode 100644 index 5bb1b85..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/vo/InputsBuyRespVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo; - -import cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo.InputsBatchRespVO; -import lombok.*; -import io.swagger.annotations.*; - -import java.util.Date; -import java.util.List; - -@ApiModel("管理后台 - 投入品采购 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class InputsBuyRespVO extends InputsBuyBaseVO { - - @ApiModelProperty(value = "编号", required = true) - private Long id; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "上链状态") - private Integer blockState; - - @ApiModelProperty(value = "投入品批次集合") - private List inputsBatchs; -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/vo/InputsBuyUpdateReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/vo/InputsBuyUpdateReqVO.java deleted file mode 100644 index 438e1ff..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/inputsbuy/vo/InputsBuyUpdateReqVO.java +++ /dev/null @@ -1,31 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo; - -import cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo.InputsBatchSaveReqVO; -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; - -import javax.validation.Valid; -import javax.validation.constraints.*; - -@ApiModel("管理后台 - 投入品采购更新 Request VO") -@Data -public class InputsBuyUpdateReqVO { - - @ApiModelProperty(value = "编号", required = true) - @NotNull(message = "编号不能为空") - private Long id; - - @ApiModelProperty(value = "关联出库单号") - private String relateOutboundId; - - @ApiModelProperty(value = "入库时间", required = true) - @NotNull(message = "入库时间不能为空") - private Date inputsBuyTime; - - @ApiModelProperty(value = "投入品采购单号", required = true) - @NotEmpty(message = "投入品不能为空") - @Valid - private List inputsBatchs; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landblockstate/LandBlockStateController.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landblockstate/LandBlockStateController.java deleted file mode 100644 index 7d97f94..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landblockstate/LandBlockStateController.java +++ /dev/null @@ -1,94 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landblockstate; - -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.landblockstate.vo.LandBlockStateCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landblockstate.vo.LandBlockStatePageReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landblockstate.vo.LandBlockStateRespVO; -import cn.iocoder.yudao.module.product.controller.admin.landblockstate.vo.LandBlockStateUpdateReqVO; -import cn.iocoder.yudao.module.product.convert.landblockstate.LandBlockStateConvert; -import cn.iocoder.yudao.module.product.dal.dataobject.landblockstate.LandBlockStateDO; -import cn.iocoder.yudao.module.product.service.landblockstate.LandBlockStateService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.Collection; -import java.util.List; - -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - -@Api(tags = "管理后台 - 地块状态") -@RestController -@RequestMapping("/product/land-block-state") -@Validated -public class LandBlockStateController { - - @Resource - private LandBlockStateService landBlockStateService; - - @PostMapping("/create") - @ApiOperation("创建地块状态") - @PreAuthorize("@ss.hasPermission('product:land-block-state:create')") - public CommonResult createLandBlockState(@Valid @RequestBody LandBlockStateCreateReqVO createReqVO) { - return success(landBlockStateService.createLandBlockState(createReqVO)); - } - - @PutMapping("/update") - @ApiOperation("更新地块状态") - @PreAuthorize("@ss.hasPermission('product:land-block-state:update')") - public CommonResult updateLandBlockState(@Valid @RequestBody LandBlockStateUpdateReqVO updateReqVO) { - landBlockStateService.updateLandBlockState(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @ApiOperation("删除地块状态") - @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:land-block-state:delete')") - public CommonResult deleteLandBlockState(@RequestParam("id") Long id) { - landBlockStateService.deleteLandBlockState(id); - return success(true); - } - - @GetMapping("/get") - @ApiOperation("获得地块状态") - @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:land-block-state:query')") - public CommonResult getLandBlockState(@RequestParam("id") Long id) { - LandBlockStateDO landBlockState = landBlockStateService.getLandBlockState(id); - return success(LandBlockStateConvert.INSTANCE.convert(landBlockState)); - } - - @GetMapping("/list") - @ApiOperation("获得地块状态列表") - @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class) - @PreAuthorize("@ss.hasPermission('product:land-block-state:query')") - public CommonResult> getLandBlockStateList(@RequestParam("ids") Collection ids) { - List list = landBlockStateService.getLandBlockStateList(ids); - return success(LandBlockStateConvert.INSTANCE.convertList(list)); - } - - @GetMapping("/page") - @ApiOperation("获得地块状态分页") - @PreAuthorize("@ss.hasPermission('product:land-block-state:query')") - public CommonResult> getLandBlockStatePage(@Valid LandBlockStatePageReqVO pageVO) { - PageResult pageResult = landBlockStateService.getLandBlockStatePage(pageVO); - return success(LandBlockStateConvert.INSTANCE.convertPage(pageResult)); - } - - @GetMapping("/getBusinessInfoByListLandBlockState") - @ApiOperation("根据商户ID信息获取所有地块状态") - @ApiImplicitParam(name = "id", value = "商户信息ID", required = true, example = "1", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:land-info-type:query')") - public CommonResult> getBusinessInfoByListLandBlockState(@RequestParam("id") Long id) { - List byBusinessInfoId = landBlockStateService.getByBusinessInfoId(id); - return success(LandBlockStateConvert.INSTANCE.convertList(byBusinessInfoId)); - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landblockstate/vo/LandBlockStateBaseVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landblockstate/vo/LandBlockStateBaseVO.java deleted file mode 100644 index 936c53f..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landblockstate/vo/LandBlockStateBaseVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landblockstate.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotNull; - -/** -* 地块状态 Base VO，提供给添加、修改、详细的子 VO 使用 -* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 -*/ -@Data -public class LandBlockStateBaseVO { - - @ApiModelProperty(value = "地块状态", required = true) - @NotNull(message = "地块状态不能为空") - private String landStateName; - - @ApiModelProperty(value = "所属商户id", required = true) - @NotNull(message = "所属商户id不能为空") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称", required = true) - @NotNull(message = "所属商户名称不能为空") - private String belongBusinessName; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landblockstate/vo/LandBlockStateCreateReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landblockstate/vo/LandBlockStateCreateReqVO.java deleted file mode 100644 index a4a3606..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landblockstate/vo/LandBlockStateCreateReqVO.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landblockstate.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.ToString; - -import javax.validation.constraints.NotNull; - -@ApiModel("管理后台 - 地块状态创建 Request VO") -@Data -@ToString(callSuper = true) -public class LandBlockStateCreateReqVO { - - @ApiModelProperty(value = "地块状态", required = true) - @NotNull(message = "地块类型名称不能为空") - private String landStateName; - - @ApiModelProperty(value = "所属商户id", required = true) - @NotNull(message = "所属商户id不能为空") - private Long belongBusinessId; -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landblockstate/vo/LandBlockStatePageReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landblockstate/vo/LandBlockStatePageReqVO.java deleted file mode 100644 index 3ff9b15..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landblockstate/vo/LandBlockStatePageReqVO.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landblockstate.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import cn.iocoder.yudao.framework.common.pojo.PageParam; - -@ApiModel("管理后台 - 地块状态分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class LandBlockStatePageReqVO extends PageParam { - - @ApiModelProperty(value = "地块状态") - private String landStateName; - - @ApiModelProperty(value = "所属商户id") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称") - private String belongBusinessName; - - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT") - @ApiModelProperty(value = "创建时间") - private Date[] createTime; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landblockstate/vo/LandBlockStateRespVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landblockstate/vo/LandBlockStateRespVO.java deleted file mode 100644 index 7a0be39..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landblockstate/vo/LandBlockStateRespVO.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landblockstate.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.*; -import io.swagger.annotations.*; - -import java.util.Date; - -@ApiModel("管理后台 - 地块状态 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class LandBlockStateRespVO extends LandBlockStateBaseVO { - - @ApiModelProperty(value = "编码", required = true) - private Long id; - - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT") - @ApiModelProperty(value = "创建时间") - private Date createTime; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landblockstate/vo/LandBlockStateUpdateReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landblockstate/vo/LandBlockStateUpdateReqVO.java deleted file mode 100644 index 7faf3ad..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landblockstate/vo/LandBlockStateUpdateReqVO.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landblockstate.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import javax.validation.constraints.NotNull; - -@ApiModel("管理后台 - 地块状态更新 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class LandBlockStateUpdateReqVO extends LandBlockStateBaseVO { - - @ApiModelProperty(value = "编码", required = true) - @NotNull(message = "编码不能为空") - private Long id; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/LandInfoController.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/LandInfoController.java deleted file mode 100644 index 3ac0ad4..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/LandInfoController.java +++ /dev/null @@ -1,102 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landinfo; - -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.landinfo.vo.LandInfoCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landinfo.vo.LandInfoPageReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landinfo.vo.LandInfoRespVO; -import cn.iocoder.yudao.module.product.controller.admin.landinfo.vo.LandInfoUpdateReqVO; -import cn.iocoder.yudao.module.product.convert.landinfo.LandInfoConvert; -import cn.iocoder.yudao.module.product.dal.dataobject.landinfo.LandInfoDO; -import cn.iocoder.yudao.module.product.service.landinfo.LandInfoService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.Collection; -import java.util.List; - -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - -@Api(tags = "管理后台 - 农事土地信息管理") -@RestController -@RequestMapping("/product/land-info") -@Validated -public class LandInfoController { - - @Resource - private LandInfoService landInfoService; - - @PostMapping("/create") - @ApiOperation("创建农事土地信息") - @PreAuthorize("@ss.hasPermission('product:land-info:create')") - public CommonResult createLandInfo(@Valid @RequestBody LandInfoCreateReqVO createReqVO) { - return success(landInfoService.createLandInfo(createReqVO)); - } - - @PutMapping("/update") - @ApiOperation("更新农事土地信息") - @PreAuthorize("@ss.hasPermission('product:land-info:update')") - public CommonResult updateLandInfo(@Valid @RequestBody LandInfoUpdateReqVO updateReqVO) { - landInfoService.updateLandInfo(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @ApiOperation("删除农事土地信息") - @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:land-info:delete')") - public CommonResult deleteLandInfo(@RequestParam("id") Long id) { - landInfoService.deleteLandInfo(id); - return success(true); - } - - @GetMapping("/get") - @ApiOperation("获得农事土地信息") - @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:land-info:query')") - public CommonResult getLandInfo(@RequestParam("id") Long id) { - LandInfoDO landInfo = landInfoService.getLandInfo(id); - return success(LandInfoConvert.INSTANCE.convert(landInfo)); - } - - @GetMapping("/list") - @ApiOperation("获得农事土地信息列表") - @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class) - @PreAuthorize("@ss.hasPermission('product:land-info:query')") - public CommonResult> getLandInfoList(@RequestParam("ids") Collection ids) { - List list = landInfoService.getLandInfoList(ids); - return success(LandInfoConvert.INSTANCE.convertList(list)); - } - - @GetMapping("/page") - @ApiOperation("获得农事土地信息分页") - @PreAuthorize("@ss.hasPermission('product:land-info:query')") - public CommonResult> getLandInfoPage(@Valid LandInfoPageReqVO pageVO) { - PageResult pageResult = landInfoService.getLandInfoPage(pageVO); - return success(LandInfoConvert.INSTANCE.convertPage(pageResult)); - } - - @GetMapping("/nameList") - @ApiOperation("获得所有地块名称") - @PreAuthorize("@ss.hasPermission('product:land-info:query')") - public CommonResult> getLandInfoLandNameList() { - List nameList = landInfoService.getLandInfoLandNameList(); - return success(LandInfoConvert.INSTANCE.convertList(nameList)); - } - - @GetMapping("/getByBusinessId") - @ApiOperation("根据商户ID获得地块信息") - @PreAuthorize("@ss.hasPermission('product:land-info:query')") - @ApiImplicitParam(name = "belongBusinessId", value = "所属商户id", required = true, example = "1024", dataTypeClass = Long.class) - public CommonResult> getBusinessNamesByLandId(@RequestParam("belongBusinessId") Long belongBusinessId) { - List namesByLandId = landInfoService.getLandInfoByBelongBusinessId(belongBusinessId); - return success(namesByLandId); - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/vo/LandInfoBaseVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/vo/LandInfoBaseVO.java deleted file mode 100644 index 734bb93..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/vo/LandInfoBaseVO.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landinfo.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotNull; -import java.math.BigDecimal; - -/** -* 农事土地信息 Base VO，提供给添加、修改、详细的子 VO 使用 -* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 -*/ -@Data -public class LandInfoBaseVO { - - @ApiModelProperty(value = "地块/鱼塘/牧场名称") - private String landName; - - @ApiModelProperty(value = "地块/鱼塘/牧场编码") - private String landId; - - @ApiModelProperty(value = "面积") - private BigDecimal size; - - @ApiModelProperty(value = "地块状态 关联block_state表id") - private Long state; - - @ApiModelProperty(value = "备注") - private String remarks; - - @ApiModelProperty(value = "地块类型 关联info_type表id") - @NotNull(message = "地块类型不能为空") - private Long landType; - - @ApiModelProperty(value = "所属商户id", required = true) - @NotNull(message = "所属商户id不能为空") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称", required = true) - @NotNull(message = "所属商户名称不能为空") - private String belongBusinessName; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/vo/LandInfoCreateReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/vo/LandInfoCreateReqVO.java deleted file mode 100644 index ab0af1b..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/vo/LandInfoCreateReqVO.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landinfo.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -@ApiModel("管理后台 - 农事土地信息创建 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class LandInfoCreateReqVO extends LandInfoBaseVO { - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/vo/LandInfoExcelVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/vo/LandInfoExcelVO.java deleted file mode 100644 index 5d9abfe..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/vo/LandInfoExcelVO.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landinfo.vo; - -import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 农事土地信息 Excel VO - * - * @author 芋道源码 - */ -@Data -public class LandInfoExcelVO { - - @ExcelProperty("编码") - private Long id; - - @ExcelProperty("地块/鱼塘/牧场名称") - private String landName; - - @ExcelProperty("地块/鱼塘/牧场编码") - private String landId; - - @ExcelProperty("面积") - private BigDecimal size; - - @ExcelProperty("地块状态 关联block_state表id") - private Long state; - - @ExcelProperty("备注") - private String remarks; - - @ExcelProperty("地块类型 关联info_type表id") - private Long landType; - - @ExcelProperty("所属商户id") - private Long belongBusinessId; - - @ExcelProperty("所属商户名称") - private String belongBusinessName; - - @ExcelProperty("创建时间") - private Date createTime; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/vo/LandInfoExportReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/vo/LandInfoExportReqVO.java deleted file mode 100644 index 716a285..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/vo/LandInfoExportReqVO.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landinfo.vo; - -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.math.BigDecimal; -import java.util.Date; - -@ApiModel(value = "管理后台 - 农事土地信息 Excel 导出 Request VO", description = "参数和 LandInfoPageReqVO 是一致的") -@Data -public class LandInfoExportReqVO { - - @ApiModelProperty(value = "地块/鱼塘/牧场名称") - private String landName; - - @ApiModelProperty(value = "地块/鱼塘/牧场编码") - private String landId; - - @ApiModelProperty(value = "面积") - private BigDecimal size; - - @ApiModelProperty(value = "地块状态 关联block_state表id") - private Long state; - - @ApiModelProperty(value = "备注") - private String remarks; - - @ApiModelProperty(value = "地块类型 关联info_type表id") - private Long landType; - - @ApiModelProperty(value = "所属商户id") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称") - private String belongBusinessName; - - @ApiModelProperty(value = "创建时间") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date[] createTime; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/vo/LandInfoPageReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/vo/LandInfoPageReqVO.java deleted file mode 100644 index 7ff0c1b..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/vo/LandInfoPageReqVO.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landinfo.vo; - -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import org.springframework.format.annotation.DateTimeFormat; - -import java.math.BigDecimal; -import java.util.Date; - -@ApiModel("管理后台 - 农事土地信息分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class LandInfoPageReqVO extends PageParam { - - @ApiModelProperty(value = "地块/鱼塘/牧场名称") - private String landName; - - @ApiModelProperty(value = "地块/鱼塘/牧场编码") - private String landId; - - @ApiModelProperty(value = "面积") - private BigDecimal size; - - @ApiModelProperty(value = "地块状态 关联block_state表id") - private Long state; - - @ApiModelProperty(value = "备注") - private String remarks; - - @ApiModelProperty(value = "地块类型 关联info_type表id") - private Long landType; - - @ApiModelProperty(value = "所属商户id") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称") - private String belongBusinessName; - - @ApiModelProperty(value = "创建时间") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date[] createTime; - - @ApiModelProperty(value = "任务类型名") - private String JobTypeName; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/vo/LandInfoRespVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/vo/LandInfoRespVO.java deleted file mode 100644 index 7da479f..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/vo/LandInfoRespVO.java +++ /dev/null @@ -1,33 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landinfo.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import lombok.*; -import io.swagger.annotations.*; - -import java.util.Date; - -@ApiModel("管理后台 - 农事土地信息 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class LandInfoRespVO extends LandInfoBaseVO { - - @ApiModelProperty(value = "编码", required = true) - private Long id; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - /** - * 地块类型（String） 为了显示 - */ - @TableField(exist = false) - private String infoTypeName; - - /** - * 地块状态（String） 为了显示 - */ - @TableField(exist = false) - private String infoStateName; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/vo/LandInfoUpdateReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/vo/LandInfoUpdateReqVO.java deleted file mode 100644 index 08e31bd..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfo/vo/LandInfoUpdateReqVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landinfo.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -@ApiModel("管理后台 - 农事土地信息更新 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class LandInfoUpdateReqVO extends LandInfoBaseVO { - - @ApiModelProperty(value = "编码", required = true) - @NotNull(message = "编码不能为空") - private Long id; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfotype/LandInfoTypeController.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfotype/LandInfoTypeController.java deleted file mode 100644 index df52176..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfotype/LandInfoTypeController.java +++ /dev/null @@ -1,94 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landinfotype; - -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.landinfotype.vo.LandInfoTypeCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landinfotype.vo.LandInfoTypePageReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landinfotype.vo.LandInfoTypeRespVO; -import cn.iocoder.yudao.module.product.controller.admin.landinfotype.vo.LandInfoTypeUpdateReqVO; -import cn.iocoder.yudao.module.product.convert.landinfotype.LandInfoTypeConvert; -import cn.iocoder.yudao.module.product.dal.dataobject.landinfotype.LandInfoTypeDO; -import cn.iocoder.yudao.module.product.service.landinfotype.LandInfoTypeService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.Collection; -import java.util.List; - -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - -@Api(tags = "管理后台 - 地块类型") -@RestController -@RequestMapping("/product/land-info-type") -@Validated -public class LandInfoTypeController { - - @Resource - private LandInfoTypeService landInfoTypeService; - - @PostMapping("/create") - @ApiOperation("创建地块类型") - @PreAuthorize("@ss.hasPermission('product:land-info-type:create')") - public CommonResult createLandInfoType(@Valid @RequestBody LandInfoTypeCreateReqVO createReqVO) { - return success(landInfoTypeService.createLandInfoType(createReqVO)); - } - - @PutMapping("/update") - @ApiOperation("更新地块类型") - @PreAuthorize("@ss.hasPermission('product:land-info-type:update')") - public CommonResult updateLandInfoType(@Valid @RequestBody LandInfoTypeUpdateReqVO updateReqVO) { - landInfoTypeService.updateLandInfoType(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @ApiOperation("删除地块类型") - @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:land-info-type:delete')") - public CommonResult deleteLandInfoType(@RequestParam("id") Long id) { - landInfoTypeService.deleteLandInfoType(id); - return success(true); - } - - @GetMapping("/get") - @ApiOperation("获得地块类型") - @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:land-info-type:query')") - public CommonResult getLandInfoType(@RequestParam("id") Long id) { - LandInfoTypeDO landInfoType = landInfoTypeService.getLandInfoType(id); - return success(LandInfoTypeConvert.INSTANCE.convert(landInfoType)); - } - - @GetMapping("/list") - @ApiOperation("获得地块类型列表") - @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class) - @PreAuthorize("@ss.hasPermission('product:land-info-type:query')") - public CommonResult> getLandInfoTypeList(@RequestParam("ids") Collection ids) { - List list = landInfoTypeService.getLandInfoTypeList(ids); - return success(LandInfoTypeConvert.INSTANCE.convertList(list)); - } - - @GetMapping("/page") - @ApiOperation("获得地块类型分页") - @PreAuthorize("@ss.hasPermission('product:land-info-type:query')") - public CommonResult> getLandInfoTypePage(@Valid LandInfoTypePageReqVO pageVO) { - PageResult pageResult = landInfoTypeService.getLandInfoTypePage(pageVO); - return success(LandInfoTypeConvert.INSTANCE.convertPage(pageResult)); - } - - @GetMapping("/getByBusinessInfoId") - @ApiOperation("根据商户ID信息获取所有地块类型") - @ApiImplicitParam(name = "id", value = "商户信息ID", required = true, example = "1", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:land-info-type:query')") - public CommonResult> getByBusinessInfoId(@RequestParam("id") Long id) { - List byBusinessInfoId = landInfoTypeService.getByBusinessInfoId(id); - return success(LandInfoTypeConvert.INSTANCE.convertList(byBusinessInfoId)); - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfotype/vo/LandInfoTypeBaseVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfotype/vo/LandInfoTypeBaseVO.java deleted file mode 100644 index 2b6ceba..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfotype/vo/LandInfoTypeBaseVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landinfotype.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotNull; - -/** -* 地块类型 Base VO，提供给添加、修改、详细的子 VO 使用 -* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 -*/ -@Data -public class LandInfoTypeBaseVO { - - @ApiModelProperty(value = "地块类型", required = true) - @NotNull(message = "地块类型不能为空") - private String landTypeName; - - @ApiModelProperty(value = "所属商户id", required = true) - @NotNull(message = "所属商户id不能为空") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称", required = true) - @NotNull(message = "所属商户名称不能为空") - private String belongBusinessName; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfotype/vo/LandInfoTypeCreateReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfotype/vo/LandInfoTypeCreateReqVO.java deleted file mode 100644 index 4ff7799..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfotype/vo/LandInfoTypeCreateReqVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landinfotype.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotNull; - -@ApiModel("管理后台 - 地块类型创建 Request VO") -@Data -public class LandInfoTypeCreateReqVO { - - @ApiModelProperty(value = "地块类型", required = true) - @NotNull(message = "地块类型名称不能为空") - private String landTypeName; - - @ApiModelProperty(value = "所属商户id", required = true) - @NotNull(message = "所属商户id不能为空") - private Long belongBusinessId; -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfotype/vo/LandInfoTypePageReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfotype/vo/LandInfoTypePageReqVO.java deleted file mode 100644 index 432fafb..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfotype/vo/LandInfoTypePageReqVO.java +++ /dev/null @@ -1,34 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landinfotype.vo; - -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -@ApiModel("管理后台 - 地块类型分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class LandInfoTypePageReqVO extends PageParam { - - @ApiModelProperty(value = "地块类型") - private String landTypeName; - - @ApiModelProperty(value = "所属商户id") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称") - private String belongBusinessName; - - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT") - @ApiModelProperty(value = "创建时间") - private Date[] createTime; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfotype/vo/LandInfoTypeRespVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfotype/vo/LandInfoTypeRespVO.java deleted file mode 100644 index 1d20eb5..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfotype/vo/LandInfoTypeRespVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landinfotype.vo; - -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -@ApiModel("管理后台 - 地块类型 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class LandInfoTypeRespVO extends LandInfoTypeBaseVO { - - @ApiModelProperty(value = "编码", required = true) - private Long id; - - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT") - @ApiModelProperty(value = "创建时间") - private Date createTime; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfotype/vo/LandInfoTypeUpdateReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfotype/vo/LandInfoTypeUpdateReqVO.java deleted file mode 100644 index 6960a01..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landinfotype/vo/LandInfoTypeUpdateReqVO.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landinfotype.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotNull; - -@ApiModel("管理后台 - 地块类型更新 Request VO") -@Data -public class LandInfoTypeUpdateReqVO { - - @ApiModelProperty(value = "编码", required = true) - @NotNull(message = "编码不能为空") - private Long id; - - @ApiModelProperty(value = "地块类型", required = true) - @NotNull(message = "地块类型名称不能为空") - private String landTypeName; - - @ApiModelProperty(value = "所属商户id") - private Long belongBusinessId; -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/LandJobController.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/LandJobController.java deleted file mode 100644 index 260d8c5..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/LandJobController.java +++ /dev/null @@ -1,128 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjob; - -import cn.iocoder.yudao.framework.common.enums.BlockStateEnum; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.module.product.controller.admin.landjob.vo.*; -import cn.iocoder.yudao.module.product.convert.landjob.LandJobConvert; -import cn.iocoder.yudao.module.product.dal.dataobject.landjob.LandJobDO; -import cn.iocoder.yudao.module.product.service.landjob.LandJobService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.IOException; -import java.util.Collection; -import java.util.List; - -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; - -@Api(tags = "管理后台 - 种植作业") -@RestController -@RequestMapping("/product/land-job") -@Validated -public class LandJobController { - - @Resource - private LandJobService landJobService; - - @PostMapping("/create") - @ApiOperation("创建种植/养殖/畜牧作业") - @PreAuthorize("@ss.hasPermission('product:land-job:create')") - public CommonResult createLandJob(@Valid @RequestBody LandJobCreateReqVO createReqVO) { - return success(landJobService.createLandJob(createReqVO)); - } - - - @PutMapping("/update") - @ApiOperation("更新种植/养殖/畜牧作业") - @PreAuthorize("@ss.hasPermission('product:land-job:update')") - public CommonResult updateLandJob(@Valid @RequestBody LandJobUpdateReqVO updateReqVO) { - landJobService.updateLandJob(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @ApiOperation("删除种植/养殖/畜牧作业") - @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:land-job:delete')") - public CommonResult deleteLandJob(@RequestParam("id") Long id) { - landJobService.deleteLandJob(id); - return success(true); - } - - @GetMapping("/get") - @ApiOperation("获得种植/养殖/畜牧作业") - @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:land-job:query')") - public CommonResult getLandJob(@RequestParam("id") Long id) { - LandJobRespVO landJob = landJobService.getLandJob(id); - return success(landJob); - } - - @GetMapping("/list") - @ApiOperation("获得种植/养殖/畜牧作业列表") - @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class) - @PreAuthorize("@ss.hasPermission('product:land-job:query')") - public CommonResult> getLandJobList(@RequestParam("ids") Collection ids) { - List list = landJobService.getLandJobList(ids); - return success(LandJobConvert.INSTANCE.convertList(list)); - } - - @GetMapping("/page") - @ApiOperation("获得种植/养殖/畜牧作业分页") - @PreAuthorize("@ss.hasPermission('product:land-job:query')") - public CommonResult> getLandJobPage(@Valid LandJobPageReqVO pageVO) { - PageResult pageResult = landJobService.getLandJobPage(pageVO); - return success(LandJobConvert.INSTANCE.convertPage(pageResult)); - } - - @GetMapping("/export-excel") - @ApiOperation("导出种植/养殖/畜牧作业 Excel") - @PreAuthorize("@ss.hasPermission('product:land-job:export')") - @OperateLog(type = EXPORT) - public void exportLandJobExcel(@Valid LandJobExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { - List list = landJobService.getLandJobList(exportReqVO); - // 导出 Excel - List datas = LandJobConvert.INSTANCE.convertList02(list); - ExcelUtils.write(response, "种植/养殖/畜牧作业.xls", "数据", LandJobExcelVO.class, datas); - } - - @PutMapping("/upChain") - @ApiOperation("上链") - @ApiImplicitParam(name = "id", value = "id", required = true, example = "1", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:harvest-info:update')") - public CommonResult upChain(@RequestParam("id") Long id) { - landJobService.upChain(id); - return CommonResult.success(true); - } - - @PutMapping("/freeze") - @ApiOperation("冻结") - @ApiImplicitParam(name = "id", value = "ID", required = true, example = "1024", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:inspection:freeze')") - public CommonResult freeze(@RequestParam("id") Long id) { - landJobService.updateChainStatus(id, BlockStateEnum.FREEZE.getBlockState()); - return success(Boolean.TRUE); - } - - @PutMapping("/active") - @ApiOperation("激活") - @ApiImplicitParam(name = "id", value = "ID", required = true, example = "1024", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:inspection:active')") - public CommonResult active(@RequestParam("id") Long id) { - landJobService.updateChainStatus(id, BlockStateEnum.ACTIVATION.getBlockState()); - return success(Boolean.TRUE); - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobBaseVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobBaseVO.java deleted file mode 100644 index 47754db..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobBaseVO.java +++ /dev/null @@ -1,69 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjob.vo; - -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -/** -* 种植/养殖/畜牧作业 Base VO，提供给添加、修改、详细的子 VO 使用 -* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 -*/ -@Data -public class LandJobBaseVO { - - @ApiModelProperty(value = "地块ID", required = true) - @NotNull(message = "地块ID不能为空") - private String landId; - - @ApiModelProperty(value = "种植作业ID", required = true) - @NotNull(message = "种植作业ID不能为空") - private String landJobId; - - @ApiModelProperty(value = "地块名称", required = true) - @NotNull(message = "地块名称不能为空") - private String landName; - - @ApiModelProperty(value = "类型：0：地块 1：鱼塘 2：牧场", required = true) - @NotNull(message = "类型：0：地块 1：鱼塘 2：牧场不能为空") - private Long landType; - - @ApiModelProperty(value = "任务类型", required = true) - @NotNull(message = "任务类型不能为空") - private Long jobType; - - @ApiModelProperty(value = "作业员工", required = true) - @NotNull(message = "作业员工不能为空") - private String jobWorker; - - @ApiModelProperty(value = "作业ID", required = true) - @NotNull(message = "作业ID不能为空") - private Long jobWorkerId; - - @ApiModelProperty(value = "作业日期", required = true) - @NotNull(message = "作业日期不能为空") - private Date jobDate; - - @ApiModelProperty(value = "备注") - private String remarks; - - @ApiModelProperty(value = "所属商户id", required = true) - @NotNull(message = "所属商户id不能为空") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称", required = true) - @NotNull(message = "所属商户名称不能为空") - private String belongBusinessName; - - @ApiModelProperty(value = "上链状态 0：未上链 1：激活状态 2：冻结状态") - private Integer blockState; - - @ApiModelProperty(value = "作业图片") - private String jobImgUrl; - - @TableField(updateStrategy = FieldStrategy.IGNORED) // 为了不被自动排空 - @ApiModelProperty(value = "作业视频") - private String jobVideoUrl; -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobCreateOfAppReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobCreateOfAppReqVO.java deleted file mode 100644 index 79847b7..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobCreateOfAppReqVO.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjob.vo; - -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.LandJobInputsSaveReqVO; -import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.ToString; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import java.util.Date; -import java.util.List; - -@ApiModel("app移动端 - 种植/养殖/畜牧作业创建 Request VO") -@Data -public class LandJobCreateOfAppReqVO { - - @ApiModelProperty(value = "openid", required = true) - @NotNull(message = "openid不能为空") - private String openid; - - @ApiModelProperty(value = "地块编码", required = true) - @NotNull(message = "地块编码不能为空") - private String landId; - - @ApiModelProperty(value = "任务类型", required = true) - @NotNull(message = "任务类型不能为空") - private Long jobType; - - @ApiModelProperty(value = "作业日期", required = true) - @NotNull(message = "作业日期不能为空") - private Date jobDate; - - @ApiModelProperty(value = "备注") - private String remarks; - - @ApiModelProperty(value = "所属商户id", required = true) - private Long belongBusinessId; - - @ApiModelProperty(value = "作业图片") - private String jobImgUrl; - - @ApiModelProperty(value = "作业视频") - private String jobVideoUrl; - - @ApiModelProperty(value = "种植作业") - @Valid - private List landJobInputs; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobCreateReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobCreateReqVO.java deleted file mode 100644 index 1497fb6..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobCreateReqVO.java +++ /dev/null @@ -1,72 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjob.vo; - -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.LandJobInputsSaveReqVO; -import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.validation.Valid; -import javax.validation.constraints.*; - -@ApiModel("管理后台 - 种植/养殖/畜牧作业创建 Request VO") -@Data -@ToString(callSuper = true) -public class LandJobCreateReqVO { - - @ApiModelProperty(value = "地块ID") - private String landId; - - @ApiModelProperty(value = "种植作业ID") - private String landJobId; - - @ApiModelProperty(value = "地块名称") - private String landName; - - @ApiModelProperty(value = "任务类型") - private Long jobType; - - @ApiModelProperty(value = "作业员工") - private String jobWorker; - - @ApiModelProperty(value = "作业ID") - private Long jobWorkerId; - - @ApiModelProperty(value = "作业日期") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date jobDate; - - @ApiModelProperty(value = "备注") - private String remarks; - - @ApiModelProperty("所属商户id") - private Long belongBusinessId; - - @ApiModelProperty("所属商户名称") - private String belongBusinessName; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("上链状态 0：未上链 1：激活状态 2：冻结状态") - private Integer blockState; - - @ApiModelProperty(value = "类型：0：地块 1：鱼塘 2：牧场") - private Long landType; - - @ApiModelProperty(value = "作业图片") - private String jobImgUrl; - - @TableField(updateStrategy = FieldStrategy.IGNORED) // 为了不被自动排空 - @ApiModelProperty(value = "作业视频") - private String jobVideoUrl; - - @ApiModelProperty(value = "种植作业", required = true) - @Valid - private List landJobIds; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobExcelVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobExcelVO.java deleted file mode 100644 index 53a9584..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobExcelVO.java +++ /dev/null @@ -1,67 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjob.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; - -import com.alibaba.excel.annotation.ExcelProperty; - -import javax.validation.constraints.NotNull; - -/** - * 种植/养殖/畜牧作业 Excel VO - * - * @author 芋道源码 - */ -@Data -public class LandJobExcelVO { - - @ExcelProperty("编号") - private Long id; - - @ExcelProperty("地块ID") - private String landId; - - @ApiModelProperty(value = "种植作业ID") - private String landJobId; - - @ExcelProperty("地块名称") - private String landName; - - @ExcelProperty("类型：0：地块 1：鱼塘 2：牧场") - private Long landType; - - @ExcelProperty("任务类型") - private Long jobType; - - @ExcelProperty("作业员工") - private String jobWorker; - - @ExcelProperty("作业ID") - private Long jobWorkerId; - - @ExcelProperty("作业日期") - private Date jobDate; - - @ExcelProperty("备注") - private String remarks; - - @ExcelProperty("所属商户id") - private Long belongBusinessId; - - @ExcelProperty("所属商户名称") - private String belongBusinessName; - - @ExcelProperty("创建时间") - private Date createTime; - - @ExcelProperty("上链状态 0：未上链 1：激活状态 2：冻结状态") - private Integer blockState; - - @ApiModelProperty(value = "作业图片") - private String jobImgUrl; - - @ApiModelProperty(value = "作业视频") - private String jobVideoUrl; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobExportReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobExportReqVO.java deleted file mode 100644 index 83d2ee7..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobExportReqVO.java +++ /dev/null @@ -1,63 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjob.vo; - -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.validation.constraints.NotNull; - -@ApiModel(value = "管理后台 - 种植/养殖/畜牧作业 Excel 导出 Request VO", description = "参数和 LandJobPageReqVO 是一致的") -@Data -public class LandJobExportReqVO { - - @ApiModelProperty(value = "地块ID") - private String landId; - - @ApiModelProperty(value = "地块名称") - private String landName; - - @ApiModelProperty(value = "种植作业ID") - private String landJobId; - - @ApiModelProperty(value = "类型：0：地块 1：鱼塘 2：牧场") - private Long landType; - - @ApiModelProperty(value = "任务类型") - private Long jobType; - - @ApiModelProperty(value = "作业员工") - private String jobWorker; - - @ApiModelProperty(value = "作业ID") - private Long jobWorkerId; - - @ApiModelProperty(value = "作业日期") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date[] jobDate; - - @ApiModelProperty(value = "备注") - private String remarks; - - @ApiModelProperty(value = "所属商户id") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称") - private String belongBusinessName; - - @ApiModelProperty(value = "创建时间") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date[] createTime; - - @ApiModelProperty(value = "上链状态 0：未上链 1：激活状态 2：冻结状态") - private Integer blockState; - - @ApiModelProperty(value = "作业图片") - private String jobImgUrl; - - @ApiModelProperty(value = "作业视频") - private String jobVideoUrl; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobPageReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobPageReqVO.java deleted file mode 100644 index af34006..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobPageReqVO.java +++ /dev/null @@ -1,71 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjob.vo; - -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.validation.constraints.NotNull; - -@ApiModel("管理后台 - 种植/养殖/畜牧作业分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class LandJobPageReqVO extends PageParam { - - @ApiModelProperty(value = "地块ID") - private String landId; - - @ApiModelProperty(value = "地块名称") - private String landName; - - @ApiModelProperty(value = "种植作业ID") - private String landJobId; - - @ApiModelProperty(value = "类型：0：地块 1：鱼塘 2：牧场") - private Long landType; - - @ApiModelProperty(value = "任务类型") - private Long jobType; - - @ApiModelProperty(value = "作业员工") - private String jobWorker; - - @ApiModelProperty(value = "作业ID") - private Long jobWorkerId; - - @ApiModelProperty(value = "作业日期") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date[] jobDate; - - @ApiModelProperty(value = "备注") - private String remarks; - - @ApiModelProperty(value = "所属商户id") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称") - private String belongBusinessName; - - @ApiModelProperty(value = "创建时间") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date[] createTime; - - @ApiModelProperty(value = "上链状态 0：未上链 1：激活状态 2：冻结状态") - private Integer blockState; - - @ApiModelProperty(value = "作业图片") - private String jobImgUrl; - - @TableField(updateStrategy = FieldStrategy.IGNORED) // 为了不被自动排空 - @ApiModelProperty(value = "作业视频") - private String jobVideoUrl; - - @ApiModelProperty(value = "任务类型名") - private String JobTypeName; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobRedisVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobRedisVO.java deleted file mode 100644 index 19da2ad..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobRedisVO.java +++ /dev/null @@ -1,39 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjob.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotNull; -import java.util.Date; - -@Data -public class LandJobRedisVO { - - @ApiModelProperty(value = "作业员工", required = true) - @NotNull(message = "作业员工不能为空") - private String jobWorker; - - @ApiModelProperty(value = "任务类型", required = true) - @NotNull(message = "任务类型不能为空") - private Long jobType; - - @ApiModelProperty(value = "地块ID", required = true) - @NotNull(message = "地块ID不能为空") - private String landId; - - @ApiModelProperty(value = "地块名称", required = true) - @NotNull(message = "地块名称不能为空") - private String landName; - - @ApiModelProperty(value = "作业日期", required = true) - @NotNull(message = "作业日期不能为空") - private Date jobDate; - - @ApiModelProperty(value = "所属商户id", required = true) - @NotNull(message = "所属商户id不能为空") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称", required = true) - @NotNull(message = "所属商户名称不能为空") - private String belongBusinessName; -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobRespVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobRespVO.java deleted file mode 100644 index 8a163ad..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobRespVO.java +++ /dev/null @@ -1,31 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjob.vo; - -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.LandJobInputsRespVO; -import lombok.*; -import io.swagger.annotations.*; - -import java.util.Date; -import java.util.List; - -@ApiModel("管理后台 - 种植/养殖/畜牧作业 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class LandJobRespVO extends LandJobBaseVO { - - @ApiModelProperty(value = "编号", required = true) - private Long id; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "任务类型名") - private String jobTypeName; - - @ApiModelProperty(value = "出库关联采收批次集合") - private List landJobIds; - - @ApiModelProperty(value = "农事作业所对应的投入品集合") - private List landJobInputs; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobUpdateReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobUpdateReqVO.java deleted file mode 100644 index 78f127b..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjob/vo/LandJobUpdateReqVO.java +++ /dev/null @@ -1,76 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjob.vo; - -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.LandJobInputsSaveReqVO; -import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.validation.Valid; -import javax.validation.constraints.*; - -@ApiModel("管理后台 - 种植/养殖/畜牧作业更新 Request VO") -@Data -@ToString(callSuper = true) -public class LandJobUpdateReqVO { - - @ApiModelProperty(value = "编号", required = true) - @NotNull(message = "编号不能为空") - private Long id; - - @ApiModelProperty(value = "地块ID") - private String landId; - - @ApiModelProperty(value = "种植作业ID") - private String landJobId; - - @ApiModelProperty(value = "地块名称") - private String landName; - - @ApiModelProperty(value = "任务类型") - private Long jobType; - - @ApiModelProperty(value = "作业员工") - private String jobWorker; - - @ApiModelProperty(value = "作业ID") - private Long jobWorkerId; - - @ApiModelProperty(value = "作业日期") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date jobDate; - - @ApiModelProperty(value = "备注") - private String remarks; - - @ExcelProperty("所属商户id") - private Long belongBusinessId; - - @ExcelProperty("所属商户名称") - private String belongBusinessName; - - @ExcelProperty("创建时间") - private Date createTime; - - @ExcelProperty("上链状态 0：未上链 1：激活状态 2：冻结状态") - private Integer blockState; - - @ApiModelProperty(value = "类型：0：地块 1：鱼塘 2：牧场") - private Long landType; - - @ApiModelProperty(value = "作业图片") - private String jobImgUrl; - - @TableField(updateStrategy = FieldStrategy.IGNORED) // 为了不被自动排空 - @ApiModelProperty(value = "作业视频") - private String jobVideoUrl; - - @ApiModelProperty(value = "种植作业", required = true) - @Valid - private List landJobIds; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/LandJobInputsController.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/LandJobInputsController.java deleted file mode 100644 index a49e0e0..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/LandJobInputsController.java +++ /dev/null @@ -1,85 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjobinputs; - -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.LandJobInputsCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.LandJobInputsPageReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.LandJobInputsRespVO; -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.LandJobInputsUpdateReqVO; -import cn.iocoder.yudao.module.product.convert.landjobinputs.LandJobInputsConvert; -import cn.iocoder.yudao.module.product.dal.dataobject.landjobinputs.LandJobInputsDO; -import cn.iocoder.yudao.module.product.service.landjobinputs.LandJobInputsService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.Collection; -import java.util.List; - -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - -@Api(tags = "管理后台 - 地块作业投入品") -@RestController -@RequestMapping("/product/land-job-inputs") -@Validated -public class LandJobInputsController { - - @Resource - private LandJobInputsService landJobInputsService; - - @PostMapping("/create") - @ApiOperation("创建地块作业投入品") - @PreAuthorize("@ss.hasPermission('product:land-job-inputs:create')") - public CommonResult createLandJobInputs(@Valid @RequestBody LandJobInputsCreateReqVO createReqVO) { - return success(landJobInputsService.createLandJobInputs(createReqVO)); - } - - @PutMapping("/update") - @ApiOperation("更新地块作业投入品") - @PreAuthorize("@ss.hasPermission('product:land-job-inputs:update')") - public CommonResult updateLandJobInputs(@Valid @RequestBody LandJobInputsUpdateReqVO updateReqVO) { - landJobInputsService.updateLandJobInputs(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @ApiOperation("删除地块作业投入品") - @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:land-job-inputs:delete')") - public CommonResult deleteLandJobInputs(@RequestParam("id") Long id) { - landJobInputsService.deleteLandJobInputs(id); - return success(true); - } - - @GetMapping("/get") - @ApiOperation("获得地块作业投入品") - @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:land-job-inputs:query')") - public CommonResult getLandJobInputs(@RequestParam("id") Long id) { - LandJobInputsDO landJobInputs = landJobInputsService.getLandJobInputs(id); - return success(LandJobInputsConvert.INSTANCE.convert(landJobInputs)); - } - - @GetMapping("/list") - @ApiOperation("获得地块作业投入品列表") - @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class) - @PreAuthorize("@ss.hasPermission('product:land-job-inputs:query')") - public CommonResult> getLandJobInputsList(@RequestParam("ids") Collection ids) { - List list = landJobInputsService.getLandJobInputsList(ids); - return success(LandJobInputsConvert.INSTANCE.convertList(list)); - } - - @GetMapping("/page") - @ApiOperation("获得地块作业投入品分页") - @PreAuthorize("@ss.hasPermission('product:land-job-inputs:query')") - public CommonResult> getLandJobInputsPage(@Valid LandJobInputsPageReqVO pageVO) { - PageResult pageResult = landJobInputsService.getLandJobInputsPage(pageVO); - return success(LandJobInputsConvert.INSTANCE.convertPage(pageResult)); - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsBaseVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsBaseVO.java deleted file mode 100644 index b32dd27..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsBaseVO.java +++ /dev/null @@ -1,54 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -/** -* 地块作业投入品 Base VO，提供给添加、修改、详细的子 VO 使用 -* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 -*/ -@Data -public class LandJobInputsBaseVO { - - @ApiModelProperty(value = "种植作业ID", required = true) - private String landJobId; - - @ApiModelProperty(value = "投入品名称", required = true) - @NotNull(message = "投入品名称不能为空") - private String inputsName; - - @ApiModelProperty(value = "投入品ID", required = true) - @NotNull(message = "投入品ID不能为空") - private String inputsId; - - @ApiModelProperty(value = "投入品批次ID", required = true) - @NotNull(message = "投入品批次ID不能为空") - private String inputsBatchId; - - @ApiModelProperty(value = "投入品数量", required = true) - @NotNull(message = "投入品数量不能为空") - private Integer inputsNum; - - @ApiModelProperty(value = "投入品单位") - private String inputsUnit; - - @ApiModelProperty(value = "投入品描述") - private String inputsDesc; - - @ApiModelProperty(value = "所属商户id", required = true) - @NotNull(message = "所属商户id不能为空") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称", required = true) - @NotNull(message = "所属商户名称不能为空") - private String belongBusinessName; - - @ApiModelProperty(value = "投入品操作图片") - private String inputsImgUrl; - - @ApiModelProperty(value = "投入品操作视频") - private String inputsVideoUrl; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsCreateReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsCreateReqVO.java deleted file mode 100644 index 172271a..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsCreateReqVO.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -@ApiModel("管理后台 - 地块作业投入品创建 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class LandJobInputsCreateReqVO extends LandJobInputsBaseVO { - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsExcelVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsExcelVO.java deleted file mode 100644 index 493665c..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsExcelVO.java +++ /dev/null @@ -1,50 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; - -import com.alibaba.excel.annotation.ExcelProperty; - -/** - * 地块作业投入品 Excel VO - * - * @author 芋道源码 - */ -@Data -public class LandJobInputsExcelVO { - - @ExcelProperty("编号") - private Long id; - - @ExcelProperty("种植作业ID") - private String landJobId; - - @ExcelProperty("投入品名称") - private String inputsName; - - @ExcelProperty("投入品ID") - private String inputsId; - - @ExcelProperty("投入品批次ID") - private String inputsBatchId; - - @ExcelProperty("投入品数量") - private Integer inputsNum; - - @ExcelProperty("投入品单位") - private String inputsUnit; - - @ExcelProperty("投入品描述") - private String inputsDesc; - - @ExcelProperty("创建时间") - private Date createTime; - - @ExcelProperty("所属商户id") - private Long belongBusinessId; - - @ExcelProperty("所属商户名称") - private String belongBusinessName; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsExportReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsExportReqVO.java deleted file mode 100644 index 1c1704a..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsExportReqVO.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo; - -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; - -@ApiModel(value = "管理后台 - 地块作业投入品 Excel 导出 Request VO", description = "参数和 LandJobInputsPageReqVO 是一致的") -@Data -public class LandJobInputsExportReqVO { - - @ApiModelProperty(value = "种植作业ID") - private String landJobId; - - @ApiModelProperty(value = "投入品名称") - private String inputsName; - - @ApiModelProperty(value = "投入品ID") - private String inputsId; - - @ApiModelProperty(value = "投入品批次ID") - private String inputsBatchId; - - @ApiModelProperty(value = "投入品数量") - private Integer inputsNum; - - @ApiModelProperty(value = "投入品单位") - private String inputsUnit; - - @ApiModelProperty(value = "投入品描述") - private String inputsDesc; - - @ApiModelProperty(value = "创建时间") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date[] createTime; - - @ApiModelProperty(value = "所属商户id") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称") - private String belongBusinessName; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsPageReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsPageReqVO.java deleted file mode 100644 index 19f7149..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsPageReqVO.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo; - -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; - -@ApiModel("管理后台 - 地块作业投入品分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class LandJobInputsPageReqVO extends PageParam { - - @ApiModelProperty(value = "种植作业ID") - private String landJobId; - - @ApiModelProperty(value = "投入品名称") - private String inputsName; - - @ApiModelProperty(value = "投入品ID") - private String inputsId; - - @ApiModelProperty(value = "投入品批次ID") - private String inputsBatchId; - - @ApiModelProperty(value = "投入品数量") - private Integer inputsNum; - - @ApiModelProperty(value = "投入品单位") - private String inputsUnit; - - @ApiModelProperty(value = "投入品描述") - private String inputsDesc; - - @ApiModelProperty(value = "创建时间") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date[] createTime; - - @ApiModelProperty(value = "所属商户id") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称") - private String belongBusinessName; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsRespVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsRespVO.java deleted file mode 100644 index e3abc5a..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsRespVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo; - -import lombok.*; -import io.swagger.annotations.*; - -import java.util.Date; - -@ApiModel("管理后台 - 地块作业投入品 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class LandJobInputsRespVO extends LandJobInputsBaseVO { - - @ApiModelProperty(value = "编号", required = true) - private Long id; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsSaveReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsSaveReqVO.java deleted file mode 100644 index 5e34dec..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsSaveReqVO.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotNull; - -@Data -public class LandJobInputsSaveReqVO { - - @ApiModelProperty(value = "编码", required = true) -// @NotNull(message = "编码不能为空") - private Long id; - - @ApiModelProperty(value = "种植作业ID") - private String landJobId; - - @ApiModelProperty(value = "投入品名称", required = true) - @NotNull(message = "投入品名称不能为空") - private String inputsName; - - @ApiModelProperty(value = "投入品ID", required = true) - @NotNull(message = "投入品ID不能为空") - private String inputsId; - - @ApiModelProperty(value = "投入品批次ID", required = true) - @NotNull(message = "投入品批次ID不能为空") - private String inputsBatchId; - - @ApiModelProperty(value = "投入品数量", required = true) - @NotNull(message = "投入品数量不能为空") - private Integer inputsNum; - - @ApiModelProperty(value = "投入品单位") - private String inputsUnit; - - @ApiModelProperty(value = "投入品描述") - private String inputsDesc; - - @ApiModelProperty(value = "所属商户id", required = true) - @NotNull(message = "所属商户id不能为空") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称") - private String belongBusinessName; - - @ApiModelProperty(value = "投入品操作图片") - private String inputsImgUrl; - - @ApiModelProperty(value = "投入品操作视频") - private String inputsVideoUrl; -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsUpdateReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsUpdateReqVO.java deleted file mode 100644 index e00ddd2..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobinputs/vo/LandJobInputsUpdateReqVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -@ApiModel("管理后台 - 地块作业投入品更新 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class LandJobInputsUpdateReqVO extends LandJobInputsBaseVO { - - @ApiModelProperty(value = "编号", required = true) - @NotNull(message = "编号不能为空") - private Long id; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobtype/LandJobTypeController.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobtype/LandJobTypeController.java deleted file mode 100644 index 573f5f3..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobtype/LandJobTypeController.java +++ /dev/null @@ -1,86 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjobtype; - -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.landjobtype.vo.LandJobTypeCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landjobtype.vo.LandJobTypePageReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landjobtype.vo.LandJobTypeRespVO; -import cn.iocoder.yudao.module.product.controller.admin.landjobtype.vo.LandJobTypeUpdateReqVO; -import cn.iocoder.yudao.module.product.convert.landjobtype.LandJobTypeConvert; -import cn.iocoder.yudao.module.product.dal.dataobject.landjobtype.LandJobTypeDO; -import cn.iocoder.yudao.module.product.service.landjobtype.LandJobTypeService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; - -import java.util.List; - -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - -@Api(tags = "管理后台 - 作业类型") -@RestController -@RequestMapping("/product/land-job-type") -@Validated -public class LandJobTypeController { - - @Resource - private LandJobTypeService landJobTypeService; - - @PostMapping("/create") - @ApiOperation("创建作业类型") - @PreAuthorize("@ss.hasPermission('product:land-job-type:create')") - public CommonResult createLandJobType(@Valid @RequestBody LandJobTypeCreateReqVO createReqVO) { - return success(landJobTypeService.createLandJobType(createReqVO)); - } - - @PutMapping("/update") - @ApiOperation("更新作业类型") - @PreAuthorize("@ss.hasPermission('product:land-job-type:update')") - public CommonResult updateLandJobType(@Valid @RequestBody LandJobTypeUpdateReqVO updateReqVO) { - landJobTypeService.updateLandJobType(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @ApiOperation("删除作业类型") - @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:land-job-type:delete')") - public CommonResult deleteLandJobType(@RequestParam("id") Long id) { - landJobTypeService.deleteLandJobType(id); - return success(true); - } - - @GetMapping("/get") - @ApiOperation("获得作业类型") - @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:land-job-type:query')") - public CommonResult getLandJobType(@RequestParam("id") Long id) { - LandJobTypeDO landJobType = landJobTypeService.getLandJobType(id); - return success(LandJobTypeConvert.INSTANCE.convert(landJobType)); - } - - @GetMapping("/page") - @ApiOperation("获得作业类型分页") - @PreAuthorize("@ss.hasPermission('product:land-job-type:query')") - public CommonResult> getLandJobTypePage(@Valid LandJobTypePageReqVO pageVO) { - PageResult pageResult = landJobTypeService.getLandJobTypePage(pageVO); - return success(LandJobTypeConvert.INSTANCE.convertPage(pageResult)); - } - - @GetMapping("/getByBusinessInfoId") - @ApiOperation("根据商户ID获得作业类型") - @ApiImplicitParam(name = "id", value = "商户信息ID", required = true, example = "1024", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:land-job-type:query')") - public CommonResult> getByBusinessInfoId(@RequestParam("id") Long id) { - List landJobTypes = landJobTypeService.getByBusinessInfoId(id); - return success(LandJobTypeConvert.INSTANCE.convertList(landJobTypes)); - } - - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobtype/vo/LandJobTypeBaseVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobtype/vo/LandJobTypeBaseVO.java deleted file mode 100644 index ecb6d36..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobtype/vo/LandJobTypeBaseVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjobtype.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -/** -* 作业类型 Base VO，提供给添加、修改、详细的子 VO 使用 -* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 -*/ -@Data -public class LandJobTypeBaseVO { - - @ApiModelProperty(value = "作业类型", required = true) - @NotNull(message = "地块名称不能为空") - private String typeName; - - @ApiModelProperty(value = "所属商户id", required = true) - @NotNull(message = "所属商户id不能为空") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称", required = true) - @NotNull(message = "所属商户名称不能为空") - private String belongBusinessName; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobtype/vo/LandJobTypeCreateReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobtype/vo/LandJobTypeCreateReqVO.java deleted file mode 100644 index 5ed2566..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobtype/vo/LandJobTypeCreateReqVO.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjobtype.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -@ApiModel("管理后台 - 作业类型创建 Request VO") -@Data -public class LandJobTypeCreateReqVO { - - @ApiModelProperty(value = "作业类型", required = true) - @NotNull(message = "地块名称不能为空") - private String typeName; - - @ApiModelProperty(value = "所属商户id", required = true) - @NotNull(message = "所属商户id不能为空") - private Long belongBusinessId; -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobtype/vo/LandJobTypePageReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobtype/vo/LandJobTypePageReqVO.java deleted file mode 100644 index 74ca2e8..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobtype/vo/LandJobTypePageReqVO.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjobtype.vo; - -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; - -@ApiModel("管理后台 - 作业类型分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class LandJobTypePageReqVO extends PageParam { - - @ApiModelProperty(value = "作业类型") - private String typeName; - - @ApiModelProperty(value = "所属商户id") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称") - private String belongBusinessName; - - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT") - @ApiModelProperty(value = "创建时间") - private Date[] createTime; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobtype/vo/LandJobTypeRespVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobtype/vo/LandJobTypeRespVO.java deleted file mode 100644 index 7e216a6..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobtype/vo/LandJobTypeRespVO.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjobtype.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.*; -import io.swagger.annotations.*; - -import java.util.Date; - -@ApiModel("管理后台 - 作业类型 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class LandJobTypeRespVO extends LandJobTypeBaseVO { - - @ApiModelProperty(value = "编号", required = true) - private Long id; - - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT") - @ApiModelProperty(value = "创建时间") - private Date createTime; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobtype/vo/LandJobTypeUpdateReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobtype/vo/LandJobTypeUpdateReqVO.java deleted file mode 100644 index 3b89486..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landjobtype/vo/LandJobTypeUpdateReqVO.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landjobtype.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -@ApiModel("管理后台 - 作业类型更新 Request VO") -@Data -public class LandJobTypeUpdateReqVO { - - @ApiModelProperty(value = "编号", required = true) - @NotNull(message = "编号不能为空") - private Long id; - - @ApiModelProperty(value = "作业类型", required = true) - @NotNull(message = "地块名称不能为空") - private String typeName; - - @ApiModelProperty(value = "所属商户id") - @NotNull(message = "地块名称不能为空") - private Long belongBusinessId; -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/LandPlanController.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/LandPlanController.java deleted file mode 100644 index d79e368..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/LandPlanController.java +++ /dev/null @@ -1,99 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landplan; - -import cn.iocoder.yudao.framework.common.enums.BlockStateEnum; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.harvestbatch.vo.FarmingPlantReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landplan.vo.*; -import cn.iocoder.yudao.module.product.convert.landplan.LandPlanConvert; -import cn.iocoder.yudao.module.product.dal.dataobject.landplan.LandPlanDO; -import cn.iocoder.yudao.module.product.service.landplan.LandPlanService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.List; - -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - -@Api(tags = "管理后台 - 种植计划") -@RestController -@RequestMapping("/product/land-plan") -@Validated -public class LandPlanController { - - @Resource - private LandPlanService landPlanService; - - @PostMapping("/create") - @ApiOperation("创建地块作业计划") -// @PreAuthorize("@ss.hasPermission('product:land-plan:create')") - public CommonResult createLandPlan(@Valid @RequestBody LandPlanCreateReqVO createReqVO) { - Long landPlan = landPlanService.createLandPlan(createReqVO); - return success(landPlan); - } - - @PostMapping("/createList") - @ApiOperation("批量创建地块作业计划") - @PreAuthorize("@ss.hasPermission('product:land-plan:create')") - public CommonResult> createLandPlanList(@Valid @RequestBody List createReqVOList) { - List landPlanList = landPlanService.createLandPlanList(createReqVOList); - return success(landPlanList); - } - - @PutMapping("/update") - @ApiOperation("更新地块作业计划") - @PreAuthorize("@ss.hasPermission('product:land-plan:update')") - public CommonResult updateLandPlan(@Valid @RequestBody LandPlanUpdateReqVO updateReqVO) { - landPlanService.updateLandPlan(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @ApiOperation("删除地块作业计划") - @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:land-plan:delete')") - public CommonResult deleteLandPlan(@RequestParam("id") Long id) { - landPlanService.deleteLandPlan(id); - return success(true); - } - - @GetMapping("/get") - @ApiOperation("获得地块作业计划") - @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) - @PreAuthorize("@ss.hasPermission('product:land-plan:query')") - public CommonResult getLandPlan(@RequestParam("id") Long id) { - LandPlanDO landPlan = landPlanService.getLandPlan(id); - return success(LandPlanConvert.INSTANCE.convert(landPlan)); - } - - @GetMapping("/getLandPlanByGoodsId") - @ApiOperation("获得地块作业计划列表") - @ApiImplicitParam(name = "goodsId", value = "商品编码", required = true, example = "GOCD202304131028TSOC", dataTypeClass = String.class) - @PreAuthorize("@ss.hasPermission('product:land-plan:query')") - public CommonResult> getLandPlanByGoodsId(@RequestParam("goodsId") String goodsId) { - List list = landPlanService.getLandPlanByGoodsId(goodsId); - return success(LandPlanConvert.INSTANCE.convertList(list)); - } - - @GetMapping("/page") - @ApiOperation("获得地块作业计划分页") - @PreAuthorize("@ss.hasPermission('product:land-plan:query')") - public CommonResult> getLandPlanPage(@Valid LandPlanPageReqVO pageVO) { - PageResult pageResult = landPlanService.getLandPlanPage(pageVO); - return success(LandPlanConvert.INSTANCE.convertPage(pageResult)); - } - - @GetMapping("/getLandPlanForFarmingConfig") - @ApiOperation("获得地块作业计划列表，用于农事活动配置") - @PreAuthorize("@ss.hasPermission('product:land-plan:query')") - public CommonResult> getLandPlanForFarmingConfig(LandPlanReqVO params) { - return success(landPlanService.getLandPlanForFarmingConfig(params.getGoodsId(), params.getIds(), params.getPlanIds(), BlockStateEnum.ACTIVATION.getBlockState())); - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanBaseVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanBaseVO.java deleted file mode 100644 index 1f3f486..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanBaseVO.java +++ /dev/null @@ -1,58 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landplan.vo; - -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.validation.constraints.NotNull; -import java.util.Date; - -/** -* 地块作业计划 Base VO，提供给添加、修改、详细的子 VO 使用 -* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 -*/ -@Data -public class LandPlanBaseVO { - - @ApiModelProperty(value = "地块ID", required = true) - @NotNull(message = "地块ID不能为空") - private String landId; - - @ApiModelProperty(value = "地块名称", required = true) - @NotNull(message = "地块名称不能为空") - private String landName; - - @ApiModelProperty(value = "种植计划ID", required = true) - private String landPlanId; - - @ApiModelProperty(value = "商品ID", required = true) - @NotNull(message = "商品ID不能为空") - private String goodsId; - - @ApiModelProperty(value = "商品名称", required = true) - @NotNull(message = "商品名称不能为空") - private String goodsName; - - @ApiModelProperty(value = "计划种植时间", required = true) - @NotNull(message = "计划种植时间不能为空") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date planStartTime; - - @ApiModelProperty(value = "计划收获时间", required = true) - @NotNull(message = "计划收获时间不能为空") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date planEndTime; - - @ApiModelProperty(value = "所属商户id", required = true) - @NotNull(message = "所属商户id不能为空") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称", required = true) - @NotNull(message = "所属商户名称不能为空") - private String belongBusinessName; - - @ApiModelProperty(value = "备注") - private String remark; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanCreateReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanCreateReqVO.java deleted file mode 100644 index 4fe34cf..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanCreateReqVO.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landplan.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -@ApiModel("管理后台 - 地块作业计划创建 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class LandPlanCreateReqVO extends LandPlanBaseVO { - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanExcelVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanExcelVO.java deleted file mode 100644 index 491244c..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanExcelVO.java +++ /dev/null @@ -1,53 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landplan.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; - -import com.alibaba.excel.annotation.ExcelProperty; - -/** - * 地块作业计划 Excel VO - * - * @author 芋道源码 - */ -@Data -public class LandPlanExcelVO { - - @ExcelProperty("编码") - private Long id; - - @ExcelProperty("地块ID") - private String landId; - - @ExcelProperty("地块名称") - private String landName; - - @ExcelProperty("种植计划ID") - private String landPlanId; - - @ExcelProperty("商品ID") - private String goodsId; - - @ExcelProperty("商品名称") - private String goodsName; - - @ExcelProperty("计划种植时间") - private Date planStartTime; - - @ExcelProperty("计划收获时间") - private Date planEndTime; - - @ExcelProperty("所属商户id") - private Long belongBusinessId; - - @ExcelProperty("所属商户名称") - private String belongBusinessName; - - @ExcelProperty("备注") - private String remark; - - @ExcelProperty("创建时间") - private Date createTime; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanExportReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanExportReqVO.java deleted file mode 100644 index ac1c47f..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanExportReqVO.java +++ /dev/null @@ -1,50 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landplan.vo; - -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; - -@ApiModel(value = "管理后台 - 地块作业计划 Excel 导出 Request VO", description = "参数和 LandPlanPageReqVO 是一致的") -@Data -public class LandPlanExportReqVO { - - @ApiModelProperty(value = "地块ID") - private String landId; - - @ApiModelProperty(value = "地块名称") - private String landName; - - @ApiModelProperty(value = "种植计划ID") - private String landPlanId; - - @ApiModelProperty(value = "商品ID") - private String goodsId; - - @ApiModelProperty(value = "商品名称") - private String goodsName; - - @ApiModelProperty(value = "计划种植时间") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date[] planStartTime; - - @ApiModelProperty(value = "计划收获时间") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date[] planEndTime; - - @ApiModelProperty(value = "所属商户id") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称") - private String belongBusinessName; - - @ApiModelProperty(value = "备注") - private String remark; - - @ApiModelProperty(value = "创建时间") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date[] createTime; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanPageReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanPageReqVO.java deleted file mode 100644 index 675cfe0..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanPageReqVO.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landplan.vo; - -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; - -@ApiModel("管理后台 - 地块作业计划分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class LandPlanPageReqVO extends PageParam { - - @ApiModelProperty(value = "地块ID") - private String landId; - - @ApiModelProperty(value = "地块名称") - private String landName; - - @ApiModelProperty(value = "种植计划ID") - private String landPlanId; - - @ApiModelProperty(value = "商品ID") - private String goodsId; - - @ApiModelProperty(value = "商品名称") - private String goodsName; - - @ApiModelProperty(value = "计划种植时间") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date[] planStartTime; - - @ApiModelProperty(value = "计划收获时间") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date[] planEndTime; - - @ApiModelProperty(value = "所属商户id") - private Long belongBusinessId; - - @ApiModelProperty(value = "所属商户名称") - private String belongBusinessName; - - @ApiModelProperty(value = "备注") - private String remark; - - @ApiModelProperty(value = "创建时间") - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date[] createTime; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanReqVO.java deleted file mode 100644 index 3f6a1ef..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanReqVO.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landplan.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotNull; -import java.util.List; - -@ApiModel("管理后台 - 地块作业计划 Response VO") -@Data -public class LandPlanReqVO { - - @ApiModelProperty(value = "商品编码") - @NotNull(message = "商品编码不能为空") - private String goodsId; - - @ApiModelProperty(value = "编码集合") - private List planIds; - - @ApiModelProperty(value = "主键ID集合") - private List ids; -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanRespVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanRespVO.java deleted file mode 100644 index df7d1e6..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanRespVO.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landplan.vo; - -import cn.iocoder.yudao.module.product.controller.admin.landjob.vo.LandJobRespVO; -import lombok.*; -import io.swagger.annotations.*; - -import java.util.Date; -import java.util.List; - -@ApiModel("管理后台 - 地块作业计划 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class LandPlanRespVO extends LandPlanBaseVO { - - @ApiModelProperty(value = "编码", required = true) - private Long id; - - @ApiModelProperty(value = "地块类型：0：地块 1：鱼塘 2：牧场") - private Integer landType; - - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "地块作业集合") - private List landJobs; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanUpdateReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanUpdateReqVO.java deleted file mode 100644 index a31956a..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/landplan/vo/LandPlanUpdateReqVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.admin.landplan.vo; - -import lombok.*; -import java.util.*; -import io.swagger.annotations.*; -import javax.validation.constraints.*; - -@ApiModel("管理后台 - 地块作业计划更新 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class LandPlanUpdateReqVO extends LandPlanBaseVO { - - @ApiModelProperty(value = "编码", required = true) - @NotNull(message = "编码不能为空") - private Long id; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/statistics/StatisticsController.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/statistics/StatisticsController.java index 6520b18..26e97ef 100644 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/statistics/StatisticsController.java +++ b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/statistics/StatisticsController.java @@ -3,9 +3,7 @@ package cn.iocoder.yudao.module.product.controller.admin.statistics; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.product.controller.admin.envdata.vo.EnvDataRespVO; import cn.iocoder.yudao.module.product.controller.admin.statistics.vo.HarvestInfoDataRespVO; -import cn.iocoder.yudao.module.product.controller.admin.statistics.vo.InputsBuyDataRespVO; import cn.iocoder.yudao.module.product.controller.admin.statistics.vo.TopDataRespVO; -import cn.iocoder.yudao.module.product.dal.dataobject.landjob.LandJobDO; import cn.iocoder.yudao.module.product.service.statistics.StatisticsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -41,20 +39,6 @@ public class StatisticsController { return CommonResult.success(statisticsService.getHarvestInfoDataStatistics()); } - @GetMapping("/inputsBuyData") - @ApiOperation("获得首页投入品采购的数据统计") - @PreAuthorize("@ss.hasPermission('product:land-info:query')") - public CommonResult getInputsBuyDataStatistics() { - return CommonResult.success(statisticsService.getInputsBuyDataStatistics()); - } - - @GetMapping("/landJobStatistics") - @ApiOperation("获取首页农事数据记录") - @PreAuthorize("@ss.hasPermission('product:land-info:query')") - public CommonResult> getLandJobList10Records() { - return CommonResult.success(statisticsService.getLandJobListStatistics()); - } - @GetMapping("/avgEnvData") @ApiOperation("获得首页环境数据统计") @PreAuthorize("@ss.hasPermission('product:land-info:query')") diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/statistics/vo/TopDataRespVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/statistics/vo/TopDataRespVO.java index e2614a5..f706af1 100644 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/statistics/vo/TopDataRespVO.java +++ b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/statistics/vo/TopDataRespVO.java @@ -8,12 +8,6 @@ import java.math.BigDecimal; @Data public class TopDataRespVO { - @ApiModelProperty(value = "地块数量") - private Integer landCount; - - @ApiModelProperty(value = "地块面积") - private BigDecimal totalLandSize; - @ApiModelProperty(value = "商品类型数") private Integer goodsTypeCount; diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/inputsbatch/InputsBatchAppController.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/inputsbatch/InputsBatchAppController.java deleted file mode 100644 index 4f7281a..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/inputsbatch/InputsBatchAppController.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.app.inputsbatch; - -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.product.service.inputsbatch.InputsBatchService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import javax.annotation.security.PermitAll; -import java.util.List; - -@Api(tags = "APP移动端 - 投入品批次") -@RestController -@RequestMapping("/product/inputs-batch") -@Validated -public class InputsBatchAppController { - - @Resource - private InputsBatchService inputsBatchService; - - @GetMapping("/getInputsBatchInputsBatchIdList") - @PermitAll // 无需登陆 - @ApiOperation("根据投入品id获取所有投入品批次") - @ApiImplicitParam(name = "inputsId", value = "投入品编码", required = true, example = "INCD202304061557C3VM", dataTypeClass = Integer.class) - public CommonResult> getInputsBatchInputsBatchIdList(@RequestParam("inputsId") String inputsId) { - List inputsBatchInputsBatchIdList = inputsBatchService.getInputsBatchInputsBatchIdList(inputsId); - return CommonResult.success(inputsBatchInputsBatchIdList); - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/landinfo/LandInfoAppController.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/landinfo/LandInfoAppController.java deleted file mode 100644 index 0b0d5c2..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/landinfo/LandInfoAppController.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.app.landinfo; - -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.product.controller.admin.landinfo.vo.LandInfoRespVO; -import cn.iocoder.yudao.module.product.convert.landinfo.LandInfoConvert; -import cn.iocoder.yudao.module.product.service.landinfo.LandInfoService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import javax.annotation.security.PermitAll; -import java.util.List; - -@Api(tags = "APP移动端 - 地块信息") -@RestController -@RequestMapping("/product/land-info") -@Validated -public class LandInfoAppController { - - @Resource - private LandInfoService landInfoService; - - @GetMapping("/getLandByBussinessInfoId") - @PermitAll // 无需登陆 - @ApiOperation("根据商户ID获取地块信息") - @ApiImplicitParam(name = "belongBusinessId", value = "商户ID", required = true, example = "1", dataTypeClass = Long.class) - public CommonResult> getLandByBussinessInfoId(@RequestParam("belongBusinessId") Long belongBusinessId) { - return CommonResult.success(LandInfoConvert.INSTANCE.convertList(landInfoService.getLandInfoByBelongBusinessId(belongBusinessId))); - } -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/landjob/LandJobAppController.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/landjob/LandJobAppController.java deleted file mode 100644 index f6f8d46..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/landjob/LandJobAppController.java +++ /dev/null @@ -1,54 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.app.landjob; - -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.module.product.controller.admin.landjob.vo.LandJobCreateOfAppReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landjob.vo.LandJobRespVO; -import cn.iocoder.yudao.module.product.controller.app.landjob.vo.FileUploadReqVO; -import cn.iocoder.yudao.module.product.controller.app.landjob.vo.LandJobReqVO; -import cn.iocoder.yudao.module.product.service.landjob.LandJobService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.annotation.security.PermitAll; -import javax.validation.Valid; -import java.util.List; - -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - -@Api(tags = "APP移动端 - 种植作业") -@RestController -@RequestMapping("/product/land-job") -@Validated -public class LandJobAppController { - - @Resource - private LandJobService landJobService; - - @GetMapping("/getSameTypeJobById") - @PermitAll // 无需登陆 - @ApiOperation("获得同类型的农事作业") - public CommonResult> getSameTypeJobById(@Valid LandJobReqVO landJobReqVO) { - return CommonResult.success(landJobService.getSameTypeJobById(landJobReqVO)); - } - - @PostMapping("/upload") - @PermitAll - @ApiOperation("上传文件") - @OperateLog(logArgs = false) // 上传文件，没有记录操作日志的必要 - public CommonResult uploadFile(@Valid FileUploadReqVO uploadReqVO) throws Exception { - return success(landJobService.upload(uploadReqVO)); - } - - @PostMapping("/create") - @PermitAll // 无需登陆 - @ApiOperation("创建种植/养殖/畜牧作业") - @OperateLog(enable = false) // 避免 Post 请求被记录操作日志 - public CommonResult create(@Valid @RequestBody LandJobCreateOfAppReqVO createReqVO) { - return CommonResult.success(landJobService.createLandJobByApp(createReqVO)); - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/landjob/vo/FileUploadReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/landjob/vo/FileUploadReqVO.java deleted file mode 100644 index b8bd1fc..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/landjob/vo/FileUploadReqVO.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.app.landjob.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.constraints.NotNull; - -@ApiModel(value = "app移动端 - 上传文件 Request VO") -@Data -public class FileUploadReqVO { - - @ApiModelProperty(value = "文件附件", required = true) - @NotNull(message = "文件附件不能为空") - private MultipartFile file; - - @ApiModelProperty(value = "文件附件", example = "yudaoyuanma.png") - private String path; - - @ApiModelProperty(value = "商户ID", required = true) - @NotNull(message = "商户ID不能为空") - private Long businessInfoId; - - @ApiModelProperty(value = "openid", required = true) - @NotNull(message = "openid不能为空") - private String openid; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/landjob/vo/LandJobReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/landjob/vo/LandJobReqVO.java deleted file mode 100644 index 99096c5..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/landjob/vo/LandJobReqVO.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.app.landjob.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotNull; - -@ApiModel("app端 - 地块作业 Request VO") -@Data -public class LandJobReqVO { - - @ApiModelProperty(value = "操作对象ID") - @NotNull - private Long objId; - - @ApiModelProperty(value = "操作类型") - @NotNull - private Integer operateType; - - @ApiModelProperty(value = "天数，默认30天") - private Integer day = 30; -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/landjobtype/LandJobTypeAppController.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/landjobtype/LandJobTypeAppController.java deleted file mode 100644 index fed5214..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/landjobtype/LandJobTypeAppController.java +++ /dev/null @@ -1,37 +0,0 @@ -package cn.iocoder.yudao.module.product.controller.app.landjobtype; - -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.product.controller.admin.landjobtype.vo.LandJobTypeRespVO; -import cn.iocoder.yudao.module.product.convert.landjobtype.LandJobTypeConvert; -import cn.iocoder.yudao.module.product.service.landjobtype.LandJobTypeService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import javax.annotation.security.PermitAll; -import java.util.List; - -@Api(tags = "APP移动端 - 地块作业类型") -@RestController -@RequestMapping("/product/land-job-type") -@Validated -public class LandJobTypeAppController { - - @Resource - private LandJobTypeService landJobTypeService; - - @GetMapping("/getLandJobTypes") - @PermitAll // 无需登陆 - @ApiOperation("根据商户ID获取地块作业类型") - @ApiImplicitParam(name = "belongBusinessId", value = "商户ID", required = true, example = "1", dataTypeClass = Long.class) - public CommonResult> getLandJobTypes(@RequestParam("belongBusinessId") Long belongBusinessId) { - return CommonResult.success(LandJobTypeConvert.INSTANCE.convertList(landJobTypeService.getByBusinessInfoId(belongBusinessId))); - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/inputsbatch/InputsBatchConvert.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/inputsbatch/InputsBatchConvert.java deleted file mode 100644 index 21cb13b..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/inputsbatch/InputsBatchConvert.java +++ /dev/null @@ -1,41 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.inputsbatch; - -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -import cn.iocoder.yudao.module.basic.api.goodsinputrelational.dto.InputInfoRelationalRespDTO; -import cn.iocoder.yudao.module.product.api.inputsbatch.dto.InputsBatchDTO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; -import cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo.*; -import cn.iocoder.yudao.module.product.dal.dataobject.inputsbatch.InputsBatchDO; - -/** - * 投入品批次 Convert - * - * @author 芋道源码 - */ -@Mapper -public interface InputsBatchConvert { - - InputsBatchConvert INSTANCE = Mappers.getMapper(InputsBatchConvert.class); - - InputsBatchDO convert(InputsBatchCreateReqVO bean); - - InputsBatchDO convert(InputsBatchSaveReqVO bean); - - InputsBatchRespVO convert(InputsBatchDO bean); - - List convertList(List list); - - PageResult convertPage(PageResult page); - - List convertList02(List list); - - List convertListForCreate(List list); - - List convertOfDTOList(List goodsInfos); - - List convertInputsBatchDOToDTOList(List goodsInfos); -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/inputsbuy/InputsBuyConvert.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/inputsbuy/InputsBuyConvert.java deleted file mode 100644 index 3537d32..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/inputsbuy/InputsBuyConvert.java +++ /dev/null @@ -1,39 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.inputsbuy; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.basic.api.goodsinfo.dto.GoodsInfoRespDTO; -import cn.iocoder.yudao.module.product.api.inputsbuy.dto.InputsBuyDTO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo.GoodsInfoReqVO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo.InputsBuyCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo.InputsBuyRespVO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo.InputsBuyUpdateReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.inputsbuy.InputsBuyDO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * 投入品采购 Convert - * - * @author 芋道源码 - */ -@Mapper -public interface InputsBuyConvert { - - InputsBuyConvert INSTANCE = Mappers.getMapper(InputsBuyConvert.class); - - InputsBuyDO convert(InputsBuyCreateReqVO bean); - - InputsBuyDO convert(InputsBuyUpdateReqVO bean); - - InputsBuyRespVO convert(InputsBuyDO bean); - - List convertList(List list); - - PageResult convertPage(PageResult page); - - List convertToGoodsInfoList(List list); - - List convertToInputsBuyDTOList(List list); -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/landblockstate/LandBlockStateConvert.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/landblockstate/LandBlockStateConvert.java deleted file mode 100644 index 4afab62..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/landblockstate/LandBlockStateConvert.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.landblockstate; - -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; -import cn.iocoder.yudao.module.product.controller.admin.landblockstate.vo.*; -import cn.iocoder.yudao.module.product.dal.dataobject.landblockstate.LandBlockStateDO; - -/** - * 地块状态 Convert - * - * @author 芋道源码 - */ -@Mapper -public interface LandBlockStateConvert { - - LandBlockStateConvert INSTANCE = Mappers.getMapper(LandBlockStateConvert.class); - - LandBlockStateDO convert(LandBlockStateCreateReqVO bean); - - LandBlockStateDO convert(LandBlockStateUpdateReqVO bean); - - LandBlockStateRespVO convert(LandBlockStateDO bean); - - List convertList(List list); - - PageResult convertPage(PageResult page); - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/landinfo/LandInfoConvert.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/landinfo/LandInfoConvert.java deleted file mode 100644 index 274e708..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/landinfo/LandInfoConvert.java +++ /dev/null @@ -1,34 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.landinfo; - -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; -import cn.iocoder.yudao.module.product.controller.admin.landinfo.vo.*; -import cn.iocoder.yudao.module.product.dal.dataobject.landinfo.LandInfoDO; - -/** - * 农事土地信息 Convert - * - * @author 芋道源码 - */ -@Mapper -public interface LandInfoConvert { - - LandInfoConvert INSTANCE = Mappers.getMapper(LandInfoConvert.class); - - LandInfoDO convert(LandInfoCreateReqVO bean); - - LandInfoDO convert(LandInfoUpdateReqVO bean); - - LandInfoRespVO convert(LandInfoDO bean); - - List convertList(List list); - - PageResult convertPage(PageResult page); - - List convertList02(List list); - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/landinfotype/LandInfoTypeConvert.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/landinfotype/LandInfoTypeConvert.java deleted file mode 100644 index 9cacea6..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/landinfotype/LandInfoTypeConvert.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.landinfotype; - -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; -import cn.iocoder.yudao.module.product.controller.admin.landinfotype.vo.*; -import cn.iocoder.yudao.module.product.dal.dataobject.landinfotype.LandInfoTypeDO; - -/** - * 地块类型 Convert - * - * @author 芋道源码 - */ -@Mapper -public interface LandInfoTypeConvert { - - LandInfoTypeConvert INSTANCE = Mappers.getMapper(LandInfoTypeConvert.class); - - LandInfoTypeDO convert(LandInfoTypeCreateReqVO bean); - - LandInfoTypeDO convert(LandInfoTypeUpdateReqVO bean); - - LandInfoTypeRespVO convert(LandInfoTypeDO bean); - - List convertList(List list); - - PageResult convertPage(PageResult page); - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/landjob/LandJobConvert.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/landjob/LandJobConvert.java deleted file mode 100644 index fde8ec7..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/landjob/LandJobConvert.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.landjob; - -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -import cn.iocoder.yudao.module.product.api.landjob.dto.LandJobDTO; -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.LandJobInputsSaveReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.landjobinputs.LandJobInputsDO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; -import cn.iocoder.yudao.module.product.controller.admin.landjob.vo.*; -import cn.iocoder.yudao.module.product.dal.dataobject.landjob.LandJobDO; - -/** - * 种植/养殖/畜牧作业 Convert - * - * @author 芋道源码 - */ -@Mapper -public interface LandJobConvert { - - LandJobConvert INSTANCE = Mappers.getMapper(LandJobConvert.class); - - LandJobDO convert(LandJobCreateReqVO bean); - - LandJobDO convert(LandJobUpdateReqVO bean); - - LandJobRespVO convert(LandJobDO bean); - - List convertList(List list); - - PageResult convertPage(PageResult page); - - List convertList02(List list); - - List convertListCreate(List jobWorkerIds); - - List convertToLandJobDTOList(List list); -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/landjobinputs/LandJobInputsConvert.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/landjobinputs/LandJobInputsConvert.java deleted file mode 100644 index 284656b..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/landjobinputs/LandJobInputsConvert.java +++ /dev/null @@ -1,38 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.landjobinputs; - -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.*; -import cn.iocoder.yudao.module.product.dal.dataobject.landjobinputs.LandJobInputsDO; - -/** - * 地块作业投入品 Convert - * - * @author 芋道源码 - */ -@Mapper -public interface LandJobInputsConvert { - - LandJobInputsConvert INSTANCE = Mappers.getMapper(LandJobInputsConvert.class); - - LandJobInputsDO convert(LandJobInputsCreateReqVO bean); - - LandJobInputsDO convert(LandJobInputsSaveReqVO bean); - - LandJobInputsDO convert(LandJobInputsUpdateReqVO bean); - - LandJobInputsRespVO convert(LandJobInputsDO bean); - - List convertList(List list); - - PageResult convertPage(PageResult page); - - List convertList02(List list); - - List convertListCreate(Listlist); - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/landjobtype/LandJobTypeConvert.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/landjobtype/LandJobTypeConvert.java deleted file mode 100644 index d2ff9b8..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/landjobtype/LandJobTypeConvert.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.landjobtype; - -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; -import cn.iocoder.yudao.module.product.controller.admin.landjobtype.vo.*; -import cn.iocoder.yudao.module.product.dal.dataobject.landjobtype.LandJobTypeDO; - -/** - * 作业类型 Convert - * - * @author 芋道源码 - */ -@Mapper -public interface LandJobTypeConvert { - - LandJobTypeConvert INSTANCE = Mappers.getMapper(LandJobTypeConvert.class); - - LandJobTypeDO convert(LandJobTypeCreateReqVO bean); - - LandJobTypeDO convert(LandJobTypeUpdateReqVO bean); - - LandJobTypeRespVO convert(LandJobTypeDO bean); - - List convertList(List list); - - PageResult convertPage(PageResult page); - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/landplan/LandPlanConvert.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/landplan/LandPlanConvert.java deleted file mode 100644 index 25ee85a..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/landplan/LandPlanConvert.java +++ /dev/null @@ -1,34 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.landplan; - -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; -import cn.iocoder.yudao.module.product.controller.admin.landplan.vo.*; -import cn.iocoder.yudao.module.product.dal.dataobject.landplan.LandPlanDO; - -/** - * 地块作业计划 Convert - * - * @author 芋道源码 - */ -@Mapper -public interface LandPlanConvert { - - LandPlanConvert INSTANCE = Mappers.getMapper(LandPlanConvert.class); - - LandPlanDO convert(LandPlanCreateReqVO bean); - - LandPlanDO convert(LandPlanUpdateReqVO bean); - - LandPlanRespVO convert(LandPlanDO bean); - - List convertList(List list); - - PageResult convertPage(PageResult page); - - List convertList02(List list); - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/deviceinfo/DeviceInfoDO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/deviceinfo/DeviceInfoDO.java index b936c8b..6f29af3 100644 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/deviceinfo/DeviceInfoDO.java +++ b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/deviceinfo/DeviceInfoDO.java @@ -30,10 +30,6 @@ public class DeviceInfoDO extends BaseDO { * 设备名称 */ private String deviceName; - /** - * 地块/鱼塘/牧场编码 - */ - private String landId; /** * 网关类型： 1：必联 2：有人 */ diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/inputsbatch/InputsBatchDO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/inputsbatch/InputsBatchDO.java deleted file mode 100644 index 9d28bff..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/inputsbatch/InputsBatchDO.java +++ /dev/null @@ -1,96 +0,0 @@ -package cn.iocoder.yudao.module.product.dal.dataobject.inputsbatch; - -import lombok.*; -import java.util.*; -import java.math.BigDecimal; -import java.math.BigDecimal; -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; - -/** - * 投入品批次 DO - * - * @author 芋道源码 - */ -@TableName("product_inputs_batch") -@KeySequence("product_inputs_batch_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class InputsBatchDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 投入品名称 - */ - private String inputsName; - /** - * 投入品ID - */ - private String inputsId; - /** - * 投入品批次ID - */ - private String inputsBatchId; - /** - * 投入品采购单号 - */ - private String inputsBuyId; - /** - * 生产日期 - */ - private Date productData; - /** - * 投入品数量 - */ - private Integer inputsNum; - /** - * 投入品单位 - */ - private String inputsUnit; - /** - * 投入品总量 - */ - private BigDecimal inputsWeight; - /** - * 投入品单价 - */ - private BigDecimal inputsUnitPrice; - /** - * 投入品总价 - */ - private BigDecimal totalPrice; - /** - * 备注 - */ - private String remarks; - /** - * 上链状态 0：未上链 1：激活状态 2：冻结状态 - */ - private Integer blockState; - /** - * 批次上链区块id - */ - private String blockChainId; - /** - * 批次上链区块唯一识别码 - */ - private String blockChainBlockIdentity; - /** - * 所属商户id - */ - private Long belongBusinessId; - /** - * 所属商户名称 - */ - private String belongBusinessName; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/inputsbuy/InputsBuyDO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/inputsbuy/InputsBuyDO.java deleted file mode 100644 index 056a1c4..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/inputsbuy/InputsBuyDO.java +++ /dev/null @@ -1,69 +0,0 @@ -package cn.iocoder.yudao.module.product.dal.dataobject.inputsbuy; - -import lombok.*; -import java.util.*; -import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; - -/** - * 投入品采购 DO - * - * @author 芋道源码 - */ -@TableName("product_inputs_buy") -@KeySequence("product_inputs_buy_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class InputsBuyDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 投入品采购单号 - */ - private String inputsBuyId; - /** - * 关联出库单号 - */ - private String relateOutboundId; - /** - * 供应商名称 - */ - private String vendorName; - /** - * 供应商id - */ - private String vendorId; - /** - * 入库时间 - */ - private Date inputsBuyTime; - /** - * 上链状态 0：未上链 1：激活状态 2：冻结状态 - */ - private Integer blockState; - /** - * 批次上链区块id - */ - private String blockChainId; - /** - * 批次上链区块唯一识别码 - */ - private String blockChainBlockIdentity; - /** - * 所属商户id - */ - private Long belongBusinessId; - /** - * 所属商户名称 - */ - private String belongBusinessName; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/landblockstate/LandBlockStateDO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/landblockstate/LandBlockStateDO.java deleted file mode 100644 index c92424c..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/landblockstate/LandBlockStateDO.java +++ /dev/null @@ -1,41 +0,0 @@ -package cn.iocoder.yudao.module.product.dal.dataobject.landblockstate; - -import lombok.*; -import java.util.*; -import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; - -/** - * 地块状态 DO - * - * @author 芋道源码 - */ -@TableName("product_land_block_state") -@KeySequence("product_land_block_state_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class LandBlockStateDO extends BaseDO { - - /** - * 编码 - */ - @TableId - private Long id; - /** - * 地块状态 - */ - private String landStateName; - /** - * 所属商户id - */ - private Long belongBusinessId; - /** - * 所属商户名称 - */ - private String belongBusinessName; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/landinfo/LandInfoDO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/landinfo/LandInfoDO.java deleted file mode 100644 index 9c4fa01..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/landinfo/LandInfoDO.java +++ /dev/null @@ -1,79 +0,0 @@ -package cn.iocoder.yudao.module.product.dal.dataobject.landinfo; - -import lombok.*; - -import java.math.BigDecimal; -import java.util.*; -import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; - -/** - * 农事土地信息 DO - * - * @author 芋道源码 - */ -@TableName("product_land_info") -@KeySequence("product_land_info_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class LandInfoDO extends BaseDO { - - /** - * 编码 - */ - @TableId - private Long id; - /** - * 地块/鱼塘/牧场名称 - */ - private String landName; - /** - * 地块/鱼塘/牧场编码 - */ - private String landId; - /** - * 面积 - */ - private BigDecimal size; - /** - * 地块状态 关联block_state表id - */ - private Long state; - /** - * 备注 - */ - private String remarks; - /** - * 地块类型 关联info_type表id - */ - private Long landType; - /** - * 所属商户id - */ - private Long belongBusinessId; - /** - * 所属商户名称 - */ - private String belongBusinessName; - /** - * 租户id - */ - private Long tenantId; - - /** - * 地块类型（String） 为了显示 - */ - @TableField(exist = false) - private String infoTypeName; - - /** - * 地块状态（String） 为了显示 - */ - @TableField(exist = false) - private String infoStateName; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/landinfotype/LandInfoTypeDO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/landinfotype/LandInfoTypeDO.java deleted file mode 100644 index 7d65994..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/landinfotype/LandInfoTypeDO.java +++ /dev/null @@ -1,41 +0,0 @@ -package cn.iocoder.yudao.module.product.dal.dataobject.landinfotype; - -import lombok.*; -import java.util.*; -import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; - -/** - * 地块类型 DO - * - * @author 芋道源码 - */ -@TableName("product_land_info_type") -@KeySequence("product_land_info_type_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class LandInfoTypeDO extends BaseDO { - - /** - * 编码 - */ - @TableId - private Long id; - /** - * 地块类型 - */ - private String landTypeName; - /** - * 所属商户id - */ - private Long belongBusinessId; - /** - * 所属商户名称 - */ - private String belongBusinessName; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/landjob/LandJobDO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/landjob/LandJobDO.java deleted file mode 100644 index dd86b0c..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/landjob/LandJobDO.java +++ /dev/null @@ -1,100 +0,0 @@ -package cn.iocoder.yudao.module.product.dal.dataobject.landjob; - -import io.swagger.annotations.ApiModelProperty; -import lombok.*; -import java.util.*; -import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; - -/** - * 种植/养殖/畜牧作业 DO - * - * @author 芋道源码 - */ -@TableName("product_land_job") -@KeySequence("product_land_job_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class LandJobDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 地块ID - */ - private String landId; - /** - * 地块名称 - */ - private String landName; - /** - * 种植作业ID - */ - private String landJobId; - /** - * 类型：0：地块 1：鱼塘 2：牧场 - */ - private Long landType; - /** - * 任务类型 - */ - private Long jobType; - /** - * 作业员工 - */ - private String jobWorker; - /** - * 作业ID - */ - private Long jobWorkerId; - /** - * 作业日期 - */ - private Date jobDate; - /** - * 备注 - */ - private String remarks; - /** - * 所属商户id - */ - private Long belongBusinessId; - /** - * 所属商户名称 - */ - private String belongBusinessName; - /** - * 上链状态 0：未上链 1：激活状态 2：冻结状态 - */ - private Integer blockState; - /** - * 批次上链区块id - */ - private String blockChainId; - /** - * 批次上链区块唯一识别码 - */ - private String blockChainBlockIdentity; - /** - * 作业图片 - */ - private String jobImgUrl; - /** - * 作业视频 - */ - @TableField(updateStrategy = FieldStrategy.IGNORED) // 为了不被自动排空 - private String jobVideoUrl; - /** - * 任务类型（String） 为了显示 - */ - @TableField(exist = false) - private String jobTypeName; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/landjobinputs/LandJobInputsDO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/landjobinputs/LandJobInputsDO.java deleted file mode 100644 index 3c8db9b..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/landjobinputs/LandJobInputsDO.java +++ /dev/null @@ -1,76 +0,0 @@ -package cn.iocoder.yudao.module.product.dal.dataobject.landjobinputs; - -import lombok.*; -import java.util.*; -import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; - -/** - * 地块作业投入品 DO - * - * @author 芋道源码 - */ -@TableName("product_land_job_inputs") -@KeySequence("product_land_job_inputs_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class LandJobInputsDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 种植作业ID - */ - private String landJobId; - /** - * 投入品名称 - */ - private String inputsName; - /** - * 投入品ID - */ - private String inputsId; - /** - * 投入品批次ID - */ - private String inputsBatchId; - /** - * 投入品数量 - */ - private Integer inputsNum; - /** - * 投入品单位 - */ - private String inputsUnit; - /** - * 投入品描述 - */ - private String inputsDesc; - /** - * 所属商户id - */ - private Long belongBusinessId; - /** - * 所属商户名称 - */ - private String belongBusinessName; - - /** - * 上传地块投入品操作图片 - */ - private String inputsImgUrl; - - /** - * 上传地块投入品操作视频 - */ - @TableField(updateStrategy = FieldStrategy.IGNORED) // 为了不被自动排空 - private String inputsVideoUrl; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/landjobtype/LandJobTypeDO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/landjobtype/LandJobTypeDO.java deleted file mode 100644 index fdf2875..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/landjobtype/LandJobTypeDO.java +++ /dev/null @@ -1,41 +0,0 @@ -package cn.iocoder.yudao.module.product.dal.dataobject.landjobtype; - -import lombok.*; -import java.util.*; -import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; - -/** - * 作业类型 DO - * - * @author 芋道源码 - */ -@TableName("product_land_job_type") -@KeySequence("product_land_job_type_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class LandJobTypeDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 地块类型 - */ - private String typeName; - /** - * 所属商户id - */ - private Long belongBusinessId; - /** - * 所属商户名称 - */ - private String belongBusinessName; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/landplan/LandPlanDO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/landplan/LandPlanDO.java deleted file mode 100644 index 2417f1f..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/landplan/LandPlanDO.java +++ /dev/null @@ -1,69 +0,0 @@ -package cn.iocoder.yudao.module.product.dal.dataobject.landplan; - -import lombok.*; -import java.util.*; -import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; - -/** - * 地块作业计划 DO - * - * @author 芋道源码 - */ -@TableName("product_land_plan") -@KeySequence("product_land_plan_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class LandPlanDO extends BaseDO { - - /** - * 编码 - */ - @TableId - private Long id; - /** - * 地块ID - */ - private String landId; - /** - * 地块名称 - */ - private String landName; - /** - * 种植计划ID - */ - private String landPlanId; - /** - * 商品ID - */ - private String goodsId; - /** - * 商品名称 - */ - private String goodsName; - /** - * 计划种植时间 - */ - private Date planStartTime; - /** - * 计划收获时间 - */ - private Date planEndTime; - /** - * 所属商户id - */ - private Long belongBusinessId; - /** - * 所属商户名称 - */ - private String belongBusinessName; - /** - * 备注 - */ - private String remark; - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/deviceinfo/DeviceInfoMapper.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/deviceinfo/DeviceInfoMapper.java index 865829f..fe9cdb0 100644 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/deviceinfo/DeviceInfoMapper.java +++ b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/deviceinfo/DeviceInfoMapper.java @@ -21,7 +21,7 @@ public interface DeviceInfoMapper extends BaseMapperX { List selectDeviceInfoPage(Page page, @Param("pageReqVO") DeviceInfoPageReqVO pageReqVO); - List getDeviceEnvTypes(@Param("tenantId")Long tenantId, @Param("belongBusinessId")Long belongBusinessId, @Param("landId")String landId, + List getDeviceEnvTypes(@Param("tenantId")Long tenantId, @Param("belongBusinessId")Long belongBusinessId, @Param("deviceType")Integer deviceType, @Param("gatewayType")Integer gatewayType); } diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/inputsbatch/InputsBatchMapper.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/inputsbatch/InputsBatchMapper.java deleted file mode 100644 index 725a22f..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/inputsbatch/InputsBatchMapper.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.iocoder.yudao.module.product.dal.mysql.inputsbatch; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo.InputsBatchExportReqVO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo.InputsBatchPageReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.inputsbatch.InputsBatchDO; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 投入品批次 Mapper - * - * @author 芋道源码 - */ -@Mapper -public interface InputsBatchMapper extends BaseMapperX { - - default PageResult selectPage(InputsBatchPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(InputsBatchDO::getInputsName, reqVO.getInputsName()) - .eqIfPresent(InputsBatchDO::getInputsBatchId, reqVO.getInputsBatchId()) - .eqIfPresent(InputsBatchDO::getInputsBuyId, reqVO.getInputsBuyId()) - .eqIfPresent(InputsBatchDO::getProductData, reqVO.getProductData()) - // .eqIfPresent(InputsBatchDO::getBlockState, reqVO.getBlockState()) - .likeIfPresent(InputsBatchDO::getBelongBusinessName, reqVO.getBelongBusinessName()) - // .ne(InputsBatchDO::getBlockState, BlockStateEnum.NOT_ON_CHAIN.getBlockState()) - .orderByDesc(InputsBatchDO::getCreateTime)); - } - - default List selectList(InputsBatchExportReqVO reqVO) { - return selectList(new LambdaQueryWrapperX() - .likeIfPresent(InputsBatchDO::getInputsName, reqVO.getInputsName()) - .eqIfPresent(InputsBatchDO::getInputsId, reqVO.getInputsId()) - .eqIfPresent(InputsBatchDO::getInputsBatchId, reqVO.getInputsBatchId()) - .eqIfPresent(InputsBatchDO::getInputsBuyId, reqVO.getInputsBuyId()) - .eqIfPresent(InputsBatchDO::getProductData, reqVO.getProductData()) - .eqIfPresent(InputsBatchDO::getInputsNum, reqVO.getInputsNum()) - .eqIfPresent(InputsBatchDO::getInputsUnit, reqVO.getInputsUnit()) - .eqIfPresent(InputsBatchDO::getInputsWeight, reqVO.getInputsWeight()) - .eqIfPresent(InputsBatchDO::getInputsUnitPrice, reqVO.getInputsUnitPrice()) - .eqIfPresent(InputsBatchDO::getTotalPrice, reqVO.getTotalPrice()) - .eqIfPresent(InputsBatchDO::getRemarks, reqVO.getRemarks()) - .eqIfPresent(InputsBatchDO::getBlockState, reqVO.getBlockState()) - .eqIfPresent(InputsBatchDO::getBlockChainId, reqVO.getBlockChainId()) - .eqIfPresent(InputsBatchDO::getBlockChainBlockIdentity, reqVO.getBlockChainBlockIdentity()) - .eqIfPresent(InputsBatchDO::getBelongBusinessId, reqVO.getBelongBusinessId()) - .likeIfPresent(InputsBatchDO::getBelongBusinessName, reqVO.getBelongBusinessName()) - .betweenIfPresent(InputsBatchDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(InputsBatchDO::getId)); - } - - List queryInputsIdByInputsBuyId(String inputsBuyId); - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/inputsbuy/InputsBuyMapper.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/inputsbuy/InputsBuyMapper.java deleted file mode 100644 index c075be0..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/inputsbuy/InputsBuyMapper.java +++ /dev/null @@ -1,48 +0,0 @@ -package cn.iocoder.yudao.module.product.dal.mysql.inputsbuy; - -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo.InputsBuyPageReqVO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo.InputsBuyRespVO; -import cn.iocoder.yudao.module.product.controller.admin.statistics.vo.GoodsStatisticsDataRespVO; -import cn.iocoder.yudao.module.product.controller.admin.statistics.vo.InputsStatisticsDataRespVO; -import cn.iocoder.yudao.module.product.controller.admin.statistics.vo.MonthYOYRespVO; -import cn.iocoder.yudao.module.product.controller.admin.statistics.vo.WeekYOYRespVO; -import cn.iocoder.yudao.module.product.dal.dataobject.inputsbuy.InputsBuyDO; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.math.BigDecimal; -import java.util.List; - -/** - * 投入品采购 Mapper - * - * @author 芋道源码 - */ -@Mapper -public interface InputsBuyMapper extends BaseMapperX { - - List selectInputsBuyPage(Page page, @Param("pageReqVO") InputsBuyPageReqVO pageReqVO); - - /** - * 获得月同比数据 - */ - List getMonthYOYDatas(); - - /** - * 获得周同比数据 - */ - List getWeekYOYDatas(); - - /** - * 获得月统计的投入品采购数据 - */ - List getDatasGroupByGoodsId(@Param("type") String type); - - /** - * 获得今天的采购数量 - */ - BigDecimal getTodayInputBuyCount(); - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/landblockstate/LandBlockStateMapper.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/landblockstate/LandBlockStateMapper.java deleted file mode 100644 index 8f62161..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/landblockstate/LandBlockStateMapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.iocoder.yudao.module.product.dal.mysql.landblockstate; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.product.controller.admin.landblockstate.vo.LandBlockStatePageReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.landblockstate.LandBlockStateDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * 地块状态 Mapper - * - * @author 芋道源码 - */ -@Mapper -public interface LandBlockStateMapper extends BaseMapperX { - - default PageResult selectPage(LandBlockStatePageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(LandBlockStateDO::getLandStateName, reqVO.getLandStateName()) - .eqIfPresent(LandBlockStateDO::getBelongBusinessId, reqVO.getBelongBusinessId()) - .likeIfPresent(LandBlockStateDO::getBelongBusinessName, reqVO.getBelongBusinessName()) - .betweenIfPresent(LandBlockStateDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(LandBlockStateDO::getId)); - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/landinfo/LandInfoMapper.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/landinfo/LandInfoMapper.java deleted file mode 100644 index d70d46c..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/landinfo/LandInfoMapper.java +++ /dev/null @@ -1,59 +0,0 @@ -package cn.iocoder.yudao.module.product.dal.mysql.landinfo; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.product.controller.admin.landinfo.vo.LandInfoExportReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landinfo.vo.LandInfoPageReqVO; -import cn.iocoder.yudao.module.product.controller.admin.statistics.vo.TopDataRespVO; -import cn.iocoder.yudao.module.product.dal.dataobject.landinfo.LandInfoDO; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 农事土地信息 Mapper - * - * @author 芋道源码 - */ -@Mapper -public interface LandInfoMapper extends BaseMapperX { - - default PageResult selectPage(LandInfoPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(LandInfoDO::getLandName, reqVO.getLandName()) - .eqIfPresent(LandInfoDO::getLandId, reqVO.getLandId()) - .eqIfPresent(LandInfoDO::getSize, reqVO.getSize()) - .eqIfPresent(LandInfoDO::getState, reqVO.getState()) - .eqIfPresent(LandInfoDO::getRemarks, reqVO.getRemarks()) - .eqIfPresent(LandInfoDO::getLandType, reqVO.getLandType()) - .eqIfPresent(LandInfoDO::getBelongBusinessId, reqVO.getBelongBusinessId()) - .likeIfPresent(LandInfoDO::getBelongBusinessName, reqVO.getBelongBusinessName()) - .betweenIfPresent(LandInfoDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(LandInfoDO::getId)); - } - - default List selectList(LandInfoExportReqVO reqVO) { - return selectList(new LambdaQueryWrapperX() - .likeIfPresent(LandInfoDO::getLandName, reqVO.getLandName()) - .eqIfPresent(LandInfoDO::getLandId, reqVO.getLandId()) - .eqIfPresent(LandInfoDO::getSize, reqVO.getSize()) - .eqIfPresent(LandInfoDO::getState, reqVO.getState()) - .eqIfPresent(LandInfoDO::getRemarks, reqVO.getRemarks()) - .eqIfPresent(LandInfoDO::getLandType, reqVO.getLandType()) - .eqIfPresent(LandInfoDO::getBelongBusinessId, reqVO.getBelongBusinessId()) - .likeIfPresent(LandInfoDO::getBelongBusinessName, reqVO.getBelongBusinessName()) - .betweenIfPresent(LandInfoDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(LandInfoDO::getId)); - } - - IPage selectLandInfoById(IPage page, - @Param("landName") String landName, - @Param("landId") String landId, - @Param("belongBusinessName") String belongBusinessName, - @Param("state") Long state); - - TopDataRespVO getLandStatistics(); -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/landinfotype/LandInfoTypeMapper.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/landinfotype/LandInfoTypeMapper.java deleted file mode 100644 index dd6f6e2..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/landinfotype/LandInfoTypeMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.iocoder.yudao.module.product.dal.mysql.landinfotype; - -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.product.dal.dataobject.landinfotype.LandInfoTypeDO; -import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.product.controller.admin.landinfotype.vo.*; - -/** - * 地块类型 Mapper - * - * @author 芋道源码 - */ -@Mapper -public interface LandInfoTypeMapper extends BaseMapperX { - - default PageResult selectPage(LandInfoTypePageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(LandInfoTypeDO::getLandTypeName, reqVO.getLandTypeName()) - .eqIfPresent(LandInfoTypeDO::getBelongBusinessId, reqVO.getBelongBusinessId()) - .likeIfPresent(LandInfoTypeDO::getBelongBusinessName, reqVO.getBelongBusinessName()) - .betweenIfPresent(LandInfoTypeDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(LandInfoTypeDO::getId)); - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/landjob/LandJobMapper.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/landjob/LandJobMapper.java deleted file mode 100644 index 8d24d0f..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/landjob/LandJobMapper.java +++ /dev/null @@ -1,72 +0,0 @@ -package cn.iocoder.yudao.module.product.dal.mysql.landjob; - -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.product.dal.dataobject.landjob.LandJobDO; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.product.controller.admin.landjob.vo.*; -import org.apache.ibatis.annotations.Param; - -/** - * 种植/养殖/畜牧作业 Mapper - * - * @author 芋道源码 - */ -@Mapper -public interface LandJobMapper extends BaseMapperX { - - default PageResult selectPage(LandJobPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(LandJobDO::getLandId, reqVO.getLandId()) - .likeIfPresent(LandJobDO::getLandName, reqVO.getLandName()) - .eqIfPresent(LandJobDO::getLandType, reqVO.getLandType()) - .eqIfPresent(LandJobDO::getJobType, reqVO.getJobType()) - .eqIfPresent(LandJobDO::getJobWorker, reqVO.getJobWorker()) - .eqIfPresent(LandJobDO::getJobWorkerId, reqVO.getJobWorkerId()) - .betweenIfPresent(LandJobDO::getJobDate, reqVO.getJobDate()) - .eqIfPresent(LandJobDO::getRemarks, reqVO.getRemarks()) - .eqIfPresent(LandJobDO::getBelongBusinessId, reqVO.getBelongBusinessId()) - .likeIfPresent(LandJobDO::getBelongBusinessName, reqVO.getBelongBusinessName()) - .betweenIfPresent(LandJobDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(LandJobDO::getBlockState, reqVO.getBlockState()) - .eqIfPresent(LandJobDO::getJobImgUrl,reqVO.getJobImgUrl()) - .eqIfPresent(LandJobDO::getJobVideoUrl,reqVO.getJobVideoUrl()) - .orderByDesc(LandJobDO::getId)); - } - - default List selectList(LandJobExportReqVO reqVO) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(LandJobDO::getLandId, reqVO.getLandId()) - .likeIfPresent(LandJobDO::getLandName, reqVO.getLandName()) - .eqIfPresent(LandJobDO::getLandType, reqVO.getLandType()) - .eqIfPresent(LandJobDO::getJobType, reqVO.getJobType()) - .eqIfPresent(LandJobDO::getJobWorker, reqVO.getJobWorker()) - .eqIfPresent(LandJobDO::getJobWorkerId, reqVO.getJobWorkerId()) - .betweenIfPresent(LandJobDO::getJobDate, reqVO.getJobDate()) - .eqIfPresent(LandJobDO::getRemarks, reqVO.getRemarks()) - .eqIfPresent(LandJobDO::getBelongBusinessId, reqVO.getBelongBusinessId()) - .likeIfPresent(LandJobDO::getBelongBusinessName, reqVO.getBelongBusinessName()) - .betweenIfPresent(LandJobDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(LandJobDO::getBlockState, reqVO.getBlockState()) - .eqIfPresent(LandJobDO::getJobImgUrl,reqVO.getJobImgUrl()) - .eqIfPresent(LandJobDO::getJobVideoUrl,reqVO.getJobVideoUrl()) - .orderByDesc(LandJobDO::getId)); - } - - - IPage selectJobTypeById(IPage page, - @Param("landName") String landName, - @Param("landId") String landId, - @Param("jobType") Long jobType, - @Param("belongBusinessName") String belongBusinessName); - - LandJobDO getLandJob(@Param("id") Long id, @Param("landJobId") String landJobId); - - List getSameTypeJobByType(@Param("type") Long type, @Param("landId") String landId, @Param("day") Integer day); - - List selectLandJob10Records(); -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/landjobinputs/LandJobInputsMapper.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/landjobinputs/LandJobInputsMapper.java deleted file mode 100644 index 39ff658..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/landjobinputs/LandJobInputsMapper.java +++ /dev/null @@ -1,53 +0,0 @@ -package cn.iocoder.yudao.module.product.dal.mysql.landjobinputs; - -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.product.dal.dataobject.landjobinputs.LandJobInputsDO; -import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.*; -import org.apache.ibatis.annotations.Param; - -/** - * 地块作业投入品 Mapper - * - * @author 芋道源码 - */ -@Mapper -public interface LandJobInputsMapper extends BaseMapperX { - - default PageResult selectPage(LandJobInputsPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(LandJobInputsDO::getLandJobId, reqVO.getLandJobId()) - .likeIfPresent(LandJobInputsDO::getInputsName, reqVO.getInputsName()) - .eqIfPresent(LandJobInputsDO::getInputsId, reqVO.getInputsId()) - .eqIfPresent(LandJobInputsDO::getInputsBatchId, reqVO.getInputsBatchId()) - .eqIfPresent(LandJobInputsDO::getInputsNum, reqVO.getInputsNum()) - .eqIfPresent(LandJobInputsDO::getInputsUnit, reqVO.getInputsUnit()) - .eqIfPresent(LandJobInputsDO::getInputsDesc, reqVO.getInputsDesc()) - .betweenIfPresent(LandJobInputsDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(LandJobInputsDO::getBelongBusinessId, reqVO.getBelongBusinessId()) - .likeIfPresent(LandJobInputsDO::getBelongBusinessName, reqVO.getBelongBusinessName()) - .orderByDesc(LandJobInputsDO::getId)); - } - - default List selectList(LandJobInputsExportReqVO reqVO) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(LandJobInputsDO::getLandJobId, reqVO.getLandJobId()) - .likeIfPresent(LandJobInputsDO::getInputsName, reqVO.getInputsName()) - .eqIfPresent(LandJobInputsDO::getInputsId, reqVO.getInputsId()) - .eqIfPresent(LandJobInputsDO::getInputsBatchId, reqVO.getInputsBatchId()) - .eqIfPresent(LandJobInputsDO::getInputsNum, reqVO.getInputsNum()) - .eqIfPresent(LandJobInputsDO::getInputsUnit, reqVO.getInputsUnit()) - .eqIfPresent(LandJobInputsDO::getInputsDesc, reqVO.getInputsDesc()) - .betweenIfPresent(LandJobInputsDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(LandJobInputsDO::getBelongBusinessId, reqVO.getBelongBusinessId()) - .likeIfPresent(LandJobInputsDO::getBelongBusinessName, reqVO.getBelongBusinessName()) - .orderByDesc(LandJobInputsDO::getId)); - } - - LandJobInputsDO getLandJobInputs(@Param("id") Long id); - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/landjobtype/LandJobTypeMapper.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/landjobtype/LandJobTypeMapper.java deleted file mode 100644 index f0ad237..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/landjobtype/LandJobTypeMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.iocoder.yudao.module.product.dal.mysql.landjobtype; - -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.product.dal.dataobject.landjobtype.LandJobTypeDO; -import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.product.controller.admin.landjobtype.vo.*; - -/** - * 作业类型 Mapper - * - * @author 芋道源码 - */ -@Mapper -public interface LandJobTypeMapper extends BaseMapperX { - - default PageResult selectPage(LandJobTypePageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(LandJobTypeDO::getTypeName, reqVO.getTypeName()) - .eqIfPresent(LandJobTypeDO::getBelongBusinessId, reqVO.getBelongBusinessId()) - .likeIfPresent(LandJobTypeDO::getBelongBusinessName, reqVO.getBelongBusinessName()) - .betweenIfPresent(LandJobTypeDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(LandJobTypeDO::getId)); - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/landplan/LandPlanMapper.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/landplan/LandPlanMapper.java deleted file mode 100644 index b70f89d..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/landplan/LandPlanMapper.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.iocoder.yudao.module.product.dal.mysql.landplan; - -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.product.dal.dataobject.landplan.LandPlanDO; -import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.product.controller.admin.landplan.vo.*; -import org.apache.ibatis.annotations.Param; - -/** - * 地块作业计划 Mapper - * - * @author 芋道源码 - */ -@Mapper -public interface LandPlanMapper extends BaseMapperX { - - default PageResult selectPage(LandPlanPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(LandPlanDO::getLandId, reqVO.getLandId()) - .likeIfPresent(LandPlanDO::getLandName, reqVO.getLandName()) - .eqIfPresent(LandPlanDO::getLandPlanId, reqVO.getLandPlanId()) - .eqIfPresent(LandPlanDO::getGoodsId, reqVO.getGoodsId()) - .likeIfPresent(LandPlanDO::getGoodsName, reqVO.getGoodsName()) - .betweenIfPresent(LandPlanDO::getPlanStartTime, reqVO.getPlanStartTime()) - .betweenIfPresent(LandPlanDO::getPlanEndTime, reqVO.getPlanEndTime()) - .eqIfPresent(LandPlanDO::getBelongBusinessId, reqVO.getBelongBusinessId()) - .likeIfPresent(LandPlanDO::getBelongBusinessName, reqVO.getBelongBusinessName()) - .eqIfPresent(LandPlanDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(LandPlanDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(LandPlanDO::getId)); - } - - default List selectList(LandPlanExportReqVO reqVO) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(LandPlanDO::getLandId, reqVO.getLandId()) - .likeIfPresent(LandPlanDO::getLandName, reqVO.getLandName()) - .eqIfPresent(LandPlanDO::getLandPlanId, reqVO.getLandPlanId()) - .eqIfPresent(LandPlanDO::getGoodsId, reqVO.getGoodsId()) - .likeIfPresent(LandPlanDO::getGoodsName, reqVO.getGoodsName()) - .betweenIfPresent(LandPlanDO::getPlanStartTime, reqVO.getPlanStartTime()) - .betweenIfPresent(LandPlanDO::getPlanEndTime, reqVO.getPlanEndTime()) - .eqIfPresent(LandPlanDO::getBelongBusinessId, reqVO.getBelongBusinessId()) - .likeIfPresent(LandPlanDO::getBelongBusinessName, reqVO.getBelongBusinessName()) - .eqIfPresent(LandPlanDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(LandPlanDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(LandPlanDO::getId)); - } - - List queryLandPlansByParams(@Param("params") Map params); - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/framework/rpc/config/RpcConfiguration.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/framework/rpc/config/RpcConfiguration.java index 5754774..ea3d5ea 100644 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/framework/rpc/config/RpcConfiguration.java +++ b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/framework/rpc/config/RpcConfiguration.java @@ -2,9 +2,7 @@ package cn.iocoder.yudao.module.product.framework.rpc.config; import cn.iocoder.yudao.module.basic.api.businessinfo.BusinessInfoApi; import cn.iocoder.yudao.module.basic.api.goodsinfo.GoodsInfoApi; -import cn.iocoder.yudao.module.basic.api.goodsinputrelational.GoodsInputRelationalApi; import cn.iocoder.yudao.module.basic.api.goodsverify.GoodsVerifyApi; -import cn.iocoder.yudao.module.basic.api.inputsinfo.InputsInfoApi; import cn.iocoder.yudao.module.basic.api.vendorinfo.VendorInfoApi; import cn.iocoder.yudao.module.basic.api.workersinfo.WorkersinfoApi; import cn.iocoder.yudao.module.chain.api.blockcertificate.BlockCertificateApi; @@ -22,9 +20,7 @@ import org.springframework.context.annotation.Configuration; @Configuration(proxyBeanMethods = false) @EnableFeignClients(clients = { VendorInfoApi.class, - InputsInfoApi.class, GoodsInfoApi.class, - GoodsInputRelationalApi.class, OutboundApi.class, BlockCertificateApi.class, OperateDetailApi.class, diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/deviceinfo/DeviceInfoServiceImpl.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/deviceinfo/DeviceInfoServiceImpl.java index b72dd0f..669e4e8 100644 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/deviceinfo/DeviceInfoServiceImpl.java +++ b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/deviceinfo/DeviceInfoServiceImpl.java @@ -14,7 +14,6 @@ import cn.iocoder.yudao.module.product.controller.admin.slavedevice.vo.SlaveDevi import cn.iocoder.yudao.module.product.convert.deviceinfo.DeviceInfoConvert; import cn.iocoder.yudao.module.product.dal.dataobject.deviceinfo.DeviceInfoDO; import cn.iocoder.yudao.module.product.dal.dataobject.envtype.EnvTypeDO; -import cn.iocoder.yudao.module.product.dal.dataobject.landinfo.LandInfoDO; import cn.iocoder.yudao.module.product.dal.dataobject.slavedevice.SlaveDeviceDO; import cn.iocoder.yudao.module.product.dal.mysql.deviceinfo.DeviceInfoMapper; import cn.iocoder.yudao.module.product.dal.mysql.envtype.EnvTypeMapper; @@ -26,7 +25,6 @@ import cn.iocoder.yudao.module.product.enums.ErrorCodeConstants; import cn.iocoder.yudao.module.product.enums.GatewayTypeEnums; import cn.iocoder.yudao.module.product.hik.HikHttpUtils; import cn.iocoder.yudao.module.product.hik.dto.HikDeviceInfoDto; -import cn.iocoder.yudao.module.product.service.landinfo.LandInfoService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; @@ -60,8 +58,6 @@ public class DeviceInfoServiceImpl implements DeviceInfoService { @Resource private BusinessInfoApi businessInfoApi; @Resource - private LandInfoService landInfoService; - @Resource private DeviceMqttService deviceMqttService; @Override @@ -72,11 +68,6 @@ public class DeviceInfoServiceImpl implements DeviceInfoService { if (businessInfo == null) { throw ServiceExceptionUtil.exception(ErrorCodeConstants.BUSINESS_INFO_NOT_EXISTS); } - // 校验地块 - LandInfoDO landInfo = landInfoService.getLandInfoByLandId(createReqVO.getLandId()); - if (landInfo == null || !landInfo.getBelongBusinessId().equals(createReqVO.getBelongBusinessId())) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.LAND_INFO_NOT_EXISTS); - } // 校验监控点名称是否正确 if (createReqVO.getDeviceType().equals(DeviceTypeEnums.MONITOR.getDeviceType())) { HikDeviceInfoDto hikDeviceInfo = HikHttpUtils.getHikDeviceInfo(createReqVO.getMonitorCode()); @@ -85,7 +76,7 @@ public class DeviceInfoServiceImpl implements DeviceInfoService { } } - this.verifyDeviceType(createReqVO, businessInfo.getId(), landInfo.getLandId(), null); + this.verifyDeviceType(createReqVO, businessInfo.getId(), null); if (createReqVO.getGatewayType().equals(GatewayTypeEnums.YOUREN.getGatewayType()) && createReqVO.getDeviceType().equals(DeviceTypeEnums.SENSOR.getDeviceType())) { if (createReqVO.getSlaveDevices().isEmpty()) { @@ -100,7 +91,6 @@ public class DeviceInfoServiceImpl implements DeviceInfoService { } DeviceInfoDO deviceInfo = DeviceInfoConvert.INSTANCE.convert(createReqVO); - deviceInfo.setLandId(landInfo.getLandId()); deviceInfo.setBelongBusinessName(businessInfo.getBusinessName()); // 插入 @@ -127,7 +117,7 @@ public class DeviceInfoServiceImpl implements DeviceInfoService { public void updateDeviceInfo(DeviceInfoUpdateReqVO updateReqVO) { // 校验存在 DeviceInfoDO deviceInfoDO = this.validateDeviceInfoExists(updateReqVO.getId()); - this.verifyDeviceType(updateReqVO, deviceInfoDO.getBelongBusinessId(), deviceInfoDO.getLandId(), deviceInfoDO); + this.verifyDeviceType(updateReqVO, deviceInfoDO.getBelongBusinessId(), deviceInfoDO); // 校验监控编码是否正确 if (updateReqVO.getDeviceType().equals(DeviceTypeEnums.MONITOR.getDeviceType())) { @@ -203,7 +193,7 @@ public class DeviceInfoServiceImpl implements DeviceInfoService { } - private void verifyDeviceType(DeviceInfoSaveReqVO saveReqVO, Long businessId, String landId, DeviceInfoDO deviceInfoDO) { + private void verifyDeviceType(DeviceInfoSaveReqVO saveReqVO, Long businessId, DeviceInfoDO deviceInfoDO) { List devices; // 校验设备类型 if (saveReqVO.getDeviceType().equals(DeviceTypeEnums.CONTROLLER.getDeviceType())) { @@ -219,18 +209,18 @@ public class DeviceInfoServiceImpl implements DeviceInfoService { } // 校验设备是否重复，每个商户下的每个地块只能拥有一个类型的设备 - if (saveReqVO.getControllerField().equals("")) { + if (saveReqVO.getControllerField().isEmpty()) { saveReqVO.setControllerField(null); } if (!saveReqVO.getDeviceType().equals(DeviceTypeEnums.MONITOR.getDeviceType())) { devices = deviceInfoMapper.selectList(new LambdaQueryWrapperX().eq(DeviceInfoDO::getBelongBusinessId, businessId) - .eq(DeviceInfoDO::getLandId, landId).eqIfPresent(DeviceInfoDO::getDeviceType, saveReqVO.getDeviceType()) + .eqIfPresent(DeviceInfoDO::getDeviceType, saveReqVO.getDeviceType()) .eqIfPresent(DeviceInfoDO::getGatewayType, saveReqVO.getGatewayType()).eqIfPresent(DeviceInfoDO::getEnvType, saveReqVO.getEnvType()) .eqIfPresent(DeviceInfoDO::getControllerField, saveReqVO.getControllerField())); } else { devices = deviceInfoMapper.selectList(new LambdaQueryWrapper().eq(DeviceInfoDO::getBelongBusinessId, businessId) - .eq(DeviceInfoDO::getLandId, landId).eq(DeviceInfoDO::getDeviceName, saveReqVO.getDeviceName()).or() - .eq(DeviceInfoDO::getBelongBusinessId, businessId).eq(DeviceInfoDO::getLandId, landId) + .eq(DeviceInfoDO::getDeviceName, saveReqVO.getDeviceName()).or() + .eq(DeviceInfoDO::getBelongBusinessId, businessId) .eq(DeviceInfoDO::getMonitorCode, saveReqVO.getMonitorCode())); } @@ -304,16 +294,11 @@ public class DeviceInfoServiceImpl implements DeviceInfoService { throw ServiceExceptionUtil.exception(ErrorCodeConstants.ONLY_CONTROLLER_CAN_CHANGE_SWITCH); } - LandInfoDO landInfoDO = landInfoService.getLandInfoByLandId(deviceInfo.getLandId()); - if (landInfoDO == null) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.LAND_INFO_NOT_EXISTS); - } - boolean so = switchOn != null && switchOn; deviceInfo.setSwitchOn(so); try { - String topic = mqttProperties.getControllerTopic() + deviceInfo.getTenantId() + "/" + deviceInfo.getBelongBusinessId() + "/" + landInfoDO.getId(); + String topic = mqttProperties.getControllerTopic() + deviceInfo.getTenantId() + "/" + deviceInfo.getBelongBusinessId(); // 向emqx发送开关命令 if (deviceInfo.getGatewayType().equals(GatewayTypeEnums.YOUREN.getGatewayType())) { String cmd = so ? deviceInfo.getOpenInstruction() : deviceInfo.getCloseInstruction(); @@ -332,7 +317,7 @@ public class DeviceInfoServiceImpl implements DeviceInfoService { deviceMqttService.sendMessage(topic, message); } } catch (Exception e) { - e.printStackTrace(); + log.error("发送命令失败: ", e); throw ServiceExceptionUtil.exception(ErrorCodeConstants.SEND_CMD_FAIL); } @@ -358,7 +343,7 @@ public class DeviceInfoServiceImpl implements DeviceInfoService { // 根据indexCode获得设备在线状态 List isOnlineList = HikHttpUtils.getCameraIsOnline(Collections.singletonList(monitorCode)); assert isOnlineList != null; - if (isOnlineList.size() == 0 || !isOnlineList.get(0)) { + if (isOnlineList.isEmpty() || !isOnlineList.get(0)) { throw ServiceExceptionUtil.exception(ErrorCodeConstants.MONITOR_DEVICE_IS_OFFLINE); } @@ -376,7 +361,7 @@ public class DeviceInfoServiceImpl implements DeviceInfoService { */ @Override public List getMonitorPreviewURLByLandId(String landId, String protocol) { - List deviceInfoDOS = deviceInfoMapper.selectList(new LambdaQueryWrapperX().eq(DeviceInfoDO::getLandId, landId) + List deviceInfoDOS = deviceInfoMapper.selectList(new LambdaQueryWrapperX() .eq(DeviceInfoDO::getDeviceType, DeviceTypeEnums.MONITOR.getDeviceType()).eq(DeviceInfoDO::getEnabled, Boolean.TRUE)); List urlList = new ArrayList<>(); diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/envdata/EnvDataServiceImpl.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/envdata/EnvDataServiceImpl.java index 886a6f3..28e7000 100644 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/envdata/EnvDataServiceImpl.java +++ b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/envdata/EnvDataServiceImpl.java @@ -1,8 +1,9 @@ package cn.iocoder.yudao.module.product.service.envdata; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; +import cn.iocoder.yudao.module.basic.api.businessinfo.BusinessInfoApi; +import cn.iocoder.yudao.module.basic.api.redis.dto.BusinessInfoDTO; import cn.iocoder.yudao.module.configure.api.deviceenvtype.DeviceEnvTypeApi; import cn.iocoder.yudao.module.configure.api.deviceenvtype.dto.DeviceEnvTypeRespDTO; import cn.iocoder.yudao.module.product.controller.admin.deviceinfo.vo.DeviceEnvTypeRespVO; @@ -12,10 +13,8 @@ import cn.iocoder.yudao.module.product.controller.admin.envdata.vo.EnvDataRespVO import cn.iocoder.yudao.module.product.controller.admin.envdata.vo.EnvDataUpdateReqVO; import cn.iocoder.yudao.module.product.convert.envdata.EnvDataConvert; import cn.iocoder.yudao.module.product.dal.dataobject.envdata.EnvDataDO; -import cn.iocoder.yudao.module.product.dal.dataobject.landinfo.LandInfoDO; import cn.iocoder.yudao.module.product.dal.mysql.deviceinfo.DeviceInfoMapper; import cn.iocoder.yudao.module.product.dal.mysql.envdata.EnvDataMapper; -import cn.iocoder.yudao.module.product.dal.mysql.landinfo.LandInfoMapper; import cn.iocoder.yudao.module.product.enums.DeviceTypeEnums; import cn.iocoder.yudao.module.product.enums.GatewayTypeEnums; import com.alibaba.fastjson.JSONObject; @@ -50,10 +49,10 @@ public class EnvDataServiceImpl implements EnvDataService { private DeviceInfoMapper deviceInfoMapper; @Resource - private LandInfoMapper landInfoMapper; + private DeviceEnvTypeApi deviceEnvTypeApi; @Resource - private DeviceEnvTypeApi deviceEnvTypeApi; + private BusinessInfoApi businessInfoApi; @Override public Long createEnvData(EnvDataCreateReqVO createReqVO) { @@ -123,23 +122,21 @@ public class EnvDataServiceImpl implements EnvDataService { } Long tenantId = Long.valueOf(slStr[1]); Long businessId = Long.valueOf(slStr[2]); - Long landInfoId = Long.valueOf(slStr[3]); // TenantUtils.execute(tenantId, () -> { TenantContextHolder.setTenantId(tenantId);// 这里手动设置租户ID // 模拟租户ID为tenantId的情况下 - // 查询地块编码 - LandInfoDO landInfo = landInfoMapper.selectOne(new LambdaQueryWrapperX().eq(LandInfoDO::getBelongBusinessId, businessId).eq(LandInfoDO::getId, landInfoId) - .eq(LandInfoDO::getTenantId, tenantId)); - if (landInfo == null) { - return; - } // 根据参数获取所有传感器的设备类型 - List deviceInfos = deviceInfoMapper.getDeviceEnvTypes(tenantId, businessId, landInfo.getLandId(), DeviceTypeEnums.SENSOR.getDeviceType(), gatewayType); + List deviceInfos = deviceInfoMapper.getDeviceEnvTypes(tenantId, businessId, DeviceTypeEnums.SENSOR.getDeviceType(), gatewayType); if (deviceInfos.isEmpty()) { return; } + // 获取商户 + BusinessInfoDTO businessInfo = businessInfoApi.getBusinessInfoById(businessId).getData(); + if (businessInfo == null) { + return; + } List insertEnvDatas = new ArrayList<>(); JSONObject jsonObject = JSONObject.parseObject(message); @@ -158,10 +155,8 @@ public class EnvDataServiceImpl implements EnvDataService { envDataDO.setEnvTypeId(item.getEnvType()); envDataDO.setEnvName(item.getEnvTypeName()); envDataDO.setValue(fieldVal); - envDataDO.setLandId(landInfo.getLandId()); - envDataDO.setLandName(landInfo.getLandName()); - envDataDO.setBelongBusinessId(landInfo.getBelongBusinessId()); - envDataDO.setBelongBusinessName(landInfo.getBelongBusinessName()); + envDataDO.setBelongBusinessId(businessId); + envDataDO.setBelongBusinessName(businessInfo.getBusinessName()); envDataDO.setTenantId(tenantId); envDataDO.setCreator(tenantId.toString()); envDataDO.setUpdater(tenantId.toString()); @@ -179,10 +174,8 @@ public class EnvDataServiceImpl implements EnvDataService { envDataDO.setEnvTypeId(info.getEnvType()); envDataDO.setEnvName(info.getEnvTypeName()); envDataDO.setValue(fieldVal); - envDataDO.setLandId(landInfo.getLandId()); - envDataDO.setLandName(landInfo.getLandName()); - envDataDO.setBelongBusinessId(landInfo.getBelongBusinessId()); - envDataDO.setBelongBusinessName(landInfo.getBelongBusinessName()); + envDataDO.setBelongBusinessName(businessInfo.getBusinessName()); + envDataDO.setBelongBusinessId(tenantId); envDataDO.setTenantId(tenantId); envDataDO.setCreator(tenantId.toString()); envDataDO.setUpdater(tenantId.toString()); diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/inputsbatch/InputsBatchService.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/inputsbatch/InputsBatchService.java deleted file mode 100644 index eaffd14..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/inputsbatch/InputsBatchService.java +++ /dev/null @@ -1,96 +0,0 @@ -package cn.iocoder.yudao.module.product.service.inputsbatch; - -import java.util.*; -import javax.validation.*; -import cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo.*; -import cn.iocoder.yudao.module.product.dal.dataobject.inputsbatch.InputsBatchDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -/** - * 投入品批次 Service 接口 - * - * @author 芋道源码 - */ -public interface InputsBatchService { - - /** - * 创建投入品批次 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createInputsBatch(@Valid InputsBatchCreateReqVO createReqVO); - - /** - * 更新投入品批次 - * - * @param updateReqVO 更新信息 - */ - void updateInputsBatch(@Valid InputsBatchSaveReqVO updateReqVO); - - /** - * 删除投入品批次 - * - * @param id 编号 - */ - void deleteInputsBatch(Long id); - - /** - * 获得投入品批次 - * - * @param id 编号 - * @return 投入品批次 - */ - InputsBatchDO getInputsBatch(Long id); - - /** - * 获得投入品批次列表 - * - * @param ids 编号 - * @return 投入品批次列表 - */ - List getInputsBatchList(Collection ids); - - /** - * 获得投入品批次分页 - * - * @param pageReqVO 分页查询 - * @return 投入品批次分页 - */ - PageResult getInputsBatchPage(InputsBatchPageReqVO pageReqVO); - - /** - * 获得投入品批次列表, 用于 Excel 导出 - * - * @param exportReqVO 查询条件 - * @return 投入品批次列表 - */ - List getInputsBatchList(InputsBatchExportReqVO exportReqVO); - - /** - * 根据数量获得投入品批次编号 - * @param count - * @return - */ - List getInputsBatchNumberList(Integer count); - - /** - * 批量删除投入品批次 - * @param ids - */ - void deleteBatch(List ids); - - /** - * 根据投入品id获取所有投入品批次 - * @param inputsId - * @return - */ - ListgetInputsBatchInputsBatchIdList(String inputsId); - - /** - * 更新链状态 - * @param id id - * @param state 状态 - */ - void updateChainStatus(Long id, Integer state); -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/inputsbatch/InputsBatchServiceImpl.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/inputsbatch/InputsBatchServiceImpl.java deleted file mode 100644 index e67a2d3..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/inputsbatch/InputsBatchServiceImpl.java +++ /dev/null @@ -1,161 +0,0 @@ -package cn.iocoder.yudao.module.product.service.inputsbatch; - -import cn.iocoder.yudao.framework.common.enums.BlockStateEnum; -import cn.iocoder.yudao.framework.common.enums.CodeEnum; -import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.chain.api.blockcertificate.BlockCertificateApi; -import cn.iocoder.yudao.module.chain.api.blockcertificate.dto.UpdateStatusReqDTO; -import cn.iocoder.yudao.module.chain.enums.ChainStatusEnum; -import cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo.InputsBatchCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo.InputsBatchExportReqVO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo.InputsBatchPageReqVO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo.InputsBatchSaveReqVO; -import cn.iocoder.yudao.module.product.convert.inputsbatch.InputsBatchConvert; -import cn.iocoder.yudao.module.product.dal.dataobject.inputsbatch.InputsBatchDO; -import cn.iocoder.yudao.module.product.dal.mysql.inputsbatch.InputsBatchMapper; -import cn.iocoder.yudao.module.product.enums.ErrorCodeConstants; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.stream.Collectors; - -/** - * 投入品批次 Service 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -public class InputsBatchServiceImpl implements InputsBatchService { - - @Resource - private InputsBatchMapper inputsBatchMapper; - @Resource - private BlockCertificateApi blockCertificateApi; - - @Override - public Long createInputsBatch(InputsBatchCreateReqVO createReqVO) { - // 插入 - InputsBatchDO inputsBatch = InputsBatchConvert.INSTANCE.convert(createReqVO); - inputsBatchMapper.insert(inputsBatch); - // 返回 - return inputsBatch.getId(); - } - - @Override - public void updateInputsBatch(InputsBatchSaveReqVO updateReqVO) { - // 校验存在 - validateInputsBatchExists(updateReqVO.getId()); - // 更新 - InputsBatchDO updateObj = InputsBatchConvert.INSTANCE.convert(updateReqVO); - inputsBatchMapper.updateById(updateObj); - } - - @Override - public void deleteInputsBatch(Long id) { - // 校验存在 - validateInputsBatchExists(id); - // 删除 - inputsBatchMapper.deleteById(id); - } - - private void validateInputsBatchExists(Long id) { - if (inputsBatchMapper.selectById(id) == null) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.INPUTS_BATCH_NOT_EXISTS); - } - } - - @Override - public InputsBatchDO getInputsBatch(Long id) { - return inputsBatchMapper.selectById(id); - } - - @Override - public List getInputsBatchList(Collection ids) { - return inputsBatchMapper.selectBatchIds(ids); - } - - @Override - public PageResult getInputsBatchPage(InputsBatchPageReqVO pageReqVO) { - // pageReqVO.setBlockState(BlockStateEnum.ACTIVATION.getBlockState()); - return inputsBatchMapper.selectPage(pageReqVO); - } - - @Override - public List getInputsBatchList(InputsBatchExportReqVO exportReqVO) { - return inputsBatchMapper.selectList(exportReqVO); - } - - @Override - public List getInputsBatchNumberList(Integer count) { - List results = new ArrayList<>(); - for (int i = 0; i < count; i++) { - results.add(CodeEnum.INPUTS_BATCH_CODE.getCode()); - } - return results; - } - - @Override - public void deleteBatch(List ids) { - List batchs = inputsBatchMapper.selectList(new LambdaQueryWrapperX().in(InputsBatchDO::getId, ids)); - if(batchs.size() != ids.size()) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.INPUTS_BATCH_NOT_EXISTS); - } - inputsBatchMapper.deleteBatchIds(ids); - } - - /** - * 根据投入品id获取所有投入品批次 - * - * @param inputsId - * @return - */ - @Override - @Transactional - public List getInputsBatchInputsBatchIdList(String inputsId) { - return inputsBatchMapper.selectList(new QueryWrapper() - //表示查询字段inputs_id等于给定的 inputsId值的记录。 - .eq("inputs_id",inputsId)) - .stream() - //将查询结果中的每个InputsBatchDO对象映射为其 inputsBatchId属性的值。 - .map(InputsBatchDO::getInputsBatchId) - .distinct() //去除重复的批次ID。 - .collect(Collectors.toList()); // 将结果收集为一个列表 - } - - @Override - @Transactional - public void updateChainStatus(Long id, Integer state) { - InputsBatchDO inputsBatchDO = inputsBatchMapper.selectById(id); - if(inputsBatchDO == null) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.INPUTS_BATCH_NOT_EXISTS); - } - if(inputsBatchDO.getBlockState().equals(BlockStateEnum.NOT_ON_CHAIN.getBlockState())) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.INPUT_BATCH_NOT_ACTIVATION); - } - - List batchsReqDTOS = new ArrayList<>(); - UpdateStatusReqDTO harvestReqDTO = new UpdateStatusReqDTO(); - harvestReqDTO.setChainOperateId(inputsBatchDO.getBlockChainId()); - harvestReqDTO.setChainStatus(state.equals(BlockStateEnum.ACTIVATION.getBlockState()) ? ChainStatusEnum.ACTIVE.getStatus() : ChainStatusEnum.FREEZE.getStatus()); - batchsReqDTOS.add(harvestReqDTO); - - if(blockCertificateApi.updateStatusBatch(batchsReqDTOS).isError()) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.UPDATE_CREATE_BLOCK_CERTIFICATE_FAIL); - } - - InputsBatchDO inputsBatch = new InputsBatchDO(); - inputsBatch.setId(id); - inputsBatch.setBlockState(state.equals(BlockStateEnum.ACTIVATION.getBlockState()) ? BlockStateEnum.ACTIVATION.getBlockState() : BlockStateEnum.FREEZE.getBlockState()); - inputsBatchMapper.updateById(inputsBatch); - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/inputsbuy/InputsBuyService.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/inputsbuy/InputsBuyService.java deleted file mode 100644 index 4054072..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/inputsbuy/InputsBuyService.java +++ /dev/null @@ -1,89 +0,0 @@ -package cn.iocoder.yudao.module.product.service.inputsbuy; - -import java.util.*; -import javax.validation.*; -import cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo.*; -import cn.iocoder.yudao.module.product.dal.dataobject.inputsbuy.InputsBuyDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -/** - * 投入品采购 Service 接口 - * - * @author 芋道源码 - */ -public interface InputsBuyService { - - /** - * 创建投入品采购 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createInputsBuy(@Valid InputsBuyCreateReqVO createReqVO); - - /** - * 更新投入品采购 - * - * @param updateReqVO 更新信息 - */ - void updateInputsBuy(@Valid InputsBuyUpdateReqVO updateReqVO); - - /** - * 删除投入品采购 - * - * @param id 编号 - */ - void deleteInputsBuy(Long id); - - /** - * 获得投入品采购 - * - * @param id 编号 - * @return 投入品采购 - */ - InputsBuyRespVO getInputsBuy(Long id); - - /** - * 获得投入品采购列表 - * - * @param ids 编号 - * @return 投入品采购列表 - */ - List getInputsBuyList(Collection ids); - - /** - * 获得投入品采购分页 - * - * @param pageReqVO 分页查询 - * @return 投入品采购分页 - */ - PageResult getInputsBuyPage(InputsBuyPageReqVO pageReqVO); - - /** - * 根据数量获得投入品批次编号 - * @param count - * @return - */ - List getInputsBuyNumberList(Integer count); - - /** - * 根据出库单单号获取投入品采购 - * @param outBoundId - * @return - */ - InputBuyForOutBoundRespVO getInputsBuyByOutbound(String outBoundId); - - /** - * 上链 - * @param id id - */ - void upChain(Long id); - - /** - * 更新链状态 - * @param id id - * @param state 状态 - */ - void updateChainStatus(Long id, Integer state); - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/inputsbuy/InputsBuyServiceImpl.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/inputsbuy/InputsBuyServiceImpl.java deleted file mode 100644 index 1a45698..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/inputsbuy/InputsBuyServiceImpl.java +++ /dev/null @@ -1,482 +0,0 @@ -package cn.iocoder.yudao.module.product.service.inputsbuy; - -import cn.hutool.core.bean.BeanUtil; -import cn.iocoder.yudao.framework.common.enums.BlockStateEnum; -import cn.iocoder.yudao.framework.common.enums.CodeEnum; -import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.basic.api.goodsinputrelational.GoodsInputRelationalApi; -import cn.iocoder.yudao.module.basic.api.goodsinputrelational.dto.RelationalRespDTO; -import cn.iocoder.yudao.module.basic.api.inputsinfo.InputsInfoApi; -import cn.iocoder.yudao.module.basic.api.inputsinfo.dto.InputsInfoRespDTO; -import cn.iocoder.yudao.module.basic.api.vendorinfo.VendorInfoApi; -import cn.iocoder.yudao.module.basic.api.vendorinfo.dto.VendorInfoRespDTO; -import cn.iocoder.yudao.module.chain.api.blockcertificate.BlockCertificateApi; -import cn.iocoder.yudao.module.chain.api.blockcertificate.dto.BlockCertificateRespDTO; -import cn.iocoder.yudao.module.chain.api.blockcertificate.dto.BlockCertificateUpChainReqDTO; -import cn.iocoder.yudao.module.chain.api.blockcertificate.dto.UpChainObjReqDTO; -import cn.iocoder.yudao.module.chain.api.blockcertificate.dto.UpdateStatusReqDTO; -import cn.iocoder.yudao.module.chain.enums.BatchTypeEnum; -import cn.iocoder.yudao.module.chain.enums.ChainStatusEnum; -import cn.iocoder.yudao.module.chain.enums.OperateTypeEnum; -import cn.iocoder.yudao.module.flow.api.outbound.OutboundApi; -import cn.iocoder.yudao.module.flow.api.outbound.dto.OutboundGoodsDTO; -import cn.iocoder.yudao.module.flow.api.outbound.dto.OutboundRespDTO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo.InputsBatchRespVO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo.InputsBatchSaveReqVO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo.*; -import cn.iocoder.yudao.module.product.convert.inputsbatch.InputsBatchConvert; -import cn.iocoder.yudao.module.product.convert.inputsbuy.InputsBuyConvert; -import cn.iocoder.yudao.module.product.dal.dataobject.inputsbatch.InputsBatchDO; -import cn.iocoder.yudao.module.product.dal.dataobject.inputsbuy.InputsBuyDO; -import cn.iocoder.yudao.module.product.dal.mysql.inputsbatch.InputsBatchMapper; -import cn.iocoder.yudao.module.product.dal.mysql.inputsbuy.InputsBuyMapper; -import cn.iocoder.yudao.module.product.enums.ErrorCodeConstants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.seata.core.context.RootContext; -import io.seata.spring.annotation.GlobalTransactional; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; - -/** - * 投入品采购 Service 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -@Slf4j -public class InputsBuyServiceImpl implements InputsBuyService { - - @Resource - private InputsBuyMapper inputsBuyMapper; - @Resource - private InputsBatchMapper inputsBatchMapper; - @Resource - private VendorInfoApi vendorInfoApi; - @Resource - private InputsInfoApi inputsInfoApi; - @Resource - private GoodsInputRelationalApi goodsInputRelationalApi; - @Resource - private OutboundApi outboundApi; - @Resource - private BlockCertificateApi blockCertificateApi; - - @Override - @Transactional - public Long createInputsBuy(InputsBuyCreateReqVO createReqVO) { - // 检验供应商vendorId - CommonResult result = vendorInfoApi.getVendorInfoByVendorId(createReqVO.getVendorId()); - VendorInfoRespDTO VIResp = result.getData(); - if(result.isError() || VIResp == null) { - throw ServiceExceptionUtil.exception(cn.iocoder.yudao.module.basic.enums.ErrorCodeConstants.VENDOR_INFO_NOT_EXISTS); - } - - List inputsBatchs = InputsBatchConvert.INSTANCE.convertListForCreate(createReqVO.getInputsBatchs()); - Map idAndNames = new HashMap<>(); - // 判断投入品是否存在 - this.verifiInputInfos(inputsBatchs, idAndNames, null, null, VIResp.getBelongBusinessId()); - - inputsBatchs.forEach(inputsBatch -> { - // inputInfoIds.add(inputsBatch.getInputsId()); - inputsBatch.setId(null); - inputsBatch.setInputsBuyId(createReqVO.getInputsBuyId()); - inputsBatch.setInputsName(idAndNames.get(inputsBatch.getInputsId())); - inputsBatch.setBlockState(BlockStateEnum.NOT_ON_CHAIN.getBlockState()); - inputsBatch.setBelongBusinessId(VIResp.getBelongBusinessId()); - inputsBatch.setBelongBusinessName(VIResp.getBelongBusinessName()); - if(inputsBatch.getInputsUnitPrice() != null) { - // 重新计算总额 - inputsBatch.setTotalPrice(inputsBatch.getInputsUnitPrice().multiply(new BigDecimal(inputsBatch.getInputsNum()))); - } else { - inputsBatch.setTotalPrice(new BigDecimal(0)); - } - }); - - // 包装需要插入的数据 - InputsBuyDO inputsBuy = InputsBuyConvert.INSTANCE.convert(createReqVO); - // 下面的以数据库的为准 - inputsBuy.setVendorName(VIResp.getVendorName()); - inputsBuy.setBelongBusinessId(VIResp.getBelongBusinessId()); - inputsBuy.setBelongBusinessName(VIResp.getBelongBusinessName()); - - inputsBuyMapper.insert(inputsBuy); - - inputsBatchMapper.insertBatch(inputsBatchs); - // 返回 - return inputsBuy.getId(); - } - - /** - * 更新投入品采购信息 - * （这里不考虑删除，删除功能在页面手动一个个删除，如果页面不传已有的数据，那么就当不变更处理） - * @param updateReqVO 更新信息 - */ - @Override - @Transactional - public void updateInputsBuy(InputsBuyUpdateReqVO updateReqVO) { - // 校验投入品采购主表信息 - InputsBuyDO inputsBuy = inputsBuyMapper.selectById(updateReqVO.getId()); - if(inputsBuy == null) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.INPUTS_BUY_NOT_EXISTS); - } - - List inputsBatchs = InputsBatchConvert.INSTANCE.convertListForCreate(updateReqVO.getInputsBatchs()); - Map idAndNames = new HashMap<>();// 页面传过来的投入品键值对 - Map inputsInfoMaps = new HashMap<>();// 页面传入的inputid集合 - List willUpdateIds = new ArrayList<>();// 将要更新的投入品批次主键id - - // 判断投入品是否存在 - this.verifiInputInfos(inputsBatchs, idAndNames, inputsInfoMaps, willUpdateIds, inputsBuy.getBelongBusinessId()); - - // 验证将要更新的批次 - Map inputBatchMaps = new HashMap<>();// 投入品批次键值对 - if(willUpdateIds.size() > 0) { - // 查询需要更新的投入品批次 - List inputBatchDOs = inputsBatchMapper.selectList(new LambdaQueryWrapperX() - .in(InputsBatchDO::getId, willUpdateIds) - .eq(InputsBatchDO::getInputsBuyId, inputsBuy.getInputsBuyId())); - if (inputBatchDOs.size() != willUpdateIds.size()) { // 存在已删除或者不是改投入品采购单的批次信息 - throw ServiceExceptionUtil.exception(ErrorCodeConstants.EXIST_DELETED_INPUT_BATCH); - } -// if(!inputBatchDOs.get(0).getBlockState().equals(BlockStateEnum.NOT_ON_CHAIN.getBlockState())) { -// throw ServiceExceptionUtil.exception(ErrorCodeConstants.ONLY_NOT_ON_CHAIN_INPUTS_BUY_CAN_BE_EDIT); -// } - - inputBatchDOs.forEach(item -> inputBatchMaps.put(item.getId(), item)); - } - - List addList = new ArrayList<>(); // 需要新增的批次集合 - List updateList = new ArrayList<>(); // 需要新增的批次集合 - // List deleteList = new ArrayList<>(); // 需要删除的批次集合 - - for(InputsBatchSaveReqVO item: updateReqVO.getInputsBatchs()) { - if(item.getId() != null) { - // 更新流程 - InputsBatchDO inputsBatch = inputBatchMaps.get(item.getId()); - // 只更新可更新的字段 - inputsBatch.setProductData(item.getProductData()); - inputsBatch.setInputsNum(item.getInputsNum()); - inputsBatch.setInputsWeight(item.getInputsWeight()); - inputsBatch.setInputsUnitPrice(item.getInputsUnitPrice()); - inputsBatch.setRemarks(item.getRemarks()); - if(inputsBatch.getInputsUnitPrice() != null) { - // 重新计算总额 - inputsBatch.setTotalPrice(inputsBatch.getInputsUnitPrice().multiply(new BigDecimal(inputsBatch.getInputsNum()))); - } else { - inputsBatch.setTotalPrice(new BigDecimal(0)); - } - updateList.add(inputsBatch); - } else { - InputsBatchDO inputsBatch = InputsBatchConvert.INSTANCE.convert(item); - // 新增 这里都以数据库的数据为准 - inputsBatch.setInputsBuyId(inputsBuy.getInputsBuyId()); - inputsBatch.setBlockState(BlockStateEnum.NOT_ON_CHAIN.getBlockState()); - inputsBatch.setInputsName(inputsInfoMaps.get(item.getInputsId()).getInputsName()); - inputsBatch.setBelongBusinessId(inputsBuy.getBelongBusinessId()); - inputsBatch.setBelongBusinessName(inputsBuy.getBelongBusinessName()); - inputsBatch.setInputsUnit(inputsInfoMaps.get(item.getInputsId()).getInputsUnit()); - if(inputsBatch.getInputsUnitPrice() != null) { - // 重新计算总额 - inputsBatch.setTotalPrice(inputsBatch.getInputsUnitPrice().multiply(new BigDecimal(inputsBatch.getInputsNum()))); - } else { - inputsBatch.setTotalPrice(new BigDecimal(0)); - } - addList.add(inputsBatch); - } - } - - // 更新主单 - InputsBuyDO updateInputBuy = new InputsBuyDO(); - updateInputBuy.setId(updateReqVO.getId()); - updateInputBuy.setRelateOutboundId(updateReqVO.getRelateOutboundId()); - updateInputBuy.setInputsBuyTime(updateReqVO.getInputsBuyTime()); - - if(!addList.isEmpty()) { - inputsBatchMapper.insertBatch(addList); - } - - if(!updateList.isEmpty()) { - inputsBatchMapper.updateBatch(updateList, Integer.MAX_VALUE); - } - - inputsBuyMapper.updateById(updateInputBuy); - } - - /** - * - * @param inputsBatchs 页面传入的InputsBatchDO集合 - * @param idAndNames id和名字的键值对， - * @param inputsInfoMaps 投入品编号 - * @param willUpdateIds 将要更新的数据的批次id - */ - private void verifiInputInfos(List inputsBatchs, Map idAndNames, Map inputsInfoMaps, - List willUpdateIds, Long businessId) { - Set inputInfoIdsSet = new HashSet<>(); - Set willUpdateIdsSet = new HashSet<>(); - inputsBatchs.forEach(inputsBatch -> { - inputInfoIdsSet.add(inputsBatch.getInputsId()); - if(inputsBatch.getId() != null) { - willUpdateIdsSet.add(inputsBatch.getId()); - if(willUpdateIds != null) { - willUpdateIds.add(inputsBatch.getId()); - } - } - }); - - // 存在相同的投入品编号 - if(inputInfoIdsSet.size() != inputsBatchs.size()) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.CAN_NOT_ADD_THE_SAME_INPUT_INFO); - } - // 存在相同的批次编号 - if(willUpdateIds != null && willUpdateIdsSet.size() != willUpdateIds.size()) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.EXIST_THE_SAME_INPUT_BATCH); - } - - // 这边开始校验投入品是否存在 - List inputInfoIds = new ArrayList<>(inputInfoIdsSet); - List inputsInfoRespDTO = inputsInfoApi.getInputsInfoListByInputId(inputInfoIds).getData(); - if(inputsInfoRespDTO.isEmpty() || inputsInfoRespDTO.size() != inputInfoIds.size()) { - throw ServiceExceptionUtil.exception(cn.iocoder.yudao.module.basic.enums.ErrorCodeConstants.INPUTS_INFO_NOT_EXISTS); - } - - inputsInfoRespDTO.forEach(item -> { - if(!item.getBelongBusinessId().equals(businessId)) { - throw ServiceExceptionUtil.exception(cn.iocoder.yudao.module.basic.enums.ErrorCodeConstants.INPUTS_INFO_NOT_EXISTS); - } - idAndNames.put(item.getInputsId(), item.getInputsName()); - if(inputsInfoMaps != null) { - inputsInfoMaps.put(item.getInputsId(), item); - } - }); - } - - @Override - public void deleteInputsBuy(Long id) { - // 校验存在 - InputsBuyDO inputsBuy = inputsBuyMapper.selectById(id); - if(inputsBuy == null) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.INPUTS_BUY_NOT_EXISTS); - } - // 删除 - inputsBuyMapper.deleteById(id); - } - - @Override - public InputsBuyRespVO getInputsBuy(Long id) { - InputsBuyDO inputsBuy = inputsBuyMapper.selectById(id); - if(inputsBuy == null) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.INPUTS_BUY_NOT_EXISTS); - } - InputsBuyRespVO inputsBuyRespVO = InputsBuyConvert.INSTANCE.convert(inputsBuy); - - List list = inputsBatchMapper.selectList(InputsBatchDO::getInputsBuyId, inputsBuyRespVO.getInputsBuyId()); - List inputsBatchVOs = InputsBatchConvert.INSTANCE.convertList(list); - inputsBuyRespVO.setInputsBatchs(inputsBatchVOs); - return inputsBuyRespVO; - } - - @Override - public List getInputsBuyList(Collection ids) { - return inputsBuyMapper.selectBatchIds(ids); - } - - @Override - public PageResult getInputsBuyPage(InputsBuyPageReqVO pageReqVO) { - Page page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); - List result = inputsBuyMapper.selectInputsBuyPage(page, pageReqVO); - // 按照已生成时间的倒序排序 - result.sort(Comparator.comparing(InputsBuyRespVO::getCreateTime).reversed()); - return new PageResult<>(result, page.getTotal()); - } - - @Override - public List getInputsBuyNumberList(Integer count) { - List results = new ArrayList<>(); - for (int i = 0; i < count; i++) { - results.add(CodeEnum.INPUTS_BUY_CODE.getCode()); - } - return results; - } - - @Override - public InputBuyForOutBoundRespVO getInputsBuyByOutbound(String outBoundId) { - // 根据出库单号查询出库单信息 - CommonResult outResp = outboundApi.getOutboundByOutBoundId(outBoundId); - if(outResp.isError()) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.OUTBOUND_NOT_EXISTS); - } -// if(!outResp.getData().getBlockState().equals(BlockStateEnum.ACTIVATION.getBlockState())) { -// throw ServiceExceptionUtil.exception(ErrorCodeConstants.OUTBOUND_NOT_ACTIVATION); -// } - - OutboundRespDTO outboundRespDTO = outResp.getData(); - List goodsIds = outboundRespDTO.getOutboundGoodsList().stream().map(OutboundGoodsDTO::getGoodsId).collect(Collectors.toList()); - // 根据商品编号查询投入品信息 - // CommonResult> inputInfoResult = goodsInputRelationalApi.getInputInfoByGoodsId(goodsIds); - CommonResult relaResult = goodsInputRelationalApi.getInputInfoByGoodsId(goodsIds); - if(relaResult.isError()) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.GOODS_INFO_NOT_EXISTS); - } - - InputBuyForOutBoundRespVO result = new InputBuyForOutBoundRespVO(); - if(relaResult.getData().getInputsInfo() == null || relaResult.getData().getInputsInfo().isEmpty()) { - // 说明出库单里面有 没和投入品关联的商品 - result.setNeedRelaInputInfo(Boolean.TRUE); - result.setGoodsInfos(InputsBuyConvert.INSTANCE.convertToGoodsInfoList(relaResult.getData().getGoodsInfos())); - result.setBelongBusinessId(outResp.getData().getBelongBusinessId()); - // 此时返回没有关联的商品 - return result; - } - - // 返回投入品信息 - // List inputsBatchVOs = InputsBatchConvert.INSTANCE.convertOfDTOList(relaResult.getData().getInputsInfo()); - - List inputsBatchVOs = relaResult.getData().getInputsInfo().stream().map(r -> { - InputsBatchRespVO InputsBatchRespVO = new InputsBatchRespVO(); - BeanUtil.copyProperties(r, InputsBatchRespVO); - InputsBatchRespVO.setInputsBatchId(CodeEnum.INPUTS_BATCH_CODE.getCode()); - // 设置商品数量 - // InputsBatchRespVO.setInputsNum(outGoodsMap.get(r.getGoodsId()).getGoodsWeight()); - return InputsBatchRespVO; - }).collect(Collectors.toList()); - - result.setNeedRelaInputInfo(Boolean.FALSE); - result.setInputsBuyTime(outboundRespDTO.getOutBoundTime()); - result.setBelongBusinessId(outboundRespDTO.getBelongBusinessId()); - result.setBelongBusinessName(outboundRespDTO.getBelongBusinessName()); - result.setVendorId(outboundRespDTO.getVendorId()); - result.setVendorName(outboundRespDTO.getVendorName()); - result.setInputsBuyId(CodeEnum.INPUTS_BUY_CODE.getCode()); - result.setRelateOutboundId(outBoundId); - result.setInputsBatchs(inputsBatchVOs); - return result; - } - - @Override - @GlobalTransactional(rollbackFor = Exception.class) - public void upChain(Long id) { - log.info("[reduceStock] 当前 XID: {}", RootContext.getXID()); - InputsBuyDO inputsBuy = inputsBuyMapper.selectById(id); - if(inputsBuy == null) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.INPUTS_BUY_NOT_EXISTS); - } - if(!inputsBuy.getBlockState().equals(BlockStateEnum.NOT_ON_CHAIN.getBlockState())) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.ONLY_NOT_ON_CHAIN_INPUT_BUY_CAN_DO_UP_CHAIN); - } - // 查询所有批次 - List inputsBatchs = inputsBatchMapper.selectList(new LambdaQueryWrapperX().eq(InputsBatchDO::getInputsBuyId, inputsBuy.getInputsBuyId())); - // 封装批次 - BlockCertificateUpChainReqDTO upChainBatchReqDTO = new BlockCertificateUpChainReqDTO(); - List operateBatchs = inputsBatchs.stream().map(batch -> { - UpChainObjReqDTO upChainObjReqDTO = new UpChainObjReqDTO(); - upChainObjReqDTO.setBatchId(batch.getInputsBatchId()); - upChainObjReqDTO.setOperateObjId(batch.getId()); - return upChainObjReqDTO; - }).collect(Collectors.toList()); - upChainBatchReqDTO.setOperateType(OperateTypeEnum.BATCH.getType()); - upChainBatchReqDTO.setOperateName(OperateTypeEnum.BATCH.getName()); - upChainBatchReqDTO.setBatchType(BatchTypeEnum.INPUT_BATCH.getType()); - upChainBatchReqDTO.setOperateObjs(operateBatchs); - upChainBatchReqDTO.setBelongBusinessId(inputsBuy.getBelongBusinessId()); - upChainBatchReqDTO.setBelongBusinessName(inputsBuy.getBelongBusinessName()); - - // 封装投入品 - List operateHarvests = new ArrayList<>(); - UpChainObjReqDTO upChainObjReqDTO = new UpChainObjReqDTO(); - upChainObjReqDTO.setOperateObjId(id); - operateHarvests.add(upChainObjReqDTO); - - BlockCertificateUpChainReqDTO upChainReqDTO = new BlockCertificateUpChainReqDTO(); - upChainReqDTO.setOperateObjs(operateHarvests); - upChainReqDTO.setOperateType(OperateTypeEnum.INPUT_BUY.getType()); - upChainReqDTO.setOperateName(OperateTypeEnum.INPUT_BUY.getName()); - upChainReqDTO.setBelongBusinessId(inputsBuy.getBelongBusinessId()); - upChainReqDTO.setBelongBusinessName(inputsBuy.getBelongBusinessName()); - - // 远程调用 - List inputBuyResults = blockCertificateApi.createAndUpChainBatch(upChainReqDTO).getData(); - List batchResults = blockCertificateApi.createAndUpChainBatch(upChainBatchReqDTO).getData(); - - if(batchResults == null || inputBuyResults == null) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.CREATE_BLOCK_CERTIFICATE_FAIL); - } - Map batchBCMaps = new HashMap<>(); - batchResults.forEach(item -> batchBCMaps.put(item.getBatchId(), item)); - // 将要更新的类 - InputsBuyDO inputsBuyDO = new InputsBuyDO(); - inputsBuyDO.setId(id); - inputsBuyDO.setBlockChainBlockIdentity(inputBuyResults.get(0).getChainBlockIdentity()); - inputsBuyDO.setBlockChainId(inputBuyResults.get(0).getChainOperateId()); - inputsBuyDO.setBlockState(BlockStateEnum.ACTIVATION.getBlockState());// 改为激活状态 - - List inputsBatchDOS = new ArrayList<>(); - //循环所有批次 - inputsBatchs.forEach(item -> { - InputsBatchDO inputsBatchDO = new InputsBatchDO(); - BeanUtil.copyProperties(item, inputsBatchDO); - inputsBatchDO.setBlockChainBlockIdentity(batchBCMaps.get(item.getInputsBatchId()).getChainBlockIdentity()); - inputsBatchDO.setBlockChainId(batchBCMaps.get(item.getInputsBatchId()).getChainOperateId()); - inputsBatchDO.setBlockState(BlockStateEnum.ACTIVATION.getBlockState());// 修改主单的激活状态时， 子单一律改为激活 - inputsBatchDOS.add(inputsBatchDO); - }); - - inputsBuyMapper.updateById(inputsBuyDO); - inputsBatchMapper.updateBatch(inputsBatchDOS, Integer.MAX_VALUE); - } - - @Override - @GlobalTransactional(rollbackFor = Exception.class) - public void updateChainStatus(Long id, Integer state) { - log.info("[reduceStock] 当前 XID: {}", RootContext.getXID()); - InputsBuyDO inputsBuy = inputsBuyMapper.selectById(id); - if(inputsBuy == null) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.INPUTS_BUY_NOT_EXISTS); - } - if(inputsBuy.getBlockState().equals(BlockStateEnum.NOT_ON_CHAIN.getBlockState())) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.ONLY_ON_CHAIN_INPUT_BUY_CAN_DO_UPDATE_CHAIN_STATUS); - } - // 查询所有批次 - List inputsBatchs = inputsBatchMapper.selectList(new LambdaQueryWrapperX().eq(InputsBatchDO::getInputsBuyId, inputsBuy.getInputsBuyId())); - - Integer blockState = state.equals(BlockStateEnum.ACTIVATION.getBlockState()) ? BlockStateEnum.ACTIVATION.getBlockState() : BlockStateEnum.FREEZE.getBlockState(); - Integer chainStatus = state.equals(BlockStateEnum.ACTIVATION.getBlockState()) ? ChainStatusEnum.ACTIVE.getStatus() : ChainStatusEnum.FREEZE.getStatus(); - - // 修改主单的链状态时，将同步修改子单的链状态 - List batchsReqDTOS = new ArrayList<>(); - UpdateStatusReqDTO harvestReqDTO = new UpdateStatusReqDTO(); - harvestReqDTO.setChainOperateId(inputsBuy.getBlockChainId()); - harvestReqDTO.setChainStatus(chainStatus); - batchsReqDTOS.add(harvestReqDTO); - inputsBatchs.forEach(batch -> { - UpdateStatusReqDTO batchReqDTO = new UpdateStatusReqDTO(); - batchReqDTO.setChainOperateId(batch.getBlockChainId()); - batchReqDTO.setChainStatus(chainStatus); - batchsReqDTOS.add(batchReqDTO); - }); - - if(blockCertificateApi.updateStatusBatch(batchsReqDTOS).isError()) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.UPDATE_CREATE_BLOCK_CERTIFICATE_FAIL); - } - - InputsBuyDO inputsBuyDO = new InputsBuyDO(); - inputsBuyDO.setId(id); - inputsBuyDO.setBlockState(blockState); - - inputsBatchs.forEach(batch -> batch.setBlockState(blockState)); - - inputsBuyMapper.updateById(inputsBuyDO); - inputsBatchMapper.updateBatch(inputsBatchs, Integer.MAX_VALUE); - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landblockstate/LandBlockStateService.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landblockstate/LandBlockStateService.java deleted file mode 100644 index 4383f97..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landblockstate/LandBlockStateService.java +++ /dev/null @@ -1,73 +0,0 @@ -package cn.iocoder.yudao.module.product.service.landblockstate; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.landblockstate.vo.LandBlockStateCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landblockstate.vo.LandBlockStatePageReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landblockstate.vo.LandBlockStateUpdateReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.landblockstate.LandBlockStateDO; - -import javax.validation.Valid; -import java.util.Collection; -import java.util.List; - -/** - * 地块状态 Service 接口 - * - * @author 芋道源码 - */ -public interface LandBlockStateService { - - /** - * 创建地块状态 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createLandBlockState(@Valid LandBlockStateCreateReqVO createReqVO); - - /** - * 更新地块状态 - * - * @param updateReqVO 更新信息 - */ - void updateLandBlockState(@Valid LandBlockStateUpdateReqVO updateReqVO); - - /** - * 删除地块状态 - * - * @param id 编号 - */ - void deleteLandBlockState(Long id); - - /** - * 获得地块状态 - * - * @param id 编号 - * @return 地块状态 - */ - LandBlockStateDO getLandBlockState(Long id); - - /** - * 获得地块状态列表 - * - * @param ids 编号 - * @return 地块状态列表 - */ - List getLandBlockStateList(Collection ids); - - /** - * 获得地块状态分页 - * - * @param pageReqVO 分页查询 - * @return 地块状态分页 - */ - PageResult getLandBlockStatePage(LandBlockStatePageReqVO pageReqVO); - - /** - * 根据商户ID获取所有地块状态 - * @param id - * @return - */ - List getByBusinessInfoId(Long id); - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landblockstate/LandBlockStateServiceImpl.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landblockstate/LandBlockStateServiceImpl.java deleted file mode 100644 index fa239dc..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landblockstate/LandBlockStateServiceImpl.java +++ /dev/null @@ -1,125 +0,0 @@ -package cn.iocoder.yudao.module.product.service.landblockstate; - -import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.basic.api.businessinfo.BusinessInfoApi; -import cn.iocoder.yudao.module.basic.api.redis.dto.BusinessInfoDTO; -import cn.iocoder.yudao.module.product.controller.admin.landblockstate.vo.LandBlockStateCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landblockstate.vo.LandBlockStatePageReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landblockstate.vo.LandBlockStateUpdateReqVO; -import cn.iocoder.yudao.module.product.convert.landblockstate.LandBlockStateConvert; -import cn.iocoder.yudao.module.product.dal.dataobject.landblockstate.LandBlockStateDO; -import cn.iocoder.yudao.module.product.dal.mysql.landblockstate.LandBlockStateMapper; -import cn.iocoder.yudao.module.product.enums.ErrorCodeConstants; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.Collection; -import java.util.List; -import java.util.Objects; - -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.LAND_BLOCK_STATE_ALREADY_EXIST; -import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.LAND_BLOCK_STATE_NOT_EXISTS; - -/** - * 地块状态 Service 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -public class LandBlockStateServiceImpl implements LandBlockStateService { - - @Resource - private LandBlockStateMapper landBlockStateMapper; - @Resource - private BusinessInfoApi businessInfoApi; - - @Override - public Long createLandBlockState(LandBlockStateCreateReqVO createReqVO) { - //校验商户昵称的地块状态名称是否重复 - validateLandStateNameExists(createReqVO.getLandStateName(),createReqVO.getBelongBusinessId()); - //校验商户 - BusinessInfoDTO businessInfo = businessInfoApi.getBusinessInfoById(createReqVO.getBelongBusinessId()).getData(); - if(businessInfo == null) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.BUSINESS_INFO_NOT_EXISTS); - } - // 插入 - LandBlockStateDO landBlockState = LandBlockStateConvert.INSTANCE.convert(createReqVO); - landBlockState.setBelongBusinessName(businessInfo.getBusinessName()); - landBlockStateMapper.insert(landBlockState); - // 返回 - return landBlockState.getId(); - } - - @Override - public void updateLandBlockState(LandBlockStateUpdateReqVO updateReqVO) { - //校验是否存在 - LandBlockStateDO landBlockStateInfo = landBlockStateMapper.selectById(updateReqVO.getId()); - if (landBlockStateInfo == null){ - throw exception(LAND_BLOCK_STATE_NOT_EXISTS); - } - // 检查地块状态是否发生变化 - if (!Objects.equals(landBlockStateInfo.getLandStateName(), updateReqVO.getLandStateName())) { - //校验商户昵称的地块状态名称是否重复 - validateLandStateNameExists(updateReqVO.getLandStateName(),updateReqVO.getBelongBusinessId()); - } - // 更新 - LandBlockStateDO updateObj = LandBlockStateConvert.INSTANCE.convert(updateReqVO); - landBlockStateMapper.updateById(updateObj); - } - - @Override - public void deleteLandBlockState(Long id) { - // 校验存在 - validateLandBlockStateExists(id); - // 删除 - landBlockStateMapper.deleteById(id); - } - - private void validateLandBlockStateExists(Long id) { - if (landBlockStateMapper.selectById(id) == null) { - throw exception(LAND_BLOCK_STATE_NOT_EXISTS); - } - } - - @Override - public LandBlockStateDO getLandBlockState(Long id) { - return landBlockStateMapper.selectById(id); - } - - @Override - public List getLandBlockStateList(Collection ids) { - return landBlockStateMapper.selectBatchIds(ids); - } - - @Override - public PageResult getLandBlockStatePage(LandBlockStatePageReqVO pageReqVO) { - return landBlockStateMapper.selectPage(pageReqVO); - } - - /** - * 根据商户ID获取所有地块状态 - * - * @param id - * @return - */ - @Override - public List getByBusinessInfoId(Long id) { - return landBlockStateMapper.selectList(new LambdaQueryWrapperX().eq(LandBlockStateDO::getBelongBusinessId, id)); - } - - private void validateLandStateNameExists(String landStateName,Long belongBusinessId) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("land_state_name", landStateName) - .eq("belong_business_id",belongBusinessId); - if (landBlockStateMapper.selectOne(wrapper) != null) { - throw exception(LAND_BLOCK_STATE_ALREADY_EXIST); - } - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landinfo/LandInfoService.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landinfo/LandInfoService.java deleted file mode 100644 index e8345eb..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landinfo/LandInfoService.java +++ /dev/null @@ -1,82 +0,0 @@ -package cn.iocoder.yudao.module.product.service.landinfo; - -import java.util.*; -import javax.validation.*; -import cn.iocoder.yudao.module.product.controller.admin.landinfo.vo.*; -import cn.iocoder.yudao.module.product.dal.dataobject.landinfo.LandInfoDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -/** - * 农事土地信息 Service 接口 - * - * @author 芋道源码 - */ -public interface LandInfoService { - - /** - * 创建农事土地信息 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createLandInfo(@Valid LandInfoCreateReqVO createReqVO); - - /** - * 更新农事土地信息 - * - * @param updateReqVO 更新信息 - */ - void updateLandInfo(@Valid LandInfoUpdateReqVO updateReqVO); - - /** - * 删除农事土地信息 - * - * @param id 编号 - */ - void deleteLandInfo(Long id); - - /** - * 获得农事土地信息 - * - * @param id 编号 - * @return 农事土地信息 - */ - LandInfoDO getLandInfo(Long id); - - /** - * 根据地块编码获取地块信息 - * @param landId 地块编码 - * @return 地块信息 - */ - LandInfoDO getLandInfoByLandId(String landId); - - /** - * 获得农事土地信息列表 - * - * @param ids 编号 - * @return 农事土地信息列表 - */ - List getLandInfoList(Collection ids); - - /** - * 获得农事土地信息分页 - * - * @param pageReqVO 分页查询 - * @return 农事土地信息分页 - */ - PageResult getLandInfoPage(LandInfoPageReqVO pageReqVO); - - /** - * 获取所有地块昵称 - * @return - */ - List getLandInfoLandNameList(); - - /** - * 根据地块id获取所有该地块的商户名称 - * @param - * @return - */ - List getLandInfoByBelongBusinessId(Long belongBusinessId); - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landinfo/LandInfoServiceImpl.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landinfo/LandInfoServiceImpl.java deleted file mode 100644 index 3ed39fd..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landinfo/LandInfoServiceImpl.java +++ /dev/null @@ -1,162 +0,0 @@ -package cn.iocoder.yudao.module.product.service.landinfo; - -import cn.iocoder.yudao.framework.common.enums.CodeEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.product.controller.admin.landinfo.vo.LandInfoCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landinfo.vo.LandInfoPageReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landinfo.vo.LandInfoUpdateReqVO; -import cn.iocoder.yudao.module.product.convert.landinfo.LandInfoConvert; -import cn.iocoder.yudao.module.product.dal.dataobject.landinfo.LandInfoDO; -import cn.iocoder.yudao.module.product.dal.mysql.landinfo.LandInfoMapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.util.Collection; -import java.util.List; - -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.LAND_INFO_NOT_EXISTS; -import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.LAND_INFO_NOT_LESS_THAN_ZERO; - -/** - * 农事土地信息 Service 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -public class LandInfoServiceImpl implements LandInfoService { - - @Resource - private LandInfoMapper landInfoMapper; - - /** - * 创建农事土地信息 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - @Override - public Long createLandInfo(LandInfoCreateReqVO createReqVO) { - // 校验size - BigDecimal size = createReqVO.getSize(); - if (size != null && size.compareTo(BigDecimal.ZERO) < 0) { - throw exception(LAND_INFO_NOT_LESS_THAN_ZERO); - } - // 插入 - LandInfoDO landInfo = LandInfoConvert.INSTANCE.convert(createReqVO); - landInfo.setLandId(CodeEnum.LAND_INFO_CODE.getCode()); - landInfoMapper.insert(landInfo); - // 返回 - return landInfo.getId(); - } - - /** - * 更新农事土地信息 - * - * @param updateReqVO 更新信息 - */ - @Override - public void updateLandInfo(LandInfoUpdateReqVO updateReqVO) { - // 校验存在 - validateLandInfoExists(updateReqVO.getId()); - // 校验size - BigDecimal size = updateReqVO.getSize(); - if (size != null && size.compareTo(BigDecimal.ZERO) < 0) { - throw exception(LAND_INFO_NOT_LESS_THAN_ZERO); - } - // 更新 - LandInfoDO updateObj = LandInfoConvert.INSTANCE.convert(updateReqVO); - landInfoMapper.updateById(updateObj); - } - - /** - * 删除农事土地信息 - * - * @param id 编号 - */ - @Override - public void deleteLandInfo(Long id) { - // 校验存在 - validateLandInfoExists(id); - // 删除 - landInfoMapper.deleteById(id); - } - - private void validateLandInfoExists(Long id) { - if (landInfoMapper.selectById(id) == null) { - throw exception(LAND_INFO_NOT_EXISTS); - } - } - - /** - * 获得农事土地信息 - * - * @param id 编号 - * @return 农事土地信息 - */ - @Override - public LandInfoDO getLandInfo(Long id) { - return landInfoMapper.selectById(id); - } - - @Override - public LandInfoDO getLandInfoByLandId(String landId) { - return landInfoMapper.selectOne(new LambdaQueryWrapperX().eq(LandInfoDO::getLandId, landId)); - } - - - /** - * 获得农事土地信息列表 - * - * @param ids 编号 - * @return 农事土地信息列表 - */ - @Override - public List getLandInfoList(Collection ids) { - return landInfoMapper.selectBatchIds(ids); - } - - /** - * 获得农事土地信息分页 - * - * @param pageReqVO 分页查询 - * @return 农事土地信息分页 - */ - @Override - public PageResult getLandInfoPage(LandInfoPageReqVO pageReqVO) { - Page page = new Page<>(pageReqVO.getPageNo(),pageReqVO.getPageSize()); - IPage landJobDOIPage = landInfoMapper.selectLandInfoById(page,pageReqVO.getLandName(), - pageReqVO.getLandId(),pageReqVO.getBelongBusinessName(),pageReqVO.getState()); - PageResult landInfoDOPageResult = new PageResult().setList(landJobDOIPage.getRecords()); - landInfoDOPageResult.setTotal(landJobDOIPage.getTotal()); - return landInfoDOPageResult; - } - - /** - * 获取所有地块昵称 - * - * @return - */ - @Override - public List getLandInfoLandNameList() { - //查询所有地块名称 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - return landInfoMapper.selectList(wrapper); - } - - @Override - public List getLandInfoByBelongBusinessId(Long belongBusinessId) { - return landInfoMapper.selectList(new QueryWrapper() - .eq("belong_business_id", belongBusinessId)); - } -} - - diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landinfotype/LandInfoTypeService.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landinfotype/LandInfoTypeService.java deleted file mode 100644 index 54fa2d4..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landinfotype/LandInfoTypeService.java +++ /dev/null @@ -1,73 +0,0 @@ -package cn.iocoder.yudao.module.product.service.landinfotype; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.landinfotype.vo.LandInfoTypeCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landinfotype.vo.LandInfoTypePageReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landinfotype.vo.LandInfoTypeUpdateReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.landinfotype.LandInfoTypeDO; - -import javax.validation.Valid; -import java.util.Collection; -import java.util.List; - -/** - * 地块类型 Service 接口 - * - * @author 芋道源码 - */ -public interface LandInfoTypeService { - - /** - * 创建地块类型 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createLandInfoType(@Valid LandInfoTypeCreateReqVO createReqVO); - - /** - * 更新地块类型 - * - * @param updateReqVO 更新信息 - */ - void updateLandInfoType(@Valid LandInfoTypeUpdateReqVO updateReqVO); - - /** - * 删除地块类型 - * - * @param id 编号 - */ - void deleteLandInfoType(Long id); - - /** - * 获得地块类型 - * - * @param id 编号 - * @return 地块类型 - */ - LandInfoTypeDO getLandInfoType(Long id); - - /** - * 获得地块类型列表 - * - * @param ids 编号 - * @return 地块类型列表 - */ - List getLandInfoTypeList(Collection ids); - - /** - * 获得地块类型分页 - * - * @param pageReqVO 分页查询 - * @return 地块类型分页 - */ - PageResult getLandInfoTypePage(LandInfoTypePageReqVO pageReqVO); - - /** - * 根据商户ID获取所有地块类型 - * @param id - * @return - */ - List getByBusinessInfoId(Long id); - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landinfotype/LandInfoTypeServiceImpl.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landinfotype/LandInfoTypeServiceImpl.java deleted file mode 100644 index 7fcadb9..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landinfotype/LandInfoTypeServiceImpl.java +++ /dev/null @@ -1,120 +0,0 @@ -package cn.iocoder.yudao.module.product.service.landinfotype; - -import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.basic.api.businessinfo.BusinessInfoApi; -import cn.iocoder.yudao.module.basic.api.redis.dto.BusinessInfoDTO; -import cn.iocoder.yudao.module.product.controller.admin.landinfotype.vo.LandInfoTypeCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landinfotype.vo.LandInfoTypePageReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landinfotype.vo.LandInfoTypeUpdateReqVO; -import cn.iocoder.yudao.module.product.convert.landinfotype.LandInfoTypeConvert; -import cn.iocoder.yudao.module.product.dal.dataobject.landinfotype.LandInfoTypeDO; -import cn.iocoder.yudao.module.product.dal.mysql.landinfotype.LandInfoTypeMapper; -import cn.iocoder.yudao.module.product.enums.ErrorCodeConstants; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.Collection; -import java.util.List; -import java.util.Objects; - -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.LAND_INFO_TYPE_ALREADY_EXIST; -import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.LAND_INFO_TYPE_NOT_EXISTS; - -/** - * 地块类型 Service 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -public class LandInfoTypeServiceImpl implements LandInfoTypeService { - - @Resource - private LandInfoTypeMapper landInfoTypeMapper; - - @Resource - private BusinessInfoApi businessInfoApi; - - @Override - public Long createLandInfoType(LandInfoTypeCreateReqVO createReqVO) { - //校验商户昵称的地块类型名称是否重复 - validateLandTypeNameExists(createReqVO.getLandTypeName(),createReqVO.getBelongBusinessId()); - // 校验商户 - BusinessInfoDTO businessInfo = businessInfoApi.getBusinessInfoById(createReqVO.getBelongBusinessId()).getData(); - if(businessInfo == null) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.BUSINESS_INFO_NOT_EXISTS); - } - // 插入 - LandInfoTypeDO landInfoType = LandInfoTypeConvert.INSTANCE.convert(createReqVO); - landInfoType.setBelongBusinessName(businessInfo.getBusinessName()); - landInfoTypeMapper.insert(landInfoType); - // 返回 - return landInfoType.getId(); - } - - @Override - public void updateLandInfoType(LandInfoTypeUpdateReqVO updateReqVO) { - //校验是否存在 - LandInfoTypeDO landInfoTypeInfo = landInfoTypeMapper.selectById(updateReqVO.getId()); - if (landInfoTypeInfo == null){ - throw exception(LAND_INFO_TYPE_NOT_EXISTS); - } - // 检查地块类型是否发生变化 - if (!Objects.equals(landInfoTypeInfo.getLandTypeName(), updateReqVO.getLandTypeName())) { - //校验商户昵称的地块类型名称是否重复 - validateLandTypeNameExists(updateReqVO.getLandTypeName(),updateReqVO.getBelongBusinessId()); - } - // 更新 - LandInfoTypeDO updateObj = LandInfoTypeConvert.INSTANCE.convert(updateReqVO); - landInfoTypeMapper.updateById(updateObj); - } - - @Override - public void deleteLandInfoType(Long id) { - // 校验存在 - validateLandInfoTypeExists(id); - // 删除 - landInfoTypeMapper.deleteById(id); - } - - private void validateLandInfoTypeExists(Long id) { - if (landInfoTypeMapper.selectById(id) == null) { - throw exception(LAND_INFO_TYPE_NOT_EXISTS); - } - } - - @Override - public LandInfoTypeDO getLandInfoType(Long id) { - return landInfoTypeMapper.selectById(id); - } - - @Override - public List getLandInfoTypeList(Collection ids) { - return landInfoTypeMapper.selectBatchIds(ids); - } - - @Override - public PageResult getLandInfoTypePage(LandInfoTypePageReqVO pageReqVO) { - return landInfoTypeMapper.selectPage(pageReqVO); - } - - @Override - public List getByBusinessInfoId(Long id) { - return landInfoTypeMapper.selectList(new LambdaQueryWrapperX().eq(LandInfoTypeDO::getBelongBusinessId, id)); - } - - private void validateLandTypeNameExists(String landTypeName,Long belongBusinessId) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("land_type_name", landTypeName) - .eq("belong_business_id",belongBusinessId); - if (landInfoTypeMapper.selectOne(wrapper) != null) { - throw exception(LAND_INFO_TYPE_ALREADY_EXIST); - } - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landjob/LandJobService.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landjob/LandJobService.java deleted file mode 100644 index d9238fd..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landjob/LandJobService.java +++ /dev/null @@ -1,111 +0,0 @@ -package cn.iocoder.yudao.module.product.service.landjob; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.landjob.vo.*; -import cn.iocoder.yudao.module.product.controller.app.landjob.vo.FileUploadReqVO; -import cn.iocoder.yudao.module.product.controller.app.landjob.vo.LandJobReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.landjob.LandJobDO; - -import javax.validation.Valid; -import java.io.IOException; -import java.util.Collection; -import java.util.List; - -/** - * 种植/养殖/畜牧作业 Service 接口 - * - * @author 芋道源码 - */ -public interface LandJobService { - - /** - * 创建种植/养殖/畜牧作业 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createLandJob(@Valid LandJobCreateReqVO createReqVO); - - /** - * 更新种植/养殖/畜牧作业 - * - * @param updateReqVO 更新信息 - */ - void updateLandJob(@Valid LandJobUpdateReqVO updateReqVO); - - /** - * 删除种植/养殖/畜牧作业 - * - * @param id 编号 - */ - void deleteLandJob(Long id); - - /** - * 获得种植/养殖/畜牧作业 - * - * @param id 编号 - * @return 种植/养殖/畜牧作业 - */ - LandJobRespVO getLandJob(Long id); - - /** - * 获得种植/养殖/畜牧作业列表 - * - * @param ids 编号 - * @return 种植/养殖/畜牧作业列表 - */ - List getLandJobList(Collection ids); - - /** - * 获得种植/养殖/畜牧作业分页 - * - * @param pageReqVO 分页查询 - * @return 种植/养殖/畜牧作业分页 - */ - PageResult getLandJobPage(LandJobPageReqVO pageReqVO); - - /** - * 获得种植/养殖/畜牧作业列表, 用于 Excel 导出 - * - * @param exportReqVO 查询条件 - * @return 种植/养殖/畜牧作业列表 - */ - List getLandJobList(LandJobExportReqVO exportReqVO); - - /** - * 上链 - * - * @param id id - */ - void upChain(Long id); - - /** - * 更新链状态 - * - * @param id id - * @param state 状态 - */ - void updateChainStatus(Long id, Integer state); - - /** - * 查询同类型的农事作业 - * @param landJobReqVO 入参 - * @return 农事作业 - */ - List getSameTypeJobById(LandJobReqVO landJobReqVO); - - /** - * 新增农事作业 - * @param createOfAppReqVO 入参 - * @return ID - */ - Long createLandJobByApp(LandJobCreateOfAppReqVO createOfAppReqVO); - - /** - * 上传文件 - * @param uploadReqVO 入参 - * @return 文件名 - * @throws IOException 异常 - */ - String upload(FileUploadReqVO uploadReqVO) throws IOException; -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landjob/LandJobServiceImpl.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landjob/LandJobServiceImpl.java deleted file mode 100644 index 74dafa4..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landjob/LandJobServiceImpl.java +++ /dev/null @@ -1,472 +0,0 @@ -package cn.iocoder.yudao.module.product.service.landjob; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.io.IoUtil; -import cn.iocoder.yudao.framework.common.enums.BlockStateEnum; -import cn.iocoder.yudao.framework.common.enums.CodeEnum; -import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; -import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils; -import cn.iocoder.yudao.module.basic.api.businessinfo.BusinessInfoApi; -import cn.iocoder.yudao.module.basic.api.redis.dto.BusinessInfoDTO; -import cn.iocoder.yudao.module.basic.api.workersinfo.WorkersinfoApi; -import cn.iocoder.yudao.module.basic.api.workersinfo.dto.WorkersInfoRespDTO; -import cn.iocoder.yudao.module.chain.api.blockcertificate.BlockCertificateApi; -import cn.iocoder.yudao.module.chain.api.blockcertificate.dto.BlockCertificateRespDTO; -import cn.iocoder.yudao.module.chain.api.blockcertificate.dto.BlockCertificateUpChainReqDTO; -import cn.iocoder.yudao.module.chain.api.blockcertificate.dto.UpChainObjReqDTO; -import cn.iocoder.yudao.module.chain.api.blockcertificate.dto.UpdateStatusReqDTO; -import cn.iocoder.yudao.module.chain.enums.ChainStatusEnum; -import cn.iocoder.yudao.module.chain.enums.OperateTypeEnum; -import cn.iocoder.yudao.module.infra.api.file.FileApi; -import cn.iocoder.yudao.module.product.controller.admin.landjob.vo.*; -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.LandJobInputsRespVO; -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.LandJobInputsSaveReqVO; -import cn.iocoder.yudao.module.product.controller.app.landjob.vo.FileUploadReqVO; -import cn.iocoder.yudao.module.product.controller.app.landjob.vo.LandJobReqVO; -import cn.iocoder.yudao.module.product.convert.landjob.LandJobConvert; -import cn.iocoder.yudao.module.product.convert.landjobinputs.LandJobInputsConvert; -import cn.iocoder.yudao.module.product.dal.dataobject.landinfo.LandInfoDO; -import cn.iocoder.yudao.module.product.dal.dataobject.landjob.LandJobDO; -import cn.iocoder.yudao.module.product.dal.dataobject.landjobinputs.LandJobInputsDO; -import cn.iocoder.yudao.module.product.dal.mysql.landinfo.LandInfoMapper; -import cn.iocoder.yudao.module.product.dal.mysql.landjob.LandJobMapper; -import cn.iocoder.yudao.module.product.dal.mysql.landjobinputs.LandJobInputsMapper; -import cn.iocoder.yudao.module.product.enums.ErrorCodeConstants; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.seata.spring.annotation.GlobalTransactional; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.io.IOException; -import java.util.*; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Function; -import java.util.stream.Collectors; - -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.basic.enums.ErrorCodeConstants.*; -import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.LAND_INFO_NOT_EXISTS; -import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.LAND_JOB_NOT_EXISTS; - -/** - * 种植/养殖/畜牧作业 Service 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -public class LandJobServiceImpl implements LandJobService { - - @Resource - private LandJobMapper landJobMapper; - - @Resource - private WorkersinfoApi workersinfoApi; - - @Resource - private BusinessInfoApi businessInfoApi; - - @Resource - private FileApi fileApi; - - @Resource - private LandJobInputsMapper landJobInputsMapper; - - @Resource - private LandInfoMapper landInfoMapper; - - @Resource - private BlockCertificateApi blockCertificateApi; - - /** - * 创建种植/养殖/畜牧作业 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - @Override - @Transactional - public Long createLandJob(LandJobCreateReqVO createReqVO) { - //校验员工是否存在，如果不存在就抛出异常 - CommonResult workersInfo = workersinfoApi.getWorkersInfo(createReqVO.getJobWorkerId()); - WorkersInfoRespDTO dto = workersInfo.getData(); - if (workersInfo.isError() || dto == null){ - throw exception(cn.iocoder.yudao.module.basic.enums.ErrorCodeConstants.WORKERS_INFO_NOT_EXISTS); - } - - // 插入 - LandJobDO landJob = LandJobConvert.INSTANCE.convert(createReqVO); - //下面的数据参照数据库为准 - landJob.setBelongBusinessId(dto.getBelongBusinessId()); - landJob.setBelongBusinessName(dto.getBelongBusinessName()); - landJob.setBlockState(BlockStateEnum.NOT_ON_CHAIN.getBlockState()); - landJob.setJobWorker(dto.getWorkersName()); - landJob.setLandJobId(CodeEnum.LAND_JOB_CODE.getCode()); - - //将批次信息转换成对应的DO对象，并进行存在性校验 - List landJobInputsDOS = LandJobInputsConvert.INSTANCE.convertListCreate(createReqVO.getLandJobIds()); - landJobInputsDOS.forEach(landJobInputsDO -> { - landJobInputsDO.setId(null); - landJobInputsDO.setLandJobId(landJob.getLandJobId()); - landJobInputsDO.setBelongBusinessId(dto.getBelongBusinessId()); - landJobInputsDO.setBelongBusinessName(dto.getBelongBusinessName()); - }); - landJobMapper.insert(landJob); - landJobInputsMapper.insertBatch(landJobInputsDOS); - // 返回 - return landJob.getId(); - } - - /** - * 更新种植/养殖/畜牧作业 - * - * @param updateReqVO 更新信息 - */ - @Override - @Transactional - public void updateLandJob(LandJobUpdateReqVO updateReqVO) { - // 查询种植计划信息 - LandJobDO landJobById = landJobMapper.selectById(updateReqVO.getId()); - if (landJobById == null) { - throw exception(LAND_JOB_NOT_EXISTS); - } - - List landJobInputsDOS = LandJobInputsConvert.INSTANCE.convertListCreate(updateReqVO.getLandJobIds()); - - // 获取原有的地块作业投入品批次信息 - List originalInputsList = landJobInputsMapper.selectList(new QueryWrapper() - .eq("land_job_id", landJobById.getLandJobId())); - Map originalInputsMap = originalInputsList.stream() - .collect(Collectors.toMap(LandJobInputsDO::getId, Function.identity())); - // 需要新增的地块作业投入品批次列表 - List addList = new ArrayList<>(); - // 需要更新的地块作业投入品批次列表 - List updateList = new ArrayList<>(); - - for (LandJobInputsDO landJobInputsDO : landJobInputsDOS) { - Long inputsId = landJobInputsDO.getId(); - LandJobInputsDO originalInputsDO = originalInputsMap.get(inputsId); - if (Objects.isNull(originalInputsDO)) { - // 新增流程 - landJobInputsDO.setId(null); - landJobInputsDO.setBelongBusinessName(landJobById.getBelongBusinessName()); - landJobInputsDO.setBelongBusinessId(landJobById.getBelongBusinessId()); - landJobInputsDO.setLandJobId(landJobById.getLandJobId()); - addList.add(landJobInputsDO); - } else {// 更新流程 - - if (originalInputsDO != null) { - // 只更新可更新的字段 - originalInputsDO.setInputsBatchId(landJobInputsDO.getInputsBatchId()); - originalInputsDO.setInputsNum(landJobInputsDO.getInputsNum()); - originalInputsDO.setInputsDesc(landJobInputsDO.getInputsDesc()); - originalInputsDO.setInputsImgUrl(landJobInputsDO.getInputsImgUrl()); - originalInputsDO.setInputsVideoUrl(landJobInputsDO.getInputsVideoUrl()); - updateList.add(originalInputsDO); - - } - - } - - // 批量新增地块作业投入品批次 - if (!addList.isEmpty()) { - landJobInputsMapper.insertBatch(addList); - } - - // 批量更新地块作业投入品批次 - if (!updateList.isEmpty()) { - landJobInputsMapper.updateBatch(updateList, Integer.MAX_VALUE); - } - } - landJobMapper.updateById(LandJobConvert.INSTANCE.convert(updateReqVO)); - - } - - /** - * 删除种植/养殖/畜牧作业 - * - * @param id 编号 - */ - @Override - public void deleteLandJob(Long id) { - // 校验存在 - LandJobDO landJob = landJobMapper.selectById(id); - if (landJob == null){ - throw ServiceExceptionUtil.exception(ErrorCodeConstants.LAND_JOB_NOT_EXISTS); - } - // 删除主表数据 - landJobMapper.deleteById(id); - } - - /** - * 获得种植/养殖/畜牧作业 - * - * @param id 编号 - * @return 种植/养殖/畜牧作业 - */ - @Override - @Transactional - public LandJobRespVO getLandJob(Long id) { - LandJobDO landJobDO = landJobMapper.selectById(id); - if (landJobDO == null){ - throw exception(LAND_JOB_NOT_EXISTS); - } - LandJobRespVO landJobRespVO = LandJobConvert.INSTANCE.convert(landJobDO); - List landJobInputsDOList = landJobInputsMapper.selectList(LandJobInputsDO::getLandJobId, landJobRespVO.getLandJobId()); - List landJobInputsRespVOS = LandJobInputsConvert.INSTANCE.convertList(landJobInputsDOList); - landJobRespVO.setLandJobIds(landJobInputsRespVOS); - return landJobRespVO; - } - - /** - * 获得种植/养殖/畜牧作业列表 - * - * @param ids 编号 - * @return 种植/养殖/畜牧作业列表 - */ - @Override - public List getLandJobList(Collection ids) { - return landJobMapper.selectBatchIds(ids); - } - - /** - * 获得种植/养殖/畜牧作业分页 - * - * @param pageReqVO 分页查询 - * @return 种植/养殖/畜牧作业分页 - */ - @Override - public PageResult getLandJobPage(LandJobPageReqVO pageReqVO) { - Page page = new Page<>(pageReqVO.getPageNo(),pageReqVO.getPageSize()); - IPage landJobDOIPage = landJobMapper.selectJobTypeById(page,pageReqVO.getLandName(),pageReqVO.getLandId(), - pageReqVO.getJobType(),pageReqVO.getBelongBusinessName()); - PageResult landJobDOPageResult = new PageResult().setList(landJobDOIPage.getRecords()); - landJobDOPageResult.setTotal(landJobDOIPage.getTotal()); - return landJobDOPageResult; - } - - /** - * 获得种植/养殖/畜牧作业列表, 用于 Excel 导出 - * - * @param exportReqVO 查询条件 - * @return 种植/养殖/畜牧作业列表 - */ - @Override - public List getLandJobList(LandJobExportReqVO exportReqVO) { - return landJobMapper.selectList(exportReqVO); - } - - @Override - @GlobalTransactional(rollbackFor = Exception.class) - public void upChain(Long id) { - LandJobDO landJob = landJobMapper.selectById(id); - if(landJob == null) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.LAND_JOB_NOT_EXISTS); - } - if(!landJob.getBlockState().equals(BlockStateEnum.NOT_ON_CHAIN.getBlockState())) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.ONLY_NOT_ON_CHAIN_LAND_JOB_CAN_DO_UP_CHAIN); - } - // 封装种植作业 - List operateJobs = new ArrayList<>(); - UpChainObjReqDTO upChainObjReqDTO = new UpChainObjReqDTO(); - upChainObjReqDTO.setOperateObjId(id); - operateJobs.add(upChainObjReqDTO); - - BlockCertificateUpChainReqDTO upChainReqDTO = new BlockCertificateUpChainReqDTO(); - upChainReqDTO.setOperateType(OperateTypeEnum.JOB.getType()); - upChainReqDTO.setOperateName(OperateTypeEnum.JOB.getName()); - upChainReqDTO.setOperateObjs(operateJobs); - upChainReqDTO.setBelongBusinessId(landJob.getBelongBusinessId()); - upChainReqDTO.setBelongBusinessName(landJob.getBelongBusinessName()); - - List jobResults = blockCertificateApi.createAndUpChainBatch(upChainReqDTO).getData(); - if(jobResults == null) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.CREATE_BLOCK_CERTIFICATE_FAIL); - } - // 将要更新的类 - LandJobDO landJobDO = new LandJobDO(); - landJobDO.setId(id); - landJobDO.setBlockChainBlockIdentity(jobResults.get(0).getChainBlockIdentity()); - landJobDO.setBlockChainId(jobResults.get(0).getChainOperateId()); - landJobDO.setBlockState(BlockStateEnum.ACTIVATION.getBlockState());// 改为激活状态 - // 更新视频字段 - landJobDO.setJobVideoUrl(landJob.getJobVideoUrl()); - - landJobMapper.updateById(landJobDO); - } - - @Override - @GlobalTransactional(rollbackFor = Exception.class) - public void updateChainStatus(Long id, Integer state) { - LandJobDO LandJob = landJobMapper.selectById(id); - if(LandJob == null) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.LAND_JOB_NOT_EXISTS); - } - if(LandJob.getBlockState().equals(BlockStateEnum.NOT_ON_CHAIN.getBlockState())) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.ONLY_ON_CHAIN_LAND_JOB_CAN_DO_UPDATE_CHAIN_STATUS); - } - Integer blockState = state.equals(BlockStateEnum.ACTIVATION.getBlockState()) ? BlockStateEnum.ACTIVATION.getBlockState() : BlockStateEnum.FREEZE.getBlockState(); - Integer chainStatus = state.equals(BlockStateEnum.ACTIVATION.getBlockState()) ? ChainStatusEnum.ACTIVE.getStatus() : ChainStatusEnum.FREEZE.getStatus(); - - List landJobReqDTOS = new ArrayList<>(); - UpdateStatusReqDTO landJobReqDTO = new UpdateStatusReqDTO(); - landJobReqDTO.setChainOperateId(LandJob.getBlockChainId()); - landJobReqDTO.setChainStatus(chainStatus); - landJobReqDTOS.add(landJobReqDTO); - if(blockCertificateApi.updateStatusBatch(landJobReqDTOS).isError()) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.UPDATE_CREATE_BLOCK_CERTIFICATE_FAIL); - } - - LandJobDO updateDO = new LandJobDO(); - updateDO.setId(id); - updateDO.setBlockState(blockState); - - landJobMapper.updateById(updateDO); - } - - @Override - public List getSameTypeJobById(LandJobReqVO landJobReqVO) { - Long type = null; - String landId = null; - - if(landJobReqVO.getOperateType().equals(OperateTypeEnum.JOB.getType())) { - LandJobDO landJobDO = landJobMapper.getLandJob(landJobReqVO.getObjId(), null); - if(landJobDO != null) { - type = landJobDO.getJobType(); - landId = landJobDO.getLandId(); - } - } else { - LandJobInputsDO landJobInputsDO = landJobInputsMapper.getLandJobInputs(landJobReqVO.getObjId()); - if(landJobInputsDO != null) { - LandJobDO landJobDO = landJobMapper.getLandJob(null, landJobInputsDO.getLandJobId()); - if(landJobDO != null) { - type = landJobDO.getJobType(); - landId = landJobDO.getLandId(); - } - } - } - - if(type != null) { - return landJobMapper.getSameTypeJobByType(type, landId, landJobReqVO.getDay()); - } - return new ArrayList<>(); - } - - @Override - public Long createLandJobByApp(LandJobCreateOfAppReqVO createOfAppReqVO) { - // 校验商户 - BusinessInfoDTO businessInfo = businessInfoApi.getBusinessInfoByIdWithOutTenantId(createOfAppReqVO.getBelongBusinessId()).getData(); - if(businessInfo == null) { - throw ServiceExceptionUtil.exception(BUSINESS_INFO_NOT_EXISTS); - } - // AtomicReference atomicId = new AtomicReference<>(); - - TenantContextHolder.setTenantId(businessInfo.getTenantId()); - TenantContextHolder.setIgnore(false); - // 校验地块 - LandInfoDO landInfo = landInfoMapper.selectOne(new LambdaQueryWrapperX().eq(LandInfoDO::getBelongBusinessId, businessInfo.getId()) - .eq(LandInfoDO::getLandId, createOfAppReqVO.getLandId())); - if(landInfo == null) { - throw ServiceExceptionUtil.exception(LAND_INFO_NOT_EXISTS); - } - - // 根据商户ID openid校验员工 - WorkersInfoRespDTO workersInfo = workersinfoApi.getWorkersInfoWithOutTenantId(businessInfo.getId(), createOfAppReqVO.getOpenid()).getData(); - if(workersInfo == null) { - throw ServiceExceptionUtil.exception(WORKERS_INFO_NOT_EXISTS); - } - - LandJobCreateReqVO createReqVO = new LandJobCreateReqVO(); - BeanUtil.copyProperties(createOfAppReqVO, createReqVO); - List landJobInputs = BeanUtil.copyToList(createOfAppReqVO.getLandJobInputs(), LandJobInputsSaveReqVO.class); - landJobInputs.forEach(input -> { - input.setBelongBusinessName(businessInfo.getBusinessName()); - }); - createReqVO.setLandJobIds(landJobInputs); - createReqVO.setLandType(landInfo.getLandType()); - createReqVO.setLandName(landInfo.getLandName()); - createReqVO.setBelongBusinessName(businessInfo.getBusinessName()); - createReqVO.setJobWorkerId(workersInfo.getId()); - createReqVO.setJobWorker(workersInfo.getWorkersName()); - - return this.createLandJob(createReqVO); - } - - @Override - public String upload(FileUploadReqVO uploadReqVO) throws IOException { - // 校验商户 - BusinessInfoDTO businessInfo = businessInfoApi.getBusinessInfoByIdWithOutTenantId(uploadReqVO.getBusinessInfoId()).getData(); - if(businessInfo == null) { - throw ServiceExceptionUtil.exception(BUSINESS_INFO_NOT_EXISTS); - } - - // 根据商户ID openid校验员工 - WorkersInfoRespDTO workersInfo = workersinfoApi.getWorkersInfoWithOutTenantId(businessInfo.getId(), uploadReqVO.getOpenid()).getData(); - if(workersInfo == null) { - throw ServiceExceptionUtil.exception(WORKERS_INFO_NOT_EXISTS); - } - AtomicReference url = new AtomicReference<>(); - TenantUtils.execute(businessInfo.getTenantId(), () -> { - try { - url.set(fileApi.createFile(uploadReqVO.getFile().getOriginalFilename(), uploadReqVO.getPath(), IoUtil.readBytes(uploadReqVO.getFile().getInputStream()))); - } catch (IOException e) { - throw ServiceExceptionUtil.exception(FILE_UPLOAD_FAIL); - } - }); - return url.get(); - } - - /** - * - * @param landJobInputsDOS - * @param idAndNames 构建投入品编码和投入品昵称映射 - * @param landJobInputsDOMaps 页面传入的LandJobIds集合 - * @param willUpadeteIds 讲要更新的地块作业投入品批次为主键id - * @param landJobDO 该修改的主库信息 - */ - private void verifInputsExists( List landJobInputsDOS, HashMap idAndNames, - Map landJobInputsDOMaps, List willUpadeteIds, LandJobDO landJobDO ) { - - Set landJobIdsSet = new HashSet<>(); - Set willUpadeteIdsSet = new HashSet<>(); - landJobInputsDOS.forEach(landJobInputsDO -> { - landJobIdsSet.add(landJobInputsDO.getInputsId()); - if (landJobInputsDO.getId() != null){ - willUpadeteIdsSet.add(landJobInputsDO.getId()); - if (willUpadeteIds != null){ - willUpadeteIds.add(landJobInputsDO.getId()); - } - } - }); - //存在相同的投入品编码 - if ( landJobIdsSet.size() != landJobInputsDOS.size() ){ - throw exception(INPUTS_INFO_ALREADY_EXIST); - } - //存在相同的投入品批次id - if ( willUpadeteIds != null && willUpadeteIdsSet.size() != willUpadeteIds.size() ){ - throw exception(INPUTS_BATCH_ID_IS_THE_SAME); - } - //这边开始校验投入品编码是否存在 - if ( landJobDO != null ){ - List landJobInputsIds = new ArrayList<>(landJobIdsSet); - List landJobInputsDOList = landJobInputsMapper.selectList(new LambdaQueryWrapperX() - .in(LandJobInputsDO::getInputsId, landJobInputsIds) - .eq(LandJobInputsDO::getLandJobId, landJobDO.getLandJobId())); - landJobInputsDOList.forEach(item ->{ - idAndNames.put(item.getInputsId(),item.getInputsName()); - if ( landJobInputsDOMaps != null ){ - landJobInputsDOMaps.put(item.getInputsId(),item); - } - }); - } - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landjobinputs/LandJobInputsService.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landjobinputs/LandJobInputsService.java deleted file mode 100644 index 6f14689..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landjobinputs/LandJobInputsService.java +++ /dev/null @@ -1,62 +0,0 @@ -package cn.iocoder.yudao.module.product.service.landjobinputs; - -import java.util.*; -import javax.validation.*; -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.*; -import cn.iocoder.yudao.module.product.dal.dataobject.landjobinputs.LandJobInputsDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -/** - * 地块作业投入品 Service 接口 - * - * @author 芋道源码 - */ -public interface LandJobInputsService { - - /** - * 创建地块作业投入品 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createLandJobInputs(@Valid LandJobInputsCreateReqVO createReqVO); - - /** - * 更新地块作业投入品 - * - * @param updateReqVO 更新信息 - */ - void updateLandJobInputs(@Valid LandJobInputsUpdateReqVO updateReqVO); - - /** - * 删除地块作业投入品 - * - * @param id 编号 - */ - void deleteLandJobInputs(Long id); - - /** - * 获得地块作业投入品 - * - * @param id 编号 - * @return 地块作业投入品 - */ - LandJobInputsDO getLandJobInputs(Long id); - - /** - * 获得地块作业投入品列表 - * - * @param ids 编号 - * @return 地块作业投入品列表 - */ - List getLandJobInputsList(Collection ids); - - /** - * 获得地块作业投入品分页 - * - * @param pageReqVO 分页查询 - * @return 地块作业投入品分页 - */ - PageResult getLandJobInputsPage(LandJobInputsPageReqVO pageReqVO); - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landjobinputs/LandJobInputsServiceImpl.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landjobinputs/LandJobInputsServiceImpl.java deleted file mode 100644 index 779be99..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landjobinputs/LandJobInputsServiceImpl.java +++ /dev/null @@ -1,80 +0,0 @@ -package cn.iocoder.yudao.module.product.service.landjobinputs; - -import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; -import cn.iocoder.yudao.module.product.enums.ErrorCodeConstants; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import java.util.*; -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.*; -import cn.iocoder.yudao.module.product.dal.dataobject.landjobinputs.LandJobInputsDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -import cn.iocoder.yudao.module.product.convert.landjobinputs.LandJobInputsConvert; -import cn.iocoder.yudao.module.product.dal.mysql.landjobinputs.LandJobInputsMapper; - -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.*; - -/** - * 地块作业投入品 Service 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -public class LandJobInputsServiceImpl implements LandJobInputsService { - - @Resource - private LandJobInputsMapper landJobInputsMapper; - - @Override - public Long createLandJobInputs(LandJobInputsCreateReqVO createReqVO) { - // 插入 - LandJobInputsDO landJobInputs = LandJobInputsConvert.INSTANCE.convert(createReqVO); - landJobInputsMapper.insert(landJobInputs); - // 返回 - return landJobInputs.getId(); - } - - @Override - public void updateLandJobInputs(LandJobInputsUpdateReqVO updateReqVO) { - // 校验存在 - validateLandJobInputsExists(updateReqVO.getId()); - // 更新 - LandJobInputsDO updateObj = LandJobInputsConvert.INSTANCE.convert(updateReqVO); - landJobInputsMapper.updateById(updateObj); - } - - @Override - public void deleteLandJobInputs(Long id) { - LandJobInputsDO landJobInputsDO = landJobInputsMapper.selectById(id); - if (landJobInputsDO == null){ - throw ServiceExceptionUtil.exception(ErrorCodeConstants.LAND_JOB_INPUTS_NOT_EXISTS); - } - // 删除 - landJobInputsMapper.deleteById(id); - } - - private void validateLandJobInputsExists(Long id) { - if (landJobInputsMapper.selectById(id) == null) { - throw exception(LAND_JOB_INPUTS_NOT_EXISTS); - } - } - - @Override - public LandJobInputsDO getLandJobInputs(Long id) { - return landJobInputsMapper.selectById(id); - } - - @Override - public List getLandJobInputsList(Collection ids) { - return landJobInputsMapper.selectBatchIds(ids); - } - - @Override - public PageResult getLandJobInputsPage(LandJobInputsPageReqVO pageReqVO) { - return landJobInputsMapper.selectPage(pageReqVO); - } -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landjobtype/LandJobTypeService.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landjobtype/LandJobTypeService.java deleted file mode 100644 index 0ccf501..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landjobtype/LandJobTypeService.java +++ /dev/null @@ -1,61 +0,0 @@ -package cn.iocoder.yudao.module.product.service.landjobtype; - -import java.util.*; -import javax.validation.*; -import cn.iocoder.yudao.module.product.controller.admin.landjobtype.vo.*; -import cn.iocoder.yudao.module.product.dal.dataobject.landjobtype.LandJobTypeDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -/** - * 作业类型 Service 接口 - * - * @author 芋道源码 - */ -public interface LandJobTypeService { - - /** - * 创建作业类型 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createLandJobType(@Valid LandJobTypeCreateReqVO createReqVO); - - /** - * 更新作业类型 - * - * @param updateReqVO 更新信息 - */ - void updateLandJobType(@Valid LandJobTypeUpdateReqVO updateReqVO); - - /** - * 删除作业类型 - * - * @param id 编号 - */ - void deleteLandJobType(Long id); - - /** - * 获得作业类型 - * - * @param id 编号 - * @return 作业类型 - */ - LandJobTypeDO getLandJobType(Long id); - - /** - * 获得作业类型分页 - * - * @param pageReqVO 分页查询 - * @return 作业类型分页 - */ - PageResult getLandJobTypePage(LandJobTypePageReqVO pageReqVO); - - /** - * 根据商户信息ID获取所有作业类型 - * @param id 商户ID - * @return 地块类型 - */ - List getByBusinessInfoId(Long id); - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landjobtype/LandJobTypeServiceImpl.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landjobtype/LandJobTypeServiceImpl.java deleted file mode 100644 index 98a4d42..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landjobtype/LandJobTypeServiceImpl.java +++ /dev/null @@ -1,113 +0,0 @@ -package cn.iocoder.yudao.module.product.service.landjobtype; - -import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.basic.api.businessinfo.BusinessInfoApi; -import cn.iocoder.yudao.module.basic.api.redis.dto.BusinessInfoDTO; -import cn.iocoder.yudao.module.product.controller.admin.landjobtype.vo.LandJobTypeCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landjobtype.vo.LandJobTypePageReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landjobtype.vo.LandJobTypeUpdateReqVO; -import cn.iocoder.yudao.module.product.convert.landjobtype.LandJobTypeConvert; -import cn.iocoder.yudao.module.product.dal.dataobject.landjobtype.LandJobTypeDO; -import cn.iocoder.yudao.module.product.dal.mysql.landjobtype.LandJobTypeMapper; -import cn.iocoder.yudao.module.product.enums.ErrorCodeConstants; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Objects; - -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.LAND_JOB_TYPE_ALREADY_EXIST; - - -/** - * 作业类型 Service 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -public class LandJobTypeServiceImpl implements LandJobTypeService { - - @Resource - private BusinessInfoApi businessInfoApi; - - @Resource - private LandJobTypeMapper landJobTypeMapper; - - @Override - public Long createLandJobType(LandJobTypeCreateReqVO createReqVO) { - //校验商户昵称的作业类型名称是否重复 - validateLandJobTypeNameExists(createReqVO.getTypeName(),createReqVO.getBelongBusinessId()); - // 校验商户 - BusinessInfoDTO businessInfo = businessInfoApi.getBusinessInfoById(createReqVO.getBelongBusinessId()).getData(); - if(businessInfo == null) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.BUSINESS_INFO_NOT_EXISTS); - } - // 插入 - LandJobTypeDO landJobType = LandJobTypeConvert.INSTANCE.convert(createReqVO); - landJobType.setBelongBusinessName(businessInfo.getBusinessName()); - landJobTypeMapper.insert(landJobType); - // 返回 - return landJobType.getId(); - } - - @Override - public void updateLandJobType(LandJobTypeUpdateReqVO updateReqVO) { - // 校验存在 - LandJobTypeDO selectById = landJobTypeMapper.selectById(updateReqVO.getId()); - if (selectById == null){ - throw ServiceExceptionUtil.exception(ErrorCodeConstants.LAND_JOB_TYPE_NOT_EXISTS); - } - // 检查地块类型是否发生变化 - if (!Objects.equals(selectById.getTypeName(), updateReqVO.getTypeName())) { - //校验商户昵称的作业类型名称是否重复 - validateLandJobTypeNameExists(updateReqVO.getTypeName(),updateReqVO.getBelongBusinessId()); - } - // 更新 - LandJobTypeDO updateObj = LandJobTypeConvert.INSTANCE.convert(updateReqVO); - landJobTypeMapper.updateById(updateObj); - } - - @Override - public void deleteLandJobType(Long id) { - // 校验存在 - validateLandJobTypeExists(id); - // 删除 - landJobTypeMapper.deleteById(id); - } - - private void validateLandJobTypeExists(Long id) { - if (landJobTypeMapper.selectById(id) == null) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.LAND_JOB_TYPE_NOT_EXISTS); - } - } - - @Override - public LandJobTypeDO getLandJobType(Long id) { - return landJobTypeMapper.selectById(id); - } - - @Override - public PageResult getLandJobTypePage(LandJobTypePageReqVO pageReqVO) { - return landJobTypeMapper.selectPage(pageReqVO); - } - - @Override - public List getByBusinessInfoId(Long id) { - return landJobTypeMapper.selectList(new LambdaQueryWrapperX().eq(LandJobTypeDO::getBelongBusinessId, id)); - } - - private void validateLandJobTypeNameExists(String typeName,Long belongBusinessId) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("type_name", typeName) - .eq("belong_business_id",belongBusinessId); - if (landJobTypeMapper.selectOne(wrapper) != null) { - throw exception(LAND_JOB_TYPE_ALREADY_EXIST); - } - } -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landplan/LandPlanService.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landplan/LandPlanService.java deleted file mode 100644 index 336114d..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landplan/LandPlanService.java +++ /dev/null @@ -1,79 +0,0 @@ -package cn.iocoder.yudao.module.product.service.landplan; - -import java.util.*; -import javax.validation.*; - -import cn.iocoder.yudao.module.product.controller.admin.harvestbatch.vo.FarmingPlantReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landplan.vo.*; -import cn.iocoder.yudao.module.product.dal.dataobject.landplan.LandPlanDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -/** - * 地块作业计划 Service 接口 - * - * @author 芋道源码 - */ -public interface LandPlanService { - - /** - * 创建地块作业计划 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createLandPlan(@Valid LandPlanCreateReqVO createReqVO); - - /** - * 批量创建地块作业计划 - * - * @param createReqVOList 创建信息列表 - * @return 编号列表 - */ - List createLandPlanList(List createReqVOList); - - /** - * 更新地块作业计划 - * - * @param updateReqVO 更新信息 - */ - void updateLandPlan(@Valid LandPlanUpdateReqVO updateReqVO); - - /** - * 删除地块作业计划 - * - * @param id 编号 - */ - void deleteLandPlan(Long id); - - /** - * 获得地块作业计划 - * - * @param id 编号 - * @return 地块作业计划 - */ - LandPlanDO getLandPlan(Long id); - - /** - * 获得地块作业计划列表 - * - * @param goodsId 编号 - * @return 地块作业计划列表 - */ - List getLandPlanByGoodsId(String goodsId); - - /** - * 获得地块作业计划分页 - * - * @param pageReqVO 分页查询 - * @return 地块作业计划分页 - */ - PageResult getLandPlanPage(LandPlanPageReqVO pageReqVO); - - /** - * 获得地块作业计划列表，用于农事活动配置 - * @param ids 计划id集合 - * @return 农事活动配置 - */ - List getLandPlanForFarmingConfig(String goodsId, List ids, List planIds, Integer blockState); - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landplan/LandPlanServiceImpl.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landplan/LandPlanServiceImpl.java deleted file mode 100644 index 3dda5cc..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/landplan/LandPlanServiceImpl.java +++ /dev/null @@ -1,283 +0,0 @@ -package cn.iocoder.yudao.module.product.service.landplan; - -import cn.hutool.core.date.DateUtil; -import cn.iocoder.yudao.framework.common.enums.CodeEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.chain.enums.OperateDetailTypeEnum; -import cn.iocoder.yudao.module.chain.enums.OperateTypeEnum; -import cn.iocoder.yudao.module.product.controller.admin.harvestbatch.vo.BlockCertificateSaveReqVO; -import cn.iocoder.yudao.module.product.controller.admin.harvestbatch.vo.FarmingPlantReqVO; -import cn.iocoder.yudao.module.product.controller.admin.harvestbatch.vo.OperateDetailSaveReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landjob.vo.LandJobRespVO; -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.LandJobInputsRespVO; -import cn.iocoder.yudao.module.product.controller.admin.landplan.vo.*; -import cn.iocoder.yudao.module.product.convert.landplan.LandPlanConvert; -import cn.iocoder.yudao.module.product.dal.dataobject.landplan.LandPlanDO; -import cn.iocoder.yudao.module.product.dal.mysql.landplan.LandPlanMapper; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.LAND_PLAN_NOT_EXISTS; - -/** - * 地块作业计划 Service 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -public class LandPlanServiceImpl implements LandPlanService { - - @Resource - private LandPlanMapper landPlanMapper; - - /** - * 创建地块作业计划 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - @Override - public Long createLandPlan(LandPlanCreateReqVO createReqVO) { - // 插入 - LandPlanDO landPlan = LandPlanConvert.INSTANCE.convert(createReqVO); - landPlan.setLandPlanId(CodeEnum.LAND_PLAN_CODE.getCode()); - landPlan.setId(null); - landPlanMapper.insert(landPlan); - // 返回 - return landPlan.getId(); - } - - /** - * 批量创建地块作业计划 - * - * @param createReqVOList 创建信息列表 - * @return 编号列表 - */ - @Override - public List createLandPlanList(List createReqVOList) { - List idList = new ArrayList<>(); - for (LandPlanCreateReqVO createReqVO : createReqVOList) { - // 插入 - LandPlanDO landPlan = LandPlanConvert.INSTANCE.convert(createReqVO); - landPlan.setLandPlanId(CodeEnum.LAND_PLAN_CODE.getCode()); - landPlan.setGoodsName(createReqVO.getGoodsName()); - landPlanMapper.insert(landPlan); - // 添加到编号列表 - idList.add(landPlan.getId()); - } - // 返回编号列表 - return idList; - } - - /** - * 更新地块作业计划 - * - * @param updateReqVO 更新信息 - */ - @Override - public void updateLandPlan(LandPlanUpdateReqVO updateReqVO) { - // 校验存在 - validateLandPlanExists(updateReqVO.getId()); - // 更新 - LandPlanDO updateObj = LandPlanConvert.INSTANCE.convert(updateReqVO); - landPlanMapper.updateById(updateObj); - } - - /** - * 删除地块作业计划 - * - * @param id 编号 - */ - @Override - public void deleteLandPlan(Long id) { - // 校验存在 - validateLandPlanExists(id); - // 删除 - landPlanMapper.deleteById(id); - } - - private void validateLandPlanExists(Long id) { - if (landPlanMapper.selectById(id) == null) { - throw exception(LAND_PLAN_NOT_EXISTS); - } - } - - /** - * 获得地块作业计划 - * - * @param id 编号 - * @return 地块作业计划 - */ - @Override - public LandPlanDO getLandPlan(Long id) { - return landPlanMapper.selectById(id); - } - - /** - * 获得地块作业计划列表 - * - * @param goodsId 商品编号 - * @return 地块作业计划列表 - */ - @Override - public List getLandPlanByGoodsId(String goodsId) { - return landPlanMapper.selectList(new LambdaQueryWrapperX().eq(LandPlanDO::getGoodsId, goodsId)); - } - - /** - * 获得地块作业计划分页 - * - * @param pageReqVO 分页查询 - * @return 地块作业计划分页 - */ - @Override - public PageResult getLandPlanPage(LandPlanPageReqVO pageReqVO) { - return landPlanMapper.selectPage(pageReqVO); - } - - @Override - public List getLandPlanForFarmingConfig(String goodsId, List ids, List planIds, Integer blockState) { - if((ids == null || ids.isEmpty()) && (planIds == null || planIds.isEmpty())) { - // 直接返回空集合 - return new ArrayList<>(); - } - List results = new ArrayList<>(); - String dataFormat = "yyyy-MM-dd"; - Map params = new HashMap<>(); - params.put("goodsId", goodsId); - params.put("ids", ids); - params.put("planIds", planIds); - // params.put("blockState", blockState); - List plans = landPlanMapper.queryLandPlansByParams(params); - plans.forEach(plan -> { - FarmingPlantReqVO farmingPlant = new FarmingPlantReqVO(); - farmingPlant.setLinkName("地块名称:" + plan.getLandName()); - farmingPlant.setOperateObjId(plan.getId()); - - List planDetails = new ArrayList<>(); - OperateDetailSaveReqVO landIdField = new OperateDetailSaveReqVO(); - landIdField.setTitle("地块编码"); - landIdField.setContent(plan.getLandId()); - landIdField.setType(OperateDetailTypeEnum.TEXT.getType()); - planDetails.add(landIdField); - - OperateDetailSaveReqVO landPlanIdField = new OperateDetailSaveReqVO(); - landPlanIdField.setTitle("计划编号"); - landPlanIdField.setContent(plan.getLandPlanId()); - landPlanIdField.setType(OperateDetailTypeEnum.TEXT.getType()); - planDetails.add(landPlanIdField); - - OperateDetailSaveReqVO planStartTimeField = new OperateDetailSaveReqVO(); - planStartTimeField.setTitle("种植时间"); - planStartTimeField.setContent(DateUtil.format(plan.getPlanStartTime(), dataFormat)); - planStartTimeField.setType(OperateDetailTypeEnum.TEXT.getType()); - planDetails.add(planStartTimeField); - - OperateDetailSaveReqVO planEndTimeField = new OperateDetailSaveReqVO(); - planEndTimeField.setTitle("采收时间"); - planEndTimeField.setContent(DateUtil.format(plan.getPlanEndTime(), dataFormat)); - planEndTimeField.setType(OperateDetailTypeEnum.TEXT.getType()); - planDetails.add(planEndTimeField); - - OperateDetailSaveReqVO planRemarksField = new OperateDetailSaveReqVO(); - planRemarksField.setTitle("说明"); - planRemarksField.setContent(plan.getRemark()); - planRemarksField.setType(OperateDetailTypeEnum.TEXT.getType()); - planDetails.add(planRemarksField); - - List blockCertificates = new ArrayList<>(); - plan.getLandJobs().forEach(job -> { - if(job.getLandJobInputs().isEmpty()) { - BlockCertificateSaveReqVO jobBlockCertificate = new BlockCertificateSaveReqVO(); - jobBlockCertificate.setLinkName("农事作业");// 这里写死 - jobBlockCertificate.setOperateObjId(job.getId()); - jobBlockCertificate.setOperateType(OperateTypeEnum.JOB.getType()); - - this.setLandJobs(jobBlockCertificate, blockCertificates, job, null, dataFormat); - } else { - // 循环投入品 - job.getLandJobInputs().forEach(input -> { - BlockCertificateSaveReqVO jobBlockCertificate = new BlockCertificateSaveReqVO(); - jobBlockCertificate.setLinkName("农事作业投入品");// 这里写死 - jobBlockCertificate.setOperateObjId(input.getId()); - jobBlockCertificate.setOperateType(OperateTypeEnum.JOB_INPUT.getType()); - - this.setLandJobs(jobBlockCertificate, blockCertificates, job, input, dataFormat); - }); - } - }); - farmingPlant.setOperateDetails(planDetails); - farmingPlant.setFarmingJobs(blockCertificates); - - results.add(farmingPlant); - }); - - return results; - } - - private void setLandJobs(BlockCertificateSaveReqVO jobBlockCertificate, List blockCertificates, LandJobRespVO landJob, - LandJobInputsRespVO input, String dataFormat) { - List jobDetails = new ArrayList<>(); - - OperateDetailSaveReqVO jobTypeField = new OperateDetailSaveReqVO(); - jobTypeField.setTitle("任务类型"); - jobTypeField.setContent(landJob.getJobTypeName()); - jobTypeField.setType(OperateDetailTypeEnum.TEXT.getType()); - jobDetails.add(jobTypeField); - - OperateDetailSaveReqVO inputNameField = new OperateDetailSaveReqVO(); - inputNameField.setTitle("投入品名称"); - inputNameField.setContent(input == null ? "-" : input.getInputsName()); - inputNameField.setType(OperateDetailTypeEnum.TEXT.getType()); - jobDetails.add(inputNameField); - - OperateDetailSaveReqVO batchIdField = new OperateDetailSaveReqVO(); - batchIdField.setTitle("投入品批次编号"); - batchIdField.setContent(input == null ? "-" : input.getInputsBatchId()); - batchIdField.setType(OperateDetailTypeEnum.TEXT.getType()); - jobDetails.add(batchIdField); - - OperateDetailSaveReqVO jobDateField = new OperateDetailSaveReqVO(); - jobDateField.setTitle("作业日期"); - jobDateField.setContent(DateUtil.format(landJob.getJobDate(), dataFormat)); - jobDateField.setType(OperateDetailTypeEnum.TEXT.getType()); - jobDetails.add(jobDateField); - - OperateDetailSaveReqVO jobWorkerField = new OperateDetailSaveReqVO(); - jobWorkerField.setTitle("作业员工"); - jobWorkerField.setContent(landJob.getJobWorker()); - jobWorkerField.setType(OperateDetailTypeEnum.TEXT.getType()); - jobDetails.add(jobWorkerField); - - OperateDetailSaveReqVO picturesField = new OperateDetailSaveReqVO(); - picturesField.setTitle("作业图片"); - picturesField.setContent(input == null ? landJob.getJobImgUrl() : input.getInputsImgUrl()); - picturesField.setType(OperateDetailTypeEnum.IMAGE.getType()); - jobDetails.add(picturesField); - - OperateDetailSaveReqVO videoField = new OperateDetailSaveReqVO(); - videoField.setTitle("作业视频"); - videoField.setContent(input == null ? landJob.getJobVideoUrl() : input.getInputsVideoUrl()); - videoField.setType(OperateDetailTypeEnum.VIDEO.getType()); - jobDetails.add(videoField); - - OperateDetailSaveReqVO remarkField = new OperateDetailSaveReqVO(); - remarkField.setTitle("说明"); - remarkField.setContent(input != null ? input.getInputsDesc() : landJob.getRemarks()); - remarkField.setType(OperateDetailTypeEnum.TEXT.getType()); - jobDetails.add(remarkField); - - jobBlockCertificate.setOperateDetails(jobDetails); - blockCertificates.add(jobBlockCertificate); - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/statistics/StatisticsService.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/statistics/StatisticsService.java index 1a59022..47a37f1 100644 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/statistics/StatisticsService.java +++ b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/statistics/StatisticsService.java @@ -2,9 +2,7 @@ package cn.iocoder.yudao.module.product.service.statistics; import cn.iocoder.yudao.module.product.controller.admin.envdata.vo.EnvDataRespVO; import cn.iocoder.yudao.module.product.controller.admin.statistics.vo.HarvestInfoDataRespVO; -import cn.iocoder.yudao.module.product.controller.admin.statistics.vo.InputsBuyDataRespVO; import cn.iocoder.yudao.module.product.controller.admin.statistics.vo.TopDataRespVO; -import cn.iocoder.yudao.module.product.dal.dataobject.landjob.LandJobDO; import java.util.List; @@ -25,19 +23,6 @@ public interface StatisticsService { */ HarvestInfoDataRespVO getHarvestInfoDataStatistics(); - /** - * 获得首页投入品采购的统计数据 - * @return 投入品采购数据 - */ - InputsBuyDataRespVO getInputsBuyDataStatistics(); - - /** - * 获取首页农事数据记录 - * @param - * @return 返回10条数据 - */ - ListgetLandJobListStatistics(); - /** * 获得首页环境数据 * @return 环境数据 diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/statistics/StatisticsServiceImpl.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/statistics/StatisticsServiceImpl.java index 3e5e43a..111dd06 100644 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/statistics/StatisticsServiceImpl.java +++ b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/statistics/StatisticsServiceImpl.java @@ -1,18 +1,12 @@ package cn.iocoder.yudao.module.product.service.statistics; -import cn.hutool.core.bean.BeanUtil; import cn.iocoder.yudao.module.basic.api.goodsinfo.GoodsInfoApi; import cn.iocoder.yudao.module.basic.api.goodsinfo.dto.GoodsInfoRespDTO; import cn.iocoder.yudao.module.product.controller.admin.envdata.vo.EnvDataRespVO; import cn.iocoder.yudao.module.product.controller.admin.statistics.vo.HarvestInfoDataRespVO; -import cn.iocoder.yudao.module.product.controller.admin.statistics.vo.InputsBuyDataRespVO; import cn.iocoder.yudao.module.product.controller.admin.statistics.vo.TopDataRespVO; -import cn.iocoder.yudao.module.product.dal.dataobject.landjob.LandJobDO; import cn.iocoder.yudao.module.product.dal.mysql.envdata.EnvDataMapper; import cn.iocoder.yudao.module.product.dal.mysql.harvestinfo.HarvestInfoMapper; -import cn.iocoder.yudao.module.product.dal.mysql.inputsbuy.InputsBuyMapper; -import cn.iocoder.yudao.module.product.dal.mysql.landinfo.LandInfoMapper; -import cn.iocoder.yudao.module.product.dal.mysql.landjob.LandJobMapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -28,28 +22,18 @@ import java.util.List; @Validated public class StatisticsServiceImpl implements StatisticsService { - @Resource - private LandInfoMapper landInfoMapper; - @Resource private HarvestInfoMapper harvestInfoMapper; - @Resource - private InputsBuyMapper inputsBuyMapper; - @Resource private EnvDataMapper envDataMapper; @Resource private GoodsInfoApi goodsInfoApi; - @Resource - private LandJobMapper landJobMapper; - @Override public TopDataRespVO getTopDataStatistics() { TopDataRespVO result = new TopDataRespVO(); - BeanUtil.copyProperties(landInfoMapper.getLandStatistics(), result); List goodsInfoList = goodsInfoApi.getAllGoodsList().getData(); if (goodsInfoList != null) { @@ -88,37 +72,6 @@ public class StatisticsServiceImpl implements StatisticsService { return result; } - @Override - public InputsBuyDataRespVO getInputsBuyDataStatistics() { - InputsBuyDataRespVO result = new InputsBuyDataRespVO(); - // 查询月同比 - result.setMonthYOYDatas(inputsBuyMapper.getMonthYOYDatas()); - - // 查询周同比 - result.setWeekYOYDatas(inputsBuyMapper.getWeekYOYDatas()); - - // 查询本月采收，按照品种分组 - result.setInputsMonthStatisticsDatas(inputsBuyMapper.getDatasGroupByGoodsId("month")); - - // 查询本周采收，按照品种分组 - result.setInputsWeekStatisticsDatas(inputsBuyMapper.getDatasGroupByGoodsId("week")); - - // 查询今日采收数量 - result.setTodayInputBuyCount(inputsBuyMapper.getTodayInputBuyCount()); - return result; - } - - /** - * 获取首页农事数据记录 - * - * @param - * @return 返回10条数据 - */ - @Override - public List getLandJobListStatistics() { - return landJobMapper.selectLandJob10Records(); - } - @Override public List getAvgEnvDataStatistics() { return envDataMapper.getAVGEnvDatas(null, 7, null); diff --git a/yudao-module-product/yudao-module-product-biz/src/main/resources/mapper/deviceinfo/DeviceInfoMapper.xml b/yudao-module-product/yudao-module-product-biz/src/main/resources/mapper/deviceinfo/DeviceInfoMapper.xml index 968422c..ae0c739 100644 --- a/yudao-module-product/yudao-module-product-biz/src/main/resources/mapper/deviceinfo/DeviceInfoMapper.xml +++ b/yudao-module-product/yudao-module-product-biz/src/main/resources/mapper/deviceinfo/DeviceInfoMapper.xml @@ -10,14 +10,12 @@ --> - SELECT * FROM product_inputs_buy - - deleted = 0 - - and inputs_buy_id like concat('%',#{pageReqVO.inputsBuyId},'%') ESCAPE '/' - - - and relate_outbound_id like concat('%',#{pageReqVO.relateOutboundId},'%') ESCAPE '/' - - - and vendor_name like concat('%',#{pageReqVO.vendorName},'%') ESCAPE '/' - - - and unix_timestamp(inputs_buy_time) between unix_timestamp(#{pageReqVO.inputsBuyTime[0]}) and unix_timestamp(#{pageReqVO.inputsBuyTime[1]}) - - - and belong_business_name like concat('%',#{pageReqVO.belongBusinessName},'%') ESCAPE '/' - - - and block_state = #{pageReqVO.blockState} - - - - - - - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/src/main/resources/mapper/landinfo/LandInfoMapper.xml b/yudao-module-product/yudao-module-product-biz/src/main/resources/mapper/landinfo/LandInfoMapper.xml deleted file mode 100644 index 9d81671..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/resources/mapper/landinfo/LandInfoMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/src/main/resources/mapper/landinfotype/LandInfoTypeMapper.xml b/yudao-module-product/yudao-module-product-biz/src/main/resources/mapper/landinfotype/LandInfoTypeMapper.xml deleted file mode 100644 index 14cde58..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/resources/mapper/landinfotype/LandInfoTypeMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/src/main/resources/mapper/landjob/LandJobMapper.xml b/yudao-module-product/yudao-module-product-biz/src/main/resources/mapper/landjob/LandJobMapper.xml deleted file mode 100644 index 3853b41..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/resources/mapper/landjob/LandJobMapper.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/src/main/resources/mapper/landjobinputs/LandJobInputsMapper.xml b/yudao-module-product/yudao-module-product-biz/src/main/resources/mapper/landjobinputs/LandJobInputsMapper.xml deleted file mode 100644 index 3da2799..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/resources/mapper/landjobinputs/LandJobInputsMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/src/main/resources/mapper/landjobtype/LandJobTypeMapper.xml b/yudao-module-product/yudao-module-product-biz/src/main/resources/mapper/landjobtype/LandJobTypeMapper.xml deleted file mode 100644 index 459ec17..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/resources/mapper/landjobtype/LandJobTypeMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/src/main/resources/mapper/landplan/LandPlanMapper.xml b/yudao-module-product/yudao-module-product-biz/src/main/resources/mapper/landplan/LandPlanMapper.xml deleted file mode 100644 index dba3da5..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/main/resources/mapper/landplan/LandPlanMapper.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/inputsbatch/InputsBatchServiceImplTest.java b/yudao-module-product/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/inputsbatch/InputsBatchServiceImplTest.java deleted file mode 100644 index 1c25cb2..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/inputsbatch/InputsBatchServiceImplTest.java +++ /dev/null @@ -1,262 +0,0 @@ -package cn.iocoder.yudao.module.product.service.inputsbatch; - -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; - -import javax.annotation.Resource; - -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; - -import cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo.*; -import cn.iocoder.yudao.module.product.dal.dataobject.inputsbatch.InputsBatchDO; -import cn.iocoder.yudao.module.product.dal.mysql.inputsbatch.InputsBatchMapper; -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -import org.springframework.context.annotation.Import; -import java.util.*; - -import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.*; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*; -import static org.junit.jupiter.api.Assertions.*; - -/** -* {@link InputsBatchServiceImpl} 的单元测试类 -* -* @author 芋道源码 -*/ -@Import(InputsBatchServiceImpl.class) -public class InputsBatchServiceImplTest extends BaseDbUnitTest { - - @Resource - private InputsBatchServiceImpl inputsBatchService; - - @Resource - private InputsBatchMapper inputsBatchMapper; - - @Test - public void testCreateInputsBatch_success() { - // 准备参数 - InputsBatchCreateReqVO reqVO = randomPojo(InputsBatchCreateReqVO.class); - - // 调用 - Long inputsBatchId = inputsBatchService.createInputsBatch(reqVO); - // 断言 - assertNotNull(inputsBatchId); - // 校验记录的属性是否正确 - InputsBatchDO inputsBatch = inputsBatchMapper.selectById(inputsBatchId); - assertPojoEquals(reqVO, inputsBatch); - } - - @Test - public void testUpdateInputsBatch_success() { - // mock 数据 - InputsBatchDO dbInputsBatch = randomPojo(InputsBatchDO.class); - inputsBatchMapper.insert(dbInputsBatch);// @Sql: 先插入出一条存在的数据 - // 准备参数 - InputsBatchSaveReqVO reqVO = randomPojo(InputsBatchSaveReqVO.class, o -> { - o.setId(dbInputsBatch.getId()); // 设置更新的 ID - }); - - // 调用 - inputsBatchService.updateInputsBatch(reqVO); - // 校验是否更新正确 - InputsBatchDO inputsBatch = inputsBatchMapper.selectById(reqVO.getId()); // 获取最新的 - assertPojoEquals(reqVO, inputsBatch); - } - - @Test - public void testUpdateInputsBatch_notExists() { - // 准备参数 - InputsBatchSaveReqVO reqVO = randomPojo(InputsBatchSaveReqVO.class); - - // 调用, 并断言异常 - assertServiceException(() -> inputsBatchService.updateInputsBatch(reqVO), INPUTS_BATCH_NOT_EXISTS); - } - - @Test - public void testDeleteInputsBatch_success() { - // mock 数据 - InputsBatchDO dbInputsBatch = randomPojo(InputsBatchDO.class); - inputsBatchMapper.insert(dbInputsBatch);// @Sql: 先插入出一条存在的数据 - // 准备参数 - Long id = dbInputsBatch.getId(); - - // 调用 - inputsBatchService.deleteInputsBatch(id); - // 校验数据不存在了 - assertNull(inputsBatchMapper.selectById(id)); - } - - @Test - public void testDeleteInputsBatch_notExists() { - // 准备参数 - Long id = randomLongId(); - - // 调用, 并断言异常 - assertServiceException(() -> inputsBatchService.deleteInputsBatch(id), INPUTS_BATCH_NOT_EXISTS); - } - - @Test - @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 - public void testGetInputsBatchPage() { - // mock 数据 - InputsBatchDO dbInputsBatch = randomPojo(InputsBatchDO.class, o -> { // 等会查询到 - o.setInputsName(null); - o.setInputsId(null); - o.setInputsBatchId(null); - o.setInputsBuyId(null); - o.setProductData(null); - o.setInputsNum(null); - o.setInputsUnit(null); - o.setInputsWeight(null); - o.setInputsUnitPrice(null); - o.setTotalPrice(null); - o.setRemarks(null); - o.setBlockState(null); - o.setBlockChainId(null); - o.setBlockChainBlockIdentity(null); - o.setBelongBusinessId(null); - o.setBelongBusinessName(null); - o.setCreateTime(null); - }); - inputsBatchMapper.insert(dbInputsBatch); - // 测试 inputsName 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setInputsName(null))); - // 测试 inputsId 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setInputsId(null))); - // 测试 inputsBatchId 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setInputsBatchId(null))); - // 测试 inputsBuyId 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setInputsBuyId(null))); - // 测试 productData 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setProductData(null))); - // 测试 inputsNum 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setInputsNum(null))); - // 测试 inputsUnit 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setInputsUnit(null))); - // 测试 inputsWeight 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setInputsWeight(null))); - // 测试 inputsUnitPrice 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setInputsUnitPrice(null))); - // 测试 totalPrice 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setTotalPrice(null))); - // 测试 remarks 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setRemarks(null))); - // 测试 blockState 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setBlockState(null))); - // 测试 blockChainId 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setBlockChainId(null))); - // 测试 blockChainBlockIdentity 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setBlockChainBlockIdentity(null))); - // 测试 belongBusinessId 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setBelongBusinessId(null))); - // 测试 belongBusinessName 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setBelongBusinessName(null))); - // 测试 createTime 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setCreateTime(null))); - // 准备参数 - InputsBatchPageReqVO reqVO = new InputsBatchPageReqVO(); - reqVO.setInputsName(null); - reqVO.setInputsBatchId(null); - reqVO.setInputsBuyId(null); - reqVO.setProductData(null); - reqVO.setBlockState(null); - reqVO.setBelongBusinessName(null); - // reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - - // 调用 - PageResult pageResult = inputsBatchService.getInputsBatchPage(reqVO); - // 断言 - assertEquals(1, pageResult.getTotal()); - assertEquals(1, pageResult.getList().size()); - assertPojoEquals(dbInputsBatch, pageResult.getList().get(0)); - } - - @Test - @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 - public void testGetInputsBatchList() { - // mock 数据 - InputsBatchDO dbInputsBatch = randomPojo(InputsBatchDO.class, o -> { // 等会查询到 - o.setInputsName(null); - o.setInputsId(null); - o.setInputsBatchId(null); - o.setInputsBuyId(null); - o.setProductData(null); - o.setInputsNum(null); - o.setInputsUnit(null); - o.setInputsWeight(null); - o.setInputsUnitPrice(null); - o.setTotalPrice(null); - o.setRemarks(null); - o.setBlockState(null); - o.setBlockChainId(null); - o.setBlockChainBlockIdentity(null); - o.setBelongBusinessId(null); - o.setBelongBusinessName(null); - o.setCreateTime(null); - }); - inputsBatchMapper.insert(dbInputsBatch); - // 测试 inputsName 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setInputsName(null))); - // 测试 inputsId 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setInputsId(null))); - // 测试 inputsBatchId 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setInputsBatchId(null))); - // 测试 inputsBuyId 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setInputsBuyId(null))); - // 测试 productData 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setProductData(null))); - // 测试 inputsNum 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setInputsNum(null))); - // 测试 inputsUnit 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setInputsUnit(null))); - // 测试 inputsWeight 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setInputsWeight(null))); - // 测试 inputsUnitPrice 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setInputsUnitPrice(null))); - // 测试 totalPrice 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setTotalPrice(null))); - // 测试 remarks 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setRemarks(null))); - // 测试 blockState 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setBlockState(null))); - // 测试 blockChainId 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setBlockChainId(null))); - // 测试 blockChainBlockIdentity 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setBlockChainBlockIdentity(null))); - // 测试 belongBusinessId 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setBelongBusinessId(null))); - // 测试 belongBusinessName 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setBelongBusinessName(null))); - // 测试 createTime 不匹配 - inputsBatchMapper.insert(cloneIgnoreId(dbInputsBatch, o -> o.setCreateTime(null))); - // 准备参数 - InputsBatchExportReqVO reqVO = new InputsBatchExportReqVO(); - reqVO.setInputsName(null); - reqVO.setInputsId(null); - reqVO.setInputsBatchId(null); - reqVO.setInputsBuyId(null); - reqVO.setProductData(null); - reqVO.setInputsNum(null); - reqVO.setInputsUnit(null); - reqVO.setInputsWeight(null); - reqVO.setInputsUnitPrice(null); - reqVO.setTotalPrice(null); - reqVO.setRemarks(null); - reqVO.setBlockState(null); - reqVO.setBlockChainId(null); - reqVO.setBlockChainBlockIdentity(null); - reqVO.setBelongBusinessId(null); - reqVO.setBelongBusinessName(null); - // reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - - // 调用 - List list = inputsBatchService.getInputsBatchList(reqVO); - // 断言 - assertEquals(1, list.size()); - assertPojoEquals(dbInputsBatch, list.get(0)); - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/inputsbuy/InputsBuyServiceImplTest.java b/yudao-module-product/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/inputsbuy/InputsBuyServiceImplTest.java deleted file mode 100644 index b5192ba..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/inputsbuy/InputsBuyServiceImplTest.java +++ /dev/null @@ -1,163 +0,0 @@ -package cn.iocoder.yudao.module.product.service.inputsbuy; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo.InputsBuyCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo.InputsBuyPageReqVO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo.InputsBuyRespVO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo.InputsBuyUpdateReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.inputsbuy.InputsBuyDO; -import cn.iocoder.yudao.module.product.dal.mysql.inputsbuy.InputsBuyMapper; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.springframework.context.annotation.Import; - -import javax.annotation.Resource; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.Date; - -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; -import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.INPUTS_BUY_NOT_EXISTS; -import static org.junit.jupiter.api.Assertions.*; - -/** -* {@link InputsBuyServiceImpl} 的单元测试类 -* -* @author 芋道源码 -*/ -@Import(InputsBuyServiceImpl.class) -public class InputsBuyServiceImplTest extends BaseDbUnitTest { - - @Resource - private InputsBuyServiceImpl inputsBuyService; - - @Resource - private InputsBuyMapper inputsBuyMapper; - - @Test - public void testCreateInputsBuy_success() { - // 准备参数 - InputsBuyCreateReqVO reqVO = randomPojo(InputsBuyCreateReqVO.class); - - // 调用 - Long inputsBuyId = inputsBuyService.createInputsBuy(reqVO); - // 断言 - assertNotNull(inputsBuyId); - // 校验记录的属性是否正确 - InputsBuyDO inputsBuy = inputsBuyMapper.selectById(inputsBuyId); - assertPojoEquals(reqVO, inputsBuy); - } - - @Test - public void testUpdateInputsBuy_success() { - // mock 数据 - InputsBuyDO dbInputsBuy = randomPojo(InputsBuyDO.class); - inputsBuyMapper.insert(dbInputsBuy);// @Sql: 先插入出一条存在的数据 - // 准备参数 - InputsBuyUpdateReqVO reqVO = randomPojo(InputsBuyUpdateReqVO.class, o -> { - o.setId(dbInputsBuy.getId()); // 设置更新的 ID - }); - - // 调用 - inputsBuyService.updateInputsBuy(reqVO); - // 校验是否更新正确 - InputsBuyDO inputsBuy = inputsBuyMapper.selectById(reqVO.getId()); // 获取最新的 - assertPojoEquals(reqVO, inputsBuy); - } - - @Test - public void testUpdateInputsBuy_notExists() { - // 准备参数 - InputsBuyUpdateReqVO reqVO = randomPojo(InputsBuyUpdateReqVO.class); - - // 调用, 并断言异常 - assertServiceException(() -> inputsBuyService.updateInputsBuy(reqVO), INPUTS_BUY_NOT_EXISTS); - } - - @Test - public void testDeleteInputsBuy_success() { - // mock 数据 - InputsBuyDO dbInputsBuy = randomPojo(InputsBuyDO.class); - inputsBuyMapper.insert(dbInputsBuy);// @Sql: 先插入出一条存在的数据 - // 准备参数 - Long id = dbInputsBuy.getId(); - - // 调用 - inputsBuyService.deleteInputsBuy(id); - // 校验数据不存在了 - assertNull(inputsBuyMapper.selectById(id)); - } - - @Test - public void testDeleteInputsBuy_notExists() { - // 准备参数 - Long id = randomLongId(); - - // 调用, 并断言异常 - assertServiceException(() -> inputsBuyService.deleteInputsBuy(id), INPUTS_BUY_NOT_EXISTS); - } - - @Test - @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 - public void testGetInputsBuyPage() { - // mock 数据 - InputsBuyDO dbInputsBuy = randomPojo(InputsBuyDO.class, o -> { // 等会查询到 - o.setInputsBuyId(null); - o.setRelateOutboundId(null); - o.setVendorName(null); - o.setVendorId(null); - o.setInputsBuyTime(null); - o.setCreateTime(null); - o.setBelongBusinessId(null); - o.setBelongBusinessName(null); - }); - inputsBuyMapper.insert(dbInputsBuy); - // 测试 inputsBuyId 不匹配 - inputsBuyMapper.insert(cloneIgnoreId(dbInputsBuy, o -> o.setInputsBuyId(null))); - // 测试 relateOutboundId 不匹配 - inputsBuyMapper.insert(cloneIgnoreId(dbInputsBuy, o -> o.setRelateOutboundId(null))); - // 测试 vendorName 不匹配 - inputsBuyMapper.insert(cloneIgnoreId(dbInputsBuy, o -> o.setVendorName(null))); - // 测试 vendorId 不匹配 - inputsBuyMapper.insert(cloneIgnoreId(dbInputsBuy, o -> o.setVendorId(null))); - // 测试 inputsBuyTime 不匹配 - inputsBuyMapper.insert(cloneIgnoreId(dbInputsBuy, o -> o.setInputsBuyTime(null))); - // 测试 createTime 不匹配 - inputsBuyMapper.insert(cloneIgnoreId(dbInputsBuy, o -> o.setCreateTime(null))); - // 测试 belongBusinessId 不匹配 - inputsBuyMapper.insert(cloneIgnoreId(dbInputsBuy, o -> o.setBelongBusinessId(null))); - // 测试 belongBusinessName 不匹配 - inputsBuyMapper.insert(cloneIgnoreId(dbInputsBuy, o -> o.setBelongBusinessName(null))); - // 准备参数 - InputsBuyPageReqVO reqVO = new InputsBuyPageReqVO(); - reqVO.setInputsBuyId(null); - reqVO.setRelateOutboundId(null); - reqVO.setVendorName(null); - reqVO.setVendorId(null); - - LocalDateTime[] localDateTimes = LocalDateTimeUtils.buildBetweenTime(2023, 2, 1, 2023, 2, 28); - Date[] dates = new Date[localDateTimes.length]; - for(int i=0; i pageResult = inputsBuyService.getInputsBuyPage(reqVO); - // 断言 - assertEquals(1, pageResult.getTotal()); - assertEquals(1, pageResult.getList().size()); - assertPojoEquals(dbInputsBuy, pageResult.getList().get(0)); - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/landinfo/LandInfoServiceImplTest.java b/yudao-module-product/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/landinfo/LandInfoServiceImplTest.java deleted file mode 100644 index 3126307..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/landinfo/LandInfoServiceImplTest.java +++ /dev/null @@ -1,160 +0,0 @@ -package cn.iocoder.yudao.module.product.service.landinfo; - -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.mock.mockito.MockBean; - -import javax.annotation.Resource; - -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; - -import cn.iocoder.yudao.module.product.controller.admin.landinfo.vo.*; -import cn.iocoder.yudao.module.product.dal.dataobject.landinfo.LandInfoDO; -import cn.iocoder.yudao.module.product.dal.mysql.landinfo.LandInfoMapper; -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -import javax.annotation.Resource; -import org.springframework.context.annotation.Import; -import java.util.*; -import java.time.LocalDateTime; - -import static cn.hutool.core.util.RandomUtil.*; -import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.*; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; - -/** -* {@link LandInfoServiceImpl} 的单元测试类 -* -* @author 芋道源码 -*/ -@Import(LandInfoServiceImpl.class) -public class LandInfoServiceImplTest extends BaseDbUnitTest { - - @Resource - private LandInfoServiceImpl landInfoService; - - @Resource - private LandInfoMapper landInfoMapper; - - @Test - public void testCreateLandInfo_success() { - // 准备参数 - LandInfoCreateReqVO reqVO = randomPojo(LandInfoCreateReqVO.class); - - // 调用 - Long landInfoId = landInfoService.createLandInfo(reqVO); - // 断言 - assertNotNull(landInfoId); - // 校验记录的属性是否正确 - LandInfoDO landInfo = landInfoMapper.selectById(landInfoId); - assertPojoEquals(reqVO, landInfo); - } - - @Test - public void testUpdateLandInfo_success() { - // mock 数据 - LandInfoDO dbLandInfo = randomPojo(LandInfoDO.class); - landInfoMapper.insert(dbLandInfo);// @Sql: 先插入出一条存在的数据 - // 准备参数 - LandInfoUpdateReqVO reqVO = randomPojo(LandInfoUpdateReqVO.class, o -> { - o.setId(dbLandInfo.getId()); // 设置更新的 ID - }); - - // 调用 - landInfoService.updateLandInfo(reqVO); - // 校验是否更新正确 - LandInfoDO landInfo = landInfoMapper.selectById(reqVO.getId()); // 获取最新的 - assertPojoEquals(reqVO, landInfo); - } - - @Test - public void testUpdateLandInfo_notExists() { - // 准备参数 - LandInfoUpdateReqVO reqVO = randomPojo(LandInfoUpdateReqVO.class); - - // 调用, 并断言异常 - assertServiceException(() -> landInfoService.updateLandInfo(reqVO), LAND_INFO_NOT_EXISTS); - } - - @Test - public void testDeleteLandInfo_success() { - // mock 数据 - LandInfoDO dbLandInfo = randomPojo(LandInfoDO.class); - landInfoMapper.insert(dbLandInfo);// @Sql: 先插入出一条存在的数据 - // 准备参数 - Long id = dbLandInfo.getId(); - - // 调用 - landInfoService.deleteLandInfo(id); - // 校验数据不存在了 - assertNull(landInfoMapper.selectById(id)); - } - - @Test - public void testDeleteLandInfo_notExists() { - // 准备参数 - Long id = randomLongId(); - - // 调用, 并断言异常 - assertServiceException(() -> landInfoService.deleteLandInfo(id), LAND_INFO_NOT_EXISTS); - } - - @Test - @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 - public void testGetLandInfoPage() { - // mock 数据 - LandInfoDO dbLandInfo = randomPojo(LandInfoDO.class, o -> { // 等会查询到 - o.setLandName(null); - o.setLandId(null); - o.setSize(null); - o.setState(null); - o.setRemarks(null); - o.setLandType(null); - o.setBelongBusinessId(null); - o.setBelongBusinessName(null); - o.setCreateTime(null); - }); - landInfoMapper.insert(dbLandInfo); - // 测试 landName 不匹配 - landInfoMapper.insert(cloneIgnoreId(dbLandInfo, o -> o.setLandName(null))); - // 测试 landId 不匹配 - landInfoMapper.insert(cloneIgnoreId(dbLandInfo, o -> o.setLandId(null))); - // 测试 size 不匹配 - landInfoMapper.insert(cloneIgnoreId(dbLandInfo, o -> o.setSize(null))); - // 测试 state 不匹配 - landInfoMapper.insert(cloneIgnoreId(dbLandInfo, o -> o.setState(null))); - // 测试 remarks 不匹配 - landInfoMapper.insert(cloneIgnoreId(dbLandInfo, o -> o.setRemarks(null))); - // 测试 landType 不匹配 - landInfoMapper.insert(cloneIgnoreId(dbLandInfo, o -> o.setLandType(null))); - // 测试 belongBusinessId 不匹配 - landInfoMapper.insert(cloneIgnoreId(dbLandInfo, o -> o.setBelongBusinessId(null))); - // 测试 belongBusinessName 不匹配 - landInfoMapper.insert(cloneIgnoreId(dbLandInfo, o -> o.setBelongBusinessName(null))); - // 测试 createTime 不匹配 - landInfoMapper.insert(cloneIgnoreId(dbLandInfo, o -> o.setCreateTime(null))); - // 准备参数 - LandInfoPageReqVO reqVO = new LandInfoPageReqVO(); - reqVO.setLandName(null); - reqVO.setLandId(null); - reqVO.setSize(null); - reqVO.setState(null); - reqVO.setRemarks(null); - reqVO.setLandType(null); - reqVO.setBelongBusinessId(null); - reqVO.setBelongBusinessName(null); -// reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - - // 调用 - PageResult pageResult = landInfoService.getLandInfoPage(reqVO); - // 断言 - assertEquals(1, pageResult.getTotal()); - assertEquals(1, pageResult.getList().size()); - assertPojoEquals(dbLandInfo, pageResult.getList().get(0)); - } -} diff --git a/yudao-module-product/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/landjob/LandJobServiceImplTest.java b/yudao-module-product/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/landjob/LandJobServiceImplTest.java deleted file mode 100644 index 61e6d91..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/landjob/LandJobServiceImplTest.java +++ /dev/null @@ -1,238 +0,0 @@ -package cn.iocoder.yudao.module.product.service.landjob; - -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.mock.mockito.MockBean; - -import javax.annotation.Resource; - -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; - -import cn.iocoder.yudao.module.product.controller.admin.landjob.vo.*; -import cn.iocoder.yudao.module.product.dal.dataobject.landjob.LandJobDO; -import cn.iocoder.yudao.module.product.dal.mysql.landjob.LandJobMapper; -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -import javax.annotation.Resource; -import org.springframework.context.annotation.Import; -import java.util.*; -import java.time.LocalDateTime; - -import static cn.hutool.core.util.RandomUtil.*; -import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.*; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; - -/** -* {@link LandJobServiceImpl} 的单元测试类 -* -* @author 芋道源码 -*/ -@Import(LandJobServiceImpl.class) -public class LandJobServiceImplTest extends BaseDbUnitTest { - - @Resource - private LandJobServiceImpl landJobService; - - @Resource - private LandJobMapper landJobMapper; - - @Test - public void testCreateLandJob_success() { - // 准备参数 - LandJobCreateReqVO reqVO = randomPojo(LandJobCreateReqVO.class); - - // 调用 - Long landJobId = landJobService.createLandJob(reqVO); - // 断言 - assertNotNull(landJobId); - // 校验记录的属性是否正确 - LandJobDO landJob = landJobMapper.selectById(landJobId); - assertPojoEquals(reqVO, landJob); - } - - @Test - public void testUpdateLandJob_success() { - // mock 数据 - LandJobDO dbLandJob = randomPojo(LandJobDO.class); - landJobMapper.insert(dbLandJob);// @Sql: 先插入出一条存在的数据 - // 准备参数 - LandJobUpdateReqVO reqVO = randomPojo(LandJobUpdateReqVO.class, o -> { - o.setId(dbLandJob.getId()); // 设置更新的 ID - }); - - // 调用 - landJobService.updateLandJob(reqVO); - // 校验是否更新正确 - LandJobDO landJob = landJobMapper.selectById(reqVO.getId()); // 获取最新的 - assertPojoEquals(reqVO, landJob); - } - - @Test - public void testUpdateLandJob_notExists() { - // 准备参数 - LandJobUpdateReqVO reqVO = randomPojo(LandJobUpdateReqVO.class); - - // 调用, 并断言异常 - assertServiceException(() -> landJobService.updateLandJob(reqVO), LAND_JOB_NOT_EXISTS); - } - - @Test - public void testDeleteLandJob_success() { - // mock 数据 - LandJobDO dbLandJob = randomPojo(LandJobDO.class); - landJobMapper.insert(dbLandJob);// @Sql: 先插入出一条存在的数据 - // 准备参数 - Long id = dbLandJob.getId(); - - // 调用 - landJobService.deleteLandJob(id); - // 校验数据不存在了 - assertNull(landJobMapper.selectById(id)); - } - - @Test - public void testDeleteLandJob_notExists() { - // 准备参数 - Long id = randomLongId(); - - // 调用, 并断言异常 - assertServiceException(() -> landJobService.deleteLandJob(id), LAND_JOB_NOT_EXISTS); - } - - @Test - @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 - public void testGetLandJobPage() { - // mock 数据 - LandJobDO dbLandJob = randomPojo(LandJobDO.class, o -> { // 等会查询到 - o.setLandId(null); - o.setLandName(null); - o.setLandType(null); - o.setJobType(null); - o.setJobWorker(null); - o.setJobWorkerId(null); - o.setJobDate(null); - o.setRemarks(null); - o.setBelongBusinessId(null); - o.setBelongBusinessName(null); - o.setCreateTime(null); - o.setBlockState(null); - }); - landJobMapper.insert(dbLandJob); - // 测试 landId 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setLandId(null))); - // 测试 landName 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setLandName(null))); - // 测试 landType 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setLandType(null))); - // 测试 jobType 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setJobType(null))); - // 测试 jobWorker 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setJobWorker(null))); - // 测试 jobWorkerId 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setJobWorkerId(null))); - // 测试 jobDate 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setJobDate(null))); - // 测试 remarks 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setRemarks(null))); - // 测试 belongBusinessId 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setBelongBusinessId(null))); - // 测试 belongBusinessName 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setBelongBusinessName(null))); - // 测试 createTime 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setCreateTime(null))); - // 测试 blockState 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setBlockState(null))); - // 准备参数 - LandJobPageReqVO reqVO = new LandJobPageReqVO(); - reqVO.setLandId(null); - reqVO.setLandName(null); - reqVO.setLandType(null); - reqVO.setJobType(null); - reqVO.setJobWorker(null); - reqVO.setJobWorkerId(null); -// reqVO.setJobDate(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - reqVO.setRemarks(null); - reqVO.setBelongBusinessId(null); - reqVO.setBelongBusinessName(null); -// reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - reqVO.setBlockState(null); - - // 调用 - PageResult pageResult = landJobService.getLandJobPage(reqVO); - // 断言 - assertEquals(1, pageResult.getTotal()); - assertEquals(1, pageResult.getList().size()); - assertPojoEquals(dbLandJob, pageResult.getList().get(0)); - } - - @Test - @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 - public void testGetLandJobList() { - // mock 数据 - LandJobDO dbLandJob = randomPojo(LandJobDO.class, o -> { // 等会查询到 - o.setLandId(null); - o.setLandName(null); - o.setLandType(null); - o.setJobType(null); - o.setJobWorker(null); - o.setJobWorkerId(null); - o.setJobDate(null); - o.setRemarks(null); - o.setBelongBusinessId(null); - o.setBelongBusinessName(null); - o.setCreateTime(null); - o.setBlockState(null); - }); - landJobMapper.insert(dbLandJob); - // 测试 landId 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setLandId(null))); - // 测试 landName 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setLandName(null))); - // 测试 landType 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setLandType(null))); - // 测试 jobType 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setJobType(null))); - // 测试 jobWorker 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setJobWorker(null))); - // 测试 jobWorkerId 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setJobWorkerId(null))); - // 测试 jobDate 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setJobDate(null))); - // 测试 remarks 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setRemarks(null))); - // 测试 belongBusinessId 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setBelongBusinessId(null))); - // 测试 belongBusinessName 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setBelongBusinessName(null))); - // 测试 createTime 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setCreateTime(null))); - // 测试 blockState 不匹配 - landJobMapper.insert(cloneIgnoreId(dbLandJob, o -> o.setBlockState(null))); - // 准备参数 - LandJobExportReqVO reqVO = new LandJobExportReqVO(); - reqVO.setLandId(null); - reqVO.setLandName(null); - reqVO.setLandType(null); - reqVO.setJobType(null); - reqVO.setJobWorker(null); - reqVO.setJobWorkerId(null); -// reqVO.setJobDate(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - reqVO.setRemarks(null); - reqVO.setBelongBusinessId(null); - reqVO.setBelongBusinessName(null); -// reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - reqVO.setBlockState(null); - - // 调用 - List list = landJobService.getLandJobList(reqVO); - // 断言 - assertEquals(1, list.size()); - assertPojoEquals(dbLandJob, list.get(0)); - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/landjobinputs/LandJobInputsServiceImplTest.java b/yudao-module-product/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/landjobinputs/LandJobInputsServiceImplTest.java deleted file mode 100644 index 0068fcd..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/landjobinputs/LandJobInputsServiceImplTest.java +++ /dev/null @@ -1,164 +0,0 @@ -package cn.iocoder.yudao.module.product.service.landjobinputs; - -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.mock.mockito.MockBean; - -import javax.annotation.Resource; - -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; - -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.*; -import cn.iocoder.yudao.module.product.dal.dataobject.landjobinputs.LandJobInputsDO; -import cn.iocoder.yudao.module.product.dal.mysql.landjobinputs.LandJobInputsMapper; -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -import javax.annotation.Resource; -import org.springframework.context.annotation.Import; -import java.util.*; -import java.time.LocalDateTime; - -import static cn.hutool.core.util.RandomUtil.*; -import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.*; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; - -/** -* {@link LandJobInputsServiceImpl} 的单元测试类 -* -* @author 芋道源码 -*/ -@Import(LandJobInputsServiceImpl.class) -public class LandJobInputsServiceImplTest extends BaseDbUnitTest { - - @Resource - private LandJobInputsServiceImpl landJobInputsService; - - @Resource - private LandJobInputsMapper landJobInputsMapper; - - @Test - public void testCreateLandJobInputs_success() { - // 准备参数 - LandJobInputsCreateReqVO reqVO = randomPojo(LandJobInputsCreateReqVO.class); - - // 调用 - Long landJobInputsId = landJobInputsService.createLandJobInputs(reqVO); - // 断言 - assertNotNull(landJobInputsId); - // 校验记录的属性是否正确 - LandJobInputsDO landJobInputs = landJobInputsMapper.selectById(landJobInputsId); - assertPojoEquals(reqVO, landJobInputs); - } - - @Test - public void testUpdateLandJobInputs_success() { - // mock 数据 - LandJobInputsDO dbLandJobInputs = randomPojo(LandJobInputsDO.class); - landJobInputsMapper.insert(dbLandJobInputs);// @Sql: 先插入出一条存在的数据 - // 准备参数 - LandJobInputsUpdateReqVO reqVO = randomPojo(LandJobInputsUpdateReqVO.class, o -> { - o.setId(dbLandJobInputs.getId()); // 设置更新的 ID - }); - - // 调用 - landJobInputsService.updateLandJobInputs(reqVO); - // 校验是否更新正确 - LandJobInputsDO landJobInputs = landJobInputsMapper.selectById(reqVO.getId()); // 获取最新的 - assertPojoEquals(reqVO, landJobInputs); - } - - @Test - public void testUpdateLandJobInputs_notExists() { - // 准备参数 - LandJobInputsUpdateReqVO reqVO = randomPojo(LandJobInputsUpdateReqVO.class); - - // 调用, 并断言异常 - assertServiceException(() -> landJobInputsService.updateLandJobInputs(reqVO), LAND_JOB_INPUTS_NOT_EXISTS); - } - - @Test - public void testDeleteLandJobInputs_success() { - // mock 数据 - LandJobInputsDO dbLandJobInputs = randomPojo(LandJobInputsDO.class); - landJobInputsMapper.insert(dbLandJobInputs);// @Sql: 先插入出一条存在的数据 - // 准备参数 - Long id = dbLandJobInputs.getId(); - - // 调用 - landJobInputsService.deleteLandJobInputs(id); - // 校验数据不存在了 - assertNull(landJobInputsMapper.selectById(id)); - } - - @Test - public void testDeleteLandJobInputs_notExists() { - // 准备参数 - Long id = randomLongId(); - - // 调用, 并断言异常 - assertServiceException(() -> landJobInputsService.deleteLandJobInputs(id), LAND_JOB_INPUTS_NOT_EXISTS); - } - - @Test - @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 - public void testGetLandJobInputsPage() { - // mock 数据 - LandJobInputsDO dbLandJobInputs = randomPojo(LandJobInputsDO.class, o -> { // 等会查询到 - o.setLandJobId(null); - o.setInputsName(null); - o.setInputsId(null); - o.setInputsBatchId(null); - o.setInputsNum(null); - o.setInputsUnit(null); - o.setInputsDesc(null); - o.setCreateTime(null); - o.setBelongBusinessId(null); - o.setBelongBusinessName(null); - }); - landJobInputsMapper.insert(dbLandJobInputs); - // 测试 landJobId 不匹配 - landJobInputsMapper.insert(cloneIgnoreId(dbLandJobInputs, o -> o.setLandJobId(null))); - // 测试 inputsName 不匹配 - landJobInputsMapper.insert(cloneIgnoreId(dbLandJobInputs, o -> o.setInputsName(null))); - // 测试 inputsId 不匹配 - landJobInputsMapper.insert(cloneIgnoreId(dbLandJobInputs, o -> o.setInputsId(null))); - // 测试 inputsBatchId 不匹配 - landJobInputsMapper.insert(cloneIgnoreId(dbLandJobInputs, o -> o.setInputsBatchId(null))); - // 测试 inputsNum 不匹配 - landJobInputsMapper.insert(cloneIgnoreId(dbLandJobInputs, o -> o.setInputsNum(null))); - // 测试 inputsUnit 不匹配 - landJobInputsMapper.insert(cloneIgnoreId(dbLandJobInputs, o -> o.setInputsUnit(null))); - // 测试 inputsDesc 不匹配 - landJobInputsMapper.insert(cloneIgnoreId(dbLandJobInputs, o -> o.setInputsDesc(null))); - // 测试 createTime 不匹配 - landJobInputsMapper.insert(cloneIgnoreId(dbLandJobInputs, o -> o.setCreateTime(null))); - // 测试 belongBusinessId 不匹配 - landJobInputsMapper.insert(cloneIgnoreId(dbLandJobInputs, o -> o.setBelongBusinessId(null))); - // 测试 belongBusinessName 不匹配 - landJobInputsMapper.insert(cloneIgnoreId(dbLandJobInputs, o -> o.setBelongBusinessName(null))); - // 准备参数 - LandJobInputsPageReqVO reqVO = new LandJobInputsPageReqVO(); - reqVO.setLandJobId(null); - reqVO.setInputsName(null); - reqVO.setInputsId(null); - reqVO.setInputsBatchId(null); - reqVO.setInputsNum(null); - reqVO.setInputsUnit(null); - reqVO.setInputsDesc(null); - reqVO.setCreateTime(null); - reqVO.setBelongBusinessId(null); - reqVO.setBelongBusinessName(null); - - // 调用 - PageResult pageResult = landJobInputsService.getLandJobInputsPage(reqVO); - // 断言 - assertEquals(1, pageResult.getTotal()); - assertEquals(1, pageResult.getList().size()); - assertPojoEquals(dbLandJobInputs, pageResult.getList().get(0)); - } -} diff --git a/yudao-module-product/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/landjobtype/LandJobTypeServiceImplTest.java b/yudao-module-product/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/landjobtype/LandJobTypeServiceImplTest.java deleted file mode 100644 index 6f6d01d..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/landjobtype/LandJobTypeServiceImplTest.java +++ /dev/null @@ -1,98 +0,0 @@ -package cn.iocoder.yudao.module.product.service.landjobtype; - -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.product.controller.admin.landjobtype.vo.LandJobTypeCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landjobtype.vo.LandJobTypeUpdateReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.landjobtype.LandJobTypeDO; -import cn.iocoder.yudao.module.product.dal.mysql.landjobtype.LandJobTypeMapper; -import org.junit.jupiter.api.Test; -import org.springframework.context.annotation.Import; - -import javax.annotation.Resource; - -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; -import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.LAND_JOB_TYPE_NOT_EXISTS; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; - -/** -* {@link LandJobTypeServiceImpl} 的单元测试类 -* -* @author 芋道源码 -*/ -@Import(LandJobTypeServiceImpl.class) -public class LandJobTypeServiceImplTest extends BaseDbUnitTest { - - @Resource - private LandJobTypeServiceImpl landJobTypeService; - - @Resource - private LandJobTypeMapper landJobTypeMapper; - - @Test - public void testCreateLandJobType_success() { - // 准备参数 - LandJobTypeCreateReqVO reqVO = randomPojo(LandJobTypeCreateReqVO.class); - - // 调用 - Long landJobTypeId = landJobTypeService.createLandJobType(reqVO); - // 断言 - assertNotNull(landJobTypeId); - // 校验记录的属性是否正确 - LandJobTypeDO landJobType = landJobTypeMapper.selectById(landJobTypeId); - assertPojoEquals(reqVO, landJobType); - } - - @Test - public void testUpdateLandJobType_success() { - // mock 数据 - LandJobTypeDO dbLandJobType = randomPojo(LandJobTypeDO.class); - landJobTypeMapper.insert(dbLandJobType);// @Sql: 先插入出一条存在的数据 - // 准备参数 - LandJobTypeUpdateReqVO reqVO = randomPojo(LandJobTypeUpdateReqVO.class, o -> { - o.setId(dbLandJobType.getId()); // 设置更新的 ID - }); - - // 调用 - landJobTypeService.updateLandJobType(reqVO); - // 校验是否更新正确 - LandJobTypeDO landJobType = landJobTypeMapper.selectById(reqVO.getId()); // 获取最新的 - assertPojoEquals(reqVO, landJobType); - } - - @Test - public void testUpdateLandJobType_notExists() { - // 准备参数 - LandJobTypeUpdateReqVO reqVO = randomPojo(LandJobTypeUpdateReqVO.class); - - // 调用, 并断言异常 - assertServiceException(() -> landJobTypeService.updateLandJobType(reqVO), LAND_JOB_TYPE_NOT_EXISTS); - } - - @Test - public void testDeleteLandJobType_success() { - // mock 数据 - LandJobTypeDO dbLandJobType = randomPojo(LandJobTypeDO.class); - landJobTypeMapper.insert(dbLandJobType);// @Sql: 先插入出一条存在的数据 - // 准备参数 - Long id = dbLandJobType.getId(); - - // 调用 - landJobTypeService.deleteLandJobType(id); - // 校验数据不存在了 - assertNull(landJobTypeMapper.selectById(id)); - } - - @Test - public void testDeleteLandJobType_notExists() { - // 准备参数 - Long id = randomLongId(); - - // 调用, 并断言异常 - assertServiceException(() -> landJobTypeService.deleteLandJobType(id), LAND_JOB_TYPE_NOT_EXISTS); - } - -} diff --git a/yudao-module-product/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/landplan/LandPlanServiceImplTest.java b/yudao-module-product/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/landplan/LandPlanServiceImplTest.java deleted file mode 100644 index 5ec5e6b..0000000 --- a/yudao-module-product/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/landplan/LandPlanServiceImplTest.java +++ /dev/null @@ -1,168 +0,0 @@ -package cn.iocoder.yudao.module.product.service.landplan; - -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.mock.mockito.MockBean; - -import javax.annotation.Resource; - -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; - -import cn.iocoder.yudao.module.product.controller.admin.landplan.vo.*; -import cn.iocoder.yudao.module.product.dal.dataobject.landplan.LandPlanDO; -import cn.iocoder.yudao.module.product.dal.mysql.landplan.LandPlanMapper; -import cn.iocoder.yudao.framework.common.pojo.PageResult; - -import javax.annotation.Resource; -import org.springframework.context.annotation.Import; -import java.util.*; -import java.time.LocalDateTime; - -import static cn.hutool.core.util.RandomUtil.*; -import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.*; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; - -/** -* {@link LandPlanServiceImpl} 的单元测试类 -* -* @author 芋道源码 -*/ -@Import(LandPlanServiceImpl.class) -public class LandPlanServiceImplTest extends BaseDbUnitTest { - - @Resource - private LandPlanServiceImpl landPlanService; - - @Resource - private LandPlanMapper landPlanMapper; - - @Test - public void testCreateLandPlan_success() { - // 准备参数 - LandPlanCreateReqVO reqVO = randomPojo(LandPlanCreateReqVO.class); - - // 调用 - Long landPlanId = landPlanService.createLandPlan(reqVO); - // 断言 - assertNotNull(landPlanId); - // 校验记录的属性是否正确 - LandPlanDO landPlan = landPlanMapper.selectById(landPlanId); - assertPojoEquals(reqVO, landPlan); - } - - @Test - public void testUpdateLandPlan_success() { - // mock 数据 - LandPlanDO dbLandPlan = randomPojo(LandPlanDO.class); - landPlanMapper.insert(dbLandPlan);// @Sql: 先插入出一条存在的数据 - // 准备参数 - LandPlanUpdateReqVO reqVO = randomPojo(LandPlanUpdateReqVO.class, o -> { - o.setId(dbLandPlan.getId()); // 设置更新的 ID - }); - - // 调用 - landPlanService.updateLandPlan(reqVO); - // 校验是否更新正确 - LandPlanDO landPlan = landPlanMapper.selectById(reqVO.getId()); // 获取最新的 - assertPojoEquals(reqVO, landPlan); - } - - @Test - public void testUpdateLandPlan_notExists() { - // 准备参数 - LandPlanUpdateReqVO reqVO = randomPojo(LandPlanUpdateReqVO.class); - - // 调用, 并断言异常 - assertServiceException(() -> landPlanService.updateLandPlan(reqVO), LAND_PLAN_NOT_EXISTS); - } - - @Test - public void testDeleteLandPlan_success() { - // mock 数据 - LandPlanDO dbLandPlan = randomPojo(LandPlanDO.class); - landPlanMapper.insert(dbLandPlan);// @Sql: 先插入出一条存在的数据 - // 准备参数 - Long id = dbLandPlan.getId(); - - // 调用 - landPlanService.deleteLandPlan(id); - // 校验数据不存在了 - assertNull(landPlanMapper.selectById(id)); - } - - @Test - public void testDeleteLandPlan_notExists() { - // 准备参数 - Long id = randomLongId(); - - // 调用, 并断言异常 - assertServiceException(() -> landPlanService.deleteLandPlan(id), LAND_PLAN_NOT_EXISTS); - } - - @Test - @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 - public void testGetLandPlanPage() { - // mock 数据 - LandPlanDO dbLandPlan = randomPojo(LandPlanDO.class, o -> { // 等会查询到 - o.setLandId(null); - o.setLandName(null); - o.setLandPlanId(null); - o.setGoodsId(null); - o.setGoodsName(null); - o.setPlanStartTime(null); - o.setPlanEndTime(null); - o.setBelongBusinessId(null); - o.setBelongBusinessName(null); - o.setRemark(null); - o.setCreateTime(null); - }); - landPlanMapper.insert(dbLandPlan); - // 测试 landId 不匹配 - landPlanMapper.insert(cloneIgnoreId(dbLandPlan, o -> o.setLandId(null))); - // 测试 landName 不匹配 - landPlanMapper.insert(cloneIgnoreId(dbLandPlan, o -> o.setLandName(null))); - // 测试 landPlanId 不匹配 - landPlanMapper.insert(cloneIgnoreId(dbLandPlan, o -> o.setLandPlanId(null))); - // 测试 goodsId 不匹配 - landPlanMapper.insert(cloneIgnoreId(dbLandPlan, o -> o.setGoodsId(null))); - // 测试 goodName 不匹配 - landPlanMapper.insert(cloneIgnoreId(dbLandPlan, o -> o.setGoodsName(null))); - // 测试 planStartTime 不匹配 - landPlanMapper.insert(cloneIgnoreId(dbLandPlan, o -> o.setPlanStartTime(null))); - // 测试 planEndTime 不匹配 - landPlanMapper.insert(cloneIgnoreId(dbLandPlan, o -> o.setPlanEndTime(null))); - // 测试 belongBusinessId 不匹配 - landPlanMapper.insert(cloneIgnoreId(dbLandPlan, o -> o.setBelongBusinessId(null))); - // 测试 belongBusinessName 不匹配 - landPlanMapper.insert(cloneIgnoreId(dbLandPlan, o -> o.setBelongBusinessName(null))); - // 测试 remark 不匹配 - landPlanMapper.insert(cloneIgnoreId(dbLandPlan, o -> o.setRemark(null))); - // 测试 createTime 不匹配 - landPlanMapper.insert(cloneIgnoreId(dbLandPlan, o -> o.setCreateTime(null))); - // 准备参数 - LandPlanPageReqVO reqVO = new LandPlanPageReqVO(); - reqVO.setLandId(null); - reqVO.setLandName(null); - reqVO.setLandPlanId(null); - reqVO.setGoodsId(null); - reqVO.setGoodsName(null); -// reqVO.setPlanStartTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); -// reqVO.setPlanEndTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - reqVO.setBelongBusinessId(null); - reqVO.setBelongBusinessName(null); - reqVO.setRemark(null); -// reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); - - // 调用 - PageResult pageResult = landPlanService.getLandPlanPage(reqVO); - // 断言 - assertEquals(1, pageResult.getTotal()); - assertEquals(1, pageResult.getList().size()); - assertPojoEquals(dbLandPlan, pageResult.getList().get(0)); - } -} diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/META-INF/spring-configuration-metadata.json b/yudao-module-product/yudao-module-product-biz/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index 5290b87..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,130 +0,0 @@ -{ - "groups": [ - { - "name": "hik", - "type": "cn.iocoder.yudao.module.product.hik.HikProperties", - "sourceType": "cn.iocoder.yudao.module.product.hik.HikProperties" - }, - { - "name": "mqtt", - "type": "cn.iocoder.yudao.module.product.emqx.MqttProperties", - "sourceType": "cn.iocoder.yudao.module.product.emqx.MqttProperties" - } - ], - "properties": [ - { - "name": "hik.app-key", - "type": "java.lang.String", - "description": "流媒体密钥 appkey", - "sourceType": "cn.iocoder.yudao.module.product.hik.HikProperties" - }, - { - "name": "hik.app-secret", - "type": "java.lang.String", - "description": "流媒体密钥appSecret", - "sourceType": "cn.iocoder.yudao.module.product.hik.HikProperties" - }, - { - "name": "hik.artemis-path", - "type": "java.lang.String", - "description": "OpenAPI接口的上下文", - "sourceType": "cn.iocoder.yudao.module.product.hik.HikProperties" - }, - { - "name": "hik.host", - "type": "java.lang.String", - "description": "isc平台地址，用于api请求", - "sourceType": "cn.iocoder.yudao.module.product.hik.HikProperties" - }, - { - "name": "hik.http-schema", - "type": "java.lang.String", - "description": "取值: http:\/\/ https:\/\/", - "sourceType": "cn.iocoder.yudao.module.product.hik.HikProperties" - }, - { - "name": "hik.preview-origin-urls", - "type": "java.util.List", - "description": "想要替换的原预览地址, 与previewTargetUrls一一对应", - "sourceType": "cn.iocoder.yudao.module.product.hik.HikProperties" - }, - { - "name": "hik.preview-target-urls", - "type": "java.util.List", - "description": "想要替换的目标预览地址", - "sourceType": "cn.iocoder.yudao.module.product.hik.HikProperties" - }, - { - "name": "mqtt.clean-session", - "type": "java.lang.Boolean", - "description": "设置是否清空session,这里如果设置为false表示服务器会保留客户端的连 接记录，这里设置为true表示每次连接到服务器都以新的身份连接", - "sourceType": "cn.iocoder.yudao.module.product.emqx.MqttProperties" - }, - { - "name": "mqtt.client-id", - "type": "java.lang.String", - "description": "客户端Id，同一台服务器下，不允许出现重复的客户端id", - "sourceType": "cn.iocoder.yudao.module.product.emqx.MqttProperties" - }, - { - "name": "mqtt.controller-topic", - "type": "java.lang.String", - "sourceType": "cn.iocoder.yudao.module.product.emqx.MqttProperties" - }, - { - "name": "mqtt.host-url", - "type": "java.lang.String", - "description": "连接地址", - "sourceType": "cn.iocoder.yudao.module.product.emqx.MqttProperties" - }, - { - "name": "mqtt.is-open", - "type": "java.lang.Boolean", - "description": "启动的时候是否关闭mqtt", - "sourceType": "cn.iocoder.yudao.module.product.emqx.MqttProperties" - }, - { - "name": "mqtt.keep-alive", - "type": "java.lang.Integer", - "description": "设置会话心跳时间 单位为秒 服务器会每隔1.5*20秒的时间向客户端 发送个消息判断客户端是否在线，但这个方法并没有重连的机制", - "sourceType": "cn.iocoder.yudao.module.product.emqx.MqttProperties" - }, - { - "name": "mqtt.password", - "type": "java.lang.String", - "description": "密码", - "sourceType": "cn.iocoder.yudao.module.product.emqx.MqttProperties" - }, - { - "name": "mqtt.qos", - "type": "java.lang.Integer", - "description": "连接方式", - "sourceType": "cn.iocoder.yudao.module.product.emqx.MqttProperties" - }, - { - "name": "mqtt.reconnect", - "type": "java.lang.Boolean", - "description": "是否断线重连", - "sourceType": "cn.iocoder.yudao.module.product.emqx.MqttProperties" - }, - { - "name": "mqtt.sensor-topic", - "type": "java.lang.String", - "description": "默认连接主题", - "sourceType": "cn.iocoder.yudao.module.product.emqx.MqttProperties" - }, - { - "name": "mqtt.timeout", - "type": "java.lang.Integer", - "description": "超时时间", - "sourceType": "cn.iocoder.yudao.module.product.emqx.MqttProperties" - }, - { - "name": "mqtt.username", - "type": "java.lang.String", - "description": "用户名", - "sourceType": "cn.iocoder.yudao.module.product.emqx.MqttProperties" - } - ], - "hints": [] -} \ No newline at end of file diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/bootstrap-local.yaml b/yudao-module-product/yudao-module-product-biz/target/classes/bootstrap-local.yaml deleted file mode 100644 index fe4d3a5..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/bootstrap-local.yaml +++ /dev/null @@ -1,31 +0,0 @@ -spring: - main: - allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 - allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Dubbo 或者 Feign 等会存在重复定义的服务 - ---- #################### 注册中心相关配置 #################### - -spring: - cloud: - nacos: - server-addr: 192.168.233.128:8848 - discovery: - namespace: dev # 命名空间。这里使用 dev 开发环境 - metadata: - version: 1.0.0 # 服务实例的版本号，可用于灰度发布 - ---- #################### 配置中心相关配置 #################### - -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: 192.168.233.128:8848 # Nacos 服务器地址 - namespace: dev # 命名空间。这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/bootstrap-prod.yaml b/yudao-module-product/yudao-module-product-biz/target/classes/bootstrap-prod.yaml deleted file mode 100644 index d0b3068..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/bootstrap-prod.yaml +++ /dev/null @@ -1,31 +0,0 @@ -spring: - main: - allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 - allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Dubbo 或者 Feign 等会存在重复定义的服务 - ---- #################### 注册中心相关配置 #################### - -spring: - cloud: - nacos: - server-addr: 127.0.0.1:8848 - discovery: - namespace: prod # 命名空间。这里使用 dev 开发环境 - metadata: - version: 1.0.0 # 服务实例的版本号，可用于灰度发布 - ---- #################### 配置中心相关配置 #################### - -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: 127.0.0.1:8848 # Nacos 服务器地址 - namespace: prod # 命名空间。这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/bootstrap.yaml b/yudao-module-product/yudao-module-product-biz/target/classes/bootstrap.yaml deleted file mode 100644 index bf6494d..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/bootstrap.yaml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - application: - name: product-server - - profiles: - active: local - -server: - port: 49086 - -# 日志文件配置。注意，如果 logging.file.name 不放在 bootstrap.yaml 配置文件，而是放在 application.yaml 中，会导致出现 LOG_FILE_IS_UNDEFINED 文件 -logging: - file: - name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径 diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/logback-spring.xml b/yudao-module-product/yudao-module-product-biz/target/classes/logback-spring.xml deleted file mode 100644 index 5f4b30d..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/logback-spring.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - 　　　　　 - - - ${PATTERN_DEFAULT} - - - - - - - - - - ${PATTERN_DEFAULT} - - - - ${LOG_FILE} - - - ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz} - - ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} - - ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB} - - ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0} - - ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30} - - - - - - 0 - - 256 - - - - - - - - ${PATTERN_DEFAULT} - - - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/controllertype/ControllerTypeMapper.xml b/yudao-module-product/yudao-module-product-biz/target/classes/mapper/controllertype/ControllerTypeMapper.xml deleted file mode 100644 index 93a03d8..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/controllertype/ControllerTypeMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/deviceinfo/DeviceInfoMapper.xml b/yudao-module-product/yudao-module-product-biz/target/classes/mapper/deviceinfo/DeviceInfoMapper.xml deleted file mode 100644 index 968422c..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/deviceinfo/DeviceInfoMapper.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/deviceoperatelog/DeviceOperateLogMapper.xml b/yudao-module-product/yudao-module-product-biz/target/classes/mapper/deviceoperatelog/DeviceOperateLogMapper.xml deleted file mode 100644 index 1063a25..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/deviceoperatelog/DeviceOperateLogMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/envdata/EnvDataMapper.xml b/yudao-module-product/yudao-module-product-biz/target/classes/mapper/envdata/EnvDataMapper.xml deleted file mode 100644 index 10b254e..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/envdata/EnvDataMapper.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - DELETE FROM product_env_data WHERE DATEDIFF(NOW(), create_time) > #{day} - - - diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/envtype/EnvTypeMapper.xml b/yudao-module-product/yudao-module-product-biz/target/classes/mapper/envtype/EnvTypeMapper.xml deleted file mode 100644 index 6bcd97e..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/envtype/EnvTypeMapper.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/harvestbatch/HarvestBatchMapper.xml b/yudao-module-product/yudao-module-product-biz/target/classes/mapper/harvestbatch/HarvestBatchMapper.xml deleted file mode 100644 index 09ea003..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/harvestbatch/HarvestBatchMapper.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/harvestinfo/HarvestInfoMapper.xml b/yudao-module-product/yudao-module-product-biz/target/classes/mapper/harvestinfo/HarvestInfoMapper.xml deleted file mode 100644 index 42fa143..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/harvestinfo/HarvestInfoMapper.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/inputsbatch/InputsBatchMapper.xml b/yudao-module-product/yudao-module-product-biz/target/classes/mapper/inputsbatch/InputsBatchMapper.xml deleted file mode 100644 index d277f13..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/inputsbatch/InputsBatchMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/inputsbuy/InputsBuyMapper.xml b/yudao-module-product/yudao-module-product-biz/target/classes/mapper/inputsbuy/InputsBuyMapper.xml deleted file mode 100644 index d592777..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/inputsbuy/InputsBuyMapper.xml +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/inspection/InspectionMapper.xml b/yudao-module-product/yudao-module-product-biz/target/classes/mapper/inspection/InspectionMapper.xml deleted file mode 100644 index 9ab7477..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/inspection/InspectionMapper.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/inspectionitem/InspectionItemMapper.xml b/yudao-module-product/yudao-module-product-biz/target/classes/mapper/inspectionitem/InspectionItemMapper.xml deleted file mode 100644 index 668b6b3..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/inspectionitem/InspectionItemMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/landinfo/LandInfoMapper.xml b/yudao-module-product/yudao-module-product-biz/target/classes/mapper/landinfo/LandInfoMapper.xml deleted file mode 100644 index 9d81671..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/landinfo/LandInfoMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/landinfotype/LandInfoTypeMapper.xml b/yudao-module-product/yudao-module-product-biz/target/classes/mapper/landinfotype/LandInfoTypeMapper.xml deleted file mode 100644 index 14cde58..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/landinfotype/LandInfoTypeMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/landjob/LandJobMapper.xml b/yudao-module-product/yudao-module-product-biz/target/classes/mapper/landjob/LandJobMapper.xml deleted file mode 100644 index 3853b41..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/landjob/LandJobMapper.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/landjobinputs/LandJobInputsMapper.xml b/yudao-module-product/yudao-module-product-biz/target/classes/mapper/landjobinputs/LandJobInputsMapper.xml deleted file mode 100644 index 3da2799..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/landjobinputs/LandJobInputsMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/landjobtype/LandJobTypeMapper.xml b/yudao-module-product/yudao-module-product-biz/target/classes/mapper/landjobtype/LandJobTypeMapper.xml deleted file mode 100644 index 459ec17..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/landjobtype/LandJobTypeMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/landplan/LandPlanMapper.xml b/yudao-module-product/yudao-module-product-biz/target/classes/mapper/landplan/LandPlanMapper.xml deleted file mode 100644 index dba3da5..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/landplan/LandPlanMapper.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/slavedevice/SlaveDeviceMapper.xml b/yudao-module-product/yudao-module-product-biz/target/classes/mapper/slavedevice/SlaveDeviceMapper.xml deleted file mode 100644 index 75a8a18..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/classes/mapper/slavedevice/SlaveDeviceMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/template/inspection.docx b/yudao-module-product/yudao-module-product-biz/target/classes/template/inspection.docx deleted file mode 100644 index ce9e078..0000000 Binary files a/yudao-module-product/yudao-module-product-biz/target/classes/template/inspection.docx and /dev/null differ diff --git a/yudao-module-product/yudao-module-product-biz/target/classes/template/~$spection.docx b/yudao-module-product/yudao-module-product-biz/target/classes/template/~$spection.docx deleted file mode 100644 index 2a1d633..0000000 Binary files a/yudao-module-product/yudao-module-product-biz/target/classes/template/~$spection.docx and /dev/null differ diff --git a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/deviceinfo/DeviceInfoConvertImpl.java b/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/deviceinfo/DeviceInfoConvertImpl.java deleted file mode 100644 index 04b48f1..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/deviceinfo/DeviceInfoConvertImpl.java +++ /dev/null @@ -1,126 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.deviceinfo; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.deviceinfo.vo.DeviceInfoCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.deviceinfo.vo.DeviceInfoRespVO; -import cn.iocoder.yudao.module.product.controller.admin.deviceinfo.vo.DeviceInfoUpdateReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.deviceinfo.DeviceInfoDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T15:59:51+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class DeviceInfoConvertImpl implements DeviceInfoConvert { - - @Override - public DeviceInfoDO convert(DeviceInfoCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - DeviceInfoDO.DeviceInfoDOBuilder deviceInfoDO = DeviceInfoDO.builder(); - - deviceInfoDO.deviceName( bean.getDeviceName() ); - deviceInfoDO.landId( bean.getLandId() ); - deviceInfoDO.gatewayType( bean.getGatewayType() ); - deviceInfoDO.deviceType( bean.getDeviceType() ); - deviceInfoDO.envType( bean.getEnvType() ); - deviceInfoDO.controllerField( bean.getControllerField() ); - deviceInfoDO.monitorCode( bean.getMonitorCode() ); - deviceInfoDO.monitorPoints( bean.getMonitorPoints() ); - deviceInfoDO.closeInstruction( bean.getCloseInstruction() ); - deviceInfoDO.openInstruction( bean.getOpenInstruction() ); - deviceInfoDO.remarks( bean.getRemarks() ); - deviceInfoDO.belongBusinessId( bean.getBelongBusinessId() ); - - return deviceInfoDO.build(); - } - - @Override - public DeviceInfoDO convert(DeviceInfoUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - DeviceInfoDO.DeviceInfoDOBuilder deviceInfoDO = DeviceInfoDO.builder(); - - deviceInfoDO.id( bean.getId() ); - deviceInfoDO.deviceName( bean.getDeviceName() ); - deviceInfoDO.gatewayType( bean.getGatewayType() ); - deviceInfoDO.deviceType( bean.getDeviceType() ); - deviceInfoDO.envType( bean.getEnvType() ); - deviceInfoDO.controllerField( bean.getControllerField() ); - deviceInfoDO.monitorCode( bean.getMonitorCode() ); - deviceInfoDO.monitorPoints( bean.getMonitorPoints() ); - deviceInfoDO.closeInstruction( bean.getCloseInstruction() ); - deviceInfoDO.openInstruction( bean.getOpenInstruction() ); - deviceInfoDO.remarks( bean.getRemarks() ); - - return deviceInfoDO.build(); - } - - @Override - public DeviceInfoRespVO convert(DeviceInfoDO bean) { - if ( bean == null ) { - return null; - } - - DeviceInfoRespVO deviceInfoRespVO = new DeviceInfoRespVO(); - - deviceInfoRespVO.setDeviceName( bean.getDeviceName() ); - deviceInfoRespVO.setLandId( bean.getLandId() ); - deviceInfoRespVO.setGatewayType( bean.getGatewayType() ); - deviceInfoRespVO.setDeviceType( bean.getDeviceType() ); - deviceInfoRespVO.setEnvType( bean.getEnvType() ); - deviceInfoRespVO.setControllerField( bean.getControllerField() ); - deviceInfoRespVO.setMonitorCode( bean.getMonitorCode() ); - deviceInfoRespVO.setMonitorPoints( bean.getMonitorPoints() ); - deviceInfoRespVO.setEnabled( bean.getEnabled() ); - deviceInfoRespVO.setSwitchOn( bean.getSwitchOn() ); - deviceInfoRespVO.setCloseInstruction( bean.getCloseInstruction() ); - deviceInfoRespVO.setOpenInstruction( bean.getOpenInstruction() ); - deviceInfoRespVO.setRemarks( bean.getRemarks() ); - deviceInfoRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - deviceInfoRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - deviceInfoRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - deviceInfoRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return deviceInfoRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( DeviceInfoDO deviceInfoDO : list ) { - list1.add( convert( deviceInfoDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } -} diff --git a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/deviceoperatelog/DeviceOperateLogConvertImpl.java b/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/deviceoperatelog/DeviceOperateLogConvertImpl.java deleted file mode 100644 index c0a4f5c..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/deviceoperatelog/DeviceOperateLogConvertImpl.java +++ /dev/null @@ -1,83 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.deviceoperatelog; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.deviceoperatelog.vo.DeviceOperateLogCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.deviceoperatelog.vo.DeviceOperateLogRespVO; -import cn.iocoder.yudao.module.product.dal.dataobject.deviceoperatelog.DeviceOperateLogDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T15:59:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class DeviceOperateLogConvertImpl implements DeviceOperateLogConvert { - - @Override - public DeviceOperateLogDO convert(DeviceOperateLogCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - DeviceOperateLogDO.DeviceOperateLogDOBuilder deviceOperateLogDO = DeviceOperateLogDO.builder(); - - deviceOperateLogDO.deviceInfoId( bean.getDeviceInfoId() ); - deviceOperateLogDO.deviceName( bean.getDeviceName() ); - deviceOperateLogDO.landId( bean.getLandId() ); - deviceOperateLogDO.operateDetail( bean.getOperateDetail() ); - - return deviceOperateLogDO.build(); - } - - @Override - public DeviceOperateLogRespVO convert(DeviceOperateLogDO bean) { - if ( bean == null ) { - return null; - } - - DeviceOperateLogRespVO deviceOperateLogRespVO = new DeviceOperateLogRespVO(); - - deviceOperateLogRespVO.setDeviceInfoId( bean.getDeviceInfoId() ); - deviceOperateLogRespVO.setDeviceName( bean.getDeviceName() ); - deviceOperateLogRespVO.setLandId( bean.getLandId() ); - deviceOperateLogRespVO.setOperateDetail( bean.getOperateDetail() ); - deviceOperateLogRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - deviceOperateLogRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return deviceOperateLogRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( DeviceOperateLogDO deviceOperateLogDO : list ) { - list1.add( convert( deviceOperateLogDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } -} diff --git a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/envdata/EnvDataConvertImpl.java b/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/envdata/EnvDataConvertImpl.java deleted file mode 100644 index e1b48aa..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/envdata/EnvDataConvertImpl.java +++ /dev/null @@ -1,111 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.envdata; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.envdata.vo.EnvDataCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.envdata.vo.EnvDataRespVO; -import cn.iocoder.yudao.module.product.controller.admin.envdata.vo.EnvDataUpdateReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.envdata.EnvDataDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T15:59:51+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class EnvDataConvertImpl implements EnvDataConvert { - - @Override - public EnvDataDO convert(EnvDataCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - EnvDataDO.EnvDataDOBuilder envDataDO = EnvDataDO.builder(); - - envDataDO.envTypeId( bean.getEnvTypeId() ); - envDataDO.envName( bean.getEnvName() ); - envDataDO.landId( bean.getLandId() ); - envDataDO.landName( bean.getLandName() ); - envDataDO.value( bean.getValue() ); - envDataDO.belongBusinessId( bean.getBelongBusinessId() ); - envDataDO.belongBusinessName( bean.getBelongBusinessName() ); - - return envDataDO.build(); - } - - @Override - public EnvDataDO convert(EnvDataUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - EnvDataDO.EnvDataDOBuilder envDataDO = EnvDataDO.builder(); - - envDataDO.id( bean.getId() ); - envDataDO.envTypeId( bean.getEnvTypeId() ); - envDataDO.envName( bean.getEnvName() ); - envDataDO.landId( bean.getLandId() ); - envDataDO.landName( bean.getLandName() ); - envDataDO.value( bean.getValue() ); - envDataDO.belongBusinessId( bean.getBelongBusinessId() ); - envDataDO.belongBusinessName( bean.getBelongBusinessName() ); - - return envDataDO.build(); - } - - @Override - public EnvDataRespVO convert(EnvDataDO bean) { - if ( bean == null ) { - return null; - } - - EnvDataRespVO envDataRespVO = new EnvDataRespVO(); - - envDataRespVO.setEnvTypeId( bean.getEnvTypeId() ); - envDataRespVO.setEnvName( bean.getEnvName() ); - envDataRespVO.setLandId( bean.getLandId() ); - envDataRespVO.setLandName( bean.getLandName() ); - envDataRespVO.setValue( bean.getValue() ); - envDataRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - envDataRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - envDataRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - envDataRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - envDataRespVO.setTenantId( bean.getTenantId() ); - - return envDataRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( EnvDataDO envDataDO : list ) { - list1.add( convert( envDataDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } -} diff --git a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/envtype/EnvTypeConvertImpl.java b/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/envtype/EnvTypeConvertImpl.java deleted file mode 100644 index 24a8321..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/envtype/EnvTypeConvertImpl.java +++ /dev/null @@ -1,101 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.envtype; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.envtype.vo.EnvTypeCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.envtype.vo.EnvTypeRespVO; -import cn.iocoder.yudao.module.product.controller.admin.envtype.vo.EnvTypeUpdateReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.envtype.EnvTypeDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T15:59:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class EnvTypeConvertImpl implements EnvTypeConvert { - - @Override - public EnvTypeDO convert(EnvTypeCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - EnvTypeDO.EnvTypeDOBuilder envTypeDO = EnvTypeDO.builder(); - - envTypeDO.envTypeName( bean.getEnvTypeName() ); - envTypeDO.envFieldName( bean.getEnvFieldName() ); - envTypeDO.unit( bean.getUnit() ); - envTypeDO.remarks( bean.getRemarks() ); - - return envTypeDO.build(); - } - - @Override - public EnvTypeDO convert(EnvTypeUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - EnvTypeDO.EnvTypeDOBuilder envTypeDO = EnvTypeDO.builder(); - - envTypeDO.id( bean.getId() ); - envTypeDO.envTypeName( bean.getEnvTypeName() ); - envTypeDO.envFieldName( bean.getEnvFieldName() ); - envTypeDO.unit( bean.getUnit() ); - envTypeDO.remarks( bean.getRemarks() ); - - return envTypeDO.build(); - } - - @Override - public EnvTypeRespVO convert(EnvTypeDO bean) { - if ( bean == null ) { - return null; - } - - EnvTypeRespVO envTypeRespVO = new EnvTypeRespVO(); - - envTypeRespVO.setEnvTypeName( bean.getEnvTypeName() ); - envTypeRespVO.setEnvFieldName( bean.getEnvFieldName() ); - envTypeRespVO.setUnit( bean.getUnit() ); - envTypeRespVO.setRemarks( bean.getRemarks() ); - envTypeRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - envTypeRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return envTypeRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( EnvTypeDO envTypeDO : list ) { - list1.add( convert( envTypeDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } -} diff --git a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/harvestbatch/HarvestBatchConvertImpl.java b/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/harvestbatch/HarvestBatchConvertImpl.java deleted file mode 100644 index 1ed4a22..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/harvestbatch/HarvestBatchConvertImpl.java +++ /dev/null @@ -1,235 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.harvestbatch; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.api.harvestbatch.dto.HarvestBatchDTO; -import cn.iocoder.yudao.module.product.controller.admin.harvestbatch.vo.BlockCertificateSaveReqVO; -import cn.iocoder.yudao.module.product.controller.admin.harvestbatch.vo.HarvestBatchRespVO; -import cn.iocoder.yudao.module.product.controller.admin.harvestbatch.vo.HarvestBatchSaveReqVO; -import cn.iocoder.yudao.module.product.controller.admin.harvestbatch.vo.HarvestBatchUpdateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.harvestbatch.vo.LinkFileVO; -import cn.iocoder.yudao.module.product.controller.admin.harvestbatch.vo.LinkItemFileVO; -import cn.iocoder.yudao.module.product.controller.admin.harvestbatch.vo.OperateDetailSaveReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.harvestbatch.HarvestBatchDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T15:59:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class HarvestBatchConvertImpl implements HarvestBatchConvert { - - @Override - public HarvestBatchDO convert(HarvestBatchUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - HarvestBatchDO.HarvestBatchDOBuilder harvestBatchDO = HarvestBatchDO.builder(); - - harvestBatchDO.id( bean.getId() ); - harvestBatchDO.harvestBatchId( bean.getHarvestBatchId() ); - harvestBatchDO.harvestId( bean.getHarvestId() ); - harvestBatchDO.harvestDate( bean.getHarvestDate() ); - harvestBatchDO.goodsName( bean.getGoodsName() ); - harvestBatchDO.goodsId( bean.getGoodsId() ); - harvestBatchDO.goodsNum( bean.getGoodsNum() ); - harvestBatchDO.blockChainId( bean.getBlockChainId() ); - harvestBatchDO.blockChainBlockIdentity( bean.getBlockChainBlockIdentity() ); - harvestBatchDO.blockState( bean.getBlockState() ); - harvestBatchDO.remarks( bean.getRemarks() ); - harvestBatchDO.belongBusinessId( bean.getBelongBusinessId() ); - harvestBatchDO.belongBusinessName( bean.getBelongBusinessName() ); - - return harvestBatchDO.build(); - } - - @Override - public HarvestBatchRespVO convert(HarvestBatchDO bean) { - if ( bean == null ) { - return null; - } - - HarvestBatchRespVO harvestBatchRespVO = new HarvestBatchRespVO(); - - harvestBatchRespVO.setHarvestBatchId( bean.getHarvestBatchId() ); - harvestBatchRespVO.setHarvestId( bean.getHarvestId() ); - harvestBatchRespVO.setHarvestDate( bean.getHarvestDate() ); - harvestBatchRespVO.setGoodsName( bean.getGoodsName() ); - harvestBatchRespVO.setGoodsId( bean.getGoodsId() ); - harvestBatchRespVO.setGoodsNum( bean.getGoodsNum() ); - harvestBatchRespVO.setBlockChainId( bean.getBlockChainId() ); - harvestBatchRespVO.setBlockChainBlockIdentity( bean.getBlockChainBlockIdentity() ); - harvestBatchRespVO.setBlockState( bean.getBlockState() ); - harvestBatchRespVO.setRemarks( bean.getRemarks() ); - harvestBatchRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - harvestBatchRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - harvestBatchRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - harvestBatchRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return harvestBatchRespVO; - } - - @Override - public HarvestBatchDO convert(HarvestBatchSaveReqVO bean) { - if ( bean == null ) { - return null; - } - - HarvestBatchDO.HarvestBatchDOBuilder harvestBatchDO = HarvestBatchDO.builder(); - - harvestBatchDO.id( bean.getId() ); - harvestBatchDO.harvestBatchId( bean.getHarvestBatchId() ); - harvestBatchDO.harvestDate( bean.getHarvestDate() ); - harvestBatchDO.goodsId( bean.getGoodsId() ); - harvestBatchDO.goodsNum( bean.getGoodsNum() ); - harvestBatchDO.remarks( bean.getRemarks() ); - - return harvestBatchDO.build(); - } - - @Override - public HarvestBatchDTO convertDTO(HarvestBatchDO bean) { - if ( bean == null ) { - return null; - } - - HarvestBatchDTO harvestBatchDTO = new HarvestBatchDTO(); - - harvestBatchDTO.setId( bean.getId() ); - harvestBatchDTO.setHarvestBatchId( bean.getHarvestBatchId() ); - harvestBatchDTO.setHarvestId( bean.getHarvestId() ); - harvestBatchDTO.setHarvestDate( bean.getHarvestDate() ); - harvestBatchDTO.setGoodsName( bean.getGoodsName() ); - harvestBatchDTO.setGoodsId( bean.getGoodsId() ); - harvestBatchDTO.setGoodsNum( bean.getGoodsNum() ); - harvestBatchDTO.setBlockChainId( bean.getBlockChainId() ); - harvestBatchDTO.setBlockChainBlockIdentity( bean.getBlockChainBlockIdentity() ); - harvestBatchDTO.setBlockState( bean.getBlockState() ); - harvestBatchDTO.setRemarks( bean.getRemarks() ); - if ( bean.getCreateTime() != null ) { - harvestBatchDTO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - harvestBatchDTO.setBelongBusinessId( bean.getBelongBusinessId() ); - harvestBatchDTO.setBelongBusinessName( bean.getBelongBusinessName() ); - - return harvestBatchDTO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( HarvestBatchDO harvestBatchDO : list ) { - list1.add( convert( harvestBatchDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertListDTO(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( HarvestBatchDO harvestBatchDO : list ) { - list1.add( convertDTO( harvestBatchDO ) ); - } - - return list1; - } - - @Override - public List convertListForCreate(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( HarvestBatchSaveReqVO harvestBatchSaveReqVO : list ) { - list1.add( convert( harvestBatchSaveReqVO ) ); - } - - return list1; - } - - @Override - public List convertToFileVOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( BlockCertificateSaveReqVO blockCertificateSaveReqVO : list ) { - list1.add( blockCertificateSaveReqVOToLinkFileVO( blockCertificateSaveReqVO ) ); - } - - return list1; - } - - protected LinkItemFileVO operateDetailSaveReqVOToLinkItemFileVO(OperateDetailSaveReqVO operateDetailSaveReqVO) { - if ( operateDetailSaveReqVO == null ) { - return null; - } - - LinkItemFileVO linkItemFileVO = new LinkItemFileVO(); - - linkItemFileVO.setTitle( operateDetailSaveReqVO.getTitle() ); - linkItemFileVO.setType( operateDetailSaveReqVO.getType() ); - linkItemFileVO.setContent( operateDetailSaveReqVO.getContent() ); - linkItemFileVO.setLinkText( operateDetailSaveReqVO.getLinkText() ); - - return linkItemFileVO; - } - - protected List operateDetailSaveReqVOListToLinkItemFileVOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( OperateDetailSaveReqVO operateDetailSaveReqVO : list ) { - list1.add( operateDetailSaveReqVOToLinkItemFileVO( operateDetailSaveReqVO ) ); - } - - return list1; - } - - protected LinkFileVO blockCertificateSaveReqVOToLinkFileVO(BlockCertificateSaveReqVO blockCertificateSaveReqVO) { - if ( blockCertificateSaveReqVO == null ) { - return null; - } - - LinkFileVO linkFileVO = new LinkFileVO(); - - linkFileVO.setLinkName( blockCertificateSaveReqVO.getLinkName() ); - linkFileVO.setOperateDetails( operateDetailSaveReqVOListToLinkItemFileVOList( blockCertificateSaveReqVO.getOperateDetails() ) ); - - return linkFileVO; - } -} diff --git a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/harvestinfo/HarvestInfoConvertImpl.java b/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/harvestinfo/HarvestInfoConvertImpl.java deleted file mode 100644 index f5576ac..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/harvestinfo/HarvestInfoConvertImpl.java +++ /dev/null @@ -1,137 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.harvestinfo; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.harvestinfo.vo.HarvestInfoCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.harvestinfo.vo.HarvestInfoExcelVO; -import cn.iocoder.yudao.module.product.controller.admin.harvestinfo.vo.HarvestInfoRespVO; -import cn.iocoder.yudao.module.product.controller.admin.harvestinfo.vo.HarvestInfoUpdateReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.harvestinfo.HarvestInfoDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T15:59:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class HarvestInfoConvertImpl implements HarvestInfoConvert { - - @Override - public HarvestInfoDO convert(HarvestInfoCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - HarvestInfoDO.HarvestInfoDOBuilder harvestInfoDO = HarvestInfoDO.builder(); - - harvestInfoDO.harverstId( bean.getHarverstId() ); - harvestInfoDO.harverstTime( bean.getHarverstTime() ); - harvestInfoDO.belongBusinessId( bean.getBelongBusinessId() ); - - return harvestInfoDO.build(); - } - - @Override - public HarvestInfoDO convert(HarvestInfoUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - HarvestInfoDO.HarvestInfoDOBuilder harvestInfoDO = HarvestInfoDO.builder(); - - harvestInfoDO.id( bean.getId() ); - harvestInfoDO.harverstTime( bean.getHarverstTime() ); - - return harvestInfoDO.build(); - } - - @Override - public HarvestInfoRespVO convert(HarvestInfoDO bean) { - if ( bean == null ) { - return null; - } - - HarvestInfoRespVO harvestInfoRespVO = new HarvestInfoRespVO(); - - harvestInfoRespVO.setHarverstId( bean.getHarverstId() ); - harvestInfoRespVO.setHarverstTime( bean.getHarverstTime() ); - harvestInfoRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - harvestInfoRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - harvestInfoRespVO.setBlockChainBlockIdentity( bean.getBlockChainBlockIdentity() ); - harvestInfoRespVO.setBlockState( bean.getBlockState() ); - harvestInfoRespVO.setBlockChainId( bean.getBlockChainId() ); - harvestInfoRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - harvestInfoRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return harvestInfoRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( HarvestInfoDO harvestInfoDO : list ) { - list1.add( convert( harvestInfoDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( HarvestInfoDO harvestInfoDO : list ) { - list1.add( harvestInfoDOToHarvestInfoExcelVO( harvestInfoDO ) ); - } - - return list1; - } - - protected HarvestInfoExcelVO harvestInfoDOToHarvestInfoExcelVO(HarvestInfoDO harvestInfoDO) { - if ( harvestInfoDO == null ) { - return null; - } - - HarvestInfoExcelVO harvestInfoExcelVO = new HarvestInfoExcelVO(); - - harvestInfoExcelVO.setId( harvestInfoDO.getId() ); - harvestInfoExcelVO.setHarverstId( harvestInfoDO.getHarverstId() ); - harvestInfoExcelVO.setHarverstTime( harvestInfoDO.getHarverstTime() ); - if ( harvestInfoDO.getCreateTime() != null ) { - harvestInfoExcelVO.setCreateTime( Date.from( harvestInfoDO.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - harvestInfoExcelVO.setBelongBusinessId( harvestInfoDO.getBelongBusinessId() ); - harvestInfoExcelVO.setBelongBusinessName( harvestInfoDO.getBelongBusinessName() ); - harvestInfoExcelVO.setBlockChainBlockIdentity( harvestInfoDO.getBlockChainBlockIdentity() ); - harvestInfoExcelVO.setBlockState( harvestInfoDO.getBlockState() ); - harvestInfoExcelVO.setBlockChainId( harvestInfoDO.getBlockChainId() ); - - return harvestInfoExcelVO; - } -} diff --git a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/inputsbatch/InputsBatchConvertImpl.java b/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/inputsbatch/InputsBatchConvertImpl.java deleted file mode 100644 index dca7a46..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/inputsbatch/InputsBatchConvertImpl.java +++ /dev/null @@ -1,260 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.inputsbatch; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.basic.api.goodsinputrelational.dto.InputInfoRelationalRespDTO; -import cn.iocoder.yudao.module.product.api.inputsbatch.dto.InputsBatchDTO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo.InputsBatchCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo.InputsBatchExcelVO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo.InputsBatchRespVO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbatch.vo.InputsBatchSaveReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.inputsbatch.InputsBatchDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T15:59:51+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class InputsBatchConvertImpl implements InputsBatchConvert { - - @Override - public InputsBatchDO convert(InputsBatchCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - InputsBatchDO.InputsBatchDOBuilder inputsBatchDO = InputsBatchDO.builder(); - - inputsBatchDO.inputsName( bean.getInputsName() ); - inputsBatchDO.inputsId( bean.getInputsId() ); - inputsBatchDO.inputsBatchId( bean.getInputsBatchId() ); - inputsBatchDO.productData( bean.getProductData() ); - inputsBatchDO.inputsNum( bean.getInputsNum() ); - inputsBatchDO.inputsUnit( bean.getInputsUnit() ); - inputsBatchDO.inputsWeight( bean.getInputsWeight() ); - inputsBatchDO.inputsUnitPrice( bean.getInputsUnitPrice() ); - inputsBatchDO.totalPrice( bean.getTotalPrice() ); - inputsBatchDO.remarks( bean.getRemarks() ); - - return inputsBatchDO.build(); - } - - @Override - public InputsBatchDO convert(InputsBatchSaveReqVO bean) { - if ( bean == null ) { - return null; - } - - InputsBatchDO.InputsBatchDOBuilder inputsBatchDO = InputsBatchDO.builder(); - - inputsBatchDO.id( bean.getId() ); - inputsBatchDO.inputsName( bean.getInputsName() ); - inputsBatchDO.inputsId( bean.getInputsId() ); - inputsBatchDO.inputsBatchId( bean.getInputsBatchId() ); - inputsBatchDO.productData( bean.getProductData() ); - inputsBatchDO.inputsNum( bean.getInputsNum() ); - inputsBatchDO.inputsUnit( bean.getInputsUnit() ); - inputsBatchDO.inputsWeight( bean.getInputsWeight() ); - inputsBatchDO.inputsUnitPrice( bean.getInputsUnitPrice() ); - inputsBatchDO.totalPrice( bean.getTotalPrice() ); - inputsBatchDO.remarks( bean.getRemarks() ); - - return inputsBatchDO.build(); - } - - @Override - public InputsBatchRespVO convert(InputsBatchDO bean) { - if ( bean == null ) { - return null; - } - - InputsBatchRespVO inputsBatchRespVO = new InputsBatchRespVO(); - - inputsBatchRespVO.setInputsName( bean.getInputsName() ); - inputsBatchRespVO.setInputsId( bean.getInputsId() ); - inputsBatchRespVO.setInputsBatchId( bean.getInputsBatchId() ); - inputsBatchRespVO.setInputsBuyId( bean.getInputsBuyId() ); - inputsBatchRespVO.setProductData( bean.getProductData() ); - inputsBatchRespVO.setInputsNum( bean.getInputsNum() ); - inputsBatchRespVO.setInputsUnit( bean.getInputsUnit() ); - inputsBatchRespVO.setInputsWeight( bean.getInputsWeight() ); - inputsBatchRespVO.setInputsUnitPrice( bean.getInputsUnitPrice() ); - inputsBatchRespVO.setTotalPrice( bean.getTotalPrice() ); - inputsBatchRespVO.setRemarks( bean.getRemarks() ); - inputsBatchRespVO.setBlockState( bean.getBlockState() ); - inputsBatchRespVO.setBlockChainId( bean.getBlockChainId() ); - inputsBatchRespVO.setBlockChainBlockIdentity( bean.getBlockChainBlockIdentity() ); - inputsBatchRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - inputsBatchRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - inputsBatchRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - inputsBatchRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return inputsBatchRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( InputsBatchDO inputsBatchDO : list ) { - list1.add( convert( inputsBatchDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( InputsBatchDO inputsBatchDO : list ) { - list1.add( inputsBatchDOToInputsBatchExcelVO( inputsBatchDO ) ); - } - - return list1; - } - - @Override - public List convertListForCreate(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( InputsBatchSaveReqVO inputsBatchSaveReqVO : list ) { - list1.add( convert( inputsBatchSaveReqVO ) ); - } - - return list1; - } - - @Override - public List convertOfDTOList(List goodsInfos) { - if ( goodsInfos == null ) { - return null; - } - - List list = new ArrayList( goodsInfos.size() ); - for ( InputInfoRelationalRespDTO inputInfoRelationalRespDTO : goodsInfos ) { - list.add( inputInfoRelationalRespDTOToInputsBatchRespVO( inputInfoRelationalRespDTO ) ); - } - - return list; - } - - @Override - public List convertInputsBatchDOToDTOList(List goodsInfos) { - if ( goodsInfos == null ) { - return null; - } - - List list = new ArrayList( goodsInfos.size() ); - for ( InputsBatchDO inputsBatchDO : goodsInfos ) { - list.add( inputsBatchDOToInputsBatchDTO( inputsBatchDO ) ); - } - - return list; - } - - protected InputsBatchExcelVO inputsBatchDOToInputsBatchExcelVO(InputsBatchDO inputsBatchDO) { - if ( inputsBatchDO == null ) { - return null; - } - - InputsBatchExcelVO inputsBatchExcelVO = new InputsBatchExcelVO(); - - inputsBatchExcelVO.setId( inputsBatchDO.getId() ); - inputsBatchExcelVO.setInputsName( inputsBatchDO.getInputsName() ); - inputsBatchExcelVO.setInputsId( inputsBatchDO.getInputsId() ); - inputsBatchExcelVO.setInputsBatchId( inputsBatchDO.getInputsBatchId() ); - inputsBatchExcelVO.setInputsBuyId( inputsBatchDO.getInputsBuyId() ); - inputsBatchExcelVO.setProductData( inputsBatchDO.getProductData() ); - inputsBatchExcelVO.setInputsNum( inputsBatchDO.getInputsNum() ); - inputsBatchExcelVO.setInputsUnit( inputsBatchDO.getInputsUnit() ); - inputsBatchExcelVO.setInputsWeight( inputsBatchDO.getInputsWeight() ); - inputsBatchExcelVO.setInputsUnitPrice( inputsBatchDO.getInputsUnitPrice() ); - inputsBatchExcelVO.setTotalPrice( inputsBatchDO.getTotalPrice() ); - inputsBatchExcelVO.setRemarks( inputsBatchDO.getRemarks() ); - inputsBatchExcelVO.setBlockState( inputsBatchDO.getBlockState() ); - inputsBatchExcelVO.setBlockChainId( inputsBatchDO.getBlockChainId() ); - inputsBatchExcelVO.setBlockChainBlockIdentity( inputsBatchDO.getBlockChainBlockIdentity() ); - inputsBatchExcelVO.setBelongBusinessId( inputsBatchDO.getBelongBusinessId() ); - inputsBatchExcelVO.setBelongBusinessName( inputsBatchDO.getBelongBusinessName() ); - if ( inputsBatchDO.getCreateTime() != null ) { - inputsBatchExcelVO.setCreateTime( Date.from( inputsBatchDO.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return inputsBatchExcelVO; - } - - protected InputsBatchRespVO inputInfoRelationalRespDTOToInputsBatchRespVO(InputInfoRelationalRespDTO inputInfoRelationalRespDTO) { - if ( inputInfoRelationalRespDTO == null ) { - return null; - } - - InputsBatchRespVO inputsBatchRespVO = new InputsBatchRespVO(); - - inputsBatchRespVO.setInputsName( inputInfoRelationalRespDTO.getInputsName() ); - inputsBatchRespVO.setInputsId( inputInfoRelationalRespDTO.getInputsId() ); - inputsBatchRespVO.setInputsUnit( inputInfoRelationalRespDTO.getInputsUnit() ); - inputsBatchRespVO.setBelongBusinessId( inputInfoRelationalRespDTO.getBelongBusinessId() ); - inputsBatchRespVO.setBelongBusinessName( inputInfoRelationalRespDTO.getBelongBusinessName() ); - inputsBatchRespVO.setId( inputInfoRelationalRespDTO.getId() ); - - return inputsBatchRespVO; - } - - protected InputsBatchDTO inputsBatchDOToInputsBatchDTO(InputsBatchDO inputsBatchDO) { - if ( inputsBatchDO == null ) { - return null; - } - - InputsBatchDTO inputsBatchDTO = new InputsBatchDTO(); - - inputsBatchDTO.setId( inputsBatchDO.getId() ); - inputsBatchDTO.setInputsName( inputsBatchDO.getInputsName() ); - inputsBatchDTO.setInputsId( inputsBatchDO.getInputsId() ); - inputsBatchDTO.setInputsBatchId( inputsBatchDO.getInputsBatchId() ); - inputsBatchDTO.setInputsBuyId( inputsBatchDO.getInputsBuyId() ); - inputsBatchDTO.setProductData( inputsBatchDO.getProductData() ); - inputsBatchDTO.setInputsNum( inputsBatchDO.getInputsNum() ); - inputsBatchDTO.setInputsUnit( inputsBatchDO.getInputsUnit() ); - inputsBatchDTO.setInputsWeight( inputsBatchDO.getInputsWeight() ); - inputsBatchDTO.setInputsUnitPrice( inputsBatchDO.getInputsUnitPrice() ); - inputsBatchDTO.setTotalPrice( inputsBatchDO.getTotalPrice() ); - inputsBatchDTO.setRemarks( inputsBatchDO.getRemarks() ); - inputsBatchDTO.setBlockState( inputsBatchDO.getBlockState() ); - inputsBatchDTO.setBlockChainId( inputsBatchDO.getBlockChainId() ); - inputsBatchDTO.setBlockChainBlockIdentity( inputsBatchDO.getBlockChainBlockIdentity() ); - inputsBatchDTO.setBelongBusinessId( inputsBatchDO.getBelongBusinessId() ); - inputsBatchDTO.setBelongBusinessName( inputsBatchDO.getBelongBusinessName() ); - - return inputsBatchDTO; - } -} diff --git a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/inputsbuy/InputsBuyConvertImpl.java b/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/inputsbuy/InputsBuyConvertImpl.java deleted file mode 100644 index 74ec319..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/inputsbuy/InputsBuyConvertImpl.java +++ /dev/null @@ -1,166 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.inputsbuy; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.basic.api.goodsinfo.dto.GoodsInfoRespDTO; -import cn.iocoder.yudao.module.product.api.inputsbuy.dto.InputsBuyDTO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo.GoodsInfoReqVO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo.InputsBuyCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo.InputsBuyRespVO; -import cn.iocoder.yudao.module.product.controller.admin.inputsbuy.vo.InputsBuyUpdateReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.inputsbuy.InputsBuyDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T15:59:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class InputsBuyConvertImpl implements InputsBuyConvert { - - @Override - public InputsBuyDO convert(InputsBuyCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - InputsBuyDO.InputsBuyDOBuilder inputsBuyDO = InputsBuyDO.builder(); - - inputsBuyDO.inputsBuyId( bean.getInputsBuyId() ); - inputsBuyDO.relateOutboundId( bean.getRelateOutboundId() ); - inputsBuyDO.vendorId( bean.getVendorId() ); - inputsBuyDO.inputsBuyTime( bean.getInputsBuyTime() ); - - return inputsBuyDO.build(); - } - - @Override - public InputsBuyDO convert(InputsBuyUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - InputsBuyDO.InputsBuyDOBuilder inputsBuyDO = InputsBuyDO.builder(); - - inputsBuyDO.id( bean.getId() ); - inputsBuyDO.relateOutboundId( bean.getRelateOutboundId() ); - inputsBuyDO.inputsBuyTime( bean.getInputsBuyTime() ); - - return inputsBuyDO.build(); - } - - @Override - public InputsBuyRespVO convert(InputsBuyDO bean) { - if ( bean == null ) { - return null; - } - - InputsBuyRespVO inputsBuyRespVO = new InputsBuyRespVO(); - - inputsBuyRespVO.setInputsBuyId( bean.getInputsBuyId() ); - inputsBuyRespVO.setRelateOutboundId( bean.getRelateOutboundId() ); - inputsBuyRespVO.setVendorName( bean.getVendorName() ); - inputsBuyRespVO.setVendorId( bean.getVendorId() ); - inputsBuyRespVO.setInputsBuyTime( bean.getInputsBuyTime() ); - inputsBuyRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - inputsBuyRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - inputsBuyRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - inputsBuyRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - inputsBuyRespVO.setBlockState( bean.getBlockState() ); - - return inputsBuyRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( InputsBuyDO inputsBuyDO : list ) { - list1.add( convert( inputsBuyDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertToGoodsInfoList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( GoodsInfoRespDTO goodsInfoRespDTO : list ) { - list1.add( goodsInfoRespDTOToGoodsInfoReqVO( goodsInfoRespDTO ) ); - } - - return list1; - } - - @Override - public List convertToInputsBuyDTOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( InputsBuyDO inputsBuyDO : list ) { - list1.add( inputsBuyDOToInputsBuyDTO( inputsBuyDO ) ); - } - - return list1; - } - - protected GoodsInfoReqVO goodsInfoRespDTOToGoodsInfoReqVO(GoodsInfoRespDTO goodsInfoRespDTO) { - if ( goodsInfoRespDTO == null ) { - return null; - } - - GoodsInfoReqVO goodsInfoReqVO = new GoodsInfoReqVO(); - - goodsInfoReqVO.setGoodsId( goodsInfoRespDTO.getGoodsId() ); - goodsInfoReqVO.setGoodsName( goodsInfoRespDTO.getGoodsName() ); - - return goodsInfoReqVO; - } - - protected InputsBuyDTO inputsBuyDOToInputsBuyDTO(InputsBuyDO inputsBuyDO) { - if ( inputsBuyDO == null ) { - return null; - } - - InputsBuyDTO inputsBuyDTO = new InputsBuyDTO(); - - inputsBuyDTO.setId( inputsBuyDO.getId() ); - inputsBuyDTO.setInputsBuyId( inputsBuyDO.getInputsBuyId() ); - inputsBuyDTO.setRelateOutboundId( inputsBuyDO.getRelateOutboundId() ); - inputsBuyDTO.setVendorName( inputsBuyDO.getVendorName() ); - inputsBuyDTO.setVendorId( inputsBuyDO.getVendorId() ); - inputsBuyDTO.setInputsBuyTime( inputsBuyDO.getInputsBuyTime() ); - inputsBuyDTO.setBelongBusinessId( inputsBuyDO.getBelongBusinessId() ); - inputsBuyDTO.setBelongBusinessName( inputsBuyDO.getBelongBusinessName() ); - - return inputsBuyDTO; - } -} diff --git a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/inspection/InspectionConvertImpl.java b/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/inspection/InspectionConvertImpl.java deleted file mode 100644 index 0fbc9cc..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/inspection/InspectionConvertImpl.java +++ /dev/null @@ -1,186 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.inspection; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.inspection.vo.InspectionCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.inspection.vo.InspectionExcelVO; -import cn.iocoder.yudao.module.product.controller.admin.inspection.vo.InspectionRespVO; -import cn.iocoder.yudao.module.product.controller.admin.inspection.vo.InspectionUpdateReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.inspection.InspectionDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T15:59:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class InspectionConvertImpl implements InspectionConvert { - - @Override - public InspectionDO convert(InspectionCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - InspectionDO.InspectionDOBuilder inspectionDO = InspectionDO.builder(); - - inspectionDO.goodsId( bean.getGoodsId() ); - inspectionDO.harvestBatchId( bean.getHarvestBatchId() ); - inspectionDO.harvestTime( bean.getHarvestTime() ); - inspectionDO.inspectionStandard( bean.getInspectionStandard() ); - inspectionDO.inspectionResult( bean.getInspectionResult() ); - inspectionDO.inspectionOwnItem( bean.getInspectionOwnItem() ); - inspectionDO.inspectionUser( bean.getInspectionUser() ); - inspectionDO.inspectionEntrustItem( bean.getInspectionEntrustItem() ); - inspectionDO.inspectionOrganization( bean.getInspectionOrganization() ); - inspectionDO.inspectionDate( bean.getInspectionDate() ); - inspectionDO.inspectionLevel( bean.getInspectionLevel() ); - inspectionDO.issuanceDate( bean.getIssuanceDate() ); - inspectionDO.belongBusinessId( bean.getBelongBusinessId() ); - inspectionDO.inspectionImgUrl( bean.getInspectionImgUrl() ); - inspectionDO.inspectionVideoUrl( bean.getInspectionVideoUrl() ); - - return inspectionDO.build(); - } - - @Override - public InspectionDO convert(InspectionUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - InspectionDO.InspectionDOBuilder inspectionDO = InspectionDO.builder(); - - inspectionDO.id( bean.getId() ); - inspectionDO.harvestTime( bean.getHarvestTime() ); - inspectionDO.inspectionStandard( bean.getInspectionStandard() ); - inspectionDO.inspectionResult( bean.getInspectionResult() ); - inspectionDO.inspectionOwnItem( bean.getInspectionOwnItem() ); - inspectionDO.inspectionUser( bean.getInspectionUser() ); - inspectionDO.inspectionEntrustItem( bean.getInspectionEntrustItem() ); - inspectionDO.inspectionOrganization( bean.getInspectionOrganization() ); - inspectionDO.inspectionDate( bean.getInspectionDate() ); - inspectionDO.inspectionLevel( bean.getInspectionLevel() ); - inspectionDO.issuanceDate( bean.getIssuanceDate() ); - inspectionDO.inspectionImgUrl( bean.getInspectionImgUrl() ); - inspectionDO.inspectionVideoUrl( bean.getInspectionVideoUrl() ); - - return inspectionDO.build(); - } - - @Override - public InspectionRespVO convert(InspectionDO bean) { - if ( bean == null ) { - return null; - } - - InspectionRespVO inspectionRespVO = new InspectionRespVO(); - - inspectionRespVO.setInspectionId( bean.getInspectionId() ); - inspectionRespVO.setGoodsId( bean.getGoodsId() ); - inspectionRespVO.setGoodsName( bean.getGoodsName() ); - inspectionRespVO.setHarvestBatchId( bean.getHarvestBatchId() ); - inspectionRespVO.setHarvestTime( bean.getHarvestTime() ); - inspectionRespVO.setInspectionStandard( bean.getInspectionStandard() ); - inspectionRespVO.setInspectionResult( bean.getInspectionResult() ); - inspectionRespVO.setInspectionOwnItem( bean.getInspectionOwnItem() ); - inspectionRespVO.setInspectionUser( bean.getInspectionUser() ); - inspectionRespVO.setInspectionEntrustItem( bean.getInspectionEntrustItem() ); - inspectionRespVO.setInspectionOrganization( bean.getInspectionOrganization() ); - inspectionRespVO.setInspectionDate( bean.getInspectionDate() ); - inspectionRespVO.setInspectionLevel( bean.getInspectionLevel() ); - inspectionRespVO.setIssuanceDate( bean.getIssuanceDate() ); - inspectionRespVO.setBlockState( bean.getBlockState() ); - inspectionRespVO.setBlockChainId( bean.getBlockChainId() ); - inspectionRespVO.setBlockChainBlockIdentity( bean.getBlockChainBlockIdentity() ); - inspectionRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - inspectionRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - inspectionRespVO.setInspectionImgUrl( bean.getInspectionImgUrl() ); - inspectionRespVO.setInspectionVideoUrl( bean.getInspectionVideoUrl() ); - inspectionRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - inspectionRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return inspectionRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( InspectionDO inspectionDO : list ) { - list1.add( convert( inspectionDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( InspectionDO inspectionDO : list ) { - list1.add( inspectionDOToInspectionExcelVO( inspectionDO ) ); - } - - return list1; - } - - protected InspectionExcelVO inspectionDOToInspectionExcelVO(InspectionDO inspectionDO) { - if ( inspectionDO == null ) { - return null; - } - - InspectionExcelVO inspectionExcelVO = new InspectionExcelVO(); - - inspectionExcelVO.setId( inspectionDO.getId() ); - inspectionExcelVO.setInspectionId( inspectionDO.getInspectionId() ); - inspectionExcelVO.setGoodsId( inspectionDO.getGoodsId() ); - inspectionExcelVO.setGoodsName( inspectionDO.getGoodsName() ); - inspectionExcelVO.setHarvestBatchId( inspectionDO.getHarvestBatchId() ); - inspectionExcelVO.setHarvestTime( inspectionDO.getHarvestTime() ); - inspectionExcelVO.setInspectionStandard( inspectionDO.getInspectionStandard() ); - inspectionExcelVO.setInspectionResult( inspectionDO.getInspectionResult() ); - inspectionExcelVO.setInspectionOwnItem( inspectionDO.getInspectionOwnItem() ); - inspectionExcelVO.setInspectionUser( inspectionDO.getInspectionUser() ); - inspectionExcelVO.setInspectionEntrustItem( inspectionDO.getInspectionEntrustItem() ); - inspectionExcelVO.setInspectionOrganization( inspectionDO.getInspectionOrganization() ); - inspectionExcelVO.setInspectionDate( inspectionDO.getInspectionDate() ); - inspectionExcelVO.setInspectionLevel( inspectionDO.getInspectionLevel() ); - inspectionExcelVO.setIssuanceDate( inspectionDO.getIssuanceDate() ); - inspectionExcelVO.setBlockState( inspectionDO.getBlockState() ); - inspectionExcelVO.setBlockChainId( inspectionDO.getBlockChainId() ); - inspectionExcelVO.setBlockChainBlockIdentity( inspectionDO.getBlockChainBlockIdentity() ); - inspectionExcelVO.setBelongBusinessId( inspectionDO.getBelongBusinessId() ); - inspectionExcelVO.setBelongBusinessName( inspectionDO.getBelongBusinessName() ); - if ( inspectionDO.getCreateTime() != null ) { - inspectionExcelVO.setCreateTime( Date.from( inspectionDO.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return inspectionExcelVO; - } -} diff --git a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/inspectionitem/InspectionItemConvertImpl.java b/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/inspectionitem/InspectionItemConvertImpl.java deleted file mode 100644 index 470ad33..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/inspectionitem/InspectionItemConvertImpl.java +++ /dev/null @@ -1,90 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.inspectionitem; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.inspectionitem.vo.InspectionItemRespVO; -import cn.iocoder.yudao.module.product.controller.admin.inspectionitem.vo.InspectionItemSaveReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.inspectionitem.InspectionItemDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T15:59:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class InspectionItemConvertImpl implements InspectionItemConvert { - - @Override - public InspectionItemDO convert(InspectionItemSaveReqVO bean) { - if ( bean == null ) { - return null; - } - - InspectionItemDO.InspectionItemDOBuilder inspectionItemDO = InspectionItemDO.builder(); - - inspectionItemDO.id( bean.getId() ); - inspectionItemDO.inspectionItem( bean.getInspectionItem() ); - inspectionItemDO.inspectionUnit( bean.getInspectionUnit() ); - inspectionItemDO.inspectionRequire( bean.getInspectionRequire() ); - inspectionItemDO.inspectionResult( bean.getInspectionResult() ); - inspectionItemDO.inspectionConclusion( bean.getInspectionConclusion() ); - - return inspectionItemDO.build(); - } - - @Override - public InspectionItemRespVO convert(InspectionItemDO bean) { - if ( bean == null ) { - return null; - } - - InspectionItemRespVO inspectionItemRespVO = new InspectionItemRespVO(); - - inspectionItemRespVO.setInspectionId( bean.getInspectionId() ); - inspectionItemRespVO.setInspectionItemId( bean.getInspectionItemId() ); - inspectionItemRespVO.setInspectionItem( bean.getInspectionItem() ); - inspectionItemRespVO.setInspectionUnit( bean.getInspectionUnit() ); - inspectionItemRespVO.setInspectionRequire( bean.getInspectionRequire() ); - inspectionItemRespVO.setInspectionResult( bean.getInspectionResult() ); - inspectionItemRespVO.setInspectionConclusion( bean.getInspectionConclusion() ); - inspectionItemRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - inspectionItemRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - inspectionItemRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - inspectionItemRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return inspectionItemRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( InspectionItemDO inspectionItemDO : list ) { - list1.add( convert( inspectionItemDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } -} diff --git a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/landblockstate/LandBlockStateConvertImpl.java b/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/landblockstate/LandBlockStateConvertImpl.java deleted file mode 100644 index fbf8bb1..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/landblockstate/LandBlockStateConvertImpl.java +++ /dev/null @@ -1,97 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.landblockstate; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.landblockstate.vo.LandBlockStateCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landblockstate.vo.LandBlockStateRespVO; -import cn.iocoder.yudao.module.product.controller.admin.landblockstate.vo.LandBlockStateUpdateReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.landblockstate.LandBlockStateDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T15:59:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class LandBlockStateConvertImpl implements LandBlockStateConvert { - - @Override - public LandBlockStateDO convert(LandBlockStateCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - LandBlockStateDO.LandBlockStateDOBuilder landBlockStateDO = LandBlockStateDO.builder(); - - landBlockStateDO.landStateName( bean.getLandStateName() ); - landBlockStateDO.belongBusinessId( bean.getBelongBusinessId() ); - - return landBlockStateDO.build(); - } - - @Override - public LandBlockStateDO convert(LandBlockStateUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - LandBlockStateDO.LandBlockStateDOBuilder landBlockStateDO = LandBlockStateDO.builder(); - - landBlockStateDO.id( bean.getId() ); - landBlockStateDO.landStateName( bean.getLandStateName() ); - landBlockStateDO.belongBusinessId( bean.getBelongBusinessId() ); - landBlockStateDO.belongBusinessName( bean.getBelongBusinessName() ); - - return landBlockStateDO.build(); - } - - @Override - public LandBlockStateRespVO convert(LandBlockStateDO bean) { - if ( bean == null ) { - return null; - } - - LandBlockStateRespVO landBlockStateRespVO = new LandBlockStateRespVO(); - - landBlockStateRespVO.setLandStateName( bean.getLandStateName() ); - landBlockStateRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - landBlockStateRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - landBlockStateRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - landBlockStateRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return landBlockStateRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( LandBlockStateDO landBlockStateDO : list ) { - list1.add( convert( landBlockStateDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } -} diff --git a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/landinfo/LandInfoConvertImpl.java b/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/landinfo/LandInfoConvertImpl.java deleted file mode 100644 index 672bcad..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/landinfo/LandInfoConvertImpl.java +++ /dev/null @@ -1,153 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.landinfo; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.landinfo.vo.LandInfoCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landinfo.vo.LandInfoExcelVO; -import cn.iocoder.yudao.module.product.controller.admin.landinfo.vo.LandInfoRespVO; -import cn.iocoder.yudao.module.product.controller.admin.landinfo.vo.LandInfoUpdateReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.landinfo.LandInfoDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T15:59:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class LandInfoConvertImpl implements LandInfoConvert { - - @Override - public LandInfoDO convert(LandInfoCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - LandInfoDO.LandInfoDOBuilder landInfoDO = LandInfoDO.builder(); - - landInfoDO.landName( bean.getLandName() ); - landInfoDO.landId( bean.getLandId() ); - landInfoDO.size( bean.getSize() ); - landInfoDO.state( bean.getState() ); - landInfoDO.remarks( bean.getRemarks() ); - landInfoDO.landType( bean.getLandType() ); - landInfoDO.belongBusinessId( bean.getBelongBusinessId() ); - landInfoDO.belongBusinessName( bean.getBelongBusinessName() ); - - return landInfoDO.build(); - } - - @Override - public LandInfoDO convert(LandInfoUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - LandInfoDO.LandInfoDOBuilder landInfoDO = LandInfoDO.builder(); - - landInfoDO.id( bean.getId() ); - landInfoDO.landName( bean.getLandName() ); - landInfoDO.landId( bean.getLandId() ); - landInfoDO.size( bean.getSize() ); - landInfoDO.state( bean.getState() ); - landInfoDO.remarks( bean.getRemarks() ); - landInfoDO.landType( bean.getLandType() ); - landInfoDO.belongBusinessId( bean.getBelongBusinessId() ); - landInfoDO.belongBusinessName( bean.getBelongBusinessName() ); - - return landInfoDO.build(); - } - - @Override - public LandInfoRespVO convert(LandInfoDO bean) { - if ( bean == null ) { - return null; - } - - LandInfoRespVO landInfoRespVO = new LandInfoRespVO(); - - landInfoRespVO.setLandName( bean.getLandName() ); - landInfoRespVO.setLandId( bean.getLandId() ); - landInfoRespVO.setSize( bean.getSize() ); - landInfoRespVO.setState( bean.getState() ); - landInfoRespVO.setRemarks( bean.getRemarks() ); - landInfoRespVO.setLandType( bean.getLandType() ); - landInfoRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - landInfoRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - landInfoRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - landInfoRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - landInfoRespVO.setInfoTypeName( bean.getInfoTypeName() ); - landInfoRespVO.setInfoStateName( bean.getInfoStateName() ); - - return landInfoRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( LandInfoDO landInfoDO : list ) { - list1.add( convert( landInfoDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( LandInfoDO landInfoDO : list ) { - list1.add( landInfoDOToLandInfoExcelVO( landInfoDO ) ); - } - - return list1; - } - - protected LandInfoExcelVO landInfoDOToLandInfoExcelVO(LandInfoDO landInfoDO) { - if ( landInfoDO == null ) { - return null; - } - - LandInfoExcelVO landInfoExcelVO = new LandInfoExcelVO(); - - landInfoExcelVO.setId( landInfoDO.getId() ); - landInfoExcelVO.setLandName( landInfoDO.getLandName() ); - landInfoExcelVO.setLandId( landInfoDO.getLandId() ); - landInfoExcelVO.setSize( landInfoDO.getSize() ); - landInfoExcelVO.setState( landInfoDO.getState() ); - landInfoExcelVO.setRemarks( landInfoDO.getRemarks() ); - landInfoExcelVO.setLandType( landInfoDO.getLandType() ); - landInfoExcelVO.setBelongBusinessId( landInfoDO.getBelongBusinessId() ); - landInfoExcelVO.setBelongBusinessName( landInfoDO.getBelongBusinessName() ); - if ( landInfoDO.getCreateTime() != null ) { - landInfoExcelVO.setCreateTime( Date.from( landInfoDO.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return landInfoExcelVO; - } -} diff --git a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/landinfotype/LandInfoTypeConvertImpl.java b/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/landinfotype/LandInfoTypeConvertImpl.java deleted file mode 100644 index af65a48..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/landinfotype/LandInfoTypeConvertImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.landinfotype; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.landinfotype.vo.LandInfoTypeCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landinfotype.vo.LandInfoTypeRespVO; -import cn.iocoder.yudao.module.product.controller.admin.landinfotype.vo.LandInfoTypeUpdateReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.landinfotype.LandInfoTypeDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T15:59:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class LandInfoTypeConvertImpl implements LandInfoTypeConvert { - - @Override - public LandInfoTypeDO convert(LandInfoTypeCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - LandInfoTypeDO.LandInfoTypeDOBuilder landInfoTypeDO = LandInfoTypeDO.builder(); - - landInfoTypeDO.landTypeName( bean.getLandTypeName() ); - landInfoTypeDO.belongBusinessId( bean.getBelongBusinessId() ); - - return landInfoTypeDO.build(); - } - - @Override - public LandInfoTypeDO convert(LandInfoTypeUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - LandInfoTypeDO.LandInfoTypeDOBuilder landInfoTypeDO = LandInfoTypeDO.builder(); - - landInfoTypeDO.id( bean.getId() ); - landInfoTypeDO.landTypeName( bean.getLandTypeName() ); - landInfoTypeDO.belongBusinessId( bean.getBelongBusinessId() ); - - return landInfoTypeDO.build(); - } - - @Override - public LandInfoTypeRespVO convert(LandInfoTypeDO bean) { - if ( bean == null ) { - return null; - } - - LandInfoTypeRespVO landInfoTypeRespVO = new LandInfoTypeRespVO(); - - landInfoTypeRespVO.setLandTypeName( bean.getLandTypeName() ); - landInfoTypeRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - landInfoTypeRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - landInfoTypeRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - landInfoTypeRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return landInfoTypeRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( LandInfoTypeDO landInfoTypeDO : list ) { - list1.add( convert( landInfoTypeDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } -} diff --git a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/landjob/LandJobConvertImpl.java b/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/landjob/LandJobConvertImpl.java deleted file mode 100644 index 38718aa..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/landjob/LandJobConvertImpl.java +++ /dev/null @@ -1,256 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.landjob; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.api.landjob.dto.LandJobDTO; -import cn.iocoder.yudao.module.product.controller.admin.landjob.vo.LandJobCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landjob.vo.LandJobExcelVO; -import cn.iocoder.yudao.module.product.controller.admin.landjob.vo.LandJobRespVO; -import cn.iocoder.yudao.module.product.controller.admin.landjob.vo.LandJobUpdateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.LandJobInputsSaveReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.landjob.LandJobDO; -import cn.iocoder.yudao.module.product.dal.dataobject.landjobinputs.LandJobInputsDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T15:59:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class LandJobConvertImpl implements LandJobConvert { - - @Override - public LandJobDO convert(LandJobCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - LandJobDO.LandJobDOBuilder landJobDO = LandJobDO.builder(); - - landJobDO.landId( bean.getLandId() ); - landJobDO.landName( bean.getLandName() ); - landJobDO.landJobId( bean.getLandJobId() ); - landJobDO.landType( bean.getLandType() ); - landJobDO.jobType( bean.getJobType() ); - landJobDO.jobWorker( bean.getJobWorker() ); - landJobDO.jobWorkerId( bean.getJobWorkerId() ); - landJobDO.jobDate( bean.getJobDate() ); - landJobDO.remarks( bean.getRemarks() ); - landJobDO.belongBusinessId( bean.getBelongBusinessId() ); - landJobDO.belongBusinessName( bean.getBelongBusinessName() ); - landJobDO.blockState( bean.getBlockState() ); - landJobDO.jobImgUrl( bean.getJobImgUrl() ); - landJobDO.jobVideoUrl( bean.getJobVideoUrl() ); - - return landJobDO.build(); - } - - @Override - public LandJobDO convert(LandJobUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - LandJobDO.LandJobDOBuilder landJobDO = LandJobDO.builder(); - - landJobDO.id( bean.getId() ); - landJobDO.landId( bean.getLandId() ); - landJobDO.landName( bean.getLandName() ); - landJobDO.landJobId( bean.getLandJobId() ); - landJobDO.landType( bean.getLandType() ); - landJobDO.jobType( bean.getJobType() ); - landJobDO.jobWorker( bean.getJobWorker() ); - landJobDO.jobWorkerId( bean.getJobWorkerId() ); - landJobDO.jobDate( bean.getJobDate() ); - landJobDO.remarks( bean.getRemarks() ); - landJobDO.belongBusinessId( bean.getBelongBusinessId() ); - landJobDO.belongBusinessName( bean.getBelongBusinessName() ); - landJobDO.blockState( bean.getBlockState() ); - landJobDO.jobImgUrl( bean.getJobImgUrl() ); - landJobDO.jobVideoUrl( bean.getJobVideoUrl() ); - - return landJobDO.build(); - } - - @Override - public LandJobRespVO convert(LandJobDO bean) { - if ( bean == null ) { - return null; - } - - LandJobRespVO landJobRespVO = new LandJobRespVO(); - - landJobRespVO.setLandId( bean.getLandId() ); - landJobRespVO.setLandJobId( bean.getLandJobId() ); - landJobRespVO.setLandName( bean.getLandName() ); - landJobRespVO.setLandType( bean.getLandType() ); - landJobRespVO.setJobType( bean.getJobType() ); - landJobRespVO.setJobWorker( bean.getJobWorker() ); - landJobRespVO.setJobWorkerId( bean.getJobWorkerId() ); - landJobRespVO.setJobDate( bean.getJobDate() ); - landJobRespVO.setRemarks( bean.getRemarks() ); - landJobRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - landJobRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - landJobRespVO.setBlockState( bean.getBlockState() ); - landJobRespVO.setJobImgUrl( bean.getJobImgUrl() ); - landJobRespVO.setJobVideoUrl( bean.getJobVideoUrl() ); - landJobRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - landJobRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - landJobRespVO.setJobTypeName( bean.getJobTypeName() ); - - return landJobRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( LandJobDO landJobDO : list ) { - list1.add( convert( landJobDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( LandJobDO landJobDO : list ) { - list1.add( landJobDOToLandJobExcelVO( landJobDO ) ); - } - - return list1; - } - - @Override - public List convertListCreate(List jobWorkerIds) { - if ( jobWorkerIds == null ) { - return null; - } - - List list = new ArrayList( jobWorkerIds.size() ); - for ( LandJobInputsSaveReqVO landJobInputsSaveReqVO : jobWorkerIds ) { - list.add( landJobInputsSaveReqVOToLandJobInputsDO( landJobInputsSaveReqVO ) ); - } - - return list; - } - - @Override - public List convertToLandJobDTOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( LandJobDO landJobDO : list ) { - list1.add( landJobDOToLandJobDTO( landJobDO ) ); - } - - return list1; - } - - protected LandJobExcelVO landJobDOToLandJobExcelVO(LandJobDO landJobDO) { - if ( landJobDO == null ) { - return null; - } - - LandJobExcelVO landJobExcelVO = new LandJobExcelVO(); - - landJobExcelVO.setId( landJobDO.getId() ); - landJobExcelVO.setLandId( landJobDO.getLandId() ); - landJobExcelVO.setLandJobId( landJobDO.getLandJobId() ); - landJobExcelVO.setLandName( landJobDO.getLandName() ); - landJobExcelVO.setLandType( landJobDO.getLandType() ); - landJobExcelVO.setJobType( landJobDO.getJobType() ); - landJobExcelVO.setJobWorker( landJobDO.getJobWorker() ); - landJobExcelVO.setJobWorkerId( landJobDO.getJobWorkerId() ); - landJobExcelVO.setJobDate( landJobDO.getJobDate() ); - landJobExcelVO.setRemarks( landJobDO.getRemarks() ); - landJobExcelVO.setBelongBusinessId( landJobDO.getBelongBusinessId() ); - landJobExcelVO.setBelongBusinessName( landJobDO.getBelongBusinessName() ); - if ( landJobDO.getCreateTime() != null ) { - landJobExcelVO.setCreateTime( Date.from( landJobDO.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - landJobExcelVO.setBlockState( landJobDO.getBlockState() ); - landJobExcelVO.setJobImgUrl( landJobDO.getJobImgUrl() ); - landJobExcelVO.setJobVideoUrl( landJobDO.getJobVideoUrl() ); - - return landJobExcelVO; - } - - protected LandJobInputsDO landJobInputsSaveReqVOToLandJobInputsDO(LandJobInputsSaveReqVO landJobInputsSaveReqVO) { - if ( landJobInputsSaveReqVO == null ) { - return null; - } - - LandJobInputsDO.LandJobInputsDOBuilder landJobInputsDO = LandJobInputsDO.builder(); - - landJobInputsDO.id( landJobInputsSaveReqVO.getId() ); - landJobInputsDO.landJobId( landJobInputsSaveReqVO.getLandJobId() ); - landJobInputsDO.inputsName( landJobInputsSaveReqVO.getInputsName() ); - landJobInputsDO.inputsId( landJobInputsSaveReqVO.getInputsId() ); - landJobInputsDO.inputsBatchId( landJobInputsSaveReqVO.getInputsBatchId() ); - landJobInputsDO.inputsNum( landJobInputsSaveReqVO.getInputsNum() ); - landJobInputsDO.inputsUnit( landJobInputsSaveReqVO.getInputsUnit() ); - landJobInputsDO.inputsDesc( landJobInputsSaveReqVO.getInputsDesc() ); - landJobInputsDO.belongBusinessId( landJobInputsSaveReqVO.getBelongBusinessId() ); - landJobInputsDO.belongBusinessName( landJobInputsSaveReqVO.getBelongBusinessName() ); - landJobInputsDO.inputsImgUrl( landJobInputsSaveReqVO.getInputsImgUrl() ); - landJobInputsDO.inputsVideoUrl( landJobInputsSaveReqVO.getInputsVideoUrl() ); - - return landJobInputsDO.build(); - } - - protected LandJobDTO landJobDOToLandJobDTO(LandJobDO landJobDO) { - if ( landJobDO == null ) { - return null; - } - - LandJobDTO landJobDTO = new LandJobDTO(); - - landJobDTO.setId( landJobDO.getId() ); - landJobDTO.setLandId( landJobDO.getLandId() ); - landJobDTO.setLandName( landJobDO.getLandName() ); - landJobDTO.setLandJobId( landJobDO.getLandJobId() ); - if ( landJobDO.getLandType() != null ) { - landJobDTO.setLandType( landJobDO.getLandType().intValue() ); - } - landJobDTO.setJobType( landJobDO.getJobType() ); - landJobDTO.setJobWorker( landJobDO.getJobWorker() ); - landJobDTO.setJobWorkerId( landJobDO.getJobWorkerId() ); - landJobDTO.setJobDate( landJobDO.getJobDate() ); - landJobDTO.setRemarks( landJobDO.getRemarks() ); - landJobDTO.setBelongBusinessId( landJobDO.getBelongBusinessId() ); - landJobDTO.setBelongBusinessName( landJobDO.getBelongBusinessName() ); - landJobDTO.setBlockState( landJobDO.getBlockState() ); - - return landJobDTO; - } -} diff --git a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/landjobinputs/LandJobInputsConvertImpl.java b/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/landjobinputs/LandJobInputsConvertImpl.java deleted file mode 100644 index 78f740a..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/landjobinputs/LandJobInputsConvertImpl.java +++ /dev/null @@ -1,200 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.landjobinputs; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.LandJobInputsCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.LandJobInputsExcelVO; -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.LandJobInputsRespVO; -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.LandJobInputsSaveReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landjobinputs.vo.LandJobInputsUpdateReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.landjobinputs.LandJobInputsDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T15:59:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class LandJobInputsConvertImpl implements LandJobInputsConvert { - - @Override - public LandJobInputsDO convert(LandJobInputsCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - LandJobInputsDO.LandJobInputsDOBuilder landJobInputsDO = LandJobInputsDO.builder(); - - landJobInputsDO.landJobId( bean.getLandJobId() ); - landJobInputsDO.inputsName( bean.getInputsName() ); - landJobInputsDO.inputsId( bean.getInputsId() ); - landJobInputsDO.inputsBatchId( bean.getInputsBatchId() ); - landJobInputsDO.inputsNum( bean.getInputsNum() ); - landJobInputsDO.inputsUnit( bean.getInputsUnit() ); - landJobInputsDO.inputsDesc( bean.getInputsDesc() ); - landJobInputsDO.belongBusinessId( bean.getBelongBusinessId() ); - landJobInputsDO.belongBusinessName( bean.getBelongBusinessName() ); - landJobInputsDO.inputsImgUrl( bean.getInputsImgUrl() ); - landJobInputsDO.inputsVideoUrl( bean.getInputsVideoUrl() ); - - return landJobInputsDO.build(); - } - - @Override - public LandJobInputsDO convert(LandJobInputsSaveReqVO bean) { - if ( bean == null ) { - return null; - } - - LandJobInputsDO.LandJobInputsDOBuilder landJobInputsDO = LandJobInputsDO.builder(); - - landJobInputsDO.id( bean.getId() ); - landJobInputsDO.landJobId( bean.getLandJobId() ); - landJobInputsDO.inputsName( bean.getInputsName() ); - landJobInputsDO.inputsId( bean.getInputsId() ); - landJobInputsDO.inputsBatchId( bean.getInputsBatchId() ); - landJobInputsDO.inputsNum( bean.getInputsNum() ); - landJobInputsDO.inputsUnit( bean.getInputsUnit() ); - landJobInputsDO.inputsDesc( bean.getInputsDesc() ); - landJobInputsDO.belongBusinessId( bean.getBelongBusinessId() ); - landJobInputsDO.belongBusinessName( bean.getBelongBusinessName() ); - landJobInputsDO.inputsImgUrl( bean.getInputsImgUrl() ); - landJobInputsDO.inputsVideoUrl( bean.getInputsVideoUrl() ); - - return landJobInputsDO.build(); - } - - @Override - public LandJobInputsDO convert(LandJobInputsUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - LandJobInputsDO.LandJobInputsDOBuilder landJobInputsDO = LandJobInputsDO.builder(); - - landJobInputsDO.id( bean.getId() ); - landJobInputsDO.landJobId( bean.getLandJobId() ); - landJobInputsDO.inputsName( bean.getInputsName() ); - landJobInputsDO.inputsId( bean.getInputsId() ); - landJobInputsDO.inputsBatchId( bean.getInputsBatchId() ); - landJobInputsDO.inputsNum( bean.getInputsNum() ); - landJobInputsDO.inputsUnit( bean.getInputsUnit() ); - landJobInputsDO.inputsDesc( bean.getInputsDesc() ); - landJobInputsDO.belongBusinessId( bean.getBelongBusinessId() ); - landJobInputsDO.belongBusinessName( bean.getBelongBusinessName() ); - landJobInputsDO.inputsImgUrl( bean.getInputsImgUrl() ); - landJobInputsDO.inputsVideoUrl( bean.getInputsVideoUrl() ); - - return landJobInputsDO.build(); - } - - @Override - public LandJobInputsRespVO convert(LandJobInputsDO bean) { - if ( bean == null ) { - return null; - } - - LandJobInputsRespVO landJobInputsRespVO = new LandJobInputsRespVO(); - - landJobInputsRespVO.setLandJobId( bean.getLandJobId() ); - landJobInputsRespVO.setInputsName( bean.getInputsName() ); - landJobInputsRespVO.setInputsId( bean.getInputsId() ); - landJobInputsRespVO.setInputsBatchId( bean.getInputsBatchId() ); - landJobInputsRespVO.setInputsNum( bean.getInputsNum() ); - landJobInputsRespVO.setInputsUnit( bean.getInputsUnit() ); - landJobInputsRespVO.setInputsDesc( bean.getInputsDesc() ); - landJobInputsRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - landJobInputsRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - landJobInputsRespVO.setInputsImgUrl( bean.getInputsImgUrl() ); - landJobInputsRespVO.setInputsVideoUrl( bean.getInputsVideoUrl() ); - landJobInputsRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - landJobInputsRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return landJobInputsRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( LandJobInputsDO landJobInputsDO : list ) { - list1.add( convert( landJobInputsDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( LandJobInputsDO landJobInputsDO : list ) { - list1.add( landJobInputsDOToLandJobInputsExcelVO( landJobInputsDO ) ); - } - - return list1; - } - - @Override - public List convertListCreate(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( LandJobInputsSaveReqVO landJobInputsSaveReqVO : list ) { - list1.add( convert( landJobInputsSaveReqVO ) ); - } - - return list1; - } - - protected LandJobInputsExcelVO landJobInputsDOToLandJobInputsExcelVO(LandJobInputsDO landJobInputsDO) { - if ( landJobInputsDO == null ) { - return null; - } - - LandJobInputsExcelVO landJobInputsExcelVO = new LandJobInputsExcelVO(); - - landJobInputsExcelVO.setId( landJobInputsDO.getId() ); - landJobInputsExcelVO.setLandJobId( landJobInputsDO.getLandJobId() ); - landJobInputsExcelVO.setInputsName( landJobInputsDO.getInputsName() ); - landJobInputsExcelVO.setInputsId( landJobInputsDO.getInputsId() ); - landJobInputsExcelVO.setInputsBatchId( landJobInputsDO.getInputsBatchId() ); - landJobInputsExcelVO.setInputsNum( landJobInputsDO.getInputsNum() ); - landJobInputsExcelVO.setInputsUnit( landJobInputsDO.getInputsUnit() ); - landJobInputsExcelVO.setInputsDesc( landJobInputsDO.getInputsDesc() ); - if ( landJobInputsDO.getCreateTime() != null ) { - landJobInputsExcelVO.setCreateTime( Date.from( landJobInputsDO.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - landJobInputsExcelVO.setBelongBusinessId( landJobInputsDO.getBelongBusinessId() ); - landJobInputsExcelVO.setBelongBusinessName( landJobInputsDO.getBelongBusinessName() ); - - return landJobInputsExcelVO; - } -} diff --git a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/landjobtype/LandJobTypeConvertImpl.java b/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/landjobtype/LandJobTypeConvertImpl.java deleted file mode 100644 index 8f38788..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/landjobtype/LandJobTypeConvertImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.landjobtype; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.landjobtype.vo.LandJobTypeCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landjobtype.vo.LandJobTypeRespVO; -import cn.iocoder.yudao.module.product.controller.admin.landjobtype.vo.LandJobTypeUpdateReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.landjobtype.LandJobTypeDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T15:59:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class LandJobTypeConvertImpl implements LandJobTypeConvert { - - @Override - public LandJobTypeDO convert(LandJobTypeCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - LandJobTypeDO.LandJobTypeDOBuilder landJobTypeDO = LandJobTypeDO.builder(); - - landJobTypeDO.typeName( bean.getTypeName() ); - landJobTypeDO.belongBusinessId( bean.getBelongBusinessId() ); - - return landJobTypeDO.build(); - } - - @Override - public LandJobTypeDO convert(LandJobTypeUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - LandJobTypeDO.LandJobTypeDOBuilder landJobTypeDO = LandJobTypeDO.builder(); - - landJobTypeDO.id( bean.getId() ); - landJobTypeDO.typeName( bean.getTypeName() ); - landJobTypeDO.belongBusinessId( bean.getBelongBusinessId() ); - - return landJobTypeDO.build(); - } - - @Override - public LandJobTypeRespVO convert(LandJobTypeDO bean) { - if ( bean == null ) { - return null; - } - - LandJobTypeRespVO landJobTypeRespVO = new LandJobTypeRespVO(); - - landJobTypeRespVO.setTypeName( bean.getTypeName() ); - landJobTypeRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - landJobTypeRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - landJobTypeRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - landJobTypeRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return landJobTypeRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( LandJobTypeDO landJobTypeDO : list ) { - list1.add( convert( landJobTypeDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } -} diff --git a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/landplan/LandPlanConvertImpl.java b/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/landplan/LandPlanConvertImpl.java deleted file mode 100644 index 38261e2..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/landplan/LandPlanConvertImpl.java +++ /dev/null @@ -1,159 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.landplan; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.landplan.vo.LandPlanCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.landplan.vo.LandPlanExcelVO; -import cn.iocoder.yudao.module.product.controller.admin.landplan.vo.LandPlanRespVO; -import cn.iocoder.yudao.module.product.controller.admin.landplan.vo.LandPlanUpdateReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.landplan.LandPlanDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T15:59:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class LandPlanConvertImpl implements LandPlanConvert { - - @Override - public LandPlanDO convert(LandPlanCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - LandPlanDO.LandPlanDOBuilder landPlanDO = LandPlanDO.builder(); - - landPlanDO.landId( bean.getLandId() ); - landPlanDO.landName( bean.getLandName() ); - landPlanDO.landPlanId( bean.getLandPlanId() ); - landPlanDO.goodsId( bean.getGoodsId() ); - landPlanDO.goodsName( bean.getGoodsName() ); - landPlanDO.planStartTime( bean.getPlanStartTime() ); - landPlanDO.planEndTime( bean.getPlanEndTime() ); - landPlanDO.belongBusinessId( bean.getBelongBusinessId() ); - landPlanDO.belongBusinessName( bean.getBelongBusinessName() ); - landPlanDO.remark( bean.getRemark() ); - - return landPlanDO.build(); - } - - @Override - public LandPlanDO convert(LandPlanUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - LandPlanDO.LandPlanDOBuilder landPlanDO = LandPlanDO.builder(); - - landPlanDO.id( bean.getId() ); - landPlanDO.landId( bean.getLandId() ); - landPlanDO.landName( bean.getLandName() ); - landPlanDO.landPlanId( bean.getLandPlanId() ); - landPlanDO.goodsId( bean.getGoodsId() ); - landPlanDO.goodsName( bean.getGoodsName() ); - landPlanDO.planStartTime( bean.getPlanStartTime() ); - landPlanDO.planEndTime( bean.getPlanEndTime() ); - landPlanDO.belongBusinessId( bean.getBelongBusinessId() ); - landPlanDO.belongBusinessName( bean.getBelongBusinessName() ); - landPlanDO.remark( bean.getRemark() ); - - return landPlanDO.build(); - } - - @Override - public LandPlanRespVO convert(LandPlanDO bean) { - if ( bean == null ) { - return null; - } - - LandPlanRespVO landPlanRespVO = new LandPlanRespVO(); - - landPlanRespVO.setLandId( bean.getLandId() ); - landPlanRespVO.setLandName( bean.getLandName() ); - landPlanRespVO.setLandPlanId( bean.getLandPlanId() ); - landPlanRespVO.setGoodsId( bean.getGoodsId() ); - landPlanRespVO.setGoodsName( bean.getGoodsName() ); - landPlanRespVO.setPlanStartTime( bean.getPlanStartTime() ); - landPlanRespVO.setPlanEndTime( bean.getPlanEndTime() ); - landPlanRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - landPlanRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - landPlanRespVO.setRemark( bean.getRemark() ); - landPlanRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - landPlanRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return landPlanRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( LandPlanDO landPlanDO : list ) { - list1.add( convert( landPlanDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( LandPlanDO landPlanDO : list ) { - list1.add( landPlanDOToLandPlanExcelVO( landPlanDO ) ); - } - - return list1; - } - - protected LandPlanExcelVO landPlanDOToLandPlanExcelVO(LandPlanDO landPlanDO) { - if ( landPlanDO == null ) { - return null; - } - - LandPlanExcelVO landPlanExcelVO = new LandPlanExcelVO(); - - landPlanExcelVO.setId( landPlanDO.getId() ); - landPlanExcelVO.setLandId( landPlanDO.getLandId() ); - landPlanExcelVO.setLandName( landPlanDO.getLandName() ); - landPlanExcelVO.setLandPlanId( landPlanDO.getLandPlanId() ); - landPlanExcelVO.setGoodsId( landPlanDO.getGoodsId() ); - landPlanExcelVO.setGoodsName( landPlanDO.getGoodsName() ); - landPlanExcelVO.setPlanStartTime( landPlanDO.getPlanStartTime() ); - landPlanExcelVO.setPlanEndTime( landPlanDO.getPlanEndTime() ); - landPlanExcelVO.setBelongBusinessId( landPlanDO.getBelongBusinessId() ); - landPlanExcelVO.setBelongBusinessName( landPlanDO.getBelongBusinessName() ); - landPlanExcelVO.setRemark( landPlanDO.getRemark() ); - if ( landPlanDO.getCreateTime() != null ) { - landPlanExcelVO.setCreateTime( Date.from( landPlanDO.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return landPlanExcelVO; - } -} diff --git a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/slavedevice/SlaveDeviceConvertImpl.java b/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/slavedevice/SlaveDeviceConvertImpl.java deleted file mode 100644 index 72fb5de..0000000 --- a/yudao-module-product/yudao-module-product-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/product/convert/slavedevice/SlaveDeviceConvertImpl.java +++ /dev/null @@ -1,101 +0,0 @@ -package cn.iocoder.yudao.module.product.convert.slavedevice; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.product.controller.admin.slavedevice.vo.SlaveDeviceCreateReqVO; -import cn.iocoder.yudao.module.product.controller.admin.slavedevice.vo.SlaveDeviceRespVO; -import cn.iocoder.yudao.module.product.controller.admin.slavedevice.vo.SlaveDeviceSaveReqVO; -import cn.iocoder.yudao.module.product.dal.dataobject.slavedevice.SlaveDeviceDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-12-31T15:59:50+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class SlaveDeviceConvertImpl implements SlaveDeviceConvert { - - @Override - public SlaveDeviceDO convert(SlaveDeviceCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - SlaveDeviceDO.SlaveDeviceDOBuilder slaveDeviceDO = SlaveDeviceDO.builder(); - - slaveDeviceDO.deviceId( bean.getDeviceId() ); - slaveDeviceDO.deviceName( bean.getDeviceName() ); - slaveDeviceDO.envType( bean.getEnvType() ); - slaveDeviceDO.belongBusinessId( bean.getBelongBusinessId() ); - slaveDeviceDO.belongBusinessName( bean.getBelongBusinessName() ); - - return slaveDeviceDO.build(); - } - - @Override - public SlaveDeviceDO convert(SlaveDeviceSaveReqVO bean) { - if ( bean == null ) { - return null; - } - - SlaveDeviceDO.SlaveDeviceDOBuilder slaveDeviceDO = SlaveDeviceDO.builder(); - - slaveDeviceDO.id( bean.getId() ); - slaveDeviceDO.deviceName( bean.getDeviceName() ); - slaveDeviceDO.envType( bean.getEnvType() ); - - return slaveDeviceDO.build(); - } - - @Override - public SlaveDeviceRespVO convert(SlaveDeviceDO bean) { - if ( bean == null ) { - return null; - } - - SlaveDeviceRespVO slaveDeviceRespVO = new SlaveDeviceRespVO(); - - slaveDeviceRespVO.setDeviceId( bean.getDeviceId() ); - slaveDeviceRespVO.setDeviceName( bean.getDeviceName() ); - slaveDeviceRespVO.setEnvType( bean.getEnvType() ); - slaveDeviceRespVO.setBelongBusinessId( bean.getBelongBusinessId() ); - slaveDeviceRespVO.setBelongBusinessName( bean.getBelongBusinessName() ); - slaveDeviceRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - slaveDeviceRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return slaveDeviceRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( SlaveDeviceDO slaveDeviceDO : list ) { - list1.add( convert( slaveDeviceDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } -} diff --git a/yudao-module-report/yudao-module-report-biz/target/classes/bootstrap-local.yaml b/yudao-module-report/yudao-module-report-biz/target/classes/bootstrap-local.yaml deleted file mode 100644 index e668672..0000000 --- a/yudao-module-report/yudao-module-report-biz/target/classes/bootstrap-local.yaml +++ /dev/null @@ -1,29 +0,0 @@ -spring: - main: - allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 - allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Dubbo 或者 Feign 等会存在重复定义的服务 - ---- #################### 注册中心相关配置 #################### -spring: - cloud: - nacos: - server-addr: 192.168.233.128:8848 - discovery: - namespace: dev # 命名空间。这里使用 dev 开发环境 - metadata: - version: 1.0.0 # 服务实例的版本号，可用于灰度发布 - ---- #################### 配置中心相关配置 #################### -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: 192.168.233.128:8848 # Nacos 服务器地址 - namespace: dev # 命名空间。这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/yudao-module-report/yudao-module-report-biz/target/classes/bootstrap-prod.yaml b/yudao-module-report/yudao-module-report-biz/target/classes/bootstrap-prod.yaml deleted file mode 100644 index 2cc3b2d..0000000 --- a/yudao-module-report/yudao-module-report-biz/target/classes/bootstrap-prod.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- #################### 注册中心相关配置 #################### - -spring: - cloud: - nacos: - server-addr: 127.0.0.1:8848 - discovery: - namespace: prod # 命名空间。这里使用 dev 开发环境 - metadata: - version: 1.0.0 # 服务实例的版本号，可用于灰度发布 - ---- #################### 配置中心相关配置 #################### - -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: 127.0.0.1:8848 # Nacos 服务器地址 - namespace: prod # 命名空间。这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties diff --git a/yudao-module-report/yudao-module-report-biz/target/classes/bootstrap.yaml b/yudao-module-report/yudao-module-report-biz/target/classes/bootstrap.yaml deleted file mode 100644 index caf41b1..0000000 --- a/yudao-module-report/yudao-module-report-biz/target/classes/bootstrap.yaml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - application: - name: report-server - - profiles: - active: local - -server: - port: 48084 - -# 日志文件配置。注意，如果 logging.file.name 不放在 bootstrap.yaml 配置文件，而是放在 application.yaml 中，会导致出现 LOG_FILE_IS_UNDEFINED 文件 -logging: - file: - name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径 diff --git a/yudao-module-report/yudao-module-report-biz/target/classes/logback-spring.xml b/yudao-module-report/yudao-module-report-biz/target/classes/logback-spring.xml deleted file mode 100644 index 5f4b30d..0000000 --- a/yudao-module-report/yudao-module-report-biz/target/classes/logback-spring.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - 　　　　　 - - - ${PATTERN_DEFAULT} - - - - - - - - - - ${PATTERN_DEFAULT} - - - - ${LOG_FILE} - - - ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz} - - ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} - - ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB} - - ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0} - - ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30} - - - - - - 0 - - 256 - - - - - - - - ${PATTERN_DEFAULT} - - - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-report/yudao-module-report-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/report/convert/goview/GoViewProjectConvertImpl.java b/yudao-module-report/yudao-module-report-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/report/convert/goview/GoViewProjectConvertImpl.java deleted file mode 100644 index 9b73653..0000000 --- a/yudao-module-report/yudao-module-report-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/report/convert/goview/GoViewProjectConvertImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package cn.iocoder.yudao.module.report.convert.goview; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectCreateReqVO; -import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectRespVO; -import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectUpdateReqVO; -import cn.iocoder.yudao.module.report.dal.dataobject.goview.GoViewProjectDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2024-07-12T09:17:05+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class GoViewProjectConvertImpl implements GoViewProjectConvert { - - @Override - public GoViewProjectDO convert(GoViewProjectCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - GoViewProjectDO.GoViewProjectDOBuilder goViewProjectDO = GoViewProjectDO.builder(); - - goViewProjectDO.name( bean.getName() ); - - return goViewProjectDO.build(); - } - - @Override - public GoViewProjectDO convert(GoViewProjectUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - GoViewProjectDO.GoViewProjectDOBuilder goViewProjectDO = GoViewProjectDO.builder(); - - goViewProjectDO.id( bean.getId() ); - goViewProjectDO.name( bean.getName() ); - goViewProjectDO.picUrl( bean.getPicUrl() ); - goViewProjectDO.content( bean.getContent() ); - goViewProjectDO.status( bean.getStatus() ); - goViewProjectDO.remark( bean.getRemark() ); - - return goViewProjectDO.build(); - } - - @Override - public GoViewProjectRespVO convert(GoViewProjectDO bean) { - if ( bean == null ) { - return null; - } - - GoViewProjectRespVO goViewProjectRespVO = new GoViewProjectRespVO(); - - goViewProjectRespVO.setId( bean.getId() ); - goViewProjectRespVO.setName( bean.getName() ); - goViewProjectRespVO.setStatus( bean.getStatus() ); - goViewProjectRespVO.setContent( bean.getContent() ); - goViewProjectRespVO.setPicUrl( bean.getPicUrl() ); - goViewProjectRespVO.setRemark( bean.getRemark() ); - goViewProjectRespVO.setCreator( bean.getCreator() ); - goViewProjectRespVO.setCreateTime( bean.getCreateTime() ); - - return goViewProjectRespVO; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( goViewProjectDOListToGoViewProjectRespVOList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - protected List goViewProjectDOListToGoViewProjectRespVOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( GoViewProjectDO goViewProjectDO : list ) { - list1.add( convert( goViewProjectDO ) ); - } - - return list1; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/classes/META-INF/spring-configuration-metadata.json b/yudao-module-system/yudao-module-system-biz/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index 4530af5..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "groups": [ - { - "name": "yudao.sms-code", - "type": "cn.iocoder.yudao.module.system.framework.sms.SmsCodeProperties", - "sourceType": "cn.iocoder.yudao.module.system.framework.sms.SmsCodeProperties" - } - ], - "properties": [ - { - "name": "yudao.sms-code.begin-code", - "type": "java.lang.Integer", - "description": "验证码最小值", - "sourceType": "cn.iocoder.yudao.module.system.framework.sms.SmsCodeProperties" - }, - { - "name": "yudao.sms-code.end-code", - "type": "java.lang.Integer", - "description": "验证码最大值", - "sourceType": "cn.iocoder.yudao.module.system.framework.sms.SmsCodeProperties" - }, - { - "name": "yudao.sms-code.expire-times", - "type": "java.time.Duration", - "description": "过期时间", - "sourceType": "cn.iocoder.yudao.module.system.framework.sms.SmsCodeProperties" - }, - { - "name": "yudao.sms-code.send-frequency", - "type": "java.time.Duration", - "description": "短信发送频率", - "sourceType": "cn.iocoder.yudao.module.system.framework.sms.SmsCodeProperties" - }, - { - "name": "yudao.sms-code.send-maximum-quantity-per-day", - "type": "java.lang.Integer", - "description": "每日发送最大数量", - "sourceType": "cn.iocoder.yudao.module.system.framework.sms.SmsCodeProperties" - } - ], - "hints": [] -} \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/target/classes/bootstrap-local.yaml b/yudao-module-system/yudao-module-system-biz/target/classes/bootstrap-local.yaml deleted file mode 100644 index e013758..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/classes/bootstrap-local.yaml +++ /dev/null @@ -1,31 +0,0 @@ -spring: - main: - allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 - allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Dubbo 或者 Feign 等会存在重复定义的服务 - ---- #################### 注册中心相关配置 #################### - -spring: - cloud: - nacos: - server-addr: 192.168.233.128:8848 - discovery: - namespace: dev # 命名空间。这里使用 dev 开发环境 - metadata: - version: 1.0.0 # 服务实例的版本号，可用于灰度发布 - ---- #################### 配置中心相关配置 #################### - -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: 192.168.233.128:8848 # Nacos 服务器地址 - namespace: dev # 命名空间。这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/yudao-module-system/yudao-module-system-biz/target/classes/bootstrap-prod.yaml b/yudao-module-system/yudao-module-system-biz/target/classes/bootstrap-prod.yaml deleted file mode 100644 index d0b3068..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/classes/bootstrap-prod.yaml +++ /dev/null @@ -1,31 +0,0 @@ -spring: - main: - allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 - allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Dubbo 或者 Feign 等会存在重复定义的服务 - ---- #################### 注册中心相关配置 #################### - -spring: - cloud: - nacos: - server-addr: 127.0.0.1:8848 - discovery: - namespace: prod # 命名空间。这里使用 dev 开发环境 - metadata: - version: 1.0.0 # 服务实例的版本号，可用于灰度发布 - ---- #################### 配置中心相关配置 #################### - -spring: - cloud: - nacos: - # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 - config: - server-addr: 127.0.0.1:8848 # Nacos 服务器地址 - namespace: prod # 命名空间。这里使用 dev 开发环境 - group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name - file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/target/classes/bootstrap.yaml b/yudao-module-system/yudao-module-system-biz/target/classes/bootstrap.yaml deleted file mode 100644 index 273749c..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/classes/bootstrap.yaml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - application: - name: system-server - - profiles: - active: local - -server: - port: 48081 - -# 日志文件配置。注意，如果 logging.file.name 不放在 bootstrap.yaml 配置文件，而是放在 application.yaml 中，会导致出现 LOG_FILE_IS_UNDEFINED 文件 -logging: - file: - name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径 diff --git a/yudao-module-system/yudao-module-system-biz/target/classes/logback-spring.xml b/yudao-module-system/yudao-module-system-biz/target/classes/logback-spring.xml deleted file mode 100644 index 5f4b30d..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/classes/logback-spring.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - 　　　　　 - - - ${PATTERN_DEFAULT} - - - - - - - - - - ${PATTERN_DEFAULT} - - - - ${LOG_FILE} - - - ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz} - - ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} - - ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB} - - ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0} - - ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30} - - - - - - 0 - - 256 - - - - - - - - ${PATTERN_DEFAULT} - - - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-system/yudao-module-system-biz/target/classes/mapper/languagetype/LanguageTypeMapper.xml b/yudao-module-system/yudao-module-system-biz/target/classes/mapper/languagetype/LanguageTypeMapper.xml deleted file mode 100644 index d76fb62..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/classes/mapper/languagetype/LanguageTypeMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/auth/AuthConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/auth/AuthConvertImpl.java deleted file mode 100644 index cd6699a..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/auth/AuthConvertImpl.java +++ /dev/null @@ -1,110 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.auth; - -import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeSendReqDTO; -import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeUseReqDTO; -import cn.iocoder.yudao.module.system.api.social.dto.SocialUserBindReqDTO; -import cn.iocoder.yudao.module.system.controller.admin.auth.vo.AuthLoginRespVO; -import cn.iocoder.yudao.module.system.controller.admin.auth.vo.AuthMenuRespVO; -import cn.iocoder.yudao.module.system.controller.admin.auth.vo.AuthSmsLoginReqVO; -import cn.iocoder.yudao.module.system.controller.admin.auth.vo.AuthSmsSendReqVO; -import cn.iocoder.yudao.module.system.controller.admin.auth.vo.AuthSocialBindLoginReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class AuthConvertImpl implements AuthConvert { - - @Override - public AuthLoginRespVO convert(OAuth2AccessTokenDO bean) { - if ( bean == null ) { - return null; - } - - AuthLoginRespVO.AuthLoginRespVOBuilder authLoginRespVO = AuthLoginRespVO.builder(); - - authLoginRespVO.userId( bean.getUserId() ); - authLoginRespVO.accessToken( bean.getAccessToken() ); - authLoginRespVO.refreshToken( bean.getRefreshToken() ); - authLoginRespVO.expiresTime( bean.getExpiresTime() ); - - return authLoginRespVO.build(); - } - - @Override - public AuthMenuRespVO convertTreeNode(MenuDO menu) { - if ( menu == null ) { - return null; - } - - AuthMenuRespVO.AuthMenuRespVOBuilder authMenuRespVO = AuthMenuRespVO.builder(); - - authMenuRespVO.id( menu.getId() ); - authMenuRespVO.parentId( menu.getParentId() ); - authMenuRespVO.name( menu.getName() ); - authMenuRespVO.path( menu.getPath() ); - authMenuRespVO.component( menu.getComponent() ); - authMenuRespVO.componentName( menu.getComponentName() ); - authMenuRespVO.icon( menu.getIcon() ); - authMenuRespVO.visible( menu.getVisible() ); - authMenuRespVO.keepAlive( menu.getKeepAlive() ); - authMenuRespVO.alwaysShow( menu.getAlwaysShow() ); - - return authMenuRespVO.build(); - } - - @Override - public SocialUserBindReqDTO convert(Long userId, Integer userType, AuthSocialBindLoginReqVO reqVO) { - if ( userId == null && userType == null && reqVO == null ) { - return null; - } - - SocialUserBindReqDTO socialUserBindReqDTO = new SocialUserBindReqDTO(); - - if ( reqVO != null ) { - socialUserBindReqDTO.setType( reqVO.getType() ); - socialUserBindReqDTO.setCode( reqVO.getCode() ); - socialUserBindReqDTO.setState( reqVO.getState() ); - } - socialUserBindReqDTO.setUserId( userId ); - socialUserBindReqDTO.setUserType( userType ); - - return socialUserBindReqDTO; - } - - @Override - public SmsCodeSendReqDTO convert(AuthSmsSendReqVO reqVO) { - if ( reqVO == null ) { - return null; - } - - SmsCodeSendReqDTO smsCodeSendReqDTO = new SmsCodeSendReqDTO(); - - smsCodeSendReqDTO.setMobile( reqVO.getMobile() ); - smsCodeSendReqDTO.setScene( reqVO.getScene() ); - - return smsCodeSendReqDTO; - } - - @Override - public SmsCodeUseReqDTO convert(AuthSmsLoginReqVO reqVO, Integer scene, String usedIp) { - if ( reqVO == null && scene == null && usedIp == null ) { - return null; - } - - SmsCodeUseReqDTO smsCodeUseReqDTO = new SmsCodeUseReqDTO(); - - if ( reqVO != null ) { - smsCodeUseReqDTO.setMobile( reqVO.getMobile() ); - smsCodeUseReqDTO.setCode( reqVO.getCode() ); - } - smsCodeUseReqDTO.setScene( scene ); - smsCodeUseReqDTO.setUsedIp( usedIp ); - - return smsCodeUseReqDTO; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/auth/OAuth2ClientConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/auth/OAuth2ClientConvertImpl.java deleted file mode 100644 index 1c3feab..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/auth/OAuth2ClientConvertImpl.java +++ /dev/null @@ -1,184 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.auth; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client.OAuth2ClientCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client.OAuth2ClientRespVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client.OAuth2ClientUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ClientDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class OAuth2ClientConvertImpl implements OAuth2ClientConvert { - - @Override - public OAuth2ClientDO convert(OAuth2ClientCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - OAuth2ClientDO oAuth2ClientDO = new OAuth2ClientDO(); - - oAuth2ClientDO.setClientId( bean.getClientId() ); - oAuth2ClientDO.setSecret( bean.getSecret() ); - oAuth2ClientDO.setName( bean.getName() ); - oAuth2ClientDO.setLogo( bean.getLogo() ); - oAuth2ClientDO.setDescription( bean.getDescription() ); - oAuth2ClientDO.setStatus( bean.getStatus() ); - oAuth2ClientDO.setAccessTokenValiditySeconds( bean.getAccessTokenValiditySeconds() ); - oAuth2ClientDO.setRefreshTokenValiditySeconds( bean.getRefreshTokenValiditySeconds() ); - List list = bean.getRedirectUris(); - if ( list != null ) { - oAuth2ClientDO.setRedirectUris( new ArrayList( list ) ); - } - List list1 = bean.getAuthorizedGrantTypes(); - if ( list1 != null ) { - oAuth2ClientDO.setAuthorizedGrantTypes( new ArrayList( list1 ) ); - } - List list2 = bean.getScopes(); - if ( list2 != null ) { - oAuth2ClientDO.setScopes( new ArrayList( list2 ) ); - } - List list3 = bean.getAutoApproveScopes(); - if ( list3 != null ) { - oAuth2ClientDO.setAutoApproveScopes( new ArrayList( list3 ) ); - } - List list4 = bean.getAuthorities(); - if ( list4 != null ) { - oAuth2ClientDO.setAuthorities( new ArrayList( list4 ) ); - } - List list5 = bean.getResourceIds(); - if ( list5 != null ) { - oAuth2ClientDO.setResourceIds( new ArrayList( list5 ) ); - } - oAuth2ClientDO.setAdditionalInformation( bean.getAdditionalInformation() ); - - return oAuth2ClientDO; - } - - @Override - public OAuth2ClientDO convert(OAuth2ClientUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - OAuth2ClientDO oAuth2ClientDO = new OAuth2ClientDO(); - - oAuth2ClientDO.setId( bean.getId() ); - oAuth2ClientDO.setClientId( bean.getClientId() ); - oAuth2ClientDO.setSecret( bean.getSecret() ); - oAuth2ClientDO.setName( bean.getName() ); - oAuth2ClientDO.setLogo( bean.getLogo() ); - oAuth2ClientDO.setDescription( bean.getDescription() ); - oAuth2ClientDO.setStatus( bean.getStatus() ); - oAuth2ClientDO.setAccessTokenValiditySeconds( bean.getAccessTokenValiditySeconds() ); - oAuth2ClientDO.setRefreshTokenValiditySeconds( bean.getRefreshTokenValiditySeconds() ); - List list = bean.getRedirectUris(); - if ( list != null ) { - oAuth2ClientDO.setRedirectUris( new ArrayList( list ) ); - } - List list1 = bean.getAuthorizedGrantTypes(); - if ( list1 != null ) { - oAuth2ClientDO.setAuthorizedGrantTypes( new ArrayList( list1 ) ); - } - List list2 = bean.getScopes(); - if ( list2 != null ) { - oAuth2ClientDO.setScopes( new ArrayList( list2 ) ); - } - List list3 = bean.getAutoApproveScopes(); - if ( list3 != null ) { - oAuth2ClientDO.setAutoApproveScopes( new ArrayList( list3 ) ); - } - List list4 = bean.getAuthorities(); - if ( list4 != null ) { - oAuth2ClientDO.setAuthorities( new ArrayList( list4 ) ); - } - List list5 = bean.getResourceIds(); - if ( list5 != null ) { - oAuth2ClientDO.setResourceIds( new ArrayList( list5 ) ); - } - oAuth2ClientDO.setAdditionalInformation( bean.getAdditionalInformation() ); - - return oAuth2ClientDO; - } - - @Override - public OAuth2ClientRespVO convert(OAuth2ClientDO bean) { - if ( bean == null ) { - return null; - } - - OAuth2ClientRespVO oAuth2ClientRespVO = new OAuth2ClientRespVO(); - - oAuth2ClientRespVO.setClientId( bean.getClientId() ); - oAuth2ClientRespVO.setSecret( bean.getSecret() ); - oAuth2ClientRespVO.setName( bean.getName() ); - oAuth2ClientRespVO.setLogo( bean.getLogo() ); - oAuth2ClientRespVO.setDescription( bean.getDescription() ); - oAuth2ClientRespVO.setStatus( bean.getStatus() ); - oAuth2ClientRespVO.setAccessTokenValiditySeconds( bean.getAccessTokenValiditySeconds() ); - oAuth2ClientRespVO.setRefreshTokenValiditySeconds( bean.getRefreshTokenValiditySeconds() ); - List list = bean.getRedirectUris(); - if ( list != null ) { - oAuth2ClientRespVO.setRedirectUris( new ArrayList( list ) ); - } - List list1 = bean.getAuthorizedGrantTypes(); - if ( list1 != null ) { - oAuth2ClientRespVO.setAuthorizedGrantTypes( new ArrayList( list1 ) ); - } - List list2 = bean.getScopes(); - if ( list2 != null ) { - oAuth2ClientRespVO.setScopes( new ArrayList( list2 ) ); - } - List list3 = bean.getAutoApproveScopes(); - if ( list3 != null ) { - oAuth2ClientRespVO.setAutoApproveScopes( new ArrayList( list3 ) ); - } - List list4 = bean.getAuthorities(); - if ( list4 != null ) { - oAuth2ClientRespVO.setAuthorities( new ArrayList( list4 ) ); - } - List list5 = bean.getResourceIds(); - if ( list5 != null ) { - oAuth2ClientRespVO.setResourceIds( new ArrayList( list5 ) ); - } - oAuth2ClientRespVO.setAdditionalInformation( bean.getAdditionalInformation() ); - oAuth2ClientRespVO.setId( bean.getId() ); - oAuth2ClientRespVO.setCreateTime( bean.getCreateTime() ); - - return oAuth2ClientRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( OAuth2ClientDO oAuth2ClientDO : list ) { - list1.add( convert( oAuth2ClientDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/auth/OAuth2TokenConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/auth/OAuth2TokenConvertImpl.java deleted file mode 100644 index efc7bc8..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/auth/OAuth2TokenConvertImpl.java +++ /dev/null @@ -1,100 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.auth; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO; -import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenRespDTO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.token.OAuth2AccessTokenRespVO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class OAuth2TokenConvertImpl implements OAuth2TokenConvert { - - @Override - public OAuth2AccessTokenCheckRespDTO convert(OAuth2AccessTokenDO bean) { - if ( bean == null ) { - return null; - } - - OAuth2AccessTokenCheckRespDTO oAuth2AccessTokenCheckRespDTO = new OAuth2AccessTokenCheckRespDTO(); - - oAuth2AccessTokenCheckRespDTO.setUserId( bean.getUserId() ); - oAuth2AccessTokenCheckRespDTO.setUserType( bean.getUserType() ); - oAuth2AccessTokenCheckRespDTO.setTenantId( bean.getTenantId() ); - List list = bean.getScopes(); - if ( list != null ) { - oAuth2AccessTokenCheckRespDTO.setScopes( new ArrayList( list ) ); - } - - return oAuth2AccessTokenCheckRespDTO; - } - - @Override - public PageResult convert(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( oAuth2AccessTokenDOListToOAuth2AccessTokenRespVOList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public OAuth2AccessTokenRespDTO convert2(OAuth2AccessTokenDO bean) { - if ( bean == null ) { - return null; - } - - OAuth2AccessTokenRespDTO oAuth2AccessTokenRespDTO = new OAuth2AccessTokenRespDTO(); - - oAuth2AccessTokenRespDTO.setAccessToken( bean.getAccessToken() ); - oAuth2AccessTokenRespDTO.setRefreshToken( bean.getRefreshToken() ); - oAuth2AccessTokenRespDTO.setUserId( bean.getUserId() ); - oAuth2AccessTokenRespDTO.setUserType( bean.getUserType() ); - oAuth2AccessTokenRespDTO.setExpiresTime( bean.getExpiresTime() ); - - return oAuth2AccessTokenRespDTO; - } - - protected OAuth2AccessTokenRespVO oAuth2AccessTokenDOToOAuth2AccessTokenRespVO(OAuth2AccessTokenDO oAuth2AccessTokenDO) { - if ( oAuth2AccessTokenDO == null ) { - return null; - } - - OAuth2AccessTokenRespVO oAuth2AccessTokenRespVO = new OAuth2AccessTokenRespVO(); - - oAuth2AccessTokenRespVO.setId( oAuth2AccessTokenDO.getId() ); - oAuth2AccessTokenRespVO.setAccessToken( oAuth2AccessTokenDO.getAccessToken() ); - oAuth2AccessTokenRespVO.setRefreshToken( oAuth2AccessTokenDO.getRefreshToken() ); - oAuth2AccessTokenRespVO.setUserId( oAuth2AccessTokenDO.getUserId() ); - oAuth2AccessTokenRespVO.setUserType( oAuth2AccessTokenDO.getUserType() ); - oAuth2AccessTokenRespVO.setClientId( oAuth2AccessTokenDO.getClientId() ); - oAuth2AccessTokenRespVO.setCreateTime( oAuth2AccessTokenDO.getCreateTime() ); - oAuth2AccessTokenRespVO.setExpiresTime( oAuth2AccessTokenDO.getExpiresTime() ); - - return oAuth2AccessTokenRespVO; - } - - protected List oAuth2AccessTokenDOListToOAuth2AccessTokenRespVOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( OAuth2AccessTokenDO oAuth2AccessTokenDO : list ) { - list1.add( oAuth2AccessTokenDOToOAuth2AccessTokenRespVO( oAuth2AccessTokenDO ) ); - } - - return list1; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/dict/DictDataConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/dict/DictDataConvertImpl.java deleted file mode 100644 index 06cceb3..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/dict/DictDataConvertImpl.java +++ /dev/null @@ -1,189 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.dict; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataRespVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataSimpleRespVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class DictDataConvertImpl implements DictDataConvert { - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( DictDataDO dictDataDO : list ) { - list1.add( dictDataDOToDictDataSimpleRespVO( dictDataDO ) ); - } - - return list1; - } - - @Override - public DictDataRespVO convert(DictDataDO bean) { - if ( bean == null ) { - return null; - } - - DictDataRespVO dictDataRespVO = new DictDataRespVO(); - - dictDataRespVO.setSort( bean.getSort() ); - dictDataRespVO.setLabel( bean.getLabel() ); - dictDataRespVO.setValue( bean.getValue() ); - dictDataRespVO.setDictType( bean.getDictType() ); - dictDataRespVO.setStatus( bean.getStatus() ); - dictDataRespVO.setColorType( bean.getColorType() ); - dictDataRespVO.setCssClass( bean.getCssClass() ); - dictDataRespVO.setRemark( bean.getRemark() ); - dictDataRespVO.setId( bean.getId() ); - dictDataRespVO.setCreateTime( bean.getCreateTime() ); - - return dictDataRespVO; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList03( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public DictDataDO convert(DictDataUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - DictDataDO dictDataDO = new DictDataDO(); - - dictDataDO.setId( bean.getId() ); - dictDataDO.setSort( bean.getSort() ); - dictDataDO.setLabel( bean.getLabel() ); - dictDataDO.setValue( bean.getValue() ); - dictDataDO.setDictType( bean.getDictType() ); - dictDataDO.setStatus( bean.getStatus() ); - dictDataDO.setColorType( bean.getColorType() ); - dictDataDO.setCssClass( bean.getCssClass() ); - dictDataDO.setRemark( bean.getRemark() ); - - return dictDataDO; - } - - @Override - public DictDataDO convert(DictDataCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - DictDataDO dictDataDO = new DictDataDO(); - - dictDataDO.setSort( bean.getSort() ); - dictDataDO.setLabel( bean.getLabel() ); - dictDataDO.setValue( bean.getValue() ); - dictDataDO.setDictType( bean.getDictType() ); - dictDataDO.setStatus( bean.getStatus() ); - dictDataDO.setColorType( bean.getColorType() ); - dictDataDO.setCssClass( bean.getCssClass() ); - dictDataDO.setRemark( bean.getRemark() ); - - return dictDataDO; - } - - @Override - public List convertList02(List bean) { - if ( bean == null ) { - return null; - } - - List list = new ArrayList( bean.size() ); - for ( DictDataDO dictDataDO : bean ) { - list.add( dictDataDOToDictDataExcelVO( dictDataDO ) ); - } - - return list; - } - - @Override - public List convertList03(List bean) { - if ( bean == null ) { - return null; - } - - List list = new ArrayList( bean.size() ); - for ( DictDataDO dictDataDO : bean ) { - list.add( convert( dictDataDO ) ); - } - - return list; - } - - @Override - public DictDataRespDTO convert02(DictDataDO bean) { - if ( bean == null ) { - return null; - } - - DictDataRespDTO dictDataRespDTO = new DictDataRespDTO(); - - dictDataRespDTO.setLabel( bean.getLabel() ); - dictDataRespDTO.setValue( bean.getValue() ); - dictDataRespDTO.setDictType( bean.getDictType() ); - dictDataRespDTO.setStatus( bean.getStatus() ); - - return dictDataRespDTO; - } - - protected DictDataSimpleRespVO dictDataDOToDictDataSimpleRespVO(DictDataDO dictDataDO) { - if ( dictDataDO == null ) { - return null; - } - - DictDataSimpleRespVO dictDataSimpleRespVO = new DictDataSimpleRespVO(); - - dictDataSimpleRespVO.setDictType( dictDataDO.getDictType() ); - dictDataSimpleRespVO.setValue( dictDataDO.getValue() ); - dictDataSimpleRespVO.setLabel( dictDataDO.getLabel() ); - dictDataSimpleRespVO.setColorType( dictDataDO.getColorType() ); - dictDataSimpleRespVO.setCssClass( dictDataDO.getCssClass() ); - - return dictDataSimpleRespVO; - } - - protected DictDataExcelVO dictDataDOToDictDataExcelVO(DictDataDO dictDataDO) { - if ( dictDataDO == null ) { - return null; - } - - DictDataExcelVO dictDataExcelVO = new DictDataExcelVO(); - - dictDataExcelVO.setId( dictDataDO.getId() ); - dictDataExcelVO.setSort( dictDataDO.getSort() ); - dictDataExcelVO.setLabel( dictDataDO.getLabel() ); - dictDataExcelVO.setValue( dictDataDO.getValue() ); - dictDataExcelVO.setDictType( dictDataDO.getDictType() ); - dictDataExcelVO.setStatus( dictDataDO.getStatus() ); - - return dictDataExcelVO; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/dict/DictTypeConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/dict/DictTypeConvertImpl.java deleted file mode 100644 index 1772905..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/dict/DictTypeConvertImpl.java +++ /dev/null @@ -1,154 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.dict; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeRespVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeSimpleRespVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictTypeDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class DictTypeConvertImpl implements DictTypeConvert { - - @Override - public PageResult convertPage(PageResult bean) { - if ( bean == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( dictTypeDOListToDictTypeRespVOList( bean.getList() ) ); - pageResult.setTotal( bean.getTotal() ); - - return pageResult; - } - - @Override - public DictTypeRespVO convert(DictTypeDO bean) { - if ( bean == null ) { - return null; - } - - DictTypeRespVO dictTypeRespVO = new DictTypeRespVO(); - - dictTypeRespVO.setName( bean.getName() ); - dictTypeRespVO.setStatus( bean.getStatus() ); - dictTypeRespVO.setRemark( bean.getRemark() ); - dictTypeRespVO.setId( bean.getId() ); - dictTypeRespVO.setType( bean.getType() ); - dictTypeRespVO.setCreateTime( bean.getCreateTime() ); - - return dictTypeRespVO; - } - - @Override - public DictTypeDO convert(DictTypeCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - DictTypeDO.DictTypeDOBuilder dictTypeDO = DictTypeDO.builder(); - - dictTypeDO.name( bean.getName() ); - dictTypeDO.type( bean.getType() ); - dictTypeDO.status( bean.getStatus() ); - dictTypeDO.remark( bean.getRemark() ); - - return dictTypeDO.build(); - } - - @Override - public DictTypeDO convert(DictTypeUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - DictTypeDO.DictTypeDOBuilder dictTypeDO = DictTypeDO.builder(); - - dictTypeDO.id( bean.getId() ); - dictTypeDO.name( bean.getName() ); - dictTypeDO.status( bean.getStatus() ); - dictTypeDO.remark( bean.getRemark() ); - - return dictTypeDO.build(); - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( DictTypeDO dictTypeDO : list ) { - list1.add( dictTypeDOToDictTypeSimpleRespVO( dictTypeDO ) ); - } - - return list1; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( DictTypeDO dictTypeDO : list ) { - list1.add( dictTypeDOToDictTypeExcelVO( dictTypeDO ) ); - } - - return list1; - } - - protected List dictTypeDOListToDictTypeRespVOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( DictTypeDO dictTypeDO : list ) { - list1.add( convert( dictTypeDO ) ); - } - - return list1; - } - - protected DictTypeSimpleRespVO dictTypeDOToDictTypeSimpleRespVO(DictTypeDO dictTypeDO) { - if ( dictTypeDO == null ) { - return null; - } - - DictTypeSimpleRespVO dictTypeSimpleRespVO = new DictTypeSimpleRespVO(); - - dictTypeSimpleRespVO.setId( dictTypeDO.getId() ); - dictTypeSimpleRespVO.setName( dictTypeDO.getName() ); - dictTypeSimpleRespVO.setType( dictTypeDO.getType() ); - - return dictTypeSimpleRespVO; - } - - protected DictTypeExcelVO dictTypeDOToDictTypeExcelVO(DictTypeDO dictTypeDO) { - if ( dictTypeDO == null ) { - return null; - } - - DictTypeExcelVO dictTypeExcelVO = new DictTypeExcelVO(); - - dictTypeExcelVO.setId( dictTypeDO.getId() ); - dictTypeExcelVO.setName( dictTypeDO.getName() ); - dictTypeExcelVO.setType( dictTypeDO.getType() ); - dictTypeExcelVO.setStatus( dictTypeDO.getStatus() ); - - return dictTypeExcelVO; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/errorcode/ErrorCodeConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/errorcode/ErrorCodeConvertImpl.java deleted file mode 100644 index aca5c1b..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/errorcode/ErrorCodeConvertImpl.java +++ /dev/null @@ -1,176 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.errorcode; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO; -import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeRespDTO; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeRespVO; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.errorcode.ErrorCodeDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class ErrorCodeConvertImpl implements ErrorCodeConvert { - - @Override - public ErrorCodeDO convert(ErrorCodeCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - ErrorCodeDO errorCodeDO = new ErrorCodeDO(); - - errorCodeDO.setApplicationName( bean.getApplicationName() ); - errorCodeDO.setCode( bean.getCode() ); - errorCodeDO.setMessage( bean.getMessage() ); - errorCodeDO.setMemo( bean.getMemo() ); - - return errorCodeDO; - } - - @Override - public ErrorCodeDO convert(ErrorCodeUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - ErrorCodeDO errorCodeDO = new ErrorCodeDO(); - - errorCodeDO.setId( bean.getId() ); - errorCodeDO.setApplicationName( bean.getApplicationName() ); - errorCodeDO.setCode( bean.getCode() ); - errorCodeDO.setMessage( bean.getMessage() ); - errorCodeDO.setMemo( bean.getMemo() ); - - return errorCodeDO; - } - - @Override - public ErrorCodeRespVO convert(ErrorCodeDO bean) { - if ( bean == null ) { - return null; - } - - ErrorCodeRespVO errorCodeRespVO = new ErrorCodeRespVO(); - - errorCodeRespVO.setApplicationName( bean.getApplicationName() ); - errorCodeRespVO.setCode( bean.getCode() ); - errorCodeRespVO.setMessage( bean.getMessage() ); - errorCodeRespVO.setMemo( bean.getMemo() ); - errorCodeRespVO.setId( bean.getId() ); - errorCodeRespVO.setType( bean.getType() ); - errorCodeRespVO.setCreateTime( bean.getCreateTime() ); - - return errorCodeRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( ErrorCodeDO errorCodeDO : list ) { - list1.add( convert( errorCodeDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( ErrorCodeDO errorCodeDO : list ) { - list1.add( errorCodeDOToErrorCodeExcelVO( errorCodeDO ) ); - } - - return list1; - } - - @Override - public ErrorCodeDO convert(ErrorCodeAutoGenerateReqDTO bean) { - if ( bean == null ) { - return null; - } - - ErrorCodeDO errorCodeDO = new ErrorCodeDO(); - - errorCodeDO.setApplicationName( bean.getApplicationName() ); - errorCodeDO.setCode( bean.getCode() ); - errorCodeDO.setMessage( bean.getMessage() ); - - return errorCodeDO; - } - - @Override - public List convertList03(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( ErrorCodeDO errorCodeDO : list ) { - list1.add( errorCodeDOToErrorCodeRespDTO( errorCodeDO ) ); - } - - return list1; - } - - protected ErrorCodeExcelVO errorCodeDOToErrorCodeExcelVO(ErrorCodeDO errorCodeDO) { - if ( errorCodeDO == null ) { - return null; - } - - ErrorCodeExcelVO errorCodeExcelVO = new ErrorCodeExcelVO(); - - errorCodeExcelVO.setId( errorCodeDO.getId() ); - errorCodeExcelVO.setType( errorCodeDO.getType() ); - errorCodeExcelVO.setApplicationName( errorCodeDO.getApplicationName() ); - errorCodeExcelVO.setCode( errorCodeDO.getCode() ); - errorCodeExcelVO.setMessage( errorCodeDO.getMessage() ); - errorCodeExcelVO.setMemo( errorCodeDO.getMemo() ); - errorCodeExcelVO.setCreateTime( errorCodeDO.getCreateTime() ); - - return errorCodeExcelVO; - } - - protected ErrorCodeRespDTO errorCodeDOToErrorCodeRespDTO(ErrorCodeDO errorCodeDO) { - if ( errorCodeDO == null ) { - return null; - } - - ErrorCodeRespDTO errorCodeRespDTO = new ErrorCodeRespDTO(); - - errorCodeRespDTO.setCode( errorCodeDO.getCode() ); - errorCodeRespDTO.setMessage( errorCodeDO.getMessage() ); - errorCodeRespDTO.setUpdateTime( errorCodeDO.getUpdateTime() ); - - return errorCodeRespDTO; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/ip/AreaConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/ip/AreaConvertImpl.java deleted file mode 100644 index cd514cb..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/ip/AreaConvertImpl.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.ip; - -import cn.iocoder.yudao.framework.ip.core.Area; -import cn.iocoder.yudao.module.system.controller.admin.ip.vo.AreaNodeRespVO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class AreaConvertImpl implements AreaConvert { - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( Area area : list ) { - list1.add( areaToAreaNodeRespVO( area ) ); - } - - return list1; - } - - protected AreaNodeRespVO areaToAreaNodeRespVO(Area area) { - if ( area == null ) { - return null; - } - - AreaNodeRespVO areaNodeRespVO = new AreaNodeRespVO(); - - areaNodeRespVO.setId( area.getId() ); - areaNodeRespVO.setName( area.getName() ); - areaNodeRespVO.setChildren( convertList( area.getChildren() ) ); - - return areaNodeRespVO; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/languagetype/LanguageTypeConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/languagetype/LanguageTypeConvertImpl.java deleted file mode 100644 index f3014a9..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/languagetype/LanguageTypeConvertImpl.java +++ /dev/null @@ -1,133 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.languagetype; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.languagetype.vo.LanguageTypeCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.languagetype.vo.LanguageTypeExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.languagetype.vo.LanguageTypeRespVO; -import cn.iocoder.yudao.module.system.controller.admin.languagetype.vo.LanguageTypeUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.languagetype.LanguageTypeDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class LanguageTypeConvertImpl implements LanguageTypeConvert { - - @Override - public LanguageTypeDO convert(LanguageTypeCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - LanguageTypeDO.LanguageTypeDOBuilder languageTypeDO = LanguageTypeDO.builder(); - - languageTypeDO.name( bean.getName() ); - languageTypeDO.showName( bean.getShowName() ); - languageTypeDO.configName( bean.getConfigName() ); - languageTypeDO.picPath( bean.getPicPath() ); - - return languageTypeDO.build(); - } - - @Override - public LanguageTypeDO convert(LanguageTypeUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - LanguageTypeDO.LanguageTypeDOBuilder languageTypeDO = LanguageTypeDO.builder(); - - languageTypeDO.id( bean.getId() ); - languageTypeDO.name( bean.getName() ); - languageTypeDO.showName( bean.getShowName() ); - languageTypeDO.configName( bean.getConfigName() ); - languageTypeDO.picPath( bean.getPicPath() ); - - return languageTypeDO.build(); - } - - @Override - public LanguageTypeRespVO convert(LanguageTypeDO bean) { - if ( bean == null ) { - return null; - } - - LanguageTypeRespVO languageTypeRespVO = new LanguageTypeRespVO(); - - languageTypeRespVO.setName( bean.getName() ); - languageTypeRespVO.setShowName( bean.getShowName() ); - languageTypeRespVO.setConfigName( bean.getConfigName() ); - languageTypeRespVO.setPicPath( bean.getPicPath() ); - languageTypeRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - languageTypeRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return languageTypeRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( LanguageTypeDO languageTypeDO : list ) { - list1.add( convert( languageTypeDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( LanguageTypeDO languageTypeDO : list ) { - list1.add( languageTypeDOToLanguageTypeExcelVO( languageTypeDO ) ); - } - - return list1; - } - - protected LanguageTypeExcelVO languageTypeDOToLanguageTypeExcelVO(LanguageTypeDO languageTypeDO) { - if ( languageTypeDO == null ) { - return null; - } - - LanguageTypeExcelVO languageTypeExcelVO = new LanguageTypeExcelVO(); - - languageTypeExcelVO.setId( languageTypeDO.getId() ); - languageTypeExcelVO.setName( languageTypeDO.getName() ); - languageTypeExcelVO.setPicPath( languageTypeDO.getPicPath() ); - if ( languageTypeDO.getCreateTime() != null ) { - languageTypeExcelVO.setCreateTime( Date.from( languageTypeDO.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return languageTypeExcelVO; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/logger/LoginLogConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/logger/LoginLogConvertImpl.java deleted file mode 100644 index c2cbd46..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/logger/LoginLogConvertImpl.java +++ /dev/null @@ -1,118 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.logger; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.api.logger.dto.LoginLogCreateReqDTO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogRespVO; -import cn.iocoder.yudao.module.system.dal.dataobject.logger.LoginLogDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class LoginLogConvertImpl implements LoginLogConvert { - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( loginLogDOListToLoginLogRespVOList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( LoginLogDO loginLogDO : list ) { - list1.add( loginLogDOToLoginLogExcelVO( loginLogDO ) ); - } - - return list1; - } - - @Override - public LoginLogDO convert(LoginLogCreateReqDTO bean) { - if ( bean == null ) { - return null; - } - - LoginLogDO loginLogDO = new LoginLogDO(); - - loginLogDO.setLogType( bean.getLogType() ); - loginLogDO.setTraceId( bean.getTraceId() ); - loginLogDO.setUserId( bean.getUserId() ); - loginLogDO.setUserType( bean.getUserType() ); - loginLogDO.setUsername( bean.getUsername() ); - loginLogDO.setResult( bean.getResult() ); - loginLogDO.setUserIp( bean.getUserIp() ); - loginLogDO.setUserAgent( bean.getUserAgent() ); - - return loginLogDO; - } - - protected LoginLogRespVO loginLogDOToLoginLogRespVO(LoginLogDO loginLogDO) { - if ( loginLogDO == null ) { - return null; - } - - LoginLogRespVO loginLogRespVO = new LoginLogRespVO(); - - loginLogRespVO.setLogType( loginLogDO.getLogType() ); - loginLogRespVO.setTraceId( loginLogDO.getTraceId() ); - loginLogRespVO.setUsername( loginLogDO.getUsername() ); - loginLogRespVO.setResult( loginLogDO.getResult() ); - loginLogRespVO.setUserIp( loginLogDO.getUserIp() ); - loginLogRespVO.setUserAgent( loginLogDO.getUserAgent() ); - loginLogRespVO.setId( loginLogDO.getId() ); - loginLogRespVO.setUserId( loginLogDO.getUserId() ); - loginLogRespVO.setUserType( loginLogDO.getUserType() ); - loginLogRespVO.setCreateTime( loginLogDO.getCreateTime() ); - - return loginLogRespVO; - } - - protected List loginLogDOListToLoginLogRespVOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( LoginLogDO loginLogDO : list ) { - list1.add( loginLogDOToLoginLogRespVO( loginLogDO ) ); - } - - return list1; - } - - protected LoginLogExcelVO loginLogDOToLoginLogExcelVO(LoginLogDO loginLogDO) { - if ( loginLogDO == null ) { - return null; - } - - LoginLogExcelVO loginLogExcelVO = new LoginLogExcelVO(); - - loginLogExcelVO.setId( loginLogDO.getId() ); - loginLogExcelVO.setUsername( loginLogDO.getUsername() ); - loginLogExcelVO.setLogType( loginLogDO.getLogType() ); - loginLogExcelVO.setResult( loginLogDO.getResult() ); - loginLogExcelVO.setUserIp( loginLogDO.getUserIp() ); - loginLogExcelVO.setUserAgent( loginLogDO.getUserAgent() ); - loginLogExcelVO.setCreateTime( loginLogDO.getCreateTime() ); - - return loginLogExcelVO; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/logger/OperateLogConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/logger/OperateLogConvertImpl.java deleted file mode 100644 index de56d4e..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/logger/OperateLogConvertImpl.java +++ /dev/null @@ -1,135 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.logger; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.api.logger.dto.OperateLogCreateReqDTO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogRespVO; -import cn.iocoder.yudao.module.system.dal.dataobject.logger.OperateLogDO; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class OperateLogConvertImpl implements OperateLogConvert { - - @Override - public OperateLogDO convert(OperateLogCreateReqDTO bean) { - if ( bean == null ) { - return null; - } - - OperateLogDO operateLogDO = new OperateLogDO(); - - operateLogDO.setTraceId( bean.getTraceId() ); - operateLogDO.setUserId( bean.getUserId() ); - operateLogDO.setUserType( bean.getUserType() ); - operateLogDO.setModule( bean.getModule() ); - operateLogDO.setName( bean.getName() ); - operateLogDO.setType( bean.getType() ); - operateLogDO.setContent( bean.getContent() ); - Map map = bean.getExts(); - if ( map != null ) { - operateLogDO.setExts( new LinkedHashMap( map ) ); - } - operateLogDO.setRequestMethod( bean.getRequestMethod() ); - operateLogDO.setRequestUrl( bean.getRequestUrl() ); - operateLogDO.setUserIp( bean.getUserIp() ); - operateLogDO.setUserAgent( bean.getUserAgent() ); - operateLogDO.setJavaMethod( bean.getJavaMethod() ); - operateLogDO.setJavaMethodArgs( bean.getJavaMethodArgs() ); - operateLogDO.setStartTime( bean.getStartTime() ); - operateLogDO.setDuration( bean.getDuration() ); - operateLogDO.setResultCode( bean.getResultCode() ); - operateLogDO.setResultMsg( bean.getResultMsg() ); - operateLogDO.setResultData( bean.getResultData() ); - - return operateLogDO; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( operateLogDOListToOperateLogRespVOList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public OperateLogRespVO convert(OperateLogDO bean) { - if ( bean == null ) { - return null; - } - - OperateLogRespVO operateLogRespVO = new OperateLogRespVO(); - - operateLogRespVO.setTraceId( bean.getTraceId() ); - operateLogRespVO.setUserId( bean.getUserId() ); - operateLogRespVO.setModule( bean.getModule() ); - operateLogRespVO.setName( bean.getName() ); - operateLogRespVO.setType( bean.getType() ); - operateLogRespVO.setContent( bean.getContent() ); - Map map = bean.getExts(); - if ( map != null ) { - operateLogRespVO.setExts( new LinkedHashMap( map ) ); - } - operateLogRespVO.setRequestMethod( bean.getRequestMethod() ); - operateLogRespVO.setRequestUrl( bean.getRequestUrl() ); - operateLogRespVO.setUserIp( bean.getUserIp() ); - operateLogRespVO.setUserAgent( bean.getUserAgent() ); - operateLogRespVO.setJavaMethod( bean.getJavaMethod() ); - operateLogRespVO.setJavaMethodArgs( bean.getJavaMethodArgs() ); - operateLogRespVO.setStartTime( bean.getStartTime() ); - operateLogRespVO.setDuration( bean.getDuration() ); - operateLogRespVO.setResultCode( bean.getResultCode() ); - operateLogRespVO.setResultMsg( bean.getResultMsg() ); - operateLogRespVO.setResultData( bean.getResultData() ); - operateLogRespVO.setId( bean.getId() ); - - return operateLogRespVO; - } - - @Override - public OperateLogExcelVO convert02(OperateLogDO bean) { - if ( bean == null ) { - return null; - } - - OperateLogExcelVO operateLogExcelVO = new OperateLogExcelVO(); - - operateLogExcelVO.setId( bean.getId() ); - operateLogExcelVO.setModule( bean.getModule() ); - operateLogExcelVO.setName( bean.getName() ); - if ( bean.getType() != null ) { - operateLogExcelVO.setType( String.valueOf( bean.getType() ) ); - } - operateLogExcelVO.setStartTime( bean.getStartTime() ); - operateLogExcelVO.setDuration( bean.getDuration() ); - - return operateLogExcelVO; - } - - protected List operateLogDOListToOperateLogRespVOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( OperateLogDO operateLogDO : list ) { - list1.add( convert( operateLogDO ) ); - } - - return list1; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvertImpl.java deleted file mode 100644 index b3b74a6..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvertImpl.java +++ /dev/null @@ -1,131 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.mail; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountBaseVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountRespVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountSimpleRespVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class MailAccountConvertImpl implements MailAccountConvert { - - @Override - public MailAccountDO convert(MailAccountCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - MailAccountDO mailAccountDO = new MailAccountDO(); - - mailAccountDO.setMail( bean.getMail() ); - mailAccountDO.setUsername( bean.getUsername() ); - mailAccountDO.setPassword( bean.getPassword() ); - mailAccountDO.setHost( bean.getHost() ); - mailAccountDO.setPort( bean.getPort() ); - mailAccountDO.setSslEnable( bean.getSslEnable() ); - - return mailAccountDO; - } - - @Override - public MailAccountDO convert(MailAccountUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - MailAccountDO mailAccountDO = new MailAccountDO(); - - mailAccountDO.setId( bean.getId() ); - mailAccountDO.setMail( bean.getMail() ); - mailAccountDO.setUsername( bean.getUsername() ); - mailAccountDO.setPassword( bean.getPassword() ); - mailAccountDO.setHost( bean.getHost() ); - mailAccountDO.setPort( bean.getPort() ); - mailAccountDO.setSslEnable( bean.getSslEnable() ); - - return mailAccountDO; - } - - @Override - public MailAccountRespVO convert(MailAccountDO bean) { - if ( bean == null ) { - return null; - } - - MailAccountRespVO mailAccountRespVO = new MailAccountRespVO(); - - mailAccountRespVO.setMail( bean.getMail() ); - mailAccountRespVO.setUsername( bean.getUsername() ); - mailAccountRespVO.setPassword( bean.getPassword() ); - mailAccountRespVO.setHost( bean.getHost() ); - mailAccountRespVO.setPort( bean.getPort() ); - mailAccountRespVO.setSslEnable( bean.getSslEnable() ); - mailAccountRespVO.setId( bean.getId() ); - mailAccountRespVO.setCreateTime( bean.getCreateTime() ); - - return mailAccountRespVO; - } - - @Override - public PageResult convertPage(PageResult pageResult) { - if ( pageResult == null ) { - return null; - } - - PageResult pageResult1 = new PageResult(); - - pageResult1.setList( mailAccountDOListToMailAccountBaseVOList( pageResult.getList() ) ); - pageResult1.setTotal( pageResult.getTotal() ); - - return pageResult1; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( MailAccountDO mailAccountDO : list ) { - list1.add( mailAccountDOToMailAccountSimpleRespVO( mailAccountDO ) ); - } - - return list1; - } - - protected List mailAccountDOListToMailAccountBaseVOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( MailAccountDO mailAccountDO : list ) { - list1.add( convert( mailAccountDO ) ); - } - - return list1; - } - - protected MailAccountSimpleRespVO mailAccountDOToMailAccountSimpleRespVO(MailAccountDO mailAccountDO) { - if ( mailAccountDO == null ) { - return null; - } - - MailAccountSimpleRespVO mailAccountSimpleRespVO = new MailAccountSimpleRespVO(); - - mailAccountSimpleRespVO.setId( mailAccountDO.getId() ); - mailAccountSimpleRespVO.setMail( mailAccountDO.getMail() ); - - return mailAccountSimpleRespVO; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/mail/MailLogConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/mail/MailLogConvertImpl.java deleted file mode 100644 index 46cb437..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/mail/MailLogConvertImpl.java +++ /dev/null @@ -1,85 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.mail; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogRespVO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class MailLogConvertImpl implements MailLogConvert { - - @Override - public PageResult convertPage(PageResult pageResult) { - if ( pageResult == null ) { - return null; - } - - PageResult pageResult1 = new PageResult(); - - pageResult1.setList( mailLogDOListToMailLogRespVOList( pageResult.getList() ) ); - pageResult1.setTotal( pageResult.getTotal() ); - - return pageResult1; - } - - @Override - public MailLogRespVO convert(MailLogDO bean) { - if ( bean == null ) { - return null; - } - - MailLogRespVO mailLogRespVO = new MailLogRespVO(); - - mailLogRespVO.setUserId( bean.getUserId() ); - if ( bean.getUserType() != null ) { - mailLogRespVO.setUserType( bean.getUserType().byteValue() ); - } - mailLogRespVO.setToMail( bean.getToMail() ); - mailLogRespVO.setAccountId( bean.getAccountId() ); - mailLogRespVO.setFromMail( bean.getFromMail() ); - mailLogRespVO.setTemplateId( bean.getTemplateId() ); - mailLogRespVO.setTemplateCode( bean.getTemplateCode() ); - mailLogRespVO.setTemplateNickname( bean.getTemplateNickname() ); - mailLogRespVO.setTemplateTitle( bean.getTemplateTitle() ); - mailLogRespVO.setTemplateContent( bean.getTemplateContent() ); - Map map = bean.getTemplateParams(); - if ( map != null ) { - mailLogRespVO.setTemplateParams( new LinkedHashMap( map ) ); - } - if ( bean.getSendStatus() != null ) { - mailLogRespVO.setSendStatus( bean.getSendStatus().byteValue() ); - } - if ( bean.getSendTime() != null ) { - mailLogRespVO.setSendTime( LocalDateTime.ofInstant( bean.getSendTime().toInstant(), ZoneId.of( "UTC" ) ) ); - } - mailLogRespVO.setSendMessageId( bean.getSendMessageId() ); - mailLogRespVO.setSendException( bean.getSendException() ); - mailLogRespVO.setId( bean.getId() ); - mailLogRespVO.setCreateTime( bean.getCreateTime() ); - - return mailLogRespVO; - } - - protected List mailLogDOListToMailLogRespVOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( MailLogDO mailLogDO : list ) { - list1.add( convert( mailLogDO ) ); - } - - return list1; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvertImpl.java deleted file mode 100644 index 7233c03..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvertImpl.java +++ /dev/null @@ -1,140 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.mail; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateRespVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateSimpleRespVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class MailTemplateConvertImpl implements MailTemplateConvert { - - @Override - public MailTemplateDO convert(MailTemplateUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - MailTemplateDO mailTemplateDO = new MailTemplateDO(); - - mailTemplateDO.setId( bean.getId() ); - mailTemplateDO.setName( bean.getName() ); - mailTemplateDO.setCode( bean.getCode() ); - mailTemplateDO.setAccountId( bean.getAccountId() ); - mailTemplateDO.setNickname( bean.getNickname() ); - mailTemplateDO.setTitle( bean.getTitle() ); - mailTemplateDO.setContent( bean.getContent() ); - mailTemplateDO.setStatus( bean.getStatus() ); - mailTemplateDO.setRemark( bean.getRemark() ); - - return mailTemplateDO; - } - - @Override - public MailTemplateDO convert(MailTemplateCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - MailTemplateDO mailTemplateDO = new MailTemplateDO(); - - mailTemplateDO.setName( bean.getName() ); - mailTemplateDO.setCode( bean.getCode() ); - mailTemplateDO.setAccountId( bean.getAccountId() ); - mailTemplateDO.setNickname( bean.getNickname() ); - mailTemplateDO.setTitle( bean.getTitle() ); - mailTemplateDO.setContent( bean.getContent() ); - mailTemplateDO.setStatus( bean.getStatus() ); - mailTemplateDO.setRemark( bean.getRemark() ); - - return mailTemplateDO; - } - - @Override - public MailTemplateRespVO convert(MailTemplateDO bean) { - if ( bean == null ) { - return null; - } - - MailTemplateRespVO mailTemplateRespVO = new MailTemplateRespVO(); - - mailTemplateRespVO.setName( bean.getName() ); - mailTemplateRespVO.setCode( bean.getCode() ); - mailTemplateRespVO.setAccountId( bean.getAccountId() ); - mailTemplateRespVO.setNickname( bean.getNickname() ); - mailTemplateRespVO.setTitle( bean.getTitle() ); - mailTemplateRespVO.setContent( bean.getContent() ); - mailTemplateRespVO.setStatus( bean.getStatus() ); - mailTemplateRespVO.setRemark( bean.getRemark() ); - mailTemplateRespVO.setId( bean.getId() ); - List list = bean.getParams(); - if ( list != null ) { - mailTemplateRespVO.setParams( new ArrayList( list ) ); - } - mailTemplateRespVO.setCreateTime( bean.getCreateTime() ); - - return mailTemplateRespVO; - } - - @Override - public PageResult convertPage(PageResult pageResult) { - if ( pageResult == null ) { - return null; - } - - PageResult pageResult1 = new PageResult(); - - pageResult1.setList( mailTemplateDOListToMailTemplateRespVOList( pageResult.getList() ) ); - pageResult1.setTotal( pageResult.getTotal() ); - - return pageResult1; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( MailTemplateDO mailTemplateDO : list ) { - list1.add( mailTemplateDOToMailTemplateSimpleRespVO( mailTemplateDO ) ); - } - - return list1; - } - - protected List mailTemplateDOListToMailTemplateRespVOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( MailTemplateDO mailTemplateDO : list ) { - list1.add( convert( mailTemplateDO ) ); - } - - return list1; - } - - protected MailTemplateSimpleRespVO mailTemplateDOToMailTemplateSimpleRespVO(MailTemplateDO mailTemplateDO) { - if ( mailTemplateDO == null ) { - return null; - } - - MailTemplateSimpleRespVO mailTemplateSimpleRespVO = new MailTemplateSimpleRespVO(); - - mailTemplateSimpleRespVO.setId( mailTemplateDO.getId() ); - mailTemplateSimpleRespVO.setName( mailTemplateDO.getName() ); - - return mailTemplateSimpleRespVO; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/notice/NoticeConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/notice/NoticeConvertImpl.java deleted file mode 100644 index e7ad86d..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/notice/NoticeConvertImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.notice; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeRespVO; -import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.notice.NoticeDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class NoticeConvertImpl implements NoticeConvert { - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( noticeDOListToNoticeRespVOList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public NoticeRespVO convert(NoticeDO bean) { - if ( bean == null ) { - return null; - } - - NoticeRespVO noticeRespVO = new NoticeRespVO(); - - noticeRespVO.setTitle( bean.getTitle() ); - noticeRespVO.setType( bean.getType() ); - noticeRespVO.setContent( bean.getContent() ); - noticeRespVO.setStatus( bean.getStatus() ); - noticeRespVO.setId( bean.getId() ); - noticeRespVO.setCreateTime( bean.getCreateTime() ); - - return noticeRespVO; - } - - @Override - public NoticeDO convert(NoticeUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - NoticeDO noticeDO = new NoticeDO(); - - noticeDO.setId( bean.getId() ); - noticeDO.setTitle( bean.getTitle() ); - noticeDO.setType( bean.getType() ); - noticeDO.setContent( bean.getContent() ); - noticeDO.setStatus( bean.getStatus() ); - - return noticeDO; - } - - @Override - public NoticeDO convert(NoticeCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - NoticeDO noticeDO = new NoticeDO(); - - noticeDO.setTitle( bean.getTitle() ); - noticeDO.setType( bean.getType() ); - noticeDO.setContent( bean.getContent() ); - noticeDO.setStatus( bean.getStatus() ); - - return noticeDO; - } - - protected List noticeDOListToNoticeRespVOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( NoticeDO noticeDO : list ) { - list1.add( convert( noticeDO ) ); - } - - return list1; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/notify/NotifyMessageConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/notify/NotifyMessageConvertImpl.java deleted file mode 100644 index b61f5da..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/notify/NotifyMessageConvertImpl.java +++ /dev/null @@ -1,79 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.notify; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageRespVO; -import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class NotifyMessageConvertImpl implements NotifyMessageConvert { - - @Override - public NotifyMessageRespVO convert(NotifyMessageDO bean) { - if ( bean == null ) { - return null; - } - - NotifyMessageRespVO notifyMessageRespVO = new NotifyMessageRespVO(); - - notifyMessageRespVO.setUserId( bean.getUserId() ); - if ( bean.getUserType() != null ) { - notifyMessageRespVO.setUserType( bean.getUserType().byteValue() ); - } - notifyMessageRespVO.setTemplateId( bean.getTemplateId() ); - notifyMessageRespVO.setTemplateCode( bean.getTemplateCode() ); - notifyMessageRespVO.setTemplateNickname( bean.getTemplateNickname() ); - notifyMessageRespVO.setTemplateContent( bean.getTemplateContent() ); - notifyMessageRespVO.setTemplateType( bean.getTemplateType() ); - Map map = bean.getTemplateParams(); - if ( map != null ) { - notifyMessageRespVO.setTemplateParams( new LinkedHashMap( map ) ); - } - notifyMessageRespVO.setReadStatus( bean.getReadStatus() ); - notifyMessageRespVO.setReadTime( bean.getReadTime() ); - notifyMessageRespVO.setId( bean.getId() ); - if ( bean.getCreateTime() != null ) { - notifyMessageRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return notifyMessageRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( NotifyMessageDO notifyMessageDO : list ) { - list1.add( convert( notifyMessageDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/notify/NotifyTemplateConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/notify/NotifyTemplateConvertImpl.java deleted file mode 100644 index 40bcd48..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/notify/NotifyTemplateConvertImpl.java +++ /dev/null @@ -1,114 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.notify; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateRespVO; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class NotifyTemplateConvertImpl implements NotifyTemplateConvert { - - @Override - public NotifyTemplateDO convert(NotifyTemplateCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - NotifyTemplateDO.NotifyTemplateDOBuilder notifyTemplateDO = NotifyTemplateDO.builder(); - - notifyTemplateDO.name( bean.getName() ); - notifyTemplateDO.code( bean.getCode() ); - notifyTemplateDO.type( bean.getType() ); - notifyTemplateDO.nickname( bean.getNickname() ); - notifyTemplateDO.content( bean.getContent() ); - notifyTemplateDO.status( bean.getStatus() ); - notifyTemplateDO.remark( bean.getRemark() ); - - return notifyTemplateDO.build(); - } - - @Override - public NotifyTemplateDO convert(NotifyTemplateUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - NotifyTemplateDO.NotifyTemplateDOBuilder notifyTemplateDO = NotifyTemplateDO.builder(); - - notifyTemplateDO.id( bean.getId() ); - notifyTemplateDO.name( bean.getName() ); - notifyTemplateDO.code( bean.getCode() ); - notifyTemplateDO.type( bean.getType() ); - notifyTemplateDO.nickname( bean.getNickname() ); - notifyTemplateDO.content( bean.getContent() ); - notifyTemplateDO.status( bean.getStatus() ); - notifyTemplateDO.remark( bean.getRemark() ); - - return notifyTemplateDO.build(); - } - - @Override - public NotifyTemplateRespVO convert(NotifyTemplateDO bean) { - if ( bean == null ) { - return null; - } - - NotifyTemplateRespVO notifyTemplateRespVO = new NotifyTemplateRespVO(); - - notifyTemplateRespVO.setName( bean.getName() ); - notifyTemplateRespVO.setCode( bean.getCode() ); - notifyTemplateRespVO.setType( bean.getType() ); - notifyTemplateRespVO.setNickname( bean.getNickname() ); - notifyTemplateRespVO.setContent( bean.getContent() ); - notifyTemplateRespVO.setStatus( bean.getStatus() ); - notifyTemplateRespVO.setRemark( bean.getRemark() ); - notifyTemplateRespVO.setId( bean.getId() ); - List list = bean.getParams(); - if ( list != null ) { - notifyTemplateRespVO.setParams( new ArrayList( list ) ); - } - if ( bean.getCreateTime() != null ) { - notifyTemplateRespVO.setCreateTime( Date.from( bean.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return notifyTemplateRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( NotifyTemplateDO notifyTemplateDO : list ) { - list1.add( convert( notifyTemplateDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/oauth2/OAuth2OpenConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/oauth2/OAuth2OpenConvertImpl.java deleted file mode 100644 index f795297..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/oauth2/OAuth2OpenConvertImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.oauth2; - -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.open.OAuth2OpenAccessTokenRespVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.open.OAuth2OpenCheckTokenRespVO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class OAuth2OpenConvertImpl implements OAuth2OpenConvert { - - @Override - public OAuth2OpenAccessTokenRespVO convert0(OAuth2AccessTokenDO bean) { - if ( bean == null ) { - return null; - } - - OAuth2OpenAccessTokenRespVO oAuth2OpenAccessTokenRespVO = new OAuth2OpenAccessTokenRespVO(); - - oAuth2OpenAccessTokenRespVO.setAccessToken( bean.getAccessToken() ); - oAuth2OpenAccessTokenRespVO.setRefreshToken( bean.getRefreshToken() ); - - return oAuth2OpenAccessTokenRespVO; - } - - @Override - public OAuth2OpenCheckTokenRespVO convert3(OAuth2AccessTokenDO bean) { - if ( bean == null ) { - return null; - } - - OAuth2OpenCheckTokenRespVO oAuth2OpenCheckTokenRespVO = new OAuth2OpenCheckTokenRespVO(); - - oAuth2OpenCheckTokenRespVO.setUserId( bean.getUserId() ); - oAuth2OpenCheckTokenRespVO.setUserType( bean.getUserType() ); - oAuth2OpenCheckTokenRespVO.setTenantId( bean.getTenantId() ); - oAuth2OpenCheckTokenRespVO.setClientId( bean.getClientId() ); - List list = bean.getScopes(); - if ( list != null ) { - oAuth2OpenCheckTokenRespVO.setScopes( new ArrayList( list ) ); - } - oAuth2OpenCheckTokenRespVO.setAccessToken( bean.getAccessToken() ); - - return oAuth2OpenCheckTokenRespVO; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/oauth2/OAuth2UserConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/oauth2/OAuth2UserConvertImpl.java deleted file mode 100644 index 1afa038..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/oauth2/OAuth2UserConvertImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.oauth2; - -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.user.OAuth2UserInfoRespVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.user.OAuth2UserUpdateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class OAuth2UserConvertImpl implements OAuth2UserConvert { - - @Override - public OAuth2UserInfoRespVO convert(AdminUserDO bean) { - if ( bean == null ) { - return null; - } - - OAuth2UserInfoRespVO oAuth2UserInfoRespVO = new OAuth2UserInfoRespVO(); - - oAuth2UserInfoRespVO.setId( bean.getId() ); - oAuth2UserInfoRespVO.setUsername( bean.getUsername() ); - oAuth2UserInfoRespVO.setNickname( bean.getNickname() ); - oAuth2UserInfoRespVO.setEmail( bean.getEmail() ); - oAuth2UserInfoRespVO.setMobile( bean.getMobile() ); - oAuth2UserInfoRespVO.setSex( bean.getSex() ); - oAuth2UserInfoRespVO.setAvatar( bean.getAvatar() ); - - return oAuth2UserInfoRespVO; - } - - @Override - public UserProfileUpdateReqVO convert(OAuth2UserUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - UserProfileUpdateReqVO userProfileUpdateReqVO = new UserProfileUpdateReqVO(); - - userProfileUpdateReqVO.setNickname( bean.getNickname() ); - userProfileUpdateReqVO.setEmail( bean.getEmail() ); - userProfileUpdateReqVO.setMobile( bean.getMobile() ); - userProfileUpdateReqVO.setSex( bean.getSex() ); - - return userProfileUpdateReqVO; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/permission/MenuConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/permission/MenuConvertImpl.java deleted file mode 100644 index 3f86862..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/permission/MenuConvertImpl.java +++ /dev/null @@ -1,139 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.permission; - -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuRespVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuSimpleRespVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class MenuConvertImpl implements MenuConvert { - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( MenuDO menuDO : list ) { - list1.add( convert( menuDO ) ); - } - - return list1; - } - - @Override - public MenuDO convert(MenuCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - MenuDO menuDO = new MenuDO(); - - menuDO.setName( bean.getName() ); - menuDO.setPermission( bean.getPermission() ); - menuDO.setType( bean.getType() ); - menuDO.setSort( bean.getSort() ); - menuDO.setParentId( bean.getParentId() ); - menuDO.setPath( bean.getPath() ); - menuDO.setIcon( bean.getIcon() ); - menuDO.setComponent( bean.getComponent() ); - menuDO.setComponentName( bean.getComponentName() ); - menuDO.setStatus( bean.getStatus() ); - menuDO.setVisible( bean.getVisible() ); - menuDO.setKeepAlive( bean.getKeepAlive() ); - menuDO.setAlwaysShow( bean.getAlwaysShow() ); - - return menuDO; - } - - @Override - public MenuDO convert(MenuUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - MenuDO menuDO = new MenuDO(); - - menuDO.setId( bean.getId() ); - menuDO.setName( bean.getName() ); - menuDO.setPermission( bean.getPermission() ); - menuDO.setType( bean.getType() ); - menuDO.setSort( bean.getSort() ); - menuDO.setParentId( bean.getParentId() ); - menuDO.setPath( bean.getPath() ); - menuDO.setIcon( bean.getIcon() ); - menuDO.setComponent( bean.getComponent() ); - menuDO.setComponentName( bean.getComponentName() ); - menuDO.setStatus( bean.getStatus() ); - menuDO.setVisible( bean.getVisible() ); - menuDO.setKeepAlive( bean.getKeepAlive() ); - menuDO.setAlwaysShow( bean.getAlwaysShow() ); - - return menuDO; - } - - @Override - public MenuRespVO convert(MenuDO bean) { - if ( bean == null ) { - return null; - } - - MenuRespVO menuRespVO = new MenuRespVO(); - - menuRespVO.setName( bean.getName() ); - menuRespVO.setPermission( bean.getPermission() ); - menuRespVO.setType( bean.getType() ); - menuRespVO.setSort( bean.getSort() ); - menuRespVO.setParentId( bean.getParentId() ); - menuRespVO.setPath( bean.getPath() ); - menuRespVO.setIcon( bean.getIcon() ); - menuRespVO.setComponent( bean.getComponent() ); - menuRespVO.setComponentName( bean.getComponentName() ); - menuRespVO.setVisible( bean.getVisible() ); - menuRespVO.setKeepAlive( bean.getKeepAlive() ); - menuRespVO.setAlwaysShow( bean.getAlwaysShow() ); - menuRespVO.setId( bean.getId() ); - menuRespVO.setStatus( bean.getStatus() ); - menuRespVO.setCreateTime( bean.getCreateTime() ); - - return menuRespVO; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( MenuDO menuDO : list ) { - list1.add( menuDOToMenuSimpleRespVO( menuDO ) ); - } - - return list1; - } - - protected MenuSimpleRespVO menuDOToMenuSimpleRespVO(MenuDO menuDO) { - if ( menuDO == null ) { - return null; - } - - MenuSimpleRespVO menuSimpleRespVO = new MenuSimpleRespVO(); - - menuSimpleRespVO.setId( menuDO.getId() ); - menuSimpleRespVO.setName( menuDO.getName() ); - menuSimpleRespVO.setParentId( menuDO.getParentId() ); - menuSimpleRespVO.setType( menuDO.getType() ); - - return menuSimpleRespVO; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/permission/RoleConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/permission/RoleConvertImpl.java deleted file mode 100644 index d4c093e..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/permission/RoleConvertImpl.java +++ /dev/null @@ -1,215 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.permission; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RolePageRespVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleRespVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleSimpleRespVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; -import cn.iocoder.yudao.module.system.service.permission.bo.RoleCreateReqBO; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Date; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class RoleConvertImpl implements RoleConvert { - - @Override - public RoleDO convert(RoleUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - RoleDO roleDO = new RoleDO(); - - roleDO.setId( bean.getId() ); - roleDO.setName( bean.getName() ); - roleDO.setCode( bean.getCode() ); - roleDO.setSort( bean.getSort() ); - roleDO.setRemark( bean.getRemark() ); - - return roleDO; - } - - @Override - public RoleRespVO convert(RoleDO bean) { - if ( bean == null ) { - return null; - } - - RoleRespVO roleRespVO = new RoleRespVO(); - - roleRespVO.setName( bean.getName() ); - roleRespVO.setCode( bean.getCode() ); - roleRespVO.setSort( bean.getSort() ); - roleRespVO.setRemark( bean.getRemark() ); - roleRespVO.setId( bean.getId() ); - roleRespVO.setDataScope( bean.getDataScope() ); - Set set = bean.getDataScopeDeptIds(); - if ( set != null ) { - roleRespVO.setDataScopeDeptIds( new LinkedHashSet( set ) ); - } - roleRespVO.setStatus( bean.getStatus() ); - roleRespVO.setType( bean.getType() ); - roleRespVO.setCreateTime( bean.getCreateTime() ); - - return roleRespVO; - } - - @Override - public RoleDO convert(RoleCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - RoleDO roleDO = new RoleDO(); - - roleDO.setName( bean.getName() ); - roleDO.setCode( bean.getCode() ); - roleDO.setSort( bean.getSort() ); - roleDO.setRemark( bean.getRemark() ); - - return roleDO; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( RoleDO roleDO : list ) { - list1.add( roleDOToRoleSimpleRespVO( roleDO ) ); - } - - return list1; - } - - @Override - public List convertList03(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( RoleDO roleDO : list ) { - list1.add( roleDOToRoleExcelVO( roleDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult pageResult) { - if ( pageResult == null ) { - return null; - } - - PageResult pageResult1 = new PageResult(); - - pageResult1.setList( roleDOListToRolePageRespVOList( pageResult.getList() ) ); - pageResult1.setTotal( pageResult.getTotal() ); - - return pageResult1; - } - - @Override - public RoleDO convert(RoleCreateReqBO bean) { - if ( bean == null ) { - return null; - } - - RoleDO roleDO = new RoleDO(); - - roleDO.setTenantId( bean.getTenantId() ); - roleDO.setName( bean.getName() ); - roleDO.setCode( bean.getCode() ); - roleDO.setSort( bean.getSort() ); - roleDO.setType( bean.getType() ); - - return roleDO; - } - - protected RoleSimpleRespVO roleDOToRoleSimpleRespVO(RoleDO roleDO) { - if ( roleDO == null ) { - return null; - } - - RoleSimpleRespVO roleSimpleRespVO = new RoleSimpleRespVO(); - - roleSimpleRespVO.setId( roleDO.getId() ); - roleSimpleRespVO.setName( roleDO.getName() ); - - return roleSimpleRespVO; - } - - protected RoleExcelVO roleDOToRoleExcelVO(RoleDO roleDO) { - if ( roleDO == null ) { - return null; - } - - RoleExcelVO roleExcelVO = new RoleExcelVO(); - - roleExcelVO.setId( roleDO.getId() ); - roleExcelVO.setName( roleDO.getName() ); - roleExcelVO.setCode( roleDO.getCode() ); - roleExcelVO.setSort( roleDO.getSort() ); - roleExcelVO.setDataScope( roleDO.getDataScope() ); - if ( roleDO.getStatus() != null ) { - roleExcelVO.setStatus( String.valueOf( roleDO.getStatus() ) ); - } - - return roleExcelVO; - } - - protected RolePageRespVO roleDOToRolePageRespVO(RoleDO roleDO) { - if ( roleDO == null ) { - return null; - } - - RolePageRespVO rolePageRespVO = new RolePageRespVO(); - - rolePageRespVO.setId( roleDO.getId() ); - rolePageRespVO.setName( roleDO.getName() ); - rolePageRespVO.setCode( roleDO.getCode() ); - rolePageRespVO.setSort( roleDO.getSort() ); - rolePageRespVO.setStatus( roleDO.getStatus() ); - rolePageRespVO.setType( roleDO.getType() ); - rolePageRespVO.setRemark( roleDO.getRemark() ); - rolePageRespVO.setDataScope( roleDO.getDataScope() ); - Set set = roleDO.getDataScopeDeptIds(); - if ( set != null ) { - rolePageRespVO.setDataScopeDeptIds( new LinkedHashSet( set ) ); - } - rolePageRespVO.setTenantId( roleDO.getTenantId() ); - if ( roleDO.getCreateTime() != null ) { - rolePageRespVO.setCreateTime( Date.from( roleDO.getCreateTime().toInstant( ZoneOffset.UTC ) ) ); - } - - return rolePageRespVO; - } - - protected List roleDOListToRolePageRespVOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( RoleDO roleDO : list ) { - list1.add( roleDOToRolePageRespVO( roleDO ) ); - } - - return list1; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/sensitiveword/SensitiveWordConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/sensitiveword/SensitiveWordConvertImpl.java deleted file mode 100644 index 6c80632..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/sensitiveword/SensitiveWordConvertImpl.java +++ /dev/null @@ -1,141 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.sensitiveword; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordRespVO; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.sensitiveword.SensitiveWordDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class SensitiveWordConvertImpl implements SensitiveWordConvert { - - @Override - public SensitiveWordDO convert(SensitiveWordCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - SensitiveWordDO.SensitiveWordDOBuilder sensitiveWordDO = SensitiveWordDO.builder(); - - sensitiveWordDO.name( bean.getName() ); - sensitiveWordDO.description( bean.getDescription() ); - List list = bean.getTags(); - if ( list != null ) { - sensitiveWordDO.tags( new ArrayList( list ) ); - } - sensitiveWordDO.status( bean.getStatus() ); - - return sensitiveWordDO.build(); - } - - @Override - public SensitiveWordDO convert(SensitiveWordUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - SensitiveWordDO.SensitiveWordDOBuilder sensitiveWordDO = SensitiveWordDO.builder(); - - sensitiveWordDO.id( bean.getId() ); - sensitiveWordDO.name( bean.getName() ); - sensitiveWordDO.description( bean.getDescription() ); - List list = bean.getTags(); - if ( list != null ) { - sensitiveWordDO.tags( new ArrayList( list ) ); - } - sensitiveWordDO.status( bean.getStatus() ); - - return sensitiveWordDO.build(); - } - - @Override - public SensitiveWordRespVO convert(SensitiveWordDO bean) { - if ( bean == null ) { - return null; - } - - SensitiveWordRespVO sensitiveWordRespVO = new SensitiveWordRespVO(); - - sensitiveWordRespVO.setName( bean.getName() ); - List list = bean.getTags(); - if ( list != null ) { - sensitiveWordRespVO.setTags( new ArrayList( list ) ); - } - sensitiveWordRespVO.setStatus( bean.getStatus() ); - sensitiveWordRespVO.setDescription( bean.getDescription() ); - sensitiveWordRespVO.setId( bean.getId() ); - sensitiveWordRespVO.setCreateTime( bean.getCreateTime() ); - - return sensitiveWordRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( SensitiveWordDO sensitiveWordDO : list ) { - list1.add( convert( sensitiveWordDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( SensitiveWordDO sensitiveWordDO : list ) { - list1.add( sensitiveWordDOToSensitiveWordExcelVO( sensitiveWordDO ) ); - } - - return list1; - } - - protected SensitiveWordExcelVO sensitiveWordDOToSensitiveWordExcelVO(SensitiveWordDO sensitiveWordDO) { - if ( sensitiveWordDO == null ) { - return null; - } - - SensitiveWordExcelVO sensitiveWordExcelVO = new SensitiveWordExcelVO(); - - sensitiveWordExcelVO.setId( sensitiveWordDO.getId() ); - sensitiveWordExcelVO.setName( sensitiveWordDO.getName() ); - List list = sensitiveWordDO.getTags(); - if ( list != null ) { - sensitiveWordExcelVO.setTags( new ArrayList( list ) ); - } - sensitiveWordExcelVO.setStatus( sensitiveWordDO.getStatus() ); - sensitiveWordExcelVO.setDescription( sensitiveWordDO.getDescription() ); - sensitiveWordExcelVO.setCreateTime( sensitiveWordDO.getCreateTime() ); - - return sensitiveWordExcelVO; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/sms/SmsChannelConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/sms/SmsChannelConvertImpl.java deleted file mode 100644 index 30f784c..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/sms/SmsChannelConvertImpl.java +++ /dev/null @@ -1,166 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.sms; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelRespVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelSimpleRespVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class SmsChannelConvertImpl implements SmsChannelConvert { - - @Override - public SmsChannelDO convert(SmsChannelCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - SmsChannelDO smsChannelDO = new SmsChannelDO(); - - smsChannelDO.setSignature( bean.getSignature() ); - smsChannelDO.setCode( bean.getCode() ); - smsChannelDO.setStatus( bean.getStatus() ); - smsChannelDO.setRemark( bean.getRemark() ); - smsChannelDO.setApiKey( bean.getApiKey() ); - smsChannelDO.setApiSecret( bean.getApiSecret() ); - smsChannelDO.setCallbackUrl( bean.getCallbackUrl() ); - - return smsChannelDO; - } - - @Override - public SmsChannelDO convert(SmsChannelUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - SmsChannelDO smsChannelDO = new SmsChannelDO(); - - smsChannelDO.setId( bean.getId() ); - smsChannelDO.setSignature( bean.getSignature() ); - smsChannelDO.setStatus( bean.getStatus() ); - smsChannelDO.setRemark( bean.getRemark() ); - smsChannelDO.setApiKey( bean.getApiKey() ); - smsChannelDO.setApiSecret( bean.getApiSecret() ); - smsChannelDO.setCallbackUrl( bean.getCallbackUrl() ); - - return smsChannelDO; - } - - @Override - public SmsChannelRespVO convert(SmsChannelDO bean) { - if ( bean == null ) { - return null; - } - - SmsChannelRespVO smsChannelRespVO = new SmsChannelRespVO(); - - smsChannelRespVO.setSignature( bean.getSignature() ); - smsChannelRespVO.setStatus( bean.getStatus() ); - smsChannelRespVO.setRemark( bean.getRemark() ); - smsChannelRespVO.setApiKey( bean.getApiKey() ); - smsChannelRespVO.setApiSecret( bean.getApiSecret() ); - smsChannelRespVO.setCallbackUrl( bean.getCallbackUrl() ); - smsChannelRespVO.setId( bean.getId() ); - smsChannelRespVO.setCode( bean.getCode() ); - smsChannelRespVO.setCreateTime( bean.getCreateTime() ); - - return smsChannelRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( SmsChannelDO smsChannelDO : list ) { - list1.add( convert( smsChannelDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( SmsChannelDO smsChannelDO : list ) { - list1.add( smsChannelDOToSmsChannelProperties( smsChannelDO ) ); - } - - return list1; - } - - @Override - public List convertList03(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( SmsChannelDO smsChannelDO : list ) { - list1.add( smsChannelDOToSmsChannelSimpleRespVO( smsChannelDO ) ); - } - - return list1; - } - - protected SmsChannelProperties smsChannelDOToSmsChannelProperties(SmsChannelDO smsChannelDO) { - if ( smsChannelDO == null ) { - return null; - } - - SmsChannelProperties smsChannelProperties = new SmsChannelProperties(); - - smsChannelProperties.setId( smsChannelDO.getId() ); - smsChannelProperties.setSignature( smsChannelDO.getSignature() ); - smsChannelProperties.setCode( smsChannelDO.getCode() ); - smsChannelProperties.setApiKey( smsChannelDO.getApiKey() ); - smsChannelProperties.setApiSecret( smsChannelDO.getApiSecret() ); - smsChannelProperties.setCallbackUrl( smsChannelDO.getCallbackUrl() ); - - return smsChannelProperties; - } - - protected SmsChannelSimpleRespVO smsChannelDOToSmsChannelSimpleRespVO(SmsChannelDO smsChannelDO) { - if ( smsChannelDO == null ) { - return null; - } - - SmsChannelSimpleRespVO smsChannelSimpleRespVO = new SmsChannelSimpleRespVO(); - - smsChannelSimpleRespVO.setId( smsChannelDO.getId() ); - smsChannelSimpleRespVO.setSignature( smsChannelDO.getSignature() ); - smsChannelSimpleRespVO.setCode( smsChannelDO.getCode() ); - - return smsChannelSimpleRespVO; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/sms/SmsLogConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/sms/SmsLogConvertImpl.java deleted file mode 100644 index 8a64a22..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/sms/SmsLogConvertImpl.java +++ /dev/null @@ -1,140 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.sms; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.log.SmsLogExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.log.SmsLogRespVO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsLogDO; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class SmsLogConvertImpl implements SmsLogConvert { - - @Override - public SmsLogRespVO convert(SmsLogDO bean) { - if ( bean == null ) { - return null; - } - - SmsLogRespVO smsLogRespVO = new SmsLogRespVO(); - - smsLogRespVO.setId( bean.getId() ); - smsLogRespVO.setChannelId( bean.getChannelId() ); - smsLogRespVO.setChannelCode( bean.getChannelCode() ); - smsLogRespVO.setTemplateId( bean.getTemplateId() ); - smsLogRespVO.setTemplateCode( bean.getTemplateCode() ); - smsLogRespVO.setTemplateType( bean.getTemplateType() ); - smsLogRespVO.setTemplateContent( bean.getTemplateContent() ); - Map map = bean.getTemplateParams(); - if ( map != null ) { - smsLogRespVO.setTemplateParams( new LinkedHashMap( map ) ); - } - smsLogRespVO.setApiTemplateId( bean.getApiTemplateId() ); - smsLogRespVO.setMobile( bean.getMobile() ); - smsLogRespVO.setUserId( bean.getUserId() ); - smsLogRespVO.setUserType( bean.getUserType() ); - smsLogRespVO.setSendStatus( bean.getSendStatus() ); - smsLogRespVO.setSendTime( bean.getSendTime() ); - smsLogRespVO.setSendCode( bean.getSendCode() ); - smsLogRespVO.setSendMsg( bean.getSendMsg() ); - smsLogRespVO.setApiSendCode( bean.getApiSendCode() ); - smsLogRespVO.setApiSendMsg( bean.getApiSendMsg() ); - smsLogRespVO.setApiRequestId( bean.getApiRequestId() ); - smsLogRespVO.setApiSerialNo( bean.getApiSerialNo() ); - smsLogRespVO.setReceiveStatus( bean.getReceiveStatus() ); - smsLogRespVO.setReceiveTime( bean.getReceiveTime() ); - smsLogRespVO.setApiReceiveCode( bean.getApiReceiveCode() ); - smsLogRespVO.setApiReceiveMsg( bean.getApiReceiveMsg() ); - smsLogRespVO.setCreateTime( bean.getCreateTime() ); - - return smsLogRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( SmsLogDO smsLogDO : list ) { - list1.add( convert( smsLogDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( SmsLogDO smsLogDO : list ) { - list1.add( smsLogDOToSmsLogExcelVO( smsLogDO ) ); - } - - return list1; - } - - protected SmsLogExcelVO smsLogDOToSmsLogExcelVO(SmsLogDO smsLogDO) { - if ( smsLogDO == null ) { - return null; - } - - SmsLogExcelVO smsLogExcelVO = new SmsLogExcelVO(); - - smsLogExcelVO.setId( smsLogDO.getId() ); - smsLogExcelVO.setChannelId( smsLogDO.getChannelId() ); - smsLogExcelVO.setChannelCode( smsLogDO.getChannelCode() ); - smsLogExcelVO.setTemplateId( smsLogDO.getTemplateId() ); - smsLogExcelVO.setTemplateCode( smsLogDO.getTemplateCode() ); - smsLogExcelVO.setTemplateType( smsLogDO.getTemplateType() ); - smsLogExcelVO.setTemplateContent( smsLogDO.getTemplateContent() ); - Map map = smsLogDO.getTemplateParams(); - if ( map != null ) { - smsLogExcelVO.setTemplateParams( new LinkedHashMap( map ) ); - } - smsLogExcelVO.setApiTemplateId( smsLogDO.getApiTemplateId() ); - smsLogExcelVO.setMobile( smsLogDO.getMobile() ); - smsLogExcelVO.setUserId( smsLogDO.getUserId() ); - smsLogExcelVO.setUserType( smsLogDO.getUserType() ); - smsLogExcelVO.setSendStatus( smsLogDO.getSendStatus() ); - smsLogExcelVO.setSendTime( smsLogDO.getSendTime() ); - smsLogExcelVO.setSendCode( smsLogDO.getSendCode() ); - smsLogExcelVO.setSendMsg( smsLogDO.getSendMsg() ); - smsLogExcelVO.setApiSendCode( smsLogDO.getApiSendCode() ); - smsLogExcelVO.setApiSendMsg( smsLogDO.getApiSendMsg() ); - smsLogExcelVO.setApiRequestId( smsLogDO.getApiRequestId() ); - smsLogExcelVO.setApiSerialNo( smsLogDO.getApiSerialNo() ); - smsLogExcelVO.setReceiveStatus( smsLogDO.getReceiveStatus() ); - smsLogExcelVO.setReceiveTime( smsLogDO.getReceiveTime() ); - smsLogExcelVO.setApiReceiveCode( smsLogDO.getApiReceiveCode() ); - smsLogExcelVO.setApiReceiveMsg( smsLogDO.getApiReceiveMsg() ); - smsLogExcelVO.setCreateTime( smsLogDO.getCreateTime() ); - - return smsLogExcelVO; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/sms/SmsTemplateConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/sms/SmsTemplateConvertImpl.java deleted file mode 100644 index 50c11a5..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/sms/SmsTemplateConvertImpl.java +++ /dev/null @@ -1,151 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.sms; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateRespVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class SmsTemplateConvertImpl implements SmsTemplateConvert { - - @Override - public SmsTemplateDO convert(SmsTemplateCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - SmsTemplateDO smsTemplateDO = new SmsTemplateDO(); - - smsTemplateDO.setType( bean.getType() ); - smsTemplateDO.setStatus( bean.getStatus() ); - smsTemplateDO.setCode( bean.getCode() ); - smsTemplateDO.setName( bean.getName() ); - smsTemplateDO.setContent( bean.getContent() ); - smsTemplateDO.setRemark( bean.getRemark() ); - smsTemplateDO.setApiTemplateId( bean.getApiTemplateId() ); - smsTemplateDO.setChannelId( bean.getChannelId() ); - - return smsTemplateDO; - } - - @Override - public SmsTemplateDO convert(SmsTemplateUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - SmsTemplateDO smsTemplateDO = new SmsTemplateDO(); - - smsTemplateDO.setId( bean.getId() ); - smsTemplateDO.setType( bean.getType() ); - smsTemplateDO.setStatus( bean.getStatus() ); - smsTemplateDO.setCode( bean.getCode() ); - smsTemplateDO.setName( bean.getName() ); - smsTemplateDO.setContent( bean.getContent() ); - smsTemplateDO.setRemark( bean.getRemark() ); - smsTemplateDO.setApiTemplateId( bean.getApiTemplateId() ); - smsTemplateDO.setChannelId( bean.getChannelId() ); - - return smsTemplateDO; - } - - @Override - public SmsTemplateRespVO convert(SmsTemplateDO bean) { - if ( bean == null ) { - return null; - } - - SmsTemplateRespVO smsTemplateRespVO = new SmsTemplateRespVO(); - - smsTemplateRespVO.setType( bean.getType() ); - smsTemplateRespVO.setStatus( bean.getStatus() ); - smsTemplateRespVO.setCode( bean.getCode() ); - smsTemplateRespVO.setName( bean.getName() ); - smsTemplateRespVO.setContent( bean.getContent() ); - smsTemplateRespVO.setRemark( bean.getRemark() ); - smsTemplateRespVO.setApiTemplateId( bean.getApiTemplateId() ); - smsTemplateRespVO.setChannelId( bean.getChannelId() ); - smsTemplateRespVO.setId( bean.getId() ); - smsTemplateRespVO.setChannelCode( bean.getChannelCode() ); - List list = bean.getParams(); - if ( list != null ) { - smsTemplateRespVO.setParams( new ArrayList( list ) ); - } - smsTemplateRespVO.setCreateTime( bean.getCreateTime() ); - - return smsTemplateRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( SmsTemplateDO smsTemplateDO : list ) { - list1.add( convert( smsTemplateDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( SmsTemplateDO smsTemplateDO : list ) { - list1.add( smsTemplateDOToSmsTemplateExcelVO( smsTemplateDO ) ); - } - - return list1; - } - - protected SmsTemplateExcelVO smsTemplateDOToSmsTemplateExcelVO(SmsTemplateDO smsTemplateDO) { - if ( smsTemplateDO == null ) { - return null; - } - - SmsTemplateExcelVO smsTemplateExcelVO = new SmsTemplateExcelVO(); - - smsTemplateExcelVO.setId( smsTemplateDO.getId() ); - smsTemplateExcelVO.setType( smsTemplateDO.getType() ); - smsTemplateExcelVO.setStatus( smsTemplateDO.getStatus() ); - smsTemplateExcelVO.setCode( smsTemplateDO.getCode() ); - smsTemplateExcelVO.setName( smsTemplateDO.getName() ); - smsTemplateExcelVO.setContent( smsTemplateDO.getContent() ); - smsTemplateExcelVO.setRemark( smsTemplateDO.getRemark() ); - smsTemplateExcelVO.setApiTemplateId( smsTemplateDO.getApiTemplateId() ); - smsTemplateExcelVO.setChannelId( smsTemplateDO.getChannelId() ); - smsTemplateExcelVO.setChannelCode( smsTemplateDO.getChannelCode() ); - smsTemplateExcelVO.setCreateTime( smsTemplateDO.getCreateTime() ); - - return smsTemplateExcelVO; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/social/SocialUserConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/social/SocialUserConvertImpl.java deleted file mode 100644 index 70d41d5..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/social/SocialUserConvertImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.social; - -import cn.iocoder.yudao.module.system.api.social.dto.SocialUserBindReqDTO; -import cn.iocoder.yudao.module.system.api.social.dto.SocialUserUnbindReqDTO; -import cn.iocoder.yudao.module.system.controller.admin.socail.vo.SocialUserBindReqVO; -import cn.iocoder.yudao.module.system.controller.admin.socail.vo.SocialUserUnbindReqVO; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class SocialUserConvertImpl implements SocialUserConvert { - - @Override - public SocialUserBindReqDTO convert(Long userId, Integer userType, SocialUserBindReqVO reqVO) { - if ( userId == null && userType == null && reqVO == null ) { - return null; - } - - SocialUserBindReqDTO socialUserBindReqDTO = new SocialUserBindReqDTO(); - - if ( reqVO != null ) { - socialUserBindReqDTO.setType( reqVO.getType() ); - socialUserBindReqDTO.setCode( reqVO.getCode() ); - socialUserBindReqDTO.setState( reqVO.getState() ); - } - socialUserBindReqDTO.setUserId( userId ); - socialUserBindReqDTO.setUserType( userType ); - - return socialUserBindReqDTO; - } - - @Override - public SocialUserUnbindReqDTO convert(Long userId, Integer userType, SocialUserUnbindReqVO reqVO) { - if ( userId == null && userType == null && reqVO == null ) { - return null; - } - - SocialUserUnbindReqDTO socialUserUnbindReqDTO = new SocialUserUnbindReqDTO(); - - if ( reqVO != null ) { - socialUserUnbindReqDTO.setType( reqVO.getType() ); - } - socialUserUnbindReqDTO.setUserId( userId ); - socialUserUnbindReqDTO.setUserType( userType ); - - return socialUserUnbindReqDTO; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/tenant/TenantConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/tenant/TenantConvertImpl.java deleted file mode 100644 index d860cdb..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/tenant/TenantConvertImpl.java +++ /dev/null @@ -1,141 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.tenant; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantRespVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class TenantConvertImpl implements TenantConvert { - - @Override - public TenantDO convert(TenantCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - TenantDO.TenantDOBuilder tenantDO = TenantDO.builder(); - - tenantDO.name( bean.getName() ); - tenantDO.contactName( bean.getContactName() ); - tenantDO.contactMobile( bean.getContactMobile() ); - tenantDO.status( bean.getStatus() ); - tenantDO.domain( bean.getDomain() ); - tenantDO.packageId( bean.getPackageId() ); - tenantDO.expireTime( bean.getExpireTime() ); - tenantDO.accountCount( bean.getAccountCount() ); - - return tenantDO.build(); - } - - @Override - public TenantDO convert(TenantUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - TenantDO.TenantDOBuilder tenantDO = TenantDO.builder(); - - tenantDO.id( bean.getId() ); - tenantDO.name( bean.getName() ); - tenantDO.contactName( bean.getContactName() ); - tenantDO.contactMobile( bean.getContactMobile() ); - tenantDO.status( bean.getStatus() ); - tenantDO.domain( bean.getDomain() ); - tenantDO.packageId( bean.getPackageId() ); - tenantDO.expireTime( bean.getExpireTime() ); - tenantDO.accountCount( bean.getAccountCount() ); - - return tenantDO.build(); - } - - @Override - public TenantRespVO convert(TenantDO bean) { - if ( bean == null ) { - return null; - } - - TenantRespVO tenantRespVO = new TenantRespVO(); - - tenantRespVO.setName( bean.getName() ); - tenantRespVO.setContactName( bean.getContactName() ); - tenantRespVO.setContactMobile( bean.getContactMobile() ); - tenantRespVO.setStatus( bean.getStatus() ); - tenantRespVO.setDomain( bean.getDomain() ); - tenantRespVO.setPackageId( bean.getPackageId() ); - tenantRespVO.setExpireTime( bean.getExpireTime() ); - tenantRespVO.setAccountCount( bean.getAccountCount() ); - tenantRespVO.setId( bean.getId() ); - tenantRespVO.setCreateTime( bean.getCreateTime() ); - - return tenantRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( TenantDO tenantDO : list ) { - list1.add( convert( tenantDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( TenantDO tenantDO : list ) { - list1.add( tenantDOToTenantExcelVO( tenantDO ) ); - } - - return list1; - } - - protected TenantExcelVO tenantDOToTenantExcelVO(TenantDO tenantDO) { - if ( tenantDO == null ) { - return null; - } - - TenantExcelVO tenantExcelVO = new TenantExcelVO(); - - tenantExcelVO.setId( tenantDO.getId() ); - tenantExcelVO.setName( tenantDO.getName() ); - tenantExcelVO.setContactName( tenantDO.getContactName() ); - tenantExcelVO.setContactMobile( tenantDO.getContactMobile() ); - tenantExcelVO.setStatus( tenantDO.getStatus() ); - tenantExcelVO.setCreateTime( tenantDO.getCreateTime() ); - - return tenantExcelVO; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/tenant/TenantPackageConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/tenant/TenantPackageConvertImpl.java deleted file mode 100644 index 978f1f8..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/tenant/TenantPackageConvertImpl.java +++ /dev/null @@ -1,136 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.tenant; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages.TenantPackageCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages.TenantPackageRespVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages.TenantPackageSimpleRespVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages.TenantPackageUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantPackageDO; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class TenantPackageConvertImpl implements TenantPackageConvert { - - @Override - public TenantPackageDO convert(TenantPackageCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - TenantPackageDO.TenantPackageDOBuilder tenantPackageDO = TenantPackageDO.builder(); - - tenantPackageDO.name( bean.getName() ); - tenantPackageDO.status( bean.getStatus() ); - tenantPackageDO.remark( bean.getRemark() ); - Set set = bean.getMenuIds(); - if ( set != null ) { - tenantPackageDO.menuIds( new LinkedHashSet( set ) ); - } - - return tenantPackageDO.build(); - } - - @Override - public TenantPackageDO convert(TenantPackageUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - TenantPackageDO.TenantPackageDOBuilder tenantPackageDO = TenantPackageDO.builder(); - - tenantPackageDO.id( bean.getId() ); - tenantPackageDO.name( bean.getName() ); - tenantPackageDO.status( bean.getStatus() ); - tenantPackageDO.remark( bean.getRemark() ); - Set set = bean.getMenuIds(); - if ( set != null ) { - tenantPackageDO.menuIds( new LinkedHashSet( set ) ); - } - - return tenantPackageDO.build(); - } - - @Override - public TenantPackageRespVO convert(TenantPackageDO bean) { - if ( bean == null ) { - return null; - } - - TenantPackageRespVO tenantPackageRespVO = new TenantPackageRespVO(); - - tenantPackageRespVO.setName( bean.getName() ); - tenantPackageRespVO.setStatus( bean.getStatus() ); - tenantPackageRespVO.setRemark( bean.getRemark() ); - Set set = bean.getMenuIds(); - if ( set != null ) { - tenantPackageRespVO.setMenuIds( new LinkedHashSet( set ) ); - } - tenantPackageRespVO.setId( bean.getId() ); - tenantPackageRespVO.setCreateTime( bean.getCreateTime() ); - - return tenantPackageRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( TenantPackageDO tenantPackageDO : list ) { - list1.add( convert( tenantPackageDO ) ); - } - - return list1; - } - - @Override - public PageResult convertPage(PageResult page) { - if ( page == null ) { - return null; - } - - PageResult pageResult = new PageResult(); - - pageResult.setList( convertList( page.getList() ) ); - pageResult.setTotal( page.getTotal() ); - - return pageResult; - } - - @Override - public List convertList02(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( TenantPackageDO tenantPackageDO : list ) { - list1.add( tenantPackageDOToTenantPackageSimpleRespVO( tenantPackageDO ) ); - } - - return list1; - } - - protected TenantPackageSimpleRespVO tenantPackageDOToTenantPackageSimpleRespVO(TenantPackageDO tenantPackageDO) { - if ( tenantPackageDO == null ) { - return null; - } - - TenantPackageSimpleRespVO tenantPackageSimpleRespVO = new TenantPackageSimpleRespVO(); - - tenantPackageSimpleRespVO.setId( tenantPackageDO.getId() ); - tenantPackageSimpleRespVO.setName( tenantPackageDO.getName() ); - - return tenantPackageSimpleRespVO; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/user/UserConvertImpl.java b/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/user/UserConvertImpl.java deleted file mode 100644 index b340abc..0000000 --- a/yudao-module-system/yudao-module-system-biz/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/user/UserConvertImpl.java +++ /dev/null @@ -1,291 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.user; - -import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileRespVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserImportExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageItemRespVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserSimpleRespVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; -import cn.iocoder.yudao.module.system.dal.dataobject.social.SocialUserDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Generated; - -@Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2025-01-02T09:04:08+0800", - comments = "version: 1.5.3.Final, compiler: javac, environment: Java 1.8.0_291 (Oracle Corporation)" -) -public class UserConvertImpl implements UserConvert { - - @Override - public UserPageItemRespVO convert(AdminUserDO bean) { - if ( bean == null ) { - return null; - } - - UserPageItemRespVO userPageItemRespVO = new UserPageItemRespVO(); - - userPageItemRespVO.setUsername( bean.getUsername() ); - userPageItemRespVO.setNickname( bean.getNickname() ); - userPageItemRespVO.setRemark( bean.getRemark() ); - userPageItemRespVO.setEmail( bean.getEmail() ); - userPageItemRespVO.setMobile( bean.getMobile() ); - userPageItemRespVO.setSex( bean.getSex() ); - userPageItemRespVO.setAvatar( bean.getAvatar() ); - userPageItemRespVO.setId( bean.getId() ); - userPageItemRespVO.setStatus( bean.getStatus() ); - userPageItemRespVO.setLoginIp( bean.getLoginIp() ); - userPageItemRespVO.setLoginDate( bean.getLoginDate() ); - userPageItemRespVO.setCreateTime( bean.getCreateTime() ); - - return userPageItemRespVO; - } - - @Override - public AdminUserDO convert(UserCreateReqVO bean) { - if ( bean == null ) { - return null; - } - - AdminUserDO.AdminUserDOBuilder adminUserDO = AdminUserDO.builder(); - - adminUserDO.username( bean.getUsername() ); - adminUserDO.password( bean.getPassword() ); - adminUserDO.nickname( bean.getNickname() ); - adminUserDO.remark( bean.getRemark() ); - adminUserDO.email( bean.getEmail() ); - adminUserDO.mobile( bean.getMobile() ); - adminUserDO.sex( bean.getSex() ); - adminUserDO.avatar( bean.getAvatar() ); - - return adminUserDO.build(); - } - - @Override - public AdminUserDO convert(UserUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - AdminUserDO.AdminUserDOBuilder adminUserDO = AdminUserDO.builder(); - - adminUserDO.id( bean.getId() ); - adminUserDO.username( bean.getUsername() ); - adminUserDO.nickname( bean.getNickname() ); - adminUserDO.remark( bean.getRemark() ); - adminUserDO.email( bean.getEmail() ); - adminUserDO.mobile( bean.getMobile() ); - adminUserDO.sex( bean.getSex() ); - adminUserDO.avatar( bean.getAvatar() ); - - return adminUserDO.build(); - } - - @Override - public UserExcelVO convert02(AdminUserDO bean) { - if ( bean == null ) { - return null; - } - - UserExcelVO userExcelVO = new UserExcelVO(); - - userExcelVO.setId( bean.getId() ); - userExcelVO.setUsername( bean.getUsername() ); - userExcelVO.setNickname( bean.getNickname() ); - userExcelVO.setEmail( bean.getEmail() ); - userExcelVO.setMobile( bean.getMobile() ); - userExcelVO.setSex( bean.getSex() ); - userExcelVO.setStatus( bean.getStatus() ); - userExcelVO.setLoginIp( bean.getLoginIp() ); - userExcelVO.setLoginDate( bean.getLoginDate() ); - - return userExcelVO; - } - - @Override - public AdminUserDO convert(UserImportExcelVO bean) { - if ( bean == null ) { - return null; - } - - AdminUserDO.AdminUserDOBuilder adminUserDO = AdminUserDO.builder(); - - adminUserDO.username( bean.getUsername() ); - adminUserDO.nickname( bean.getNickname() ); - adminUserDO.email( bean.getEmail() ); - adminUserDO.mobile( bean.getMobile() ); - adminUserDO.sex( bean.getSex() ); - adminUserDO.status( bean.getStatus() ); - - return adminUserDO.build(); - } - - @Override - public UserProfileRespVO convert03(AdminUserDO bean) { - if ( bean == null ) { - return null; - } - - UserProfileRespVO userProfileRespVO = new UserProfileRespVO(); - - userProfileRespVO.setUsername( bean.getUsername() ); - userProfileRespVO.setNickname( bean.getNickname() ); - userProfileRespVO.setRemark( bean.getRemark() ); - userProfileRespVO.setEmail( bean.getEmail() ); - userProfileRespVO.setMobile( bean.getMobile() ); - userProfileRespVO.setSex( bean.getSex() ); - userProfileRespVO.setAvatar( bean.getAvatar() ); - userProfileRespVO.setId( bean.getId() ); - userProfileRespVO.setStatus( bean.getStatus() ); - userProfileRespVO.setLoginIp( bean.getLoginIp() ); - userProfileRespVO.setLoginDate( bean.getLoginDate() ); - userProfileRespVO.setCreateTime( bean.getCreateTime() ); - - return userProfileRespVO; - } - - @Override - public List convertList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( RoleDO roleDO : list ) { - list1.add( roleDOToRole( roleDO ) ); - } - - return list1; - } - - @Override - public AdminUserDO convert(UserProfileUpdateReqVO bean) { - if ( bean == null ) { - return null; - } - - AdminUserDO.AdminUserDOBuilder adminUserDO = AdminUserDO.builder(); - - adminUserDO.nickname( bean.getNickname() ); - adminUserDO.email( bean.getEmail() ); - adminUserDO.mobile( bean.getMobile() ); - adminUserDO.sex( bean.getSex() ); - - return adminUserDO.build(); - } - - @Override - public AdminUserDO convert(UserProfileUpdatePasswordReqVO bean) { - if ( bean == null ) { - return null; - } - - AdminUserDO.AdminUserDOBuilder adminUserDO = AdminUserDO.builder(); - - return adminUserDO.build(); - } - - @Override - public List convertList03(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( SocialUserDO socialUserDO : list ) { - list1.add( socialUserDOToSocialUser( socialUserDO ) ); - } - - return list1; - } - - @Override - public List convertList04(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( list.size() ); - for ( AdminUserDO adminUserDO : list ) { - list1.add( adminUserDOToUserSimpleRespVO( adminUserDO ) ); - } - - return list1; - } - - @Override - public AdminUserRespDTO convert4(AdminUserDO bean) { - if ( bean == null ) { - return null; - } - - AdminUserRespDTO adminUserRespDTO = new AdminUserRespDTO(); - - adminUserRespDTO.setId( bean.getId() ); - adminUserRespDTO.setNickname( bean.getNickname() ); - adminUserRespDTO.setStatus( bean.getStatus() ); - adminUserRespDTO.setMobile( bean.getMobile() ); - - return adminUserRespDTO; - } - - @Override - public List convertList4(List users) { - if ( users == null ) { - return null; - } - - List list = new ArrayList( users.size() ); - for ( AdminUserDO adminUserDO : users ) { - list.add( convert4( adminUserDO ) ); - } - - return list; - } - - protected UserProfileRespVO.Role roleDOToRole(RoleDO roleDO) { - if ( roleDO == null ) { - return null; - } - - UserProfileRespVO.Role role = new UserProfileRespVO.Role(); - - role.setId( roleDO.getId() ); - role.setName( roleDO.getName() ); - - return role; - } - - protected UserProfileRespVO.SocialUser socialUserDOToSocialUser(SocialUserDO socialUserDO) { - if ( socialUserDO == null ) { - return null; - } - - UserProfileRespVO.SocialUser socialUser = new UserProfileRespVO.SocialUser(); - - socialUser.setType( socialUserDO.getType() ); - socialUser.setOpenid( socialUserDO.getOpenid() ); - - return socialUser; - } - - protected UserSimpleRespVO adminUserDOToUserSimpleRespVO(AdminUserDO adminUserDO) { - if ( adminUserDO == null ) { - return null; - } - - UserSimpleRespVO userSimpleRespVO = new UserSimpleRespVO(); - - userSimpleRespVO.setId( adminUserDO.getId() ); - userSimpleRespVO.setNickname( adminUserDO.getNickname() ); - - return userSimpleRespVO; - } -}