diff --git a/cloud-modules/cloud-Saas-Service/pom.xml b/cloud-modules/cloud-Saas-Service/pom.xml deleted file mode 100644 index 342a15b..0000000 --- a/cloud-modules/cloud-Saas-Service/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-server - 3.6.3 - ../../pom.xml - - - cloud-Saas-Service - - - 21 - 21 - UTF-8 - - - diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/banner.txt b/cloud-modules/cloud-Saas-Service/src/main/resources/banner.txt deleted file mode 100644 index 0dd5eee..0000000 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/banner.txt +++ /dev/null @@ -1,2 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/bootstrap.yml b/cloud-modules/cloud-Saas-Service/src/main/resources/bootstrap.yml deleted file mode 100644 index b68ce33..0000000 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,51 +0,0 @@ -# Tomcat -server: - port: 92111 - -# nacos线上地址 -nacos: - addr: 159.75.188.178:8848 - user-name: nacos - password: nacos - namespace: eight - -# Spring -spring: - main: - allow-bean-definition-overriding: true - application: - # 应用名称 - name: cloud-gen - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: ${nacos.addr} - # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} - # 命名空间 - namespace: ${nacos.namespace} - config: - # 服务注册地址 - server-addr: ${nacos.addr} - # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} - # 命名空间 - namespace: ${nacos.namespace} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - # 系统共享配置 - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # 系统环境Config共享配置 - - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # xxl-job 配置文件 - - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/logback/dev.xml b/cloud-modules/cloud-Saas-Service/src/main/resources/logback/dev.xml deleted file mode 100644 index 0b3964c..0000000 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/logback/dev.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/logback/prod.xml b/cloud-modules/cloud-Saas-Service/src/main/resources/logback/prod.xml deleted file mode 100644 index 4a9d602..0000000 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/logback/prod.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/logback/test.xml b/cloud-modules/cloud-Saas-Service/src/main/resources/logback/test.xml deleted file mode 100644 index 4a9d602..0000000 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/logback/test.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/cloud-modules/cloud-Saas-Service/src/main/resources/mapper/generator/GenTableColumnMapper.xml deleted file mode 100644 index fb9800e..0000000 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - insert into gen_table_column ( - 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 - )values( - #{tableId}, - #{columnName}, - #{columnComment}, - #{columnType}, - #{javaType}, - #{javaField}, - #{isPk}, - #{isIncrement}, - #{isRequired}, - #{isInsert}, - #{isEdit}, - #{isList}, - #{isQuery}, - #{queryType}, - #{htmlType}, - #{dictType}, - #{sort}, - #{createBy}, - sysdate() - ) - - - - update gen_table_column - - column_comment = #{columnComment}, - java_type = #{javaType}, - java_field = #{javaField}, - is_insert = #{isInsert}, - is_edit = #{isEdit}, - is_list = #{isList}, - is_query = #{isQuery}, - is_required = #{isRequired}, - query_type = #{queryType}, - html_type = #{htmlType}, - dict_type = #{dictType}, - sort = #{sort}, - update_by = #{updateBy}, - update_time = sysdate() - - where column_id = #{columnId} - - - - delete from gen_table_column where table_id in - - #{tableId} - - - - - delete from gen_table_column where column_id in - - #{item.columnId} - - - - diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/mapper/generator/GenTableMapper.xml b/cloud-modules/cloud-Saas-Service/src/main/resources/mapper/generator/GenTableMapper.xml deleted file mode 100644 index 42ab2cf..0000000 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/mapper/generator/GenTableMapper.xml +++ /dev/null @@ -1,317 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select table_id, - table_name, - table_comment, - sub_table_name, - sub_table_fk_name, - class_name, - tpl_category, - 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 - - - - - - - - - - - - - - - - - - insert into gen_table ( - table_name, - table_comment, - class_name, - tpl_category, - package_name, - module_name, - business_name, - function_name, - function_author, - gen_type, - gen_path, - remark, - create_by, - create_time - )values( - #{tableName}, - #{tableComment}, - #{className}, - #{tplCategory}, - #{packageName}, - #{moduleName}, - #{businessName}, - #{functionName}, - #{functionAuthor}, - #{genType}, - #{genPath}, - #{remark}, - #{createBy}, - sysdate() - ) - - - - update gen_table - - table_name = #{tableName}, - table_comment = #{tableComment}, - sub_table_name = #{subTableName}, - sub_table_fk_name = #{subTableFkName}, - class_name = #{className}, - function_author = #{functionAuthor}, - gen_type = #{genType}, - gen_path = #{genPath}, - tpl_category = #{tplCategory}, - package_name = #{packageName}, - module_name = #{moduleName}, - business_name = #{businessName}, - function_name = #{functionName}, - options = #{options}, - update_by = #{updateBy}, - remark = #{remark}, - update_time = sysdate() - - where table_id = #{tableId} - - - - delete from gen_table where table_id in - - #{tableId} - - - - diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/controller.java.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/controller.java.vm deleted file mode 100644 index 1df5be0..0000000 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/controller.java.vm +++ /dev/null @@ -1,116 +0,0 @@ -package ${packageName}.controller; - -import java.util.List; -import java.io.IOException; -import jakarta.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.muyu.common.log.annotation.Log; -import com.muyu.common.log.enums.BusinessType; -import com.muyu.common.security.annotation.RequiresPermissions; -import ${packageName}.domain.${ClassName}; -import ${packageName}.service.I${ClassName}Service; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.poi.ExcelUtil; -#if($table.crud || $table.sub) -import com.muyu.common.core.web.page.TableDataInfo; -#elseif($table.tree) -#end - -/** - * ${functionName}Controller - * - * @author ${author} - * @date ${datetime} - */ -@RestController -@RequestMapping("/${businessName}") -public class ${ClassName}Controller extends BaseController -{ - @Autowired - private I${ClassName}Service ${className}Service; - - /** - * 查询${functionName}列表 - */ - @RequiresPermissions("${permissionPrefix}:list") - @GetMapping("/list") -#if($table.crud || $table.sub) - public Result list(${ClassName} ${className}) - { - startPage(); - List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); - return getDataTable(list); - } -#elseif($table.tree) - public Result list(${ClassName} ${className}) - { - List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); - return success(list); - } -#end - - /** - * 导出${functionName}列表 - */ - @RequiresPermissions("${permissionPrefix}:export") - @Log(title = "${functionName}", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, ${ClassName} ${className}) - { - List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); - ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class); - util.exportExcel(response, list, "${functionName}数据"); - } - - /** - * 获取${functionName}详细信息 - */ - @RequiresPermissions("${permissionPrefix}:query") - @GetMapping(value = "/{${pkColumn.javaField}}") - public Result getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) - { - return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField})); - } - - /** - * 新增${functionName} - */ - @RequiresPermissions("${permissionPrefix}:add") - @Log(title = "${functionName}", businessType = BusinessType.INSERT) - @PostMapping - public Result add(@RequestBody ${ClassName} ${className}) - { - return toAjax(${className}Service.insert${ClassName}(${className})); - } - - /** - * 修改${functionName} - */ - @RequiresPermissions("${permissionPrefix}:edit") - @Log(title = "${functionName}", businessType = BusinessType.UPDATE) - @PutMapping - public Result edit(@RequestBody ${ClassName} ${className}) - { - return toAjax(${className}Service.update${ClassName}(${className})); - } - - /** - * 删除${functionName} - */ - @RequiresPermissions("${permissionPrefix}:remove") - @Log(title = "${functionName}", businessType = BusinessType.DELETE) - @DeleteMapping("/{${pkColumn.javaField}s}") - public Result remove(@PathVariable("${pkColumn.javaField}s") ${pkColumn.javaType}[] ${pkColumn.javaField}s) - { - return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s)); - } -} diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/domain.java.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/domain.java.vm deleted file mode 100644 index 1292991..0000000 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/domain.java.vm +++ /dev/null @@ -1,103 +0,0 @@ -package ${packageName}.domain; - -#foreach ($import in $importList) -import ${import}; -#end -import com.muyu.common.core.annotation.Excel; -#if($table.crud || $table.sub) -import com.muyu.common.core.web.domain.BaseEntity; -#elseif($table.tree) -import com.muyu.common.core.web.domain.TreeEntity; -#end - -/** - * ${functionName}对象 ${tableName} - * - * @author ${author} - * @date ${datetime} - */ -#if($table.crud || $table.sub) -#set($Entity="BaseEntity") -#elseif($table.tree) -#set($Entity="TreeEntity") -#end -public class ${ClassName} extends ${Entity} -{ - private static final long serialVersionUID = 1L; - -#foreach ($column in $columns) -#if(!$table.isSuperColumn($column.javaField)) - /** $column.columnComment */ -#if($column.list) -#set($parentheseIndex=$column.columnComment.indexOf("（")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#if($parentheseIndex != -1) - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") -#elseif($column.javaType == 'Date') - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") -#else - @Excel(name = "${comment}") -#end -#end - private $column.javaType $column.javaField; - -#end -#end -#if($table.sub) - /** $table.subTable.functionName信息 */ - private List<${subClassName}> ${subclassName}List; - -#end -#foreach ($column in $columns) -#if(!$table.isSuperColumn($column.javaField)) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - public void set${AttrName}($column.javaType $column.javaField) - { - this.$column.javaField = $column.javaField; - } - - public $column.javaType get${AttrName}() - { - return $column.javaField; - } -#end -#end - -#if($table.sub) - public List<${subClassName}> get${subClassName}List() - { - return ${subclassName}List; - } - - public void set${subClassName}List(List<${subClassName}> ${subclassName}List) - { - this.${subclassName}List = ${subclassName}List; - } - -#end - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) -#foreach ($column in $columns) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - .append("${column.javaField}", get${AttrName}()) -#end -#if($table.sub) - .append("${subclassName}List", get${subClassName}List()) -#end - .toString(); - } -} diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/mapper.java.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/mapper.java.vm deleted file mode 100644 index 7e7d7c2..0000000 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/mapper.java.vm +++ /dev/null @@ -1,91 +0,0 @@ -package ${packageName}.mapper; - -import java.util.List; -import ${packageName}.domain.${ClassName}; -#if($table.sub) -import ${packageName}.domain.${subClassName}; -#end - -/** - * ${functionName}Mapper接口 - * - * @author ${author} - * @date ${datetime} - */ -public interface ${ClassName}Mapper -{ - /** - * 查询${functionName} - * - * @param ${pkColumn.javaField} ${functionName}主键 - * @return ${functionName} - */ - public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); - - /** - * 查询${functionName}列表 - * - * @param ${className} ${functionName} - * @return ${functionName}集合 - */ - public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); - - /** - * 新增${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int insert${ClassName}(${ClassName} ${className}); - - /** - * 修改${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int update${ClassName}(${ClassName} ${className}); - - /** - * 删除${functionName} - * - * @param ${pkColumn.javaField} ${functionName}主键 - * @return 结果 - */ - public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); - - /** - * 批量删除${functionName} - * - * @param ${pkColumn.javaField}s 需要删除的数据主键集合 - * @return 结果 - */ - public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); -#if($table.sub) - - /** - * 批量删除${subTable.functionName} - * - * @param ${pkColumn.javaField}s 需要删除的数据主键集合 - * @return 结果 - */ - public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); - - /** - * 批量新增${subTable.functionName} - * - * @param ${subclassName}List ${subTable.functionName}列表 - * @return 结果 - */ - public int batch${subClassName}(List<${subClassName}> ${subclassName}List); - - - /** - * 通过${functionName}主键删除${subTable.functionName}信息 - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return 结果 - */ - public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField}); -#end -} diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/service.java.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/service.java.vm deleted file mode 100644 index 264882b..0000000 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/service.java.vm +++ /dev/null @@ -1,61 +0,0 @@ -package ${packageName}.service; - -import java.util.List; -import ${packageName}.domain.${ClassName}; - -/** - * ${functionName}Service接口 - * - * @author ${author} - * @date ${datetime} - */ -public interface I${ClassName}Service -{ - /** - * 查询${functionName} - * - * @param ${pkColumn.javaField} ${functionName}主键 - * @return ${functionName} - */ - public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); - - /** - * 查询${functionName}列表 - * - * @param ${className} ${functionName} - * @return ${functionName}集合 - */ - public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); - - /** - * 新增${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int insert${ClassName}(${ClassName} ${className}); - - /** - * 修改${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int update${ClassName}(${ClassName} ${className}); - - /** - * 批量删除${functionName} - * - * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合 - * @return 结果 - */ - public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); - - /** - * 删除${functionName}信息 - * - * @param ${pkColumn.javaField} ${functionName}主键 - * @return 结果 - */ - public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); -} diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/serviceImpl.java.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/serviceImpl.java.vm deleted file mode 100644 index 3904af5..0000000 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/serviceImpl.java.vm +++ /dev/null @@ -1,169 +0,0 @@ -package ${packageName}.service.impl; - -import java.util.List; -#foreach ($column in $columns) -#if($column.javaField == 'createTime' || $column.javaField == 'updateTime') -import com.muyu.common.core.utils.DateUtils; -#break -#end -#end -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -#if($table.sub) -import java.util.ArrayList; -import com.muyu.common.core.utils.StringUtils; -import org.springframework.transaction.annotation.Transactional; -import ${packageName}.domain.${subClassName}; -#end -import ${packageName}.mapper.${ClassName}Mapper; -import ${packageName}.domain.${ClassName}; -import ${packageName}.service.I${ClassName}Service; - -/** - * ${functionName}Service业务层处理 - * - * @author ${author} - * @date ${datetime} - */ -@Service -public class ${ClassName}ServiceImpl implements I${ClassName}Service -{ - @Autowired - private ${ClassName}Mapper ${className}Mapper; - - /** - * 查询${functionName} - * - * @param ${pkColumn.javaField} ${functionName}主键 - * @return ${functionName} - */ - @Override - public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) - { - return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); - } - - /** - * 查询${functionName}列表 - * - * @param ${className} ${functionName} - * @return ${functionName} - */ - @Override - public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) - { - return ${className}Mapper.select${ClassName}List(${className}); - } - - /** - * 新增${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ -#if($table.sub) - @Transactional -#end - @Override - public int insert${ClassName}(${ClassName} ${className}) - { -#foreach ($column in $columns) -#if($column.javaField == 'createTime') - ${className}.setCreateTime(DateUtils.getNowDate()); -#end -#end -#if($table.sub) - int rows = ${className}Mapper.insert${ClassName}(${className}); - insert${subClassName}(${className}); - return rows; -#else - return ${className}Mapper.insert${ClassName}(${className}); -#end - } - - /** - * 修改${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ -#if($table.sub) - @Transactional -#end - @Override - public int update${ClassName}(${ClassName} ${className}) - { -#foreach ($column in $columns) -#if($column.javaField == 'updateTime') - ${className}.setUpdateTime(DateUtils.getNowDate()); -#end -#end -#if($table.sub) - ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}()); - insert${subClassName}(${className}); -#end - return ${className}Mapper.update${ClassName}(${className}); - } - - /** - * 批量删除${functionName} - * - * @param ${pkColumn.javaField}s 需要删除的${functionName}主键 - * @return 结果 - */ -#if($table.sub) - @Transactional -#end - @Override - public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) - { -#if($table.sub) - ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s); -#end - return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s); - } - - /** - * 删除${functionName}信息 - * - * @param ${pkColumn.javaField} ${functionName}主键 - * @return 结果 - */ -#if($table.sub) - @Transactional -#end - @Override - public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) - { -#if($table.sub) - ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField}); -#end - return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); - } -#if($table.sub) - - /** - * 新增${subTable.functionName}信息 - * - * @param ${className} ${functionName}对象 - */ - public void insert${subClassName}(${ClassName} ${className}) - { - List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List(); - ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}(); - if (StringUtils.isNotNull(${subclassName}List)) - { - List<${subClassName}> list = new ArrayList<${subClassName}>(); - for (${subClassName} ${subclassName} : ${subclassName}List) - { - ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField}); - list.add(${subclassName}); - } - if (list.size() > 0) - { - ${className}Mapper.batch${subClassName}(list); - } - } - } -#end -} diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/sub-domain.java.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/sub-domain.java.vm deleted file mode 100644 index a5c170c..0000000 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/sub-domain.java.vm +++ /dev/null @@ -1,79 +0,0 @@ -package ${packageName}.domain; - -#foreach ($import in $subImportList) -import ${import}; -#end -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.web.domain.BaseEntity; - -/** - * ${subTable.functionName}对象 ${subTableName} - * - * @author ${author} - * @date ${datetime} - */ -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class ${subClassName} extends BaseEntity -{ - private static final long serialVersionUID = 1L; - -#foreach ($column in $subTable.columns) -#if(!$table.isSuperColumn($column.javaField)) - /** $column.columnComment */ -#if($column.list) -#set($parentheseIndex=$column.columnComment.indexOf("（")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#if($parentheseIndex != -1) - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") -#elseif($column.javaType == 'Date') - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") -#else - @Excel(name = "${comment}") -#end -#end - private $column.javaType $column.javaField; - -#end -#end -#foreach ($column in $subTable.columns) -#if(!$table.isSuperColumn($column.javaField)) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - public void set${AttrName}($column.javaType $column.javaField) - { - this.$column.javaField = $column.javaField; - } - - public $column.javaType get${AttrName}() - { - return $column.javaField; - } -#end -#end - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) -#foreach ($column in $subTable.columns) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - .append("${column.javaField}", get${AttrName}()) -#end - .toString(); - } -} diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/js/api.js.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/js/api.js.vm deleted file mode 100644 index 9295524..0000000 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/js/api.js.vm +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询${functionName}列表 -export function list${BusinessName}(query) { - return request({ - url: '/${moduleName}/${businessName}/list', - method: 'get', - params: query - }) -} - -// 查询${functionName}详细 -export function get${BusinessName}(${pkColumn.javaField}) { - return request({ - url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, - method: 'get' - }) -} - -// 新增${functionName} -export function add${BusinessName}(data) { - return request({ - url: '/${moduleName}/${businessName}', - method: 'post', - data: data - }) -} - -// 修改${functionName} -export function update${BusinessName}(data) { - return request({ - url: '/${moduleName}/${businessName}', - method: 'put', - data: data - }) -} - -// 删除${functionName} -export function del${BusinessName}(${pkColumn.javaField}) { - return request({ - url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, - method: 'delete' - }) -} diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/sql/sql.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/sql/sql.vm deleted file mode 100644 index 0575583..0000000 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/sql/sql.vm +++ /dev/null @@ -1,22 +0,0 @@ --- 菜单 SQL -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', sysdate(), '', null, '${functionName}菜单'); - --- 按钮父菜单ID -SELECT @parentId := LAST_INSERT_ID(); - --- 按钮 SQL -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', sysdate(), '', null, ''); - -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', sysdate(), '', null, ''); - -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', sysdate(), '', null, ''); - -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', sysdate(), '', null, ''); - -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', sysdate(), '', null, ''); \ No newline at end of file diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/index-tree.vue.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/index-tree.vue.vm deleted file mode 100644 index a4c64a0..0000000 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/index-tree.vue.vm +++ /dev/null @@ -1,505 +0,0 @@ - - - diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/index.vue.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/index.vue.vm deleted file mode 100644 index 6296014..0000000 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/index.vue.vm +++ /dev/null @@ -1,602 +0,0 @@ - - - diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/v3/index-tree.vue.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/v3/index-tree.vue.vm deleted file mode 100644 index 7bbd2fc..0000000 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/v3/index-tree.vue.vm +++ /dev/null @@ -1,474 +0,0 @@ - - - diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/v3/index.vue.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/v3/index.vue.vm deleted file mode 100644 index 8b25665..0000000 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/v3/index.vue.vm +++ /dev/null @@ -1,590 +0,0 @@ - - - diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/v3/readme.txt b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/v3/readme.txt deleted file mode 100644 index 9f60284..0000000 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/v3/readme.txt +++ /dev/null @@ -1 +0,0 @@ -���ʹ�õ���cloud-Cloud-Vue3ǰ�ˣ���ô��Ҫ����һ�´�Ŀ¼��ģ��index.vue.vm��index-tree.vue.vm�ļ����ϼ�vueĿ¼�� diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/xml/mapper.xml.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/xml/mapper.xml.vm deleted file mode 100644 index 0ceb3d8..0000000 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/xml/mapper.xml.vm +++ /dev/null @@ -1,135 +0,0 @@ - - - - - -#foreach ($column in $columns) - -#end - -#if($table.sub) - - - - - - -#foreach ($column in $subTable.columns) - -#end - -#end - - - select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName} - - - - - - - - insert into ${tableName} - -#foreach($column in $columns) -#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) - $column.columnName, -#end -#end - - -#foreach($column in $columns) -#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) - #{$column.javaField}, -#end -#end - - - - - update ${tableName} - -#foreach($column in $columns) -#if($column.columnName != $pkColumn.columnName) - $column.columnName = #{$column.javaField}, -#end -#end - - where ${pkColumn.columnName} = #{${pkColumn.javaField}} - - - - delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}} - - - - delete from ${tableName} where ${pkColumn.columnName} in - - #{${pkColumn.javaField}} - - -#if($table.sub) - - - delete from ${subTableName} where ${subTableFkName} in - - #{${subTableFkclassName}} - - - - - delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}} - - - - insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end) values - - (#foreach($column in $subTable.columns) #{item.$column.javaField}#if($foreach.count != $subTable.columns.size()),#end#end) - - -#end - \ No newline at end of file diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml index b5e1bb6..1a91896 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml @@ -11,7 +11,7 @@ cloud-modules-enterprise-common - 3.6.3 + 1.0.0 cloud-modules-enterprise-common 企业业务common diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/message/Message.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/message/Message.java index 52831fb..1659a75 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/message/Message.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/message/Message.java @@ -63,6 +63,15 @@ public class Message { private long userId; - - + public static Message messageBuilder(Message message) { + return Message.builder() + .id(message.getId()) + .sender(message.getSender()) + .receiver(message.getReceiver()) + .content(message.getContent()) + .status(message.getStatus()) + .createTime(message.getCreateTime()) + .userId(message.getUserId()) + .build(); + } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultConditionResp.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultConditionResp.java new file mode 100644 index 0000000..2010aa8 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultConditionResp.java @@ -0,0 +1,58 @@ +package com.muyu.domain.resp; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * @Author：yang + * @Package：com.muyu.domain.resp + * @Project：cloud-server-8 + * @name：FaultConditionResp + * @Date：2024/9/28 16:53 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Tag(name="故障规则表",description = "数据响应") +public class FaultConditionResp { + + /** + * 故障规则表Id + */ + @TableId(value = "carcondition_id",type = IdType.AUTO) + private long carconditionId; + /** + * 车辆类型Id + */ + private long carTypeId; + /** + *故障名称Id + */ + private long messageTypeId; + /** + * 故障条件 + */ + private String faultconditionIdentification; + /** + * 故障规则参数 + */ + private BigDecimal faultconditionParameter; + /** + * 车辆类型名称 + */ + private String carTypeName; + /** + * 故障名称 + */ + private String messageTypeName; + /** + * 报文编码 + */ + private String messageTypeCode; +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml index e864e8d..b2a2fc9 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml @@ -72,7 +72,12 @@ com.muyu cloud-modules-enterprise-common - 3.6.3 + 1.0.0 + + + com.github.yulichang + mybatis-plus-join-boot-starter + 1.4.13 com.github.pagehelper diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarInformationMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarInformationMapper.java index d02ce85..3dd35de 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarInformationMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarInformationMapper.java @@ -1,6 +1,7 @@ package com.muyu.server.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.CarInformation; import com.muyu.domain.req.CarInformationAddReq; import com.muyu.domain.req.CarInformationListReq; @@ -14,7 +15,7 @@ import java.util.List; * @author 17353 */ @Mapper -public interface CarInformationMapper { +public interface CarInformationMapper extends BaseMapper { /** * 企业车辆管理列表 * 联查--> 车辆管理--车辆类型表--车辆电子围栏 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarMessageMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarMessageMapper.java index 5bb6fdb..f437634 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarMessageMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarMessageMapper.java @@ -1,12 +1,16 @@ package com.muyu.server.mapper; +import com.github.yulichang.base.MPJBaseMapper; import com.muyu.domain.CarMessage; import org.apache.ibatis.annotations.Mapper; import java.util.List; +/** + * @author 17353 + */ @Mapper -public interface CarMessageMapper { +public interface CarMessageMapper extends MPJBaseMapper { /** * 根据所属车类别 解析 车辆报文模板 * @param diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarMiddleGroupMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarMiddleGroupMapper.java index 91aa15e..2050260 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarMiddleGroupMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarMiddleGroupMapper.java @@ -17,6 +17,5 @@ import java.util.List; */ @Mapper public interface CarMiddleGroupMapper extends BaseMapper { - List selectByIdList(@Param("carFenceId") Integer carFenceId); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultConditionMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultConditionMapper.java index 393f49d..6bca136 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultConditionMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultConditionMapper.java @@ -1,6 +1,7 @@ package com.muyu.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; import com.muyu.domain.FaultCondition; import com.muyu.domain.req.FaultConditionAddReq; import com.muyu.domain.req.FaultConditionListReq; @@ -16,7 +17,7 @@ import java.util.List; * @Date：2024/9/19 22:11 */ @Mapper -public interface FaultConditionMapper extends BaseMapper { +public interface FaultConditionMapper extends MPJBaseMapper { List selectfaultconditionlist(FaultConditionListReq faultConditionListReq); diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultRuleMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultRuleMapper.java index a458025..06e95d2 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultRuleMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultRuleMapper.java @@ -1,6 +1,7 @@ package com.muyu.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; import com.muyu.domain.CarFaultRule; import com.muyu.domain.CarInformation; import com.muyu.domain.FaultCondition; @@ -17,9 +18,5 @@ import java.util.List; * @Date：2024/9/19 22:11 */ @Mapper -public interface FaultRuleMapper extends BaseMapper { - - CarInformation selectTypeByVIN(@Param("vin") String vin); - - List selectruleByType(@Param("carInformationType") Integer carInformationType); +public interface FaultRuleMapper extends MPJBaseMapper { } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/MessageMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/MessageMapper.java index e53e40d..9e95e69 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/MessageMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/MessageMapper.java @@ -15,8 +15,5 @@ import java.util.List; */ @Mapper public interface MessageMapper extends BaseMapper { - void changestatus(Message message); - - List unread(); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/WarnRuleMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/WarnRuleMapper.java index 5a2f1a1..10766a6 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/WarnRuleMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/WarnRuleMapper.java @@ -1,6 +1,7 @@ package com.muyu.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; import com.muyu.domain.WarnRule; import com.muyu.domain.resp.CarMessageResp; import org.apache.ibatis.annotations.Mapper; @@ -16,7 +17,6 @@ import java.util.List; * @Date：2024/9/20 下午7:29 */ @Mapper -public interface WarnRuleMapper extends BaseMapper { +public interface WarnRuleMapper extends MPJBaseMapper { - List findByMsg(@Param("id") Long id); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/WarnStrategyMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/WarnStrategyMapper.java index 1c14ec2..937e984 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/WarnStrategyMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/WarnStrategyMapper.java @@ -19,7 +19,4 @@ import java.util.List; @Mapper public interface WarnStrategyMapper extends BaseMapper { - List findByCarType(); - - List selectStrategyType(@Param("ids") Long ids); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarMessageService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarMessageService.java index 4b45d84..a7d4b0d 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarMessageService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarMessageService.java @@ -1,11 +1,13 @@ package com.muyu.server.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.core.domain.Result; import com.muyu.domain.CarMessage; +import com.muyu.domain.resp.CarMessageResp; import java.util.List; -public interface CarMessageService { +public interface CarMessageService extends IService { /** * 根据所属车类别 解析 车辆报文模板 @@ -32,9 +34,11 @@ public interface CarMessageService { */ Result updateCarMessage(CarMessage carMessage); - /** - * 分割字符串获取报文模板信息 + * 查询 + * @param id + * @return */ + List selectJoinList(Long id); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java deleted file mode 100644 index 068fa92..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.muyu.server.service.faultDetectionStrategy; - -import org.springframework.stereotype.Service; - -/** - * @Author：weiran - * @Package：com.muyu.cloud.faultmanage.service.impl.faultDetectionStrategy - * @Project：cloud-server-8 - * @name：FuelVehicleCarFaultDetectionStrategy - * @Date：2024/9/20 20:00 - */ - - -/** - * 针对燃油车的故障检测逻辑 - */ -@Service(value = "FuelVehicleCar") -public class FuelVehicleCarFaultDetectionStrategy { -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java deleted file mode 100644 index e6d7b4e..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java +++ /dev/null @@ -1,198 +0,0 @@ -package com.muyu.server.service.faultDetectionStrategy; - -import com.muyu.domain.CarFaultRule; -import com.muyu.domain.FaultReport; -import com.muyu.server.service.FaultDetectionStrategy; -import org.springframework.stereotype.Service; - -/** - * @Author：weiran - * @Package：com.muyu.cloud.faultmanage.service.impl.faultDetectionStrategy - * @Project：cloud-server-8 - * @name：CarFaultDetectionStrategy - * @Date：2024/9/20 19:44 - */ - -/** - * 针对纯电车的故障检测逻辑 - */ -@Service(value = "PureElectricCar") -public class PureElectricCarFaultDetectionStrategy implements FaultDetectionStrategy { - - - - @Override - public FaultReport detectFaults(CarFaultRule carFaultRule) { - - - //检测车速是否处于正常范围 - if (carFaultRule.getSpeed()>200 || carFaultRule.getSpeed()<0){ - return new FaultReport("纯电车","车速不在正常范围内,请注意"); - } - //检测总里程数是否超过正常数 - if (carFaultRule.getTm()>5000000){ - return new FaultReport("纯电车","总里程数已超标,请注意"); - } - //检测总电压是否正常 - if (carFaultRule.getTv()>650){ - return new FaultReport("纯电车","总电压过高,请注意"); - } - //检测电流是否超标 - if (carFaultRule.getCc()>50){ - return new FaultReport("纯电车","电流过高,请注意"); - } - //检测绝缘电阻 - if (carFaultRule.getIr()>100000){ - return new FaultReport("纯电车","绝缘电阻过高,请注意"); - } -// //检测加速踏板行程值 -// if (carFaultRule.getAPTV()){ -// -// } -// //检测制动踏板行程值 -// if (carFaultRule.getBPTV()){ -// -// } -// //检测燃料消耗率 -// if (carFaultRule.getSFC()){ -// -// } -// //检测电机控制器温度 -// if (carFaultRule.getMCT()){ -// -// } -// //检测电机转速 -// if (carFaultRule.getMS()){ -// -// } -// //检测电机转矩 -// if (carFaultRule.getMTO()){ -// -// } -// //检测电机温度 -// if (carFaultRule.getMTE()){ -// -// } -// //检测电机电压 -// if (carFaultRule.getMV()){ -// -// } -// //检测电机电流 -// if (carFaultRule.getMC()){ -// -// } -// //检测动力电池剩余电量SOC -// if (carFaultRule.getPBRSOC()){ -// -// } -// //检测当前状态允许的最大反馈功率 -// if (carFaultRule.getMACSFP()){ -// -// } -// //检测当前状态允许最大放电功率 -// if (carFaultRule.getCSATMDP()) { -// -// } -// //检测BMS自检计数器 -// if (carFaultRule.getBMS()) { -// -// } -// //检测动力电池充放电电流 -// if (carFaultRule.getCADC()) { -// -// } -// //检测动力电池负载端总电压V3 -// if (carFaultRule.getPBLETVV3()) { -// -// } -// //检测单次最大电压 -// if (carFaultRule.getSMV()) { -// -// } -// //检测单体电池最低电压 -// if (carFaultRule.getMVOAB()) { -// -// } -// //检测单体电池最高温度 -// if (carFaultRule.getMAXBT()) { -// -// } -// //检测单体电池最低温度 -// if (carFaultRule.getMINBT()) { -// -// } -// //检测动力电池可用容量 -// if (carFaultRule.getPBAC()) { -// -// } -// //检测车辆状态 -// if (carFaultRule.getVS()) { -// -// } -// //检测充电状态 -// if (carFaultRule.getCS()) { -// -// } -// //检测运行状态 -// if (carFaultRule.getRS()) { -// -// } -// //检测SOC -// if (carFaultRule.getSOC()) { -// -// } -// //检测可充电储能装置工作状态 -// if (carFaultRule.getRESDWC()) { -// -// } -// //检测驱动电机状态 -// if (carFaultRule.getEAS()) { -// -// } -// //检测定位是否有效 -// if (carFaultRule.getPTC()) { -// -// } -// //检测EAS -// if (carFaultRule.getEPS()) { -// -// } -// //检测PTC -// if (carFaultRule.getABS()) { -// -// } -// //检测EPS -// if (carFaultRule.getMCU()) { -// -// } -// //检测ABS -// if (carFaultRule.getPBHS()) { -// -// } -// //检测MCU -// if (carFaultRule.getPBCS()) { -// -// } -// //检测动力电池加热状态 -// if (carFaultRule.getPBIS()) { -// -// } -// //检测动力电池当前状态 -// if (carFaultRule.getDCDC()) { -// -// } -// //检测动力电池保温状态 -// if (carFaultRule.getCHG()) { -// -// } -// //检测DCDC -// if (carFaultRule.getCHB()) { -// -// } -// //检测CHG -// if (carFaultRule.getCUB()) { -// -// } - return null; - } -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarMessageServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarMessageServiceImpl.java index 9ec3513..a1ad626 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarMessageServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarMessageServiceImpl.java @@ -1,7 +1,12 @@ package com.muyu.server.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.query.MPJLambdaQueryWrapper; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.muyu.common.core.domain.Result; import com.muyu.domain.CarMessage; +import com.muyu.domain.CarMessageType; +import com.muyu.domain.resp.CarMessageResp; import com.muyu.server.mapper.CarMessageMapper; import com.muyu.server.service.CarMessageService; import org.springframework.stereotype.Service; @@ -9,8 +14,13 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; +/** + * @author 17353 + */ @Service -public class CarMessageServiceImpl implements CarMessageService { +public class CarMessageServiceImpl + extends ServiceImpl + implements CarMessageService { @Resource private CarMessageMapper carMessageMapper; @@ -47,9 +57,19 @@ public class CarMessageServiceImpl implements CarMessageService { return Result.error( 402,"修改失败"); } - - - + @Override + public List selectJoinList(Long id) { + return carMessageMapper.selectJoinList(CarMessageResp.class, new MPJLambdaWrapper() + .select(CarMessage::getCarMessageId, + CarMessage::getCarMessageCartype, + CarMessage::getCarMessageType, + CarMessage::getCarMessageStartIndex, + CarMessage::getCarMessageEndIndex, + CarMessage::getCarMessageState) + .select(CarMessageType::getMessageTypeName) + .leftJoin(CarMessageType.class, CarMessageType::getMessageTypeId, CarMessage::getCarMessageType) + .eq(CarMessage::getCarMessageCartype, id)); + } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarMiddleGroupServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarMiddleGroupServiceImpl.java index 03978cb..ddb2a2d 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarMiddleGroupServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarMiddleGroupServiceImpl.java @@ -1,11 +1,8 @@ package com.muyu.server.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.CarFenceGroup; -import com.muyu.domain.CarFenceType; import com.muyu.domain.CarMiddleGroup; -import com.muyu.domain.req.CarFenceGroupReq; import com.muyu.server.mapper.CarMiddleGroupMapper; import com.muyu.server.service.CarFenceGroupService; import com.muyu.server.service.CarMiddleGroupService; @@ -26,8 +23,7 @@ public class CarMiddleGroupServiceImpl extends ServiceImpl implements CarMiddleGroupService { - @Autowired - private CarMiddleGroupMapper carMiddleGroupMapper; + @Autowired private CarFenceGroupService carFenceGroupService; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultConditionServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultConditionServiceImpl.java index c380ef6..507e5c8 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultConditionServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultConditionServiceImpl.java @@ -43,7 +43,8 @@ public class FaultConditionServiceImpl extends ServiceImpl selectfaultconditionlist = faultConditionMapper.selectfaultconditionlist(faultConditionListReq); - List faultConditionListRespList = selectfaultconditionlist.stream() + List faultConditionListRespList = selectfaultconditionlist + .stream() .map(FaultConditionListResp::faultConditionListResp) .toList(); return FaultConditionTotalListResp.faultConditionTotalListResp(faultConditionListRespList,count); diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLabelServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLabelServiceImpl.java index 3b309de..ebfd4a3 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLabelServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLabelServiceImpl.java @@ -30,7 +30,6 @@ public class FaultLabelServiceImpl extends ServiceImpl select() { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - List list = this.list(queryWrapper); - return list; + return this.list(queryWrapper); } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultRuleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultRuleServiceImpl.java index 79c8c23..55408b8 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultRuleServiceImpl.java @@ -1,10 +1,13 @@ package com.muyu.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.domain.CarFaultRule; -import com.muyu.domain.CarInformation; -import com.muyu.domain.FaultCondition; -import com.muyu.domain.Vehicle; +import com.github.yulichang.query.MPJLambdaQueryWrapper; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.muyu.domain.*; +import com.muyu.domain.resp.FaultConditionResp; +import com.muyu.server.mapper.CarFenceMapper; +import com.muyu.server.mapper.CarInformationMapper; +import com.muyu.server.mapper.FaultConditionMapper; import com.muyu.server.mapper.FaultRuleMapper; import com.muyu.server.service.FaultRuleService; import org.springframework.beans.factory.annotation.Autowired; @@ -26,7 +29,9 @@ import java.util.List; public class FaultRuleServiceImpl extends ServiceImpl implements FaultRuleService { @Autowired - private FaultRuleMapper faultRuleMapper; + private CarInformationMapper carInformationMapper; + @Autowired + private FaultConditionMapper faultConditionMapper; /** * 故障参数匹配检查 @@ -37,10 +42,17 @@ public class FaultRuleServiceImpl extends ServiceImpl checkfault(CarFaultRule carFaultRule) { List vehicles = new ArrayList<>(); //根据车辆VIN判断它属于什么类型的车辆 - CarInformation carInformation = faultRuleMapper.selectTypeByVIN(carFaultRule.getVin()); + CarInformation carInformation = carInformationMapper.selectById(carFaultRule.getVin()); Integer carInformationType = carInformation.getCarInformationType(); //根据车辆类型，查询表获取对应的类型的故障规则 - List faultConditionList = faultRuleMapper.selectruleByType(carInformationType); + + List faultConditionResps = faultConditionMapper.selectJoinList(FaultConditionResp.class, new MPJLambdaWrapper() + .selectAll(FaultCondition.class) + .select(CarType::getCarTypeName) + .select(FaultLabel::getMessageTypeName) + .select(FaultLabel::getMessageTypeCode) + .leftJoin(CarType.class, CarType::getCarTypeId, FaultCondition::getCarTypeId) + .leftJoin(FaultLabel.class, FaultLabel::getMessageTypeId, FaultCondition::getMessageTypeId)); //获取当前类的所有字段，不包括继承的 Class carFaultRuleClass = carFaultRule.getClass(); Field[] declaredFields = carFaultRuleClass.getDeclaredFields(); @@ -52,7 +64,7 @@ public class FaultRuleServiceImpl extends ServiceImpl implements MessageService { +public class MessageServiceImpl + extends ServiceImpl + implements MessageService { @Autowired private TokenService tokenService; @Autowired private HttpServletRequest request; - @Autowired - private MessageMapper messageMapper; /** * 消息发送 * @param messageSendReq @@ -106,7 +106,8 @@ public class MessageServiceImpl extends ServiceImpl imple */ @Override public void changestatus(Message message) { - messageMapper.changestatus(message); + message.setStatus(1); + this.updateById(message); } /** @@ -115,7 +116,11 @@ public class MessageServiceImpl extends ServiceImpl imple */ @Override public List unread() { - return messageMapper.unread(); + return this.list(new LambdaQueryWrapper() + .eq(Message::getStatus,0)) + .stream() + .map(Message::messageBuilder) + .toList(); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/WarnRuleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/WarnRuleServiceImpl.java index a6ba993..1ebd345 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/WarnRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/WarnRuleServiceImpl.java @@ -2,11 +2,16 @@ package com.muyu.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.query.MPJLambdaQueryWrapper; import com.muyu.common.core.utils.StringUtils; +import com.muyu.domain.CarMessage; import com.muyu.domain.WarnRule; import com.muyu.domain.resp.CarMessageResp; +import com.muyu.server.mapper.CarMessageMapper; import com.muyu.server.mapper.WarnRuleMapper; +import com.muyu.server.service.CarMessageService; import com.muyu.server.service.WarnRuleService; +import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.Assert; @@ -21,11 +26,12 @@ import java.util.List; * @Date：2024/9/20 下午7:29 */ @Service +@AllArgsConstructor public class WarnRuleServiceImpl extends ServiceImpl implements WarnRuleService { - @Autowired private WarnRuleMapper warnRuleMapper; + private final CarMessageService carMessageService; /** * 精确查询预警规则 @@ -91,7 +97,7 @@ public class WarnRuleServiceImpl @Override public List findByMsg(Long id) { - return warnRuleMapper.findByMsg(id); + return carMessageService.selectJoinList(id); } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/WarnStrategyServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/WarnStrategyServiceImpl.java index d6937e9..a331bbf 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/WarnStrategyServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/WarnStrategyServiceImpl.java @@ -8,10 +8,10 @@ import com.muyu.domain.WarnStrategy; import com.muyu.domain.req.WarnStrategyReq; import com.muyu.server.mapper.WarnStrategyMapper; import com.muyu.server.service.WarnStrategyService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.Assert; +import java.util.ArrayList; import java.util.List; /** @@ -26,8 +26,6 @@ public class WarnStrategyServiceImpl extends ServiceImpl implements WarnStrategyService { - @Autowired private WarnStrategyMapper warnStrategyMapper; - /** * 精确查询预警策略 * @@ -80,12 +78,31 @@ public class WarnStrategyServiceImpl @Override public List findByCarType() { - return warnStrategyMapper.findByCarType(); + List list = this.list(); + List carTypes = new ArrayList<>(); + list.forEach(warnStrategy -> { + CarType carType = new CarType(); + carType.setCarTypeId(warnStrategy.getCarTypeId()); + carType.setCarTypeName(warnStrategy.getStrategyName()); + carType.setCarTypeRules(warnStrategy.getCarTypeId()); + carTypes.add(carType); + }); + return carTypes; } @Override public List selectStrategyType(Long ids) { - return warnStrategyMapper.selectStrategyType(ids); + List warnStrategyReqs = this.list(new LambdaQueryWrapper() + .eq(WarnStrategy::getCarTypeId,ids)) + .stream().toList(); + List carTypes = new ArrayList<>(); + WarnStrategyReq warnStrategyReq1 = new WarnStrategyReq(); + warnStrategyReqs.forEach(warnStrategyReq -> { + warnStrategyReq1.setId(warnStrategyReq.getId()); + warnStrategyReq1.setStrategyName(warnStrategyReq.getStrategyName()); + carTypes.add(warnStrategyReq1); + }); + return carTypes; } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/CarMiddleGroupMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/CarMiddleGroupMapper.xml deleted file mode 100644 index e95c1a4..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/CarMiddleGroupMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultRuleMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultRuleMapper.xml deleted file mode 100644 index 03ac61c..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultRuleMapper.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select - car_information.*, - car_type.car_type_name - from - car_information - left join car_type on car_information.car_information_type=car_type.car_type_id - - - - SELECT - car_fault_condition.*, - car_type.car_type_name, - car_fault_label.message_type_name, - car_fault_label.message_type_code - FROM - car_fault_condition - LEFT JOIN car_type ON car_fault_condition.car_type_id = car_type.car_type_id - LEFT JOIN car_fault_label ON car_fault_condition.message_type_id = car_fault_label.message_type_id - - - - - - - - diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/MessageMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/MessageMapper.xml deleted file mode 100644 index b636a5d..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/MessageMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - update car_fault_message set status=1 where id=#{id} - - - diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/WarnRuleMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/WarnRuleMapper.xml deleted file mode 100644 index 2063a3c..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/WarnRuleMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/WarnStrategyMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/WarnStrategyMapper.xml deleted file mode 100644 index 5945787..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/WarnStrategyMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/cloud-modules/cloud-modules-enterprise/pom.xml b/cloud-modules/cloud-modules-enterprise/pom.xml index 3bedb42..28c9043 100644 --- a/cloud-modules/cloud-modules-enterprise/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/pom.xml @@ -5,11 +5,15 @@ 4.0.0 com.muyu - cloud-server + cloud-modules 3.6.3 - ../../pom.xml + + cloud-modules-enterprise-common + cloud-modules-enterprise-server + + cloud-modules-enterprise pom diff --git a/cloud-modules/cloud-modules-enterprise/web/WEB-INF/web.xml b/cloud-modules/cloud-modules-enterprise/web/WEB-INF/web.xml deleted file mode 100644 index d80081d..0000000 --- a/cloud-modules/cloud-modules-enterprise/web/WEB-INF/web.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - \ No newline at end of file diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml index 7627a64..d58c3fd 100644 --- a/cloud-modules/pom.xml +++ b/cloud-modules/pom.xml @@ -13,7 +13,6 @@ cloud-modules-system cloud-modules-gen cloud-modules-file - cloud-Saas-Service cloud-modules diff --git a/pom.xml b/pom.xml index 7053527..c71200f 100644 --- a/pom.xml +++ b/pom.xml @@ -282,10 +282,6 @@ cloud-visual cloud-modules cloud-common - cloud-modules/cloud-modules-enterprise - cloud-modules/cloud-Saas-Service - cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common - cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server pom