From ff45a6ce2287d44fe0274768c1edcb0b441c8d56 Mon Sep 17 00:00:00 2001 From: liyongjie <1318551549@qq.com> Date: Thu, 28 Mar 2024 22:38:44 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=89=8D=E5=8F=B0=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu-gen/src/main/resources/vm/vue/index.vue.vm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm b/muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm index 6296014..8f2aeb0 100644 --- a/muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm +++ b/muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm @@ -170,7 +170,7 @@ - + { - this.${businessName}List = response.rows; - this.total = response.total; + list${BusinessName}(this.queryParams).then(res => { + this.${businessName}List = res.data.rows; + this.total = res.data.total; this.loading = false; }); }, From 5a24552e9a09921863cf9e6ebaddd81310e92a3b Mon Sep 17 00:00:00 2001 From: liyongjie <1318551549@qq.com> Date: Fri, 29 Mar 2024 09:08:33 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=89=8D=E5=8F=B0=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm b/muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm index 8f2aeb0..1640107 100644 --- a/muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm +++ b/muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm @@ -448,8 +448,8 @@ export default { #end #end list${BusinessName}(this.queryParams).then(res => { - this.${businessName}List = res.data.rows; - this.total = res.data.total; + this.${businessName}List = res.rows; + this.total = res.total; this.loading = false; }); }, From 7a1cc797b0dc6cbb319655bb9cfeed73f3ad22dc Mon Sep 17 00:00:00 2001 From: liyongjie <1318551549@qq.com> Date: Fri, 29 Mar 2024 09:11:19 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=89=8D=E5=8F=B0=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm b/muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm index 1640107..8f2aeb0 100644 --- a/muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm +++ b/muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm @@ -448,8 +448,8 @@ export default { #end #end list${BusinessName}(this.queryParams).then(res => { - this.${businessName}List = res.rows; - this.total = res.total; + this.${businessName}List = res.data.rows; + this.total = res.data.total; this.loading = false; }); }, From 2356746be84d92e146a3adc54128b58e460bc4df Mon Sep 17 00:00:00 2001 From: liyongjie <1318551549@qq.com> Date: Fri, 29 Mar 2024 12:09:25 +0800 Subject: [PATCH 4/6] =?UTF-8?q?xml=E8=AF=BB=E5=8F=96=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/generator/GenTableColumnMapper.xml | 8 +++---- .../mapper/generator/GenTableMapper.xml | 12 +++++----- .../resources/mapper/job/SysJobLogMapper.xml | 6 ++--- .../resources/mapper/job/SysJobMapper.xml | 8 +++---- .../mapper/system/SysConfigMapper.xml | 10 ++++---- .../resources/mapper/system/SysDeptMapper.xml | 8 +++---- .../mapper/system/SysDictDataMapper.xml | 10 ++++---- .../mapper/system/SysDictTypeMapper.xml | 8 +++---- .../mapper/system/SysLogininforMapper.xml | 6 ++--- .../resources/mapper/system/SysMenuMapper.xml | 12 +++++----- .../mapper/system/SysNoticeMapper.xml | 8 +++---- .../mapper/system/SysOperLogMapper.xml | 6 ++--- .../resources/mapper/system/SysPostMapper.xml | 8 +++---- .../mapper/system/SysRoleDeptMapper.xml | 2 +- .../resources/mapper/system/SysRoleMapper.xml | 8 +++---- .../mapper/system/SysRoleMenuMapper.xml | 2 +- .../resources/mapper/system/SysUserMapper.xml | 24 +++++++++---------- .../mapper/system/SysUserPostMapper.xml | 2 +- .../mapper/system/SysUserRoleMapper.xml | 4 ++-- 19 files changed, 76 insertions(+), 76 deletions(-) diff --git a/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml index 59f40b1..afb0ac6 100644 --- a/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -33,7 +33,7 @@ select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column - where table_id = #{tableId} @@ -60,7 +60,7 @@ order by ordinal_position - + insert into gen_table_column ( table_id, column_name, @@ -104,7 +104,7 @@ ) - + update gen_table_column column_comment = #{columnComment}, diff --git a/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableMapper.xml b/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableMapper.xml index ba659e1..198066a 100644 --- a/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -30,7 +30,7 @@ - + @@ -59,7 +59,7 @@ select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, tpl_web_type, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table - @@ -77,7 +77,7 @@ - select table_schema as database_name,table_name, table_comment, create_time, update_time from information_schema.tables where @@ -162,7 +162,7 @@ where table_schema not in ('information_schema','mysql','performance_schema','sys') - + insert into gen_table ( database_name, table_name, @@ -200,7 +200,7 @@ ) - + update gen_table table_name = #{tableName}, diff --git a/muyu-modules/muyu-job/src/main/resources/mapper/job/SysJobLogMapper.xml b/muyu-modules/muyu-job/src/main/resources/mapper/job/SysJobLogMapper.xml index 8e590e7..8a5ac22 100644 --- a/muyu-modules/muyu-job/src/main/resources/mapper/job/SysJobLogMapper.xml +++ b/muyu-modules/muyu-job/src/main/resources/mapper/job/SysJobLogMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_job_log - @@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" truncate table sys_job_log - + insert into sys_job_log( job_log_id, job_name, diff --git a/muyu-modules/muyu-job/src/main/resources/mapper/job/SysJobMapper.xml b/muyu-modules/muyu-job/src/main/resources/mapper/job/SysJobMapper.xml index 9a98bf4..1b0b21b 100644 --- a/muyu-modules/muyu-job/src/main/resources/mapper/job/SysJobMapper.xml +++ b/muyu-modules/muyu-job/src/main/resources/mapper/job/SysJobMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_job - @@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update sys_job job_name = #{jobName}, @@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where job_id = #{jobId} - + insert into sys_job( job_id, job_name, diff --git a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysConfigMapper.xml b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysConfigMapper.xml index e296b52..966cce3 100644 --- a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysConfigMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -33,12 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - @@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where config_key = #{configKey} limit 1 - + insert into sys_config ( config_name, config_key, @@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update sys_config config_name = #{configName}, diff --git a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysDeptMapper.xml b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysDeptMapper.xml index 8377ef6..71a626b 100644 --- a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysDeptMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_dept d - where d.del_flag = '0' @@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1 - + insert into sys_dept( dept_id, parent_id, @@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update sys_dept parent_id = #{parentId}, diff --git a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysDictDataMapper.xml b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysDictDataMapper.xml index cc543e4..668b8bb 100644 --- a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_dict_data - @@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by dict_sort asc - where status = '0' and dict_type = #{dictType} order by dict_sort asc @@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update sys_dict_data dict_sort = #{dictSort}, @@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType} - + insert into sys_dict_data( dict_sort, dict_label, diff --git a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysDictTypeMapper.xml b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysDictTypeMapper.xml index a16581f..d8dee1d 100644 --- a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_dict_type - @@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update sys_dict_type dict_name = #{dictName}, @@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dict_id = #{dictId} - + insert into sys_dict_type( dict_name, dict_type, diff --git a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysLogininforMapper.xml b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysLogininforMapper.xml index 9a3f492..768d6f0 100644 --- a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -13,12 +13,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into sys_logininfor (user_name, status, ipaddr, msg, access_time) values (#{userName}, #{status}, #{ipaddr}, #{msg}, sysdate()) - select info_id, user_name, ipaddr, status, msg, access_time from sys_logininfor diff --git a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysMenuMapper.xml b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysMenuMapper.xml index fce89c4..fcb8072 100644 --- a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysMenuMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -32,7 +32,7 @@ from sys_menu - @@ -54,7 +54,7 @@ order by m.parent_id, m.order_num - select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time from sys_menu m left join sys_role_menu rm on m.menu_id = rm.menu_id @@ -127,12 +127,12 @@ select count(1) from sys_menu where parent_id = #{menuId} - where menu_name=#{menuName} and parent_id = #{parentId} limit 1 - + update sys_menu menu_name = #{menuName}, @@ -155,7 +155,7 @@ where menu_id = #{menuId} - + insert into sys_menu( menu_id, parent_id, diff --git a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysNoticeMapper.xml b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysNoticeMapper.xml index d73d8f6..cb15200 100644 --- a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where notice_id = #{noticeId} - @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into sys_notice ( notice_title, notice_type, @@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update sys_notice notice_title = #{noticeTitle}, diff --git a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysOperLogMapper.xml b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysOperLogMapper.xml index f35b5df..d484bb8 100644 --- a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -28,12 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_oper_log - + insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_param, json_result, status, error_msg, cost_time, oper_time) values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate()) - diff --git a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysPostMapper.xml b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysPostMapper.xml index 93616ff..4146a19 100644 --- a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysPostMapper.xml +++ b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysPostMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_post - @@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where post_code=#{postCode} limit 1 - + update sys_post post_code = #{postCode}, @@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where post_id = #{postId} - + insert into sys_post( post_id, post_code, diff --git a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysRoleDeptMapper.xml index 2ca1f5a..79ee876 100644 --- a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysRoleMapper.xml b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysRoleMapper.xml index 8ab4b92..4a635d4 100644 --- a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysRoleMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_dept d on u.dept_id = d.dept_id - where r.del_flag = '0' @@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where r.role_key=#{roleKey} and r.del_flag = '0' limit 1 - + insert into sys_role( role_id, role_name, @@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update sys_role role_name = #{roleName}, diff --git a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysRoleMenuMapper.xml index 231dcf5..15fbc96 100644 --- a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysUserMapper.xml b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysUserMapper.xml index a2464c3..07885a4 100644 --- a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysUserMapper.xml +++ b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysUserMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -23,11 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_role r on r.role_id = ur.role_id - select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u left join sys_dept d on u.dept_id = d.dept_id where u.del_flag = '0' @@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.dataScope} - select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time from sys_user u left join sys_dept d on u.dept_id = d.dept_id @@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.dataScope} - select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time from sys_user u left join sys_dept d on u.dept_id = d.dept_id @@ -142,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1 - + insert into sys_user( user_id, dept_id, @@ -174,7 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update sys_user dept_id = #{deptId}, @@ -195,15 +195,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where user_id = #{userId} - + update sys_user set status = #{status} where user_id = #{userId} - + update sys_user set avatar = #{avatar} where user_name = #{userName} - + update sys_user set password = #{password} where user_name = #{userName} diff --git a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysUserPostMapper.xml b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysUserPostMapper.xml index ac35414..9cbcd2d 100644 --- a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysUserRoleMapper.xml b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysUserRoleMapper.xml index 5511cdb..9dd1ca9 100644 --- a/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/muyu-modules/muyu-system/muyu-system-server/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + delete from sys_user_role where user_id=#{userId} and role_id=#{roleId} From 3ff308b45c17093dd19e023993c1cb079c468dda Mon Sep 17 00:00:00 2001 From: liyongjie <1318551549@qq.com> Date: Fri, 29 Mar 2024 23:12:48 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=95=85=E9=9A=9C=E7=A0=81=E5=9F=BA?= =?UTF-8?q?=E6=9C=AC=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- muyu-common/muyu-common-core/pom.xml | 17 ++- .../muyu-business-common/pom.xml | 5 - .../muyu/business/domain/FaultCodeInfo.java | 119 ++++++++++++++++++ .../business/domain/req/FaultCodeReq.java | 28 +++++ .../business/domain/req/FaultCodesAddReq.java | 67 ++++++++++ .../business/domain/req/FaultCodesUpdReq.java | 70 +++++++++++ .../domain/res/FaultCodeResponse.java | 51 ++++++++ .../controller/FaultCodesController.java | 94 ++++++++++++++ .../business/mapper/FaultCodesMapper.java | 65 ++++++++++ .../business/service/FaultCodesService.java | 72 +++++++++++ .../service/impl/FaultCodesServiceImpl.java | 119 ++++++++++++++++++ .../mapper/business/FaultCodesMapper.xml | 38 ++++++ .../sql/fault_code_info/fault_code_info.sql | 27 ++++ 13 files changed, 766 insertions(+), 6 deletions(-) create mode 100644 muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/FaultCodeInfo.java create mode 100644 muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultCodeReq.java create mode 100644 muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultCodesAddReq.java create mode 100644 muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultCodesUpdReq.java create mode 100644 muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/res/FaultCodeResponse.java create mode 100644 muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/controller/FaultCodesController.java create mode 100644 muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/mapper/FaultCodesMapper.java create mode 100644 muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/service/FaultCodesService.java create mode 100644 muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/service/impl/FaultCodesServiceImpl.java create mode 100644 muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/business/FaultCodesMapper.xml create mode 100644 muyu-modules/muyu-business/sql/fault_code_info/fault_code_info.sql diff --git a/muyu-common/muyu-common-core/pom.xml b/muyu-common/muyu-common-core/pom.xml index ae5fd1b..489f81e 100644 --- a/muyu-common/muyu-common-core/pom.xml +++ b/muyu-common/muyu-common-core/pom.xml @@ -77,7 +77,22 @@ jjwt - + + + com.baomidou + mybatis-plus-boot-starter + 3.5.3.1 + + + com.github.jsqlparser + jsqlparser + + + org.mybatis + mybatis + + + diff --git a/muyu-modules/muyu-business/muyu-business-common/pom.xml b/muyu-modules/muyu-business/muyu-business-common/pom.xml index dcaea1b..b34c785 100644 --- a/muyu-modules/muyu-business/muyu-business-common/pom.xml +++ b/muyu-modules/muyu-business/muyu-business-common/pom.xml @@ -11,11 +11,6 @@ muyu-business-common - - 20 - 20 - UTF-8 - com.muyu diff --git a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/FaultCodeInfo.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/FaultCodeInfo.java new file mode 100644 index 0000000..99ca8c4 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/FaultCodeInfo.java @@ -0,0 +1,119 @@ +package com.muyu.business.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.*; +import com.muyu.business.domain.req.*; +import lombok.*; +import lombok.experimental.*; +import org.springframework.format.annotation.*; + +import java.io.*; +import java.util.*; + +/** + * 故障码对象 fault_codes + * + * @author Li YongJie + * @date 2024-03-28 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("fault_code_info") +public class FaultCodeInfo implements Serializable { + private static final long serialVersionUID = 1L; + + /** 故障码主键 */ + @TableId(type = IdType.AUTO) + private Long faultId; + + /** 故障名称 */ + private String faultName; + + /** 故障码 */ + private String faultCode; + + /** 故障类型:1-通讯丢失故障 2-车身故障 3-底盘故障 4-电子围栏故障 5-其他故障 */ + private Integer faultType; + + /** 故障等级:1-高级故障 2-中级故障 3-低级故障 */ + private Integer faultLevel; + + /** 是否产生报警（Y正常 N报警） */ + private String alarmFlag; + + /** 故障描述 */ + private String faultDesc; + + /** 故障位 */ + private Integer faultLocation; + + /** 故障值 */ + private Long faultValue; + + /** 故障码状态（0正常 1停用） */ + private String status; + + /** 删除标志（0存在 2删除） */ + private String delFlag; + /** + * 创建者 + */ + private String createBy; + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + /** + * 更新者 + */ + private String updateBy; + /** + * 更新时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + /** + * 备注 + */ + private String remark; + + public static FaultCodeInfo addFaultCodesReq(FaultCodesAddReq faultCodes) { + return FaultCodeInfo.builder() + .faultName(faultCodes.getFaultName()) + .faultCode(faultCodes.getFaultCode()) + .faultType(faultCodes.getFaultType()) + .faultLevel(faultCodes.getFaultLevel()) + .alarmFlag(faultCodes.getAlarmFlag()) + .faultDesc(faultCodes.getFaultDesc()) + .faultLocation(faultCodes.getFaultLocation()) + .faultValue(faultCodes.getFaultValue()) + .status(faultCodes.getStatus()) + .delFlag(faultCodes.getDelFlag()) + .createBy(faultCodes.getCreateBy()) + .createTime(faultCodes.getCreateTime()) + .build(); + } + + public static FaultCodeInfo updFaultCodesReq(FaultCodesUpdReq faultCodes) { + return FaultCodeInfo.builder() + .faultId(faultCodes.getFaultId()) + .faultName(faultCodes.getFaultName()) + .faultCode(faultCodes.getFaultCode()) + .faultType(faultCodes.getFaultType()) + .faultLevel(faultCodes.getFaultLevel()) + .alarmFlag(faultCodes.getAlarmFlag()) + .faultDesc(faultCodes.getFaultDesc()) + .faultLocation(faultCodes.getFaultLocation()) + .faultValue(faultCodes.getFaultValue()) + .status(faultCodes.getStatus()) + .delFlag(faultCodes.getDelFlag()) + .updateBy(faultCodes.getUpdateBy()) + .updateTime(faultCodes.getUpdateTime()) + .build(); + } +} diff --git a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultCodeReq.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultCodeReq.java new file mode 100644 index 0000000..a0140e7 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultCodeReq.java @@ -0,0 +1,28 @@ +package com.muyu.business.domain.req; + +import com.baomidou.mybatisplus.core.conditions.*; +import com.baomidou.mybatisplus.core.conditions.segments.*; +import com.muyu.business.domain.*; +import lombok.*; + +import java.io.*; + +/** + * 查询故障码对象 + * @Author LiYonJie + * @Date 2024/3/28 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class FaultCodeReq implements Serializable { + /** 故障名称 */ + private String faultName; + + /** 故障码 */ + private String faultCode; + + /** 是否产生报警（Y正常 N报警） */ + private String alarmFlag; +} diff --git a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultCodesAddReq.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultCodesAddReq.java new file mode 100644 index 0000000..e1d88cd --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultCodesAddReq.java @@ -0,0 +1,67 @@ +package com.muyu.business.domain.req; + +import com.fasterxml.jackson.annotation.*; +import lombok.*; +import org.springframework.format.annotation.*; + +import javax.validation.constraints.*; +import java.io.*; +import java.util.*; + +/** + * 新增故障码对象 + * @author LiYonJie + * @date 2024/3/28 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class FaultCodesAddReq implements Serializable { + /** 故障名称 */ + @NotBlank(message = "故障名称不能为空") + private String faultName; + + /** 故障码 */ + @NotBlank(message = "故障码不能为空") + private String faultCode; + + /** 故障类型:1-通讯丢失故障 2-车身故障 3-底盘故障 4-电子围栏故障 5-其他故障 */ + @NotNull(message = "故障类型不能为空") + private Integer faultType; + + /** 故障等级:1-高级故障 2-中级故障 3-低级故障 */ + @NotNull(message = "故障等级不能为空") + private Integer faultLevel; + + /** 是否产生报警（Y正常 N报警） */ + private String alarmFlag; + + /** 故障描述 */ + @NotBlank(message = "故障描述不能为空") + private String faultDesc; + + /** 故障位 */ + @NotNull(message = "故障位不能为空") + private Integer faultLocation; + + /** 故障值 */ + @NotNull(message = "故障值不能为空") + private Long faultValue; + + /** 故障码状态（0正常 1停用） */ + private String status; + + /** 删除标志（0存在 2删除） */ + private String delFlag; + /** + * 创建者 + */ + private String createBy; + /* + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; +} diff --git a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultCodesUpdReq.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultCodesUpdReq.java new file mode 100644 index 0000000..73c90f1 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultCodesUpdReq.java @@ -0,0 +1,70 @@ +package com.muyu.business.domain.req; + +import com.fasterxml.jackson.annotation.*; +import lombok.*; +import org.springframework.format.annotation.*; + +import javax.validation.constraints.*; +import java.io.*; +import java.util.*; + +/** + * 编辑故障码对象 + * @author LiYonJie + * @date 2024/3/28 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class FaultCodesUpdReq implements Serializable { + /** 故障码主键 */ + private Long faultId; + + /** 故障名称 */ + @NotBlank(message = "故障名称不能为空") + private String faultName; + + /** 故障码 */ + @NotBlank(message = "故障码不能为空") + private String faultCode; + + /** 故障类型:1-通讯丢失故障 2-车身故障 3-底盘故障 4-电子围栏故障 5-其他故障 */ + @NotNull(message = "故障类型不能为空") + private Integer faultType; + + /** 故障等级:1-高级故障 2-中级故障 3-低级故障 */ + @NotNull(message = "故障等级不能为空") + private Integer faultLevel; + + /** 是否产生报警（Y正常 N报警） */ + private String alarmFlag; + + /** 故障描述 */ + @NotBlank(message = "故障描述不能为空") + private String faultDesc; + + /** 故障位 */ + @NotNull(message = "故障位不能为空") + private Integer faultLocation; + + /** 故障值 */ + @NotNull(message = "故障值不能为空") + private Long faultValue; + + /** 故障码状态（0正常 1停用） */ + private String status; + + /** 删除标志（0存在 2删除） */ + private String delFlag; + /** + * 更新者 + */ + private String updateBy; + /** + * 更新时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; +} diff --git a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/res/FaultCodeResponse.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/res/FaultCodeResponse.java new file mode 100644 index 0000000..1a8cf1f --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/res/FaultCodeResponse.java @@ -0,0 +1,51 @@ +package com.muyu.business.domain.res; + +import com.baomidou.mybatisplus.annotation.*; +import com.muyu.business.domain.*; +import lombok.*; +import lombok.experimental.*; + +import java.io.*; + +/** + * 故障码响应类 + * + * @Author LiYonJie + * @Date 2024/3/29 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper=false) +public class FaultCodeResponse implements Serializable { + /** 故障码主键 */ + private Long faultId; + + /** 故障名称 */ + private String faultName; + + /** 故障码 */ + private String faultCode; + + /** 故障类型:1-通讯丢失故障 2-车身故障 3-底盘故障 4-电子围栏故障 5-其他故障 */ + private Integer faultType; + + /** 故障等级:1-高级故障 2-中级故障 3-低级故障 */ + private Integer faultLevel; + + /** 是否产生报警（0正常 1报警） */ + private String alarmFlag; + + /** 故障描述 */ + private String faultDesc; + + /** 故障位 */ + private Integer faultLocation; + + /** 故障值 */ + private Long faultValue; + + /** 故障码状态（0正常 1停用） */ + private String status; +} diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/controller/FaultCodesController.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/controller/FaultCodesController.java new file mode 100644 index 0000000..47a78a8 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/controller/FaultCodesController.java @@ -0,0 +1,94 @@ +package com.muyu.business.controller; + +import com.muyu.business.domain.*; +import com.muyu.business.domain.req.*; +import com.muyu.business.domain.res.*; +import com.muyu.business.service.*; +import com.muyu.common.core.domain.*; +import com.muyu.common.core.web.controller.*; +import com.muyu.common.core.web.page.*; +import com.muyu.common.log.annotation.*; +import com.muyu.common.log.enums.*; +import com.muyu.common.security.annotation.*; +import org.springframework.beans.factory.annotation.*; +import org.springframework.validation.annotation.*; +import org.springframework.web.bind.annotation.*; + +import java.util.*; + +/** + * 故障码Controller + * + * @author Li YongJie + * @date 2024-03-28 + */ +@RestController +@RequestMapping("/faultCodes") +public class FaultCodesController extends BaseController { + + /** + * 注入故障码Service + */ + @Autowired + private FaultCodesService faultCodesService; + + /** + * 查询故障码列表 + */ + @RequiresPermissions("business:faultCodes:list") + @GetMapping("/list") + public Result list(FaultCodeReq faultCodes) { + startPage(); + List list = faultCodesService.selectFaultCodesList(faultCodes); + return getDataTable(list); + } + + /** + * 新增故障码 + */ + @RequiresPermissions("business:faultCodes:add") + @Log(title = "故障码", businessType = BusinessType.INSERT) + @PostMapping + public Result add(@RequestBody @Validated FaultCodesAddReq faultCodesAddReq) { + return toAjax(faultCodesService.insertFaultCodes(FaultCodeInfo.addFaultCodesReq(faultCodesAddReq))); + } + + /** + * 获取故障码详细信息 + */ + @RequiresPermissions("business:faultCodes:query") + @GetMapping(value = "/{faultId}") + public Result getInfo(@PathVariable("faultId") Long faultId) { + return success(faultCodesService.selectFaultCodesByFaultId(faultId)); + } + + /** + * 修改故障码 + */ + @RequiresPermissions("business:faultCodes:edit") + @Log(title = "故障码", businessType = BusinessType.UPDATE) + @PutMapping + public Result edit(@RequestBody @Validated FaultCodesUpdReq faultCodesUpdReq) { + return toAjax(faultCodesService.updateFaultCodesStatus(FaultCodeInfo.updFaultCodesReq(faultCodesUpdReq))); + } + + /** + * 修改故障码状态 + */ + @RequiresPermissions("business:faultCodes:edit") + @Log(title = "故障码", businessType = BusinessType.UPDATE) + @PutMapping("/changeStatus") + public Result changeStatus(@RequestBody FaultCodesUpdReq faultCodesUpdReq) { + return toAjax(faultCodesService.updateFaultCodes(FaultCodeInfo.updFaultCodesReq(faultCodesUpdReq))); + } + + /** + * 删除故障码 + */ + @RequiresPermissions("business:faultCodes:remove") + @Log(title = "故障码", businessType = BusinessType.DELETE) + @DeleteMapping("/{faultIds}") + public Result remove(@PathVariable Long[] faultIds) { + return toAjax(faultCodesService.deleteFaultCodesByFaultIds(faultIds)); + } +} diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/mapper/FaultCodesMapper.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/mapper/FaultCodesMapper.java new file mode 100644 index 0000000..e19b4d8 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/mapper/FaultCodesMapper.java @@ -0,0 +1,65 @@ +package com.muyu.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.*; +import com.muyu.business.domain.*; +import com.muyu.business.domain.req.*; +import com.muyu.business.domain.res.*; + +import java.util.*; + +/** + * 故障码Mapper接口 + * + * @author Li YongJie + * @date 2024-03-28 + */ +public interface FaultCodesMapper extends BaseMapper { + + /** + * 查询故障码列表 + * + * @param faultCodeReq 故障码 + * @return 故障码集合 + */ +// public List selectFaultCodesList(FaultCodeReq faultCodeReq); + + /** + * 新增故障码 + * + * @param faultCodes 故障码 + * @return 结果 + */ +// public int insertFaultCodes(FaultCodeInfo faultCodes); + + /** + * 查询故障码 + * + * @param faultId 故障码主键 + * @return 故障码 + */ +// public FaultCodeInfo selectFaultCodesByFaultId(Long faultId); + + /** + * 修改故障码 + * + * @param faultCodes 故障码 + * @return 结果 + */ +// public int updateFaultCodes(FaultCodeInfo faultCodes); + + /** + * 删除故障码 + * + * @param faultId 故障码主键 + * @return 结果 + */ +// public int deleteFaultCodesByFaultId(Long faultId); + + /** + * 批量删除故障码 + * + * @param faultIds 需要删除的数据主键集合 + * @return 结果 + */ +// public int deleteFaultCodesByFaultIds(Long[] faultIds); +} diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/service/FaultCodesService.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/service/FaultCodesService.java new file mode 100644 index 0000000..aa33f70 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/service/FaultCodesService.java @@ -0,0 +1,72 @@ +package com.muyu.business.service; + +import com.baomidou.mybatisplus.extension.service.*; +import com.muyu.business.domain.*; +import com.muyu.business.domain.req.*; +import com.muyu.business.domain.res.*; + +import java.util.*; + +/** + * 故障码Service接口 + * + * @author Li YongJie + * @date 2024-03-28 + */ +public interface FaultCodesService extends IService { + /** + * 查询故障码列表 + * + * @param faultCodes 故障码 + * @return 故障码集合 + */ + public List selectFaultCodesList(FaultCodeReq faultCodes); + + /** + * 新增故障码 + * + * @param faultCodes 故障码 + * @return 结果 + */ + public int insertFaultCodes(FaultCodeInfo faultCodes); + + /** + * 故障码详情 + * + * @param faultId 故障码主键 + * @return 故障码 + */ + public FaultCodeInfo selectFaultCodesByFaultId(Long faultId); + + /** + * 修改故障码 + * + * @param faultCodes 故障码 + * @return 结果 + */ + public int updateFaultCodes(FaultCodeInfo faultCodes); + + /** + * 删除故障码信息 + * + * @param faultId 故障码主键 + * @return 结果 + */ + public int deleteFaultCodesByFaultId(Long faultId); + + /** + * 批量删除故障码 + * + * @param faultIds 需要删除的故障码主键集合 + * @return 结果 + */ + public int deleteFaultCodesByFaultIds(Long[] faultIds); + + /** + * 修改故障码状态 + * + * @param faultCodeInfo + * @return + */ + int updateFaultCodesStatus(FaultCodeInfo faultCodeInfo); +} diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/service/impl/FaultCodesServiceImpl.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/service/impl/FaultCodesServiceImpl.java new file mode 100644 index 0000000..20194a1 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/service/impl/FaultCodesServiceImpl.java @@ -0,0 +1,119 @@ +package com.muyu.business.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.*; +import com.baomidou.mybatisplus.extension.service.impl.*; +import com.muyu.business.domain.*; +import com.muyu.business.domain.req.*; +import com.muyu.business.domain.res.*; +import com.muyu.business.mapper.*; +import com.muyu.business.service.*; +import com.muyu.common.core.utils.*; +import com.muyu.common.security.utils.*; +import org.springframework.beans.factory.annotation.*; +import org.springframework.stereotype.*; + +import java.util.*; + +/** + * 故障码Service业务层处理 + * + * @author Li YongJie + * @date 2024-03-28 + */ +@Service +public class FaultCodesServiceImpl extends ServiceImpl + implements FaultCodesService { + + /** + * 注入故障码Mapper + */ + @Autowired + private FaultCodesMapper faultCodesMapper; + + /** + * 查询故障码列表 + * + * @param faultCodeReq 故障码查询对象 + * @return 故障码 + */ + @Override + public List selectFaultCodesList(FaultCodeReq faultCodeReq) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.like(StringUtils.isNotEmpty(faultCodeReq.getFaultName()),FaultCodeInfo::getFaultName, faultCodeReq.getFaultName()); + wrapper.eq(StringUtils.isNotNull(faultCodeReq.getFaultCode()),FaultCodeInfo::getFaultCode, faultCodeReq.getFaultCode()); + wrapper.eq(StringUtils.isNotEmpty(faultCodeReq.getAlarmFlag()),FaultCodeInfo::getAlarmFlag, faultCodeReq.getAlarmFlag()); + return faultCodesMapper.selectList(wrapper); + } + + /** + * 新增故障码 + * + * @param faultCodes 故障码 + * @return 结果 + */ + @Override + public int insertFaultCodes(FaultCodeInfo faultCodes) { + faultCodes.setCreateBy(SecurityUtils.getUsername()); + faultCodes.setCreateTime(DateUtils.getNowDate()); + return faultCodesMapper.insert(faultCodes); + } + + /** + * 故障码详情 + * + * @param faultId 故障码主键 + * @return 故障码 + */ + @Override + public FaultCodeInfo selectFaultCodesByFaultId(Long faultId) { + return faultCodesMapper.selectById(faultId); + } + + /** + * 修改故障码 + * + * @param faultCodes 故障码 + * @return 结果 + */ + @Override + public int updateFaultCodes(FaultCodeInfo faultCodes) { + faultCodes.setUpdateBy(SecurityUtils.getUsername()); + faultCodes.setUpdateTime(DateUtils.getNowDate()); + return faultCodesMapper.updateById(faultCodes); + } + + /** + * 删除故障码信息 + * + * @param faultId 故障码主键 + * @return 结果 + */ + @Override + public int deleteFaultCodesByFaultId(Long faultId) { + return faultCodesMapper.deleteById(faultId); + } + + /** + * 批量删除故障码 + * + * @param faultIds 需要删除的故障码主键 + * @return 结果 + */ + @Override + public int deleteFaultCodesByFaultIds(Long[] faultIds) { + return faultCodesMapper.deleteBatchIds(Arrays.asList(faultIds)); + } + + /** + * 修改故障码状态 + * + * @param faultCodeInfo 故障码 + * @return + */ + @Override + public int updateFaultCodesStatus(FaultCodeInfo faultCodeInfo) { + faultCodeInfo.setUpdateBy(SecurityUtils.getUsername()); + faultCodeInfo.setUpdateTime(DateUtils.getNowDate()); + return faultCodesMapper.updateById(faultCodeInfo); + } +} diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/business/FaultCodesMapper.xml b/muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/business/FaultCodesMapper.xml new file mode 100644 index 0000000..cfa45c3 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/business/FaultCodesMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/muyu-modules/muyu-business/sql/fault_code_info/fault_code_info.sql b/muyu-modules/muyu-business/sql/fault_code_info/fault_code_info.sql new file mode 100644 index 0000000..c55c2a8 --- /dev/null +++ b/muyu-modules/muyu-business/sql/fault_code_info/fault_code_info.sql @@ -0,0 +1,27 @@ +-- 故障码管理 +-- 故障码信息表 +drop table if exists fault_code_info; +create table fault_code_info( + fault_id int(11) comment '故障码主键' primary key auto_increment, + fault_name varchar(32) comment '故障名称', + fault_code varchar(32) comment '故障码', + fault_type tinyint(4) comment '故障类型:1-通讯丢失故障 2-车身故障 3-底盘故障 4-电子围栏故障 5-其他故障', + fault_level tinyint(4) comment '故障等级:1-高级故障 2-中级故障 3-低级故障', + alarm_flag char(1) default 'Y' comment '是否产生报警（Y正常 N报警）', + fault_desc varchar(100) comment '故障描述', + fault_location tinyint(4) comment '故障位置', + fault_value bigint(20) comment '故障值', + status char(1) default '0' comment '故障码状态（0正常 1停用）', + del_flag char(1) default '0' comment '删除标志（0存在 2删除）', + create_by varchar(64) default '' comment '创建者', + create_time datetime comment '创建时间', + update_by varchar(64) default '' comment '更新者', + update_time datetime comment '更新时间', + remark varchar(200) comment '备注' +) engine=innodb auto_increment=200 comment = '故障码表'; +insert into fault_code_info(fault_name, fault_code, fault_type, fault_level, alarm_flag, fault_desc, fault_location, fault_value, status, del_flag, create_by, create_time, remark) values ('通讯丢失故障', '0001', 1, 1, '0', '通讯丢失故障', '车辆', 0, '0', '0', 'admin', now(), '通讯丢失故障'); +insert into fault_code_info(fault_name, fault_code, fault_type, fault_level, alarm_flag, fault_desc, fault_location, fault_value, status, del_flag, create_by, create_time, remark) values ('车身故障', '0002', 2, 1, '0', '车身故障', '车辆', 0, '0', '0', 'admin', now(), '车身故障'); +insert into fault_code_info(fault_name, fault_code, fault_type, fault_level, alarm_flag, fault_desc, fault_location, fault_value, status, del_flag, create_by, create_time, remark) values ('底盘故障', '0003', 3, 1, '0', '底盘故障', '车辆', 0, '0', '0', 'admin', now(),'底盘故障'); +insert into fault_code_info(fault_name, fault_code, fault_type, fault_level, alarm_flag, fault_desc, fault_location, fault_value, status, del_flag, create_by, create_time, remark) values ('电子围栏故障', '0004', 4, 1, '0', '电子围栏故障', '车辆', 0, '0', '0', 'admin', now(),'电子围栏故障'); +insert into fault_code_info(fault_name, fault_code, fault_type, fault_level, alarm_flag, fault_desc, fault_location, fault_value, status, del_flag, create_by, create_time, remark) values ('其他故障', '0005', 5, 1, '0', '其他故障', '车辆', 0, '0', '0', 'admin', now(), '其他故障'); +select fault_id,fault_name, fault_code, fault_type, fault_level, alarm_flag, fault_desc, fault_location, fault_value, status, del_flag from fault_code_info; From f945c781068c2ccded2bb40bf05aa7efbf5c6bc5 Mon Sep 17 00:00:00 2001 From: liyongjie <1318551549@qq.com> Date: Sat, 30 Mar 2024 10:02:39 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=95=85=E9=9A=9C=E7=A0=81=E5=9F=BA?= =?UTF-8?q?=E6=9C=AC=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sql/fault_code_info/fault_code_info.sql | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/muyu-modules/muyu-business/sql/fault_code_info/fault_code_info.sql b/muyu-modules/muyu-business/sql/fault_code_info/fault_code_info.sql index c55c2a8..2cc9572 100644 --- a/muyu-modules/muyu-business/sql/fault_code_info/fault_code_info.sql +++ b/muyu-modules/muyu-business/sql/fault_code_info/fault_code_info.sql @@ -18,10 +18,27 @@ create table fault_code_info( update_by varchar(64) default '' comment '更新者', update_time datetime comment '更新时间', remark varchar(200) comment '备注' -) engine=innodb auto_increment=200 comment = '故障码表'; +) engine=innodb comment = '故障码表'; insert into fault_code_info(fault_name, fault_code, fault_type, fault_level, alarm_flag, fault_desc, fault_location, fault_value, status, del_flag, create_by, create_time, remark) values ('通讯丢失故障', '0001', 1, 1, '0', '通讯丢失故障', '车辆', 0, '0', '0', 'admin', now(), '通讯丢失故障'); insert into fault_code_info(fault_name, fault_code, fault_type, fault_level, alarm_flag, fault_desc, fault_location, fault_value, status, del_flag, create_by, create_time, remark) values ('车身故障', '0002', 2, 1, '0', '车身故障', '车辆', 0, '0', '0', 'admin', now(), '车身故障'); insert into fault_code_info(fault_name, fault_code, fault_type, fault_level, alarm_flag, fault_desc, fault_location, fault_value, status, del_flag, create_by, create_time, remark) values ('底盘故障', '0003', 3, 1, '0', '底盘故障', '车辆', 0, '0', '0', 'admin', now(),'底盘故障'); insert into fault_code_info(fault_name, fault_code, fault_type, fault_level, alarm_flag, fault_desc, fault_location, fault_value, status, del_flag, create_by, create_time, remark) values ('电子围栏故障', '0004', 4, 1, '0', '电子围栏故障', '车辆', 0, '0', '0', 'admin', now(),'电子围栏故障'); insert into fault_code_info(fault_name, fault_code, fault_type, fault_level, alarm_flag, fault_desc, fault_location, fault_value, status, del_flag, create_by, create_time, remark) values ('其他故障', '0005', 5, 1, '0', '其他故障', '车辆', 0, '0', '0', 'admin', now(), '其他故障'); select fault_id,fault_name, fault_code, fault_type, fault_level, alarm_flag, fault_desc, fault_location, fault_value, status, del_flag from fault_code_info; + + +-- 故障记录 +drop table if exists fault_logs; +create table fault_logs ( + log_id int(11) comment '故障码主键' primary key auto_increment, + car_vin varchar(100) comment '车辆VIN', + car_id bigint(40) comment '车辆编号', + fault_name varchar(32) comment '故障名称', + fault_code varchar(32) comment '故障码', + alarm_flag char(1) default 'Y' comment '是否产生报警（Y正常 N报警）', + start_alarm_time datetime comment '开始报警时间', + end_alarm_time datetime comment '最近报警时间', + processing_time datetime comment '处理时间', + processing_by varchar(32) comment '处理人', + processing_status char(1) comment '' +)engine=innodb comment = '故障记录表';