Browse Source

达梦数据库格式修改

wanggaokun 1 year ago
parent
commit
10750e8e2a
44 changed files with 380 additions and 317 deletions
  1. 63 0
      PHM-admin/phm-admin/src/main/resources/application-local.yml
  2. 5 5
      PHM-admin/phm-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
  3. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/AfterAnalysisResultMapper.xml
  4. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/AircraftMapper.xml
  5. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/AnalyzeCourseLogMapper.xml
  6. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/AnalyzeDownLogMapper.xml
  7. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/AnalyzeResultMapper.xml
  8. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/DataDownResultMapper.xml
  9. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/DeepIsolationModelMapper.xml
  10. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/DeriveParameterMapper.xml
  11. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/DiagnoseResultMapper.xml
  12. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/ExternalInterfaceLogMapper.xml
  13. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/FalseAlarmRestrainModelMapper.xml
  14. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/FaultAnalyzeResultMapper.xml
  15. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/FaultCaseMapper.xml
  16. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/FeedbackRawDataMapper.xml
  17. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/FleetMapper.xml
  18. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/ForecastModelMapper.xml
  19. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/ForecastResultMapper.xml
  20. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/GroundDiagnosisModelMapper.xml
  21. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/ImportExportLogMapper.xml
  22. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/InstructionInfoMapper.xml
  23. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/LifePartConfigMapper.xml
  24. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/MaintenanceMapper.xml
  25. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/MaintenanceTestControlMapper.xml
  26. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/MonitorParameterConfigMapper.xml
  27. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/OrderInfoMapper.xml
  28. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/PerformanceMonitorModelMapper.xml
  29. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/PreHandleResultMapper.xml
  30. 6 6
      PHM-admin/phm-manage/src/main/resources/mapper/manage/ProductMapper.xml
  31. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/SoftwareConfigMapper.xml
  32. 5 5
      PHM-admin/phm-manage/src/main/resources/mapper/manage/SortieMapper.xml
  33. 13 13
      PHM-admin/phm-system/src/main/resources/mapper/system/SysDeptMapper.xml
  34. 50 50
      PHM-admin/phm-system/src/main/resources/mapper/system/SysLogininforMapper.xml
  35. 32 32
      PHM-admin/phm-system/src/main/resources/mapper/system/SysMenuMapper.xml
  36. 5 5
      PHM-admin/phm-system/src/main/resources/mapper/system/SysNoticeMapper.xml
  37. 4 4
      PHM-admin/phm-system/src/main/resources/mapper/system/SysOperLogMapper.xml
  38. 7 7
      PHM-admin/phm-system/src/main/resources/mapper/system/SysPostMapper.xml
  39. 4 4
      PHM-admin/phm-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
  40. 6 6
      PHM-admin/phm-system/src/main/resources/mapper/system/SysRoleMapper.xml
  41. 4 4
      PHM-admin/phm-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
  42. 26 26
      PHM-admin/phm-system/src/main/resources/mapper/system/SysUserMapper.xml
  43. 4 4
      PHM-admin/phm-system/src/main/resources/mapper/system/SysUserPostMapper.xml
  44. 6 6
      PHM-admin/phm-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

+ 63 - 0
PHM-admin/phm-admin/src/main/resources/application-local.yml

@@ -0,0 +1,63 @@
+# 数据源配置
+spring:
+  redis:
+    host: localhost
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: dm.jdbc.driver.DmDriver
+    druid:
+      # 主库数据源
+      master:
+        url: jdbc:dm://124.71.193.202:5236/PHM?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: SYSDBA
+        password: SYSDBA
+      # 从库数据源
+      slave:
+        # 从数据源开关/默认关闭
+        enabled: false
+        url:
+        username:
+        password:
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置连接超时时间
+      connectTimeout: 30000
+      # 配置网络超时时间
+      socketTimeout: 60000
+      # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间,单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间,单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1 FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单,不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username: SYSDBA
+        login-password: SYSDBA
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true

+ 5 - 5
PHM-admin/phm-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
 	<sql id="selectGenTableColumnVo">
 	<sql id="selectGenTableColumnVo">
-        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
+        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 PHM.GEN_TABLE_COLUMN
     </sql>
     </sql>
 
 
     <select id="selectGenTableColumnListByTableId" parameterType="Long" resultMap="GenTableColumnResult">
     <select id="selectGenTableColumnListByTableId" parameterType="Long" resultMap="GenTableColumnResult">
@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	</select>
 
 
     <insert id="insertGenTableColumn" parameterType="GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
     <insert id="insertGenTableColumn" parameterType="GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
-        insert into gen_table_column (
+        insert into PHM.GEN_TABLE_COLUMN (
 			<if test="tableId != null and tableId != ''">table_id,</if>
 			<if test="tableId != null and tableId != ''">table_id,</if>
 			<if test="columnName != null and columnName != ''">column_name,</if>
 			<if test="columnName != null and columnName != ''">column_name,</if>
 			<if test="columnComment != null and columnComment != ''">column_comment,</if>
 			<if test="columnComment != null and columnComment != ''">column_comment,</if>
@@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateGenTableColumn" parameterType="GenTableColumn">
     <update id="updateGenTableColumn" parameterType="GenTableColumn">
-        update gen_table_column
+        update PHM.GEN_TABLE_COLUMN
         <set>
         <set>
             <if test="columnComment != null">column_comment = #{columnComment},</if>
             <if test="columnComment != null">column_comment = #{columnComment},</if>
             <if test="javaType != null">java_type = #{javaType},</if>
             <if test="javaType != null">java_type = #{javaType},</if>
@@ -111,14 +111,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteGenTableColumnByIds" parameterType="Long">
     <delete id="deleteGenTableColumnByIds" parameterType="Long">
-        delete from gen_table_column where table_id in
+        delete from PHM.GEN_TABLE_COLUMN where table_id in
         <foreach collection="array" item="tableId" open="(" separator="," close=")">
         <foreach collection="array" item="tableId" open="(" separator="," close=")">
             #{tableId}
             #{tableId}
         </foreach>
         </foreach>
     </delete>
     </delete>
 
 
     <delete id="deleteGenTableColumns">
     <delete id="deleteGenTableColumns">
-        delete from gen_table_column where column_id in
+        delete from PHM.GEN_TABLE_COLUMN where column_id in
         <foreach collection="list" item="item" open="(" separator="," close=")">
         <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item.columnId}
             #{item.columnId}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/AfterAnalysisResultMapper.xml

@@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectAfterAnalysisResultVo">
     <sql id="selectAfterAnalysisResultVo">
-        select id, remark, is_delete, create_by, create_time, update_by, update_time from phm_after_analysis_result
+        select id, remark, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_AFTER_ANALYSIS_RESULT
     </sql>
     </sql>
 
 
     <select id="selectAfterAnalysisResultList" parameterType="AfterAnalysisResult" resultMap="AfterAnalysisResultResult">
     <select id="selectAfterAnalysisResultList" parameterType="AfterAnalysisResult" resultMap="AfterAnalysisResultResult">
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertAfterAnalysisResult" parameterType="AfterAnalysisResult">
     <insert id="insertAfterAnalysisResult" parameterType="AfterAnalysisResult">
-        insert into phm_after_analysis_result
+        insert into PHM.PHM_AFTER_ANALYSIS_RESULT
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="remark != null">remark,</if>
             <if test="remark != null">remark,</if>
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateAfterAnalysisResult" parameterType="AfterAnalysisResult">
     <update id="updateAfterAnalysisResult" parameterType="AfterAnalysisResult">
-        update phm_after_analysis_result
+        update PHM.PHM_AFTER_ANALYSIS_RESULT
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="remark != null">remark = #{remark},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="isDelete != null">is_delete = #{isDelete},</if>
             <if test="isDelete != null">is_delete = #{isDelete},</if>
@@ -66,11 +66,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteAfterAnalysisResultById" parameterType="Long">
     <delete id="deleteAfterAnalysisResultById" parameterType="Long">
-        delete from phm_after_analysis_result where id = #{id}
+        delete from PHM.PHM_AFTER_ANALYSIS_RESULT where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteAfterAnalysisResultByIds" parameterType="String">
     <delete id="deleteAfterAnalysisResultByIds" parameterType="String">
-        delete from phm_after_analysis_result where id in 
+        delete from PHM.PHM_AFTER_ANALYSIS_RESULT where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/AircraftMapper.xml

@@ -18,7 +18,7 @@
     </resultMap>
     </resultMap>
 
 
     <sql id="selectAircraftVo">
     <sql id="selectAircraftVo">
-        select id, name, number, fleet_id, aircraft_type_id, is_delete, create_by, create_time, update_by, update_time from phm_aircraft
+        select id, name, number, fleet_id, aircraft_type_id, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_AIRCRAFT
     </sql>
     </sql>
 
 
     <select id="selectAircraftList" parameterType="Aircraft" resultMap="AircraftResult">
     <select id="selectAircraftList" parameterType="Aircraft" resultMap="AircraftResult">
@@ -37,7 +37,7 @@
     </select>
     </select>
         
         
     <insert id="insertAircraft" parameterType="Aircraft">
     <insert id="insertAircraft" parameterType="Aircraft">
-        insert into phm_aircraft
+        insert into PHM.PHM_AIRCRAFT
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="name != null">name,</if>
             <if test="name != null">name,</if>
@@ -65,7 +65,7 @@
     </insert>
     </insert>
 
 
     <update id="updateAircraft" parameterType="Aircraft">
     <update id="updateAircraft" parameterType="Aircraft">
-        update phm_aircraft
+        update PHM.PHM_AIRCRAFT
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null">name = #{name},</if>
             <if test="name != null">name = #{name},</if>
             <if test="number != null">number = #{number},</if>
             <if test="number != null">number = #{number},</if>
@@ -81,11 +81,11 @@
     </update>
     </update>
 
 
     <delete id="deleteAircraftById" parameterType="Long">
     <delete id="deleteAircraftById" parameterType="Long">
-        delete from phm_aircraft where id = #{id}
+        delete from PHM.PHM_AIRCRAFT where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteAircraftByIds" parameterType="String">
     <delete id="deleteAircraftByIds" parameterType="String">
-        delete from phm_aircraft where id in 
+        delete from PHM.PHM_AIRCRAFT where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/AnalyzeCourseLogMapper.xml

@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectAnalyzeCourseLogVo">
     <sql id="selectAnalyzeCourseLogVo">
-        select id, module_name, module_type, course_content, status, is_delete, create_by, create_time, update_by, update_time from phm_analyze_course_log
+        select id, module_name, module_type, course_content, status, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_ANALYZE_COURSE_LOG
     </sql>
     </sql>
 
 
     <select id="selectAnalyzeCourseLogList" parameterType="AnalyzeCourseLog" resultMap="AnalyzeCourseLogResult">
     <select id="selectAnalyzeCourseLogList" parameterType="AnalyzeCourseLog" resultMap="AnalyzeCourseLogResult">
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertAnalyzeCourseLog" parameterType="AnalyzeCourseLog">
     <insert id="insertAnalyzeCourseLog" parameterType="AnalyzeCourseLog">
-        insert into phm_analyze_course_log
+        insert into PHM.PHM_ANALYZE_COURSE_LOG
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="moduleName != null">module_name,</if>
             <if test="moduleName != null">module_name,</if>
@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateAnalyzeCourseLog" parameterType="AnalyzeCourseLog">
     <update id="updateAnalyzeCourseLog" parameterType="AnalyzeCourseLog">
-        update phm_analyze_course_log
+        update PHM.PHM_ANALYZE_COURSE_LOG
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="moduleName != null">module_name = #{moduleName},</if>
             <if test="moduleName != null">module_name = #{moduleName},</if>
             <if test="moduleType != null">module_type = #{moduleType},</if>
             <if test="moduleType != null">module_type = #{moduleType},</if>
@@ -81,11 +81,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteAnalyzeCourseLogById" parameterType="Long">
     <delete id="deleteAnalyzeCourseLogById" parameterType="Long">
-        delete from phm_analyze_course_log where id = #{id}
+        delete from PHM.PHM_ANALYZE_COURSE_LOG where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteAnalyzeCourseLogByIds" parameterType="String">
     <delete id="deleteAnalyzeCourseLogByIds" parameterType="String">
-        delete from phm_analyze_course_log where id in 
+        delete from PHM.PHM_ANALYZE_COURSE_LOG where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/AnalyzeDownLogMapper.xml

@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectAnalyzeDownLogVo">
     <sql id="selectAnalyzeDownLogVo">
-        select id, name, path, status, fault, is_delete, create_by, create_time, update_by, update_time from phm_analyze_down_log
+        select id, name, path, status, fault, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_ANALYZE_DOWN_LOG
     </sql>
     </sql>
 
 
     <select id="selectAnalyzeDownLogList" parameterType="AnalyzeDownLog" resultMap="AnalyzeDownLogResult">
     <select id="selectAnalyzeDownLogList" parameterType="AnalyzeDownLog" resultMap="AnalyzeDownLogResult">
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertAnalyzeDownLog" parameterType="AnalyzeDownLog">
     <insert id="insertAnalyzeDownLog" parameterType="AnalyzeDownLog">
-        insert into phm_analyze_down_log
+        insert into PHM.PHM_ANALYZE_DOWN_LOG
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="name != null">name,</if>
             <if test="name != null">name,</if>
@@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateAnalyzeDownLog" parameterType="AnalyzeDownLog">
     <update id="updateAnalyzeDownLog" parameterType="AnalyzeDownLog">
-        update phm_analyze_down_log
+        update PHM.PHM_ANALYZE_DOWN_LOG
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null">name = #{name},</if>
             <if test="name != null">name = #{name},</if>
             <if test="path != null">path = #{path},</if>
             <if test="path != null">path = #{path},</if>
@@ -82,11 +82,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteAnalyzeDownLogById" parameterType="Long">
     <delete id="deleteAnalyzeDownLogById" parameterType="Long">
-        delete from phm_analyze_down_log where id = #{id}
+        delete from PHM.PHM_ANALYZE_DOWN_LOG where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteAnalyzeDownLogByIds" parameterType="String">
     <delete id="deleteAnalyzeDownLogByIds" parameterType="String">
-        delete from phm_analyze_down_log where id in 
+        delete from PHM.PHM_ANALYZE_DOWN_LOG where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/AnalyzeResultMapper.xml

@@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectAnalyzeResultVo">
     <sql id="selectAnalyzeResultVo">
-        select id, remark, is_delete, create_by, create_time, update_by, update_time from phm_analyze_result
+        select id, remark, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_ANALYZE_RESULT
     </sql>
     </sql>
 
 
     <select id="selectAnalyzeResultList" parameterType="AnalyzeResult" resultMap="AnalyzeResultResult">
     <select id="selectAnalyzeResultList" parameterType="AnalyzeResult" resultMap="AnalyzeResultResult">
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertAnalyzeResult" parameterType="AnalyzeResult">
     <insert id="insertAnalyzeResult" parameterType="AnalyzeResult">
-        insert into phm_analyze_result
+        insert into PHM.PHM_ANALYZE_RESULT
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="remark != null">remark,</if>
             <if test="remark != null">remark,</if>
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateAnalyzeResult" parameterType="AnalyzeResult">
     <update id="updateAnalyzeResult" parameterType="AnalyzeResult">
-        update phm_analyze_result
+        update PHM.PHM_ANALYZE_RESULT
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="remark != null">remark = #{remark},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="isDelete != null">is_delete = #{isDelete},</if>
             <if test="isDelete != null">is_delete = #{isDelete},</if>
@@ -66,11 +66,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteAnalyzeResultById" parameterType="Long">
     <delete id="deleteAnalyzeResultById" parameterType="Long">
-        delete from phm_analyze_result where id = #{id}
+        delete from PHM.PHM_ANALYZE_RESULT where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteAnalyzeResultByIds" parameterType="String">
     <delete id="deleteAnalyzeResultByIds" parameterType="String">
-        delete from phm_analyze_result where id in 
+        delete from PHM.PHM_ANALYZE_RESULT where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/DataDownResultMapper.xml

@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectDataDownResultVo">
     <sql id="selectDataDownResultVo">
-        select id, order, name, path, remark, is_delete, create_by, create_time, update_by, update_time from phm_data_down_result
+        select id, order, name, path, remark, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_DATA_DOWN_RESULT
     </sql>
     </sql>
 
 
     <select id="selectDataDownResultList" parameterType="DataDownResult" resultMap="DataDownResultResult">
     <select id="selectDataDownResultList" parameterType="DataDownResult" resultMap="DataDownResultResult">
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertDataDownResult" parameterType="DataDownResult">
     <insert id="insertDataDownResult" parameterType="DataDownResult">
-        insert into phm_data_down_result
+        insert into PHM.PHM_DATA_DOWN_RESULT
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="order != null">order,</if>
             <if test="order != null">order,</if>
@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateDataDownResult" parameterType="DataDownResult">
     <update id="updateDataDownResult" parameterType="DataDownResult">
-        update phm_data_down_result
+        update PHM.PHM_DATA_DOWN_RESULT
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="order != null">order = #{order},</if>
             <if test="order != null">order = #{order},</if>
             <if test="name != null">name = #{name},</if>
             <if test="name != null">name = #{name},</if>
@@ -81,11 +81,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteDataDownResultById" parameterType="Long">
     <delete id="deleteDataDownResultById" parameterType="Long">
-        delete from phm_data_down_result where id = #{id}
+        delete from PHM.PHM_DATA_DOWN_RESULT where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteDataDownResultByIds" parameterType="String">
     <delete id="deleteDataDownResultByIds" parameterType="String">
-        delete from phm_data_down_result where id in 
+        delete from PHM.PHM_DATA_DOWN_RESULT where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/DeepIsolationModelMapper.xml

@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectDeepIsolationModelVo">
     <sql id="selectDeepIsolationModelVo">
-        select id, code, fault_equation, fault_lru, is_delete, create_by, create_time, update_by, update_time from phm_deep_isolation_model
+        select id, code, fault_equation, fault_lru, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_DATA_DOWN_RESULT
     </sql>
     </sql>
 
 
     <select id="selectDeepIsolationModelList" parameterType="DeepIsolationModel" resultMap="DeepIsolationModelResult">
     <select id="selectDeepIsolationModelList" parameterType="DeepIsolationModel" resultMap="DeepIsolationModelResult">
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertDeepIsolationModel" parameterType="DeepIsolationModel">
     <insert id="insertDeepIsolationModel" parameterType="DeepIsolationModel">
-        insert into phm_deep_isolation_model
+        insert into PHM.PHM_DATA_DOWN_RESULT
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="code != null">code,</if>
             <if test="code != null">code,</if>
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateDeepIsolationModel" parameterType="DeepIsolationModel">
     <update id="updateDeepIsolationModel" parameterType="DeepIsolationModel">
-        update phm_deep_isolation_model
+        update PHM.PHM_DATA_DOWN_RESULT
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="code != null">code = #{code},</if>
             <if test="code != null">code = #{code},</if>
             <if test="faultEquation != null">fault_equation = #{faultEquation},</if>
             <if test="faultEquation != null">fault_equation = #{faultEquation},</if>
@@ -77,11 +77,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteDeepIsolationModelById" parameterType="Long">
     <delete id="deleteDeepIsolationModelById" parameterType="Long">
-        delete from phm_deep_isolation_model where id = #{id}
+        delete from PHM.PHM_DATA_DOWN_RESULT where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteDeepIsolationModelByIds" parameterType="String">
     <delete id="deleteDeepIsolationModelByIds" parameterType="String">
-        delete from phm_deep_isolation_model where id in 
+        delete from PHM.PHM_DATA_DOWN_RESULT where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/DeriveParameterMapper.xml

@@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectDeriveParameterVo">
     <sql id="selectDeriveParameterVo">
-        select id, name, expression, is_delete, create_by, create_time, update_by, update_time from phm_derive_parameter
+        select id, name, expression, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_DERIVE_PARAMETER
     </sql>
     </sql>
 
 
     <select id="selectDeriveParameterList" parameterType="DeriveParameter" resultMap="DeriveParameterResult">
     <select id="selectDeriveParameterList" parameterType="DeriveParameter" resultMap="DeriveParameterResult">
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertDeriveParameter" parameterType="DeriveParameter">
     <insert id="insertDeriveParameter" parameterType="DeriveParameter">
-        insert into phm_derive_parameter
+        insert into PHM.PHM_DERIVE_PARAMETER
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="name != null">name,</if>
             <if test="name != null">name,</if>
@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateDeriveParameter" parameterType="DeriveParameter">
     <update id="updateDeriveParameter" parameterType="DeriveParameter">
-        update phm_derive_parameter
+        update PHM.PHM_DERIVE_PARAMETER
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null">name = #{name},</if>
             <if test="name != null">name = #{name},</if>
             <if test="expression != null">expression = #{expression},</if>
             <if test="expression != null">expression = #{expression},</if>
@@ -72,11 +72,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteDeriveParameterById" parameterType="Long">
     <delete id="deleteDeriveParameterById" parameterType="Long">
-        delete from phm_derive_parameter where id = #{id}
+        delete from PHM.PHM_DERIVE_PARAMETER where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteDeriveParameterByIds" parameterType="String">
     <delete id="deleteDeriveParameterByIds" parameterType="String">
-        delete from phm_derive_parameter where id in 
+        delete from PHM.PHM_DERIVE_PARAMETER where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/DiagnoseResultMapper.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectDiagnoseResultVo">
     <sql id="selectDiagnoseResultVo">
-        select id, fault_mode, fault_object, fault_code, fault_source, analysis_time, comment, is_delete, create_by, create_time, update_by, update_time from phm_diagnose_result
+        select id, fault_mode, fault_object, fault_code, fault_source, analysis_time, comment, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_DERIVE_PARAMETER
     </sql>
     </sql>
 
 
     <select id="selectDiagnoseResultList" parameterType="DiagnoseResult" resultMap="DiagnoseResultResult">
     <select id="selectDiagnoseResultList" parameterType="DiagnoseResult" resultMap="DiagnoseResultResult">
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertDiagnoseResult" parameterType="DiagnoseResult">
     <insert id="insertDiagnoseResult" parameterType="DiagnoseResult">
-        insert into phm_diagnose_result
+        insert into PHM.PHM_DERIVE_PARAMETER
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="faultMode != null">fault_mode,</if>
             <if test="faultMode != null">fault_mode,</if>
@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateDiagnoseResult" parameterType="DiagnoseResult">
     <update id="updateDiagnoseResult" parameterType="DiagnoseResult">
-        update phm_diagnose_result
+        update PHM.PHM_DERIVE_PARAMETER
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="faultMode != null">fault_mode = #{faultMode},</if>
             <if test="faultMode != null">fault_mode = #{faultMode},</if>
             <if test="faultObject != null">fault_object = #{faultObject},</if>
             <if test="faultObject != null">fault_object = #{faultObject},</if>
@@ -92,11 +92,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteDiagnoseResultById" parameterType="Long">
     <delete id="deleteDiagnoseResultById" parameterType="Long">
-        delete from phm_diagnose_result where id = #{id}
+        delete from PHM.PHM_DERIVE_PARAMETER where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteDiagnoseResultByIds" parameterType="String">
     <delete id="deleteDiagnoseResultByIds" parameterType="String">
-        delete from phm_diagnose_result where id in 
+        delete from PHM.PHM_DERIVE_PARAMETER where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/ExternalInterfaceLogMapper.xml

@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectExternalInterfaceLogVo">
     <sql id="selectExternalInterfaceLogVo">
-        select id, result, name, url, is_delete, create_by, create_time, update_by, update_time from sys_external_interface_log
+        select id, result, name, url, is_delete, create_by, create_time, update_by, update_time from PHM.SYS_EXTERNAL_INTERFACE_LOG
     </sql>
     </sql>
 
 
     <select id="selectExternalInterfaceLogList" parameterType="ExternalInterfaceLog" resultMap="ExternalInterfaceLogResult">
     <select id="selectExternalInterfaceLogList" parameterType="ExternalInterfaceLog" resultMap="ExternalInterfaceLogResult">
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertExternalInterfaceLog" parameterType="ExternalInterfaceLog">
     <insert id="insertExternalInterfaceLog" parameterType="ExternalInterfaceLog">
-        insert into sys_external_interface_log
+        insert into PHM.SYS_EXTERNAL_INTERFACE_LOG
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="result != null">result,</if>
             <if test="result != null">result,</if>
@@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateExternalInterfaceLog" parameterType="ExternalInterfaceLog">
     <update id="updateExternalInterfaceLog" parameterType="ExternalInterfaceLog">
-        update sys_external_interface_log
+        update PHM.SYS_EXTERNAL_INTERFACE_LOG
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="result != null">result = #{result},</if>
             <if test="result != null">result = #{result},</if>
             <if test="name != null">name = #{name},</if>
             <if test="name != null">name = #{name},</if>
@@ -81,11 +81,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteExternalInterfaceLogById" parameterType="Long">
     <delete id="deleteExternalInterfaceLogById" parameterType="Long">
-        delete from sys_external_interface_log where id = #{id}
+        delete from PHM.SYS_EXTERNAL_INTERFACE_LOG where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteExternalInterfaceLogByIds" parameterType="String">
     <delete id="deleteExternalInterfaceLogByIds" parameterType="String">
-        delete from sys_external_interface_log where id in 
+        delete from PHM.SYS_EXTERNAL_INTERFACE_LOG where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/FalseAlarmRestrainModelMapper.xml

@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectFalseAlarmRestrainModelVo">
     <sql id="selectFalseAlarmRestrainModelVo">
-        select id, code, restrain_criteria, min_duration, is_delete, create_by, create_time, update_by, update_time from phm_false_alarm_restrain_model
+        select id, code, restrain_criteria, min_duration, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_FALSE_ALARM_RESTRAIN_MODEL
     </sql>
     </sql>
 
 
     <select id="selectFalseAlarmRestrainModelList" parameterType="FalseAlarmRestrainModel" resultMap="FalseAlarmRestrainModelResult">
     <select id="selectFalseAlarmRestrainModelList" parameterType="FalseAlarmRestrainModel" resultMap="FalseAlarmRestrainModelResult">
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertFalseAlarmRestrainModel" parameterType="FalseAlarmRestrainModel">
     <insert id="insertFalseAlarmRestrainModel" parameterType="FalseAlarmRestrainModel">
-        insert into phm_false_alarm_restrain_model
+        insert into PHM.PHM_FALSE_ALARM_RESTRAIN_MODEL
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="code != null">code,</if>
             <if test="code != null">code,</if>
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateFalseAlarmRestrainModel" parameterType="FalseAlarmRestrainModel">
     <update id="updateFalseAlarmRestrainModel" parameterType="FalseAlarmRestrainModel">
-        update phm_false_alarm_restrain_model
+        update PHM.PHM_FALSE_ALARM_RESTRAIN_MODEL
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="code != null">code = #{code},</if>
             <if test="code != null">code = #{code},</if>
             <if test="restrainCriteria != null">restrain_criteria = #{restrainCriteria},</if>
             <if test="restrainCriteria != null">restrain_criteria = #{restrainCriteria},</if>
@@ -77,11 +77,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteFalseAlarmRestrainModelById" parameterType="Long">
     <delete id="deleteFalseAlarmRestrainModelById" parameterType="Long">
-        delete from phm_false_alarm_restrain_model where id = #{id}
+        delete from PHM.PHM_FALSE_ALARM_RESTRAIN_MODEL where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteFalseAlarmRestrainModelByIds" parameterType="String">
     <delete id="deleteFalseAlarmRestrainModelByIds" parameterType="String">
-        delete from phm_false_alarm_restrain_model where id in 
+        delete from PHM.PHM_FALSE_ALARM_RESTRAIN_MODEL where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/FaultAnalyzeResultMapper.xml

@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectFaultAnalyzeResultVo">
     <sql id="selectFaultAnalyzeResultVo">
-        select id, module_name, module_type, analyze_info, comment, is_delete, create_by, create_time, update_by, update_time from phm_fault_analyze_result
+        select id, module_name, module_type, analyze_info, comment, is_delete, create_by, create_time, update_by, update_time from PHM.phm_fault_analyze_result
     </sql>
     </sql>
 
 
     <select id="selectFaultAnalyzeResultList" parameterType="FaultAnalyzeResult" resultMap="FaultAnalyzeResultResult">
     <select id="selectFaultAnalyzeResultList" parameterType="FaultAnalyzeResult" resultMap="FaultAnalyzeResultResult">
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertFaultAnalyzeResult" parameterType="FaultAnalyzeResult" >
     <insert id="insertFaultAnalyzeResult" parameterType="FaultAnalyzeResult" >
-        insert into phm_fault_analyze_result
+        insert into PHM.phm_fault_analyze_result
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="moduleName != null">module_name,</if>
             <if test="moduleName != null">module_name,</if>
@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateFaultAnalyzeResult" parameterType="FaultAnalyzeResult">
     <update id="updateFaultAnalyzeResult" parameterType="FaultAnalyzeResult">
-        update phm_fault_analyze_result
+        update PHM.phm_fault_analyze_result
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="moduleName != null">module_name = #{moduleName},</if>
             <if test="moduleName != null">module_name = #{moduleName},</if>
             <if test="moduleType != null">module_type = #{moduleType},</if>
             <if test="moduleType != null">module_type = #{moduleType},</if>
@@ -86,11 +86,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteFaultAnalyzeResultById" parameterType="Long">
     <delete id="deleteFaultAnalyzeResultById" parameterType="Long">
-        delete from phm_fault_analyze_result where id = #{id}
+        delete from PHM.phm_fault_analyze_result where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteFaultAnalyzeResultByIds" parameterType="String">
     <delete id="deleteFaultAnalyzeResultByIds" parameterType="String">
-        delete from phm_fault_analyze_result where id in 
+        delete from PHM.phm_fault_analyze_result where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/FaultCaseMapper.xml

@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectFaultCaseVo">
     <sql id="selectFaultCaseVo">
-        select id, case_file_name, case_name, description, case_number, is_delete, create_by, create_time, update_by, update_time, parameter, location, solution from phm_fault_case
+        select id, case_file_name, case_name, description, case_number, is_delete, create_by, create_time, update_by, update_time, parameter, location, solution from PHM.PHM_FAULT_CASE
     </sql>
     </sql>
 
 
     <select id="selectFaultCaseList" parameterType="FaultCase" resultMap="FaultCaseResult">
     <select id="selectFaultCaseList" parameterType="FaultCase" resultMap="FaultCaseResult">
@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertFaultCase" parameterType="FaultCase">
     <insert id="insertFaultCase" parameterType="FaultCase">
-        insert into phm_fault_case
+        insert into PHM.PHM_FAULT_CASE
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="caseFileName != null">case_file_name,</if>
             <if test="caseFileName != null">case_file_name,</if>
@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateFaultCase" parameterType="FaultCase">
     <update id="updateFaultCase" parameterType="FaultCase">
-        update phm_fault_case
+        update PHM.PHM_FAULT_CASE
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="caseName != null">case_name = #{caseName},</if>
             <if test="caseName != null">case_name = #{caseName},</if>
             <if test="caseFileName != null">case_file_name = #{caseFileName},</if>
             <if test="caseFileName != null">case_file_name = #{caseFileName},</if>
@@ -100,11 +100,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteFaultCaseById" parameterType="Long">
     <delete id="deleteFaultCaseById" parameterType="Long">
-        delete from phm_fault_case where id = #{id}
+        delete from PHM.PHM_FAULT_CASE where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteFaultCaseByIds" parameterType="String">
     <delete id="deleteFaultCaseByIds" parameterType="String">
-        delete from phm_fault_case where id in 
+        delete from PHM.PHM_FAULT_CASE where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/FeedbackRawDataMapper.xml

@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectFeedbackRawDataVo">
     <sql id="selectFeedbackRawDataVo">
-        select id, is_delete, create_by, create_time, update_by, update_time from phm_feedback_raw_data
+        select id, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_FEEDBACK_RAW_DATA
     </sql>
     </sql>
 
 
     <select id="selectFeedbackRawDataList" parameterType="FeedbackRawData" resultMap="FeedbackRawDataResult">
     <select id="selectFeedbackRawDataList" parameterType="FeedbackRawData" resultMap="FeedbackRawDataResult">
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertFeedbackRawData" parameterType="FeedbackRawData">
     <insert id="insertFeedbackRawData" parameterType="FeedbackRawData">
-        insert into phm_feedback_raw_data
+        insert into PHM.PHM_FEEDBACK_RAW_DATA
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="isDelete != null">is_delete,</if>
             <if test="isDelete != null">is_delete,</if>
@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateFeedbackRawData" parameterType="FeedbackRawData">
     <update id="updateFeedbackRawData" parameterType="FeedbackRawData">
-        update phm_feedback_raw_data
+        update PHM.PHM_FEEDBACK_RAW_DATA
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="isDelete != null">is_delete = #{isDelete},</if>
             <if test="isDelete != null">is_delete = #{isDelete},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
@@ -66,11 +66,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteFeedbackRawDataById" parameterType="Long">
     <delete id="deleteFeedbackRawDataById" parameterType="Long">
-        delete from phm_feedback_raw_data where id = #{id}
+        delete from PHM.PHM_FEEDBACK_RAW_DATA where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteFeedbackRawDataByIds" parameterType="String">
     <delete id="deleteFeedbackRawDataByIds" parameterType="String">
-        delete from phm_feedback_raw_data where id in 
+        delete from PHM.PHM_FEEDBACK_RAW_DATA where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/FleetMapper.xml

@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectFleetVo">
     <sql id="selectFleetVo">
-        select id, fleet_name, fleet_code, gather, is_delete, create_by, create_time, update_by, update_time from phm_fleet
+        select id, fleet_name, fleet_code, gather, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_FLEET
     </sql>
     </sql>
 
 
     <select id="selectFleetList" parameterType="Fleet" resultMap="FleetResult">
     <select id="selectFleetList" parameterType="Fleet" resultMap="FleetResult">
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertFleet" parameterType="Fleet">
     <insert id="insertFleet" parameterType="Fleet">
-        insert into phm_fleet
+        insert into PHM.PHM_FLEET
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="fleetName != null">fleet_name,</if>
             <if test="fleetName != null">fleet_name,</if>
@@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateFleet" parameterType="Fleet">
     <update id="updateFleet" parameterType="Fleet">
-        update phm_fleet
+        update PHM.PHM_FLEET
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="fleetName != null">fleet_name = #{fleetName},</if>
             <if test="fleetName != null">fleet_name = #{fleetName},</if>
             <if test="fleetCode != null">fleet_code = #{fleetCode},</if>
             <if test="fleetCode != null">fleet_code = #{fleetCode},</if>
@@ -81,11 +81,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteFleetById" parameterType="Long">
     <delete id="deleteFleetById" parameterType="Long">
-        delete from phm_fleet where id = #{id}
+        delete from PHM.PHM_FLEET where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteFleetByIds" parameterType="String">
     <delete id="deleteFleetByIds" parameterType="String">
-        delete from phm_fleet where id in 
+        delete from PHM.PHM_FLEET where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/ForecastModelMapper.xml

@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectForecastModelVo">
     <sql id="selectForecastModelVo">
-        select id, object, method, trains_range, accuracy, is_delete, create_by, create_time, update_by, update_time from phm_forecast_model
+        select id, object, method, trains_range, accuracy, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_FORECAST_MODEL
     </sql>
     </sql>
 
 
     <select id="selectForecastModelList" parameterType="ForecastModel" resultMap="ForecastModelResult">
     <select id="selectForecastModelList" parameterType="ForecastModel" resultMap="ForecastModelResult">
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertForecastModel" parameterType="ForecastModel">
     <insert id="insertForecastModel" parameterType="ForecastModel">
-        insert into phm_forecast_model
+        insert into PHM.PHM_FORECAST_MODEL
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="object != null">object,</if>
             <if test="object != null">object,</if>
@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateForecastModel" parameterType="ForecastModel">
     <update id="updateForecastModel" parameterType="ForecastModel">
-        update phm_forecast_model
+        update PHM.PHM_FORECAST_MODEL
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="object != null">object = #{object},</if>
             <if test="object != null">object = #{object},</if>
             <if test="method != null">method = #{method},</if>
             <if test="method != null">method = #{method},</if>
@@ -86,11 +86,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteForecastModelById" parameterType="Long">
     <delete id="deleteForecastModelById" parameterType="Long">
-        delete from phm_forecast_model where id = #{id}
+        delete from PHM.PHM_FORECAST_MODEL where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteForecastModelByIds" parameterType="String">
     <delete id="deleteForecastModelByIds" parameterType="String">
-        delete from phm_forecast_model where id in 
+        delete from PHM.PHM_FORECAST_MODEL where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/ForecastResultMapper.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectForecastResultVo">
     <sql id="selectForecastResultVo">
-        select id, unit_name, study_object, sns_code, forecast_fault, analysis_time, comment, is_delete, create_by, create_time, update_by, update_time from phm_forecast_result
+        select id, unit_name, study_object, sns_code, forecast_fault, analysis_time, comment, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_FORECAST_RESULT
     </sql>
     </sql>
 
 
     <select id="selectForecastResultList" parameterType="ForecastResult" resultMap="ForecastResultResult">
     <select id="selectForecastResultList" parameterType="ForecastResult" resultMap="ForecastResultResult">
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertForecastResult" parameterType="ForecastResult">
     <insert id="insertForecastResult" parameterType="ForecastResult">
-        insert into phm_forecast_result
+        insert into PHM.PHM_FORECAST_RESULT
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="unitName != null">unit_name,</if>
             <if test="unitName != null">unit_name,</if>
@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateForecastResult" parameterType="ForecastResult">
     <update id="updateForecastResult" parameterType="ForecastResult">
-        update phm_forecast_result
+        update PHM.PHM_FORECAST_RESULT
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="unitName != null">unit_name = #{unitName},</if>
             <if test="unitName != null">unit_name = #{unitName},</if>
             <if test="studyObject != null">study_object = #{studyObject},</if>
             <if test="studyObject != null">study_object = #{studyObject},</if>
@@ -90,11 +90,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteForecastResultById" parameterType="Long">
     <delete id="deleteForecastResultById" parameterType="Long">
-        delete from phm_forecast_result where id = #{id}
+        delete from PHM.PHM_FORECAST_RESULT where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteForecastResultByIds" parameterType="String">
     <delete id="deleteForecastResultByIds" parameterType="String">
-        delete from phm_forecast_result where id in 
+        delete from PHM.PHM_FORECAST_RESULT where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/GroundDiagnosisModelMapper.xml

@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectGroundDiagnosisModelVo">
     <sql id="selectGroundDiagnosisModelVo">
-        select id, code, criteria, min_duration, system_source, lru_source, is_delete, create_by, create_time, update_by, update_time from phm_ground_diagnosis_model
+        select id, code, criteria, min_duration, system_source, lru_source, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_GROUND_DIAGNOSIS_MODEL
     </sql>
     </sql>
 
 
     <select id="selectGroundDiagnosisModelList" parameterType="GroundDiagnosisModel" resultMap="GroundDiagnosisModelResult">
     <select id="selectGroundDiagnosisModelList" parameterType="GroundDiagnosisModel" resultMap="GroundDiagnosisModelResult">
@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertGroundDiagnosisModel" parameterType="GroundDiagnosisModel">
     <insert id="insertGroundDiagnosisModel" parameterType="GroundDiagnosisModel">
-        insert into phm_ground_diagnosis_model
+        insert into PHM.PHM_GROUND_DIAGNOSIS_MODEL
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="code != null">code,</if>
             <if test="code != null">code,</if>
@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateGroundDiagnosisModel" parameterType="GroundDiagnosisModel">
     <update id="updateGroundDiagnosisModel" parameterType="GroundDiagnosisModel">
-        update phm_ground_diagnosis_model
+        update PHM.PHM_GROUND_DIAGNOSIS_MODEL
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="code != null">code = #{code},</if>
             <if test="code != null">code = #{code},</if>
             <if test="criteria != null">criteria = #{criteria},</if>
             <if test="criteria != null">criteria = #{criteria},</if>
@@ -91,11 +91,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteGroundDiagnosisModelById" parameterType="Long">
     <delete id="deleteGroundDiagnosisModelById" parameterType="Long">
-        delete from phm_ground_diagnosis_model where id = #{id}
+        delete from PHM.PHM_GROUND_DIAGNOSIS_MODEL where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteGroundDiagnosisModelByIds" parameterType="String">
     <delete id="deleteGroundDiagnosisModelByIds" parameterType="String">
-        delete from phm_ground_diagnosis_model where id in 
+        delete from PHM.PHM_GROUND_DIAGNOSIS_MODEL where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/ImportExportLogMapper.xml

@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectImportExportLogVo">
     <sql id="selectImportExportLogVo">
-        select id, model_name, name, error, status, is_delete, create_by, create_time, update_by, update_time from sys_import_export_log
+        select id, model_name, name, error, status, is_delete, create_by, create_time, update_by, update_time from PHM.SYS_IMPORT_EXPORT_LOG
     </sql>
     </sql>
 
 
     <select id="selectImportExportLogList" parameterType="ImportExportLog" resultMap="ImportExportLogResult">
     <select id="selectImportExportLogList" parameterType="ImportExportLog" resultMap="ImportExportLogResult">
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertImportExportLog" parameterType="ImportExportLog">
     <insert id="insertImportExportLog" parameterType="ImportExportLog">
-        insert into sys_import_export_log
+        insert into PHM.SYS_IMPORT_EXPORT_LOG
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="modelName != null">model_name,</if>
             <if test="modelName != null">model_name,</if>
@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateImportExportLog" parameterType="ImportExportLog">
     <update id="updateImportExportLog" parameterType="ImportExportLog">
-        update sys_import_export_log
+        update PHM.SYS_IMPORT_EXPORT_LOG
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="modelName != null">model_name = #{modelName},</if>
             <if test="modelName != null">model_name = #{modelName},</if>
             <if test="name != null">name = #{name},</if>
             <if test="name != null">name = #{name},</if>
@@ -86,11 +86,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteImportExportLogById" parameterType="Long">
     <delete id="deleteImportExportLogById" parameterType="Long">
-        delete from sys_import_export_log where id = #{id}
+        delete from PHM.SYS_IMPORT_EXPORT_LOG where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteImportExportLogByIds" parameterType="String">
     <delete id="deleteImportExportLogByIds" parameterType="String">
-        delete from sys_import_export_log where id in 
+        delete from PHM.SYS_IMPORT_EXPORT_LOG where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/InstructionInfoMapper.xml

@@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectInstructionInfoVo">
     <sql id="selectInstructionInfoVo">
-        select id, attribute, content, is_delete, create_by, create_time, update_by, update_time from phm_instruction_info
+        select id, attribute, content, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_INSTRUCTION_INFO
     </sql>
     </sql>
 
 
     <select id="selectInstructionInfoList" parameterType="InstructionInfo" resultMap="InstructionInfoResult">
     <select id="selectInstructionInfoList" parameterType="InstructionInfo" resultMap="InstructionInfoResult">
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertInstructionInfo" parameterType="InstructionInfo">
     <insert id="insertInstructionInfo" parameterType="InstructionInfo">
-        insert into phm_instruction_info
+        insert into PHM.PHM_INSTRUCTION_INFO
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="attribute != null">attribute,</if>
             <if test="attribute != null">attribute,</if>
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateInstructionInfo" parameterType="InstructionInfo">
     <update id="updateInstructionInfo" parameterType="InstructionInfo">
-        update phm_instruction_info
+        update PHM.PHM_INSTRUCTION_INFO
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="attribute != null">attribute = #{attribute},</if>
             <if test="attribute != null">attribute = #{attribute},</if>
             <if test="content != null">content = #{content},</if>
             <if test="content != null">content = #{content},</if>
@@ -76,11 +76,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteInstructionInfoById" parameterType="Long">
     <delete id="deleteInstructionInfoById" parameterType="Long">
-        delete from phm_instruction_info where id = #{id}
+        delete from PHM.PHM_INSTRUCTION_INFO where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteInstructionInfoByIds" parameterType="String">
     <delete id="deleteInstructionInfoByIds" parameterType="String">
-        delete from phm_instruction_info where id in 
+        delete from PHM.PHM_INSTRUCTION_INFO where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/LifePartConfigMapper.xml

@@ -12,7 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectLifePartConfigVo">
     <sql id="selectLifePartConfigVo">
-        select id, name, monitor_name, unit from phm_life_part_config
+        select id, name, monitor_name, unit from PHM.PHM_LIFE_PART_CONFIG
     </sql>
     </sql>
 
 
     <select id="selectLifePartConfigList" parameterType="LifePartConfig" resultMap="LifePartConfigResult">
     <select id="selectLifePartConfigList" parameterType="LifePartConfig" resultMap="LifePartConfigResult">
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertLifePartConfig" parameterType="LifePartConfig">
     <insert id="insertLifePartConfig" parameterType="LifePartConfig">
-        insert into phm_life_part_config
+        insert into PHM.PHM_LIFE_PART_CONFIG
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="name != null">name,</if>
             <if test="name != null">name,</if>
@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateLifePartConfig" parameterType="LifePartConfig">
     <update id="updateLifePartConfig" parameterType="LifePartConfig">
-        update phm_life_part_config
+        update PHM.PHM_LIFE_PART_CONFIG
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null">name = #{name},</if>
             <if test="name != null">name = #{name},</if>
             <if test="monitorName != null">monitor_name = #{monitorName},</if>
             <if test="monitorName != null">monitor_name = #{monitorName},</if>
@@ -56,11 +56,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteLifePartConfigById" parameterType="Long">
     <delete id="deleteLifePartConfigById" parameterType="Long">
-        delete from phm_life_part_config where id = #{id}
+        delete from PHM.PHM_LIFE_PART_CONFIG where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteLifePartConfigByIds" parameterType="String">
     <delete id="deleteLifePartConfigByIds" parameterType="String">
-        delete from phm_life_part_config where id in 
+        delete from PHM.PHM_LIFE_PART_CONFIG where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/MaintenanceMapper.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectMaintenanceVo">
     <sql id="selectMaintenanceVo">
-        select id, code, description, grade, fault_source, treatment_measure, fault_code, is_delete, create_by, create_time, update_by, update_time from phm_maintenance
+        select id, code, description, grade, fault_source, treatment_measure, fault_code, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_MAINTENANCE
     </sql>
     </sql>
 
 
     <select id="selectMaintenanceList" parameterType="Maintenance" resultMap="MaintenanceResult">
     <select id="selectMaintenanceList" parameterType="Maintenance" resultMap="MaintenanceResult">
@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertMaintenance" parameterType="Maintenance">
     <insert id="insertMaintenance" parameterType="Maintenance">
-        insert into phm_maintenance
+        insert into PHM.PHM_MAINTENANCE
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="code != null">code,</if>
             <if test="code != null">code,</if>
@@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateMaintenance" parameterType="Maintenance">
     <update id="updateMaintenance" parameterType="Maintenance">
-        update phm_maintenance
+        update PHM.PHM_MAINTENANCE
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="code != null">code = #{code},</if>
             <if test="code != null">code = #{code},</if>
             <if test="description != null">description = #{description},</if>
             <if test="description != null">description = #{description},</if>
@@ -96,11 +96,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteMaintenanceById" parameterType="Long">
     <delete id="deleteMaintenanceById" parameterType="Long">
-        delete from phm_maintenance where id = #{id}
+        delete from PHM.PHM_MAINTENANCE where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteMaintenanceByIds" parameterType="String">
     <delete id="deleteMaintenanceByIds" parameterType="String">
-        delete from phm_maintenance where id in 
+        delete from PHM.PHM_MAINTENANCE where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/MaintenanceTestControlMapper.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectMaintenanceTestControlVo">
     <sql id="selectMaintenanceTestControlVo">
-        select id, maintenance_control, object, name, application_doc, fault_data, version, is_delete, create_by, create_time, update_by, update_time from phm_maintenance_test_control
+        select id, maintenance_control, object, name, application_doc, fault_data, version, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_MAINTENANCE_TEST_CONTROL
     </sql>
     </sql>
 
 
     <select id="selectMaintenanceTestControlList" parameterType="MaintenanceTestControl" resultMap="MaintenanceTestControlResult">
     <select id="selectMaintenanceTestControlList" parameterType="MaintenanceTestControl" resultMap="MaintenanceTestControlResult">
@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertMaintenanceTestControl" parameterType="MaintenanceTestControl">
     <insert id="insertMaintenanceTestControl" parameterType="MaintenanceTestControl">
-        insert into phm_maintenance_test_control
+        insert into PHM.PHM_MAINTENANCE_TEST_CONTROL
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="maintenanceControl != null">maintenance_control,</if>
             <if test="maintenanceControl != null">maintenance_control,</if>
@@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateMaintenanceTestControl" parameterType="MaintenanceTestControl">
     <update id="updateMaintenanceTestControl" parameterType="MaintenanceTestControl">
-        update phm_maintenance_test_control
+        update PHM.PHM_MAINTENANCE_TEST_CONTROL
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="maintenanceControl != null">maintenance_control = #{maintenanceControl},</if>
             <if test="maintenanceControl != null">maintenance_control = #{maintenanceControl},</if>
             <if test="object != null">object = #{object},</if>
             <if test="object != null">object = #{object},</if>
@@ -96,11 +96,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteMaintenanceTestControlById" parameterType="Long">
     <delete id="deleteMaintenanceTestControlById" parameterType="Long">
-        delete from phm_maintenance_test_control where id = #{id}
+        delete from PHM.PHM_MAINTENANCE_TEST_CONTROL where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteMaintenanceTestControlByIds" parameterType="String">
     <delete id="deleteMaintenanceTestControlByIds" parameterType="String">
-        delete from phm_maintenance_test_control where id in 
+        delete from PHM.PHM_MAINTENANCE_TEST_CONTROL where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/MonitorParameterConfigMapper.xml

@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectMonitorParameterConfigVo">
     <sql id="selectMonitorParameterConfigVo">
-        select id, name, bus_rotocol, data_block, data_word, is_delete, create_by, create_time, update_by, update_time from phm_monitor_parameter_config
+        select id, name, bus_rotocol, data_block, data_word, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_MONITOR_PARAMETER_CONFIG
     </sql>
     </sql>
 
 
     <select id="selectMonitorParameterConfigList" parameterType="MonitorParameterConfig" resultMap="MonitorParameterConfigResult">
     <select id="selectMonitorParameterConfigList" parameterType="MonitorParameterConfig" resultMap="MonitorParameterConfigResult">
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertMonitorParameterConfig" parameterType="MonitorParameterConfig">
     <insert id="insertMonitorParameterConfig" parameterType="MonitorParameterConfig">
-        insert into phm_monitor_parameter_config
+        insert into PHM.PHM_MONITOR_PARAMETER_CONFIG
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="name != null">name,</if>
             <if test="name != null">name,</if>
@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateMonitorParameterConfig" parameterType="MonitorParameterConfig">
     <update id="updateMonitorParameterConfig" parameterType="MonitorParameterConfig">
-        update phm_monitor_parameter_config
+        update PHM.PHM_MONITOR_PARAMETER_CONFIG
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null">name = #{name},</if>
             <if test="name != null">name = #{name},</if>
             <if test="busRotocol != null">bus_rotocol = #{busRotocol},</if>
             <if test="busRotocol != null">bus_rotocol = #{busRotocol},</if>
@@ -86,11 +86,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteMonitorParameterConfigById" parameterType="Long">
     <delete id="deleteMonitorParameterConfigById" parameterType="Long">
-        delete from phm_monitor_parameter_config where id = #{id}
+        delete from PHM.PHM_MONITOR_PARAMETER_CONFIG where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteMonitorParameterConfigByIds" parameterType="String">
     <delete id="deleteMonitorParameterConfigByIds" parameterType="String">
-        delete from phm_monitor_parameter_config where id in 
+        delete from PHM.PHM_MONITOR_PARAMETER_CONFIG where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/OrderInfoMapper.xml

@@ -18,7 +18,7 @@
     </resultMap>
     </resultMap>
 
 
     <sql id="selectOrderInfoVo">
     <sql id="selectOrderInfoVo">
-        select id, order_name, order_type, content, status, is_delete, create_by, create_time, update_by, update_time from phm_order_info
+        select id, order_name, order_type, content, status, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_ORDER_INFO
     </sql>
     </sql>
 
 
     <select id="selectOrderInfoList" parameterType="OrderInfo" resultMap="OrderInfoResult">
     <select id="selectOrderInfoList" parameterType="OrderInfo" resultMap="OrderInfoResult">
@@ -42,7 +42,7 @@
     </select>
     </select>
 
 
     <insert id="insertOrderInfo" parameterType="OrderInfo">
     <insert id="insertOrderInfo" parameterType="OrderInfo">
-        insert into phm_order_info
+        insert into PHM.PHM_ORDER_INFO
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="orderName != null">order_name,</if>
             <if test="orderName != null">order_name,</if>
@@ -70,7 +70,7 @@
     </insert>
     </insert>
 
 
     <update id="updateOrderInfo" parameterType="OrderInfo">
     <update id="updateOrderInfo" parameterType="OrderInfo">
-        update phm_order_info
+        update PHM.PHM_ORDER_INFO
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="orderName != null">order_name = #{orderName},</if>
             <if test="orderName != null">order_name = #{orderName},</if>
             <if test="orderType != null">order_type = #{orderType},</if>
             <if test="orderType != null">order_type = #{orderType},</if>
@@ -86,11 +86,11 @@
     </update>
     </update>
 
 
     <delete id="deleteOrderInfoById" parameterType="Long">
     <delete id="deleteOrderInfoById" parameterType="Long">
-        delete from phm_order_info where id = #{id}
+        delete from PHM.PHM_ORDER_INFO where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteOrderInfoByIds" parameterType="String">
     <delete id="deleteOrderInfoByIds" parameterType="String">
-        delete from phm_order_info where id in
+        delete from PHM.PHM_ORDER_INFO where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/PerformanceMonitorModelMapper.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectPerformanceMonitorModelVo">
     <sql id="selectPerformanceMonitorModelVo">
-        select id, object, parameter, state_condition, value_method, alarm_value, threshold_value, is_delete, create_by, create_time, update_by, update_time from phm_performance_monitor_model
+        select id, object, parameter, state_condition, value_method, alarm_value, threshold_value, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_PERFORMANCE_MONITOR_MODEL
     </sql>
     </sql>
 
 
     <select id="selectPerformanceMonitorModelList" parameterType="PerformanceMonitorModel" resultMap="PerformanceMonitorModelResult">
     <select id="selectPerformanceMonitorModelList" parameterType="PerformanceMonitorModel" resultMap="PerformanceMonitorModelResult">
@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertPerformanceMonitorModel" parameterType="PerformanceMonitorModel">
     <insert id="insertPerformanceMonitorModel" parameterType="PerformanceMonitorModel">
-        insert into phm_performance_monitor_model
+        insert into PHM.PHM_PERFORMANCE_MONITOR_MODEL
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="object != null">object,</if>
             <if test="object != null">object,</if>
@@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updatePerformanceMonitorModel" parameterType="PerformanceMonitorModel">
     <update id="updatePerformanceMonitorModel" parameterType="PerformanceMonitorModel">
-        update phm_performance_monitor_model
+        update PHM.PHM_PERFORMANCE_MONITOR_MODEL
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="object != null">object = #{object},</if>
             <if test="object != null">object = #{object},</if>
             <if test="parameter != null">parameter = #{parameter},</if>
             <if test="parameter != null">parameter = #{parameter},</if>
@@ -96,11 +96,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deletePerformanceMonitorModelById" parameterType="Long">
     <delete id="deletePerformanceMonitorModelById" parameterType="Long">
-        delete from phm_performance_monitor_model where id = #{id}
+        delete from PHM.PHM_PERFORMANCE_MONITOR_MODEL where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deletePerformanceMonitorModelByIds" parameterType="String">
     <delete id="deletePerformanceMonitorModelByIds" parameterType="String">
-        delete from phm_performance_monitor_model where id in 
+        delete from PHM.PHM_PERFORMANCE_MONITOR_MODEL where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/PreHandleResultMapper.xml

@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectPreHandleResultVo">
     <sql id="selectPreHandleResultVo">
-        select id, is_delete, create_by, create_time, update_by, update_time from phm_pre_handle_result
+        select id, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_PRE_HANDLE_RESULT
     </sql>
     </sql>
 
 
     <select id="selectPreHandleResultList" parameterType="PreHandleResult" resultMap="PreHandleResultResult">
     <select id="selectPreHandleResultList" parameterType="PreHandleResult" resultMap="PreHandleResultResult">
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertPreHandleResult" parameterType="PreHandleResult" >
     <insert id="insertPreHandleResult" parameterType="PreHandleResult" >
-        insert into phm_pre_handle_result
+        insert into PHM.PHM_PRE_HANDLE_RESULT
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="isDelete != null">is_delete,</if>
             <if test="isDelete != null">is_delete,</if>
@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updatePreHandleResult" parameterType="PreHandleResult">
     <update id="updatePreHandleResult" parameterType="PreHandleResult">
-        update phm_pre_handle_result
+        update PHM.PHM_PRE_HANDLE_RESULT
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="isDelete != null">is_delete = #{isDelete},</if>
             <if test="isDelete != null">is_delete = #{isDelete},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
@@ -66,11 +66,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deletePreHandleResultById" parameterType="Long">
     <delete id="deletePreHandleResultById" parameterType="Long">
-        delete from phm_pre_handle_result where id = #{id}
+        delete from PHM.PHM_PRE_HANDLE_RESULT where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deletePreHandleResultByIds" parameterType="String">
     <delete id="deletePreHandleResultByIds" parameterType="String">
-        delete from phm_pre_handle_result where id in 
+        delete from PHM.PHM_PRE_HANDLE_RESULT where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 6 - 6
PHM-admin/phm-manage/src/main/resources/mapper/manage/ProductMapper.xml

@@ -32,8 +32,8 @@
                t.create_time,
                t.create_time,
                t.update_by,
                t.update_by,
                t.update_time
                t.update_time
-        FROM phm_product t
-                 LEFT JOIN phm_product p2
+        FROM PHM.PHM_PRODUCT t
+                 LEFT JOIN PHM.PHM_PRODUCT p2
                            ON t.parent_id = p2.id
                            ON t.parent_id = p2.id
     </sql>
     </sql>
 
 
@@ -55,7 +55,7 @@
     </select>
     </select>
 
 
     <insert id="insertProduct" parameterType="Product">
     <insert id="insertProduct" parameterType="Product">
-        insert into phm_product
+        insert into PHM.PHM_PRODUCT
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="parentId != null">parent_id,</if>
             <if test="parentId != null">parent_id,</if>
@@ -87,7 +87,7 @@
     </insert>
     </insert>
 
 
     <update id="updateProduct" parameterType="Product">
     <update id="updateProduct" parameterType="Product">
-        update phm_product
+        update PHM.PHM_PRODUCT
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="parentId != null">parent_id = #{parentId},</if>
             <if test="parentId != null">parent_id = #{parentId},</if>
             <if test="aircraftId != null">aircraft_id = #{aircraftId},</if>
             <if test="aircraftId != null">aircraft_id = #{aircraftId},</if>
@@ -106,12 +106,12 @@
 
 
     <delete id="deleteProductById" parameterType="Long">
     <delete id="deleteProductById" parameterType="Long">
         delete
         delete
-        from phm_product
+        from PHM.PHM_PRODUCT
         where id = #{id}
         where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteProductByIds" parameterType="String">
     <delete id="deleteProductByIds" parameterType="String">
-        delete from phm_product where id in
+        delete from PHM.PHM_PRODUCT where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/SoftwareConfigMapper.xml

@@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     </resultMap>
 
 
     <sql id="selectSoftwareConfigVo">
     <sql id="selectSoftwareConfigVo">
-        select id, serial_number, name, is_delete, create_by, create_time, update_by, update_time from phm_software_config
+        select id, serial_number, name, is_delete, create_by, create_time, update_by, update_time from PHM.PHM_SOFTWARE_CONFIG
     </sql>
     </sql>
 
 
     <select id="selectSoftwareConfigList" parameterType="SoftwareConfig" resultMap="SoftwareConfigResult">
     <select id="selectSoftwareConfigList" parameterType="SoftwareConfig" resultMap="SoftwareConfigResult">
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
         
         
     <insert id="insertSoftwareConfig" parameterType="SoftwareConfig">
     <insert id="insertSoftwareConfig" parameterType="SoftwareConfig">
-        insert into phm_software_config
+        insert into PHM.PHM_SOFTWARE_CONFIG
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="id != null">id,</if>
             <if test="serialNumber != null">serial_number,</if>
             <if test="serialNumber != null">serial_number,</if>
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 
 
     <update id="updateSoftwareConfig" parameterType="SoftwareConfig">
     <update id="updateSoftwareConfig" parameterType="SoftwareConfig">
-        update phm_software_config
+        update PHM.PHM_SOFTWARE_CONFIG
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="serialNumber != null">serial_number = #{serialNumber},</if>
             <if test="serialNumber != null">serial_number = #{serialNumber},</if>
             <if test="name != null">name = #{name},</if>
             <if test="name != null">name = #{name},</if>
@@ -76,11 +76,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 
 
     <delete id="deleteSoftwareConfigById" parameterType="Long">
     <delete id="deleteSoftwareConfigById" parameterType="Long">
-        delete from phm_software_config where id = #{id}
+        delete from PHM.PHM_SOFTWARE_CONFIG where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteSoftwareConfigByIds" parameterType="String">
     <delete id="deleteSoftwareConfigByIds" parameterType="String">
-        delete from phm_software_config where id in 
+        delete from PHM.PHM_SOFTWARE_CONFIG where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 5 - 5
PHM-admin/phm-manage/src/main/resources/mapper/manage/SortieMapper.xml

@@ -29,7 +29,7 @@
                create_time,
                create_time,
                update_by,
                update_by,
                update_time
                update_time
-        from phm_sortie
+        from PHM.PHM_SORTIE
     </sql>
     </sql>
 
 
     <select id="selectSortieList" parameterType="Sortie" resultMap="SortieResult">
     <select id="selectSortieList" parameterType="Sortie" resultMap="SortieResult">
@@ -64,7 +64,7 @@
     </select>
     </select>
 
 
     <insert id="insertSortie" parameterType="Sortie">
     <insert id="insertSortie" parameterType="Sortie">
-        insert into phm_sortie
+        insert into PHM.PHM_SORTIE
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">
             <if test="id != null">
                 id,
                 id,
@@ -138,7 +138,7 @@
     </insert>
     </insert>
 
 
     <update id="updateSortie" parameterType="Sortie">
     <update id="updateSortie" parameterType="Sortie">
-        update phm_sortie
+        update PHM.PHM_SORTIE
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="aircraftNumber != null">
             <if test="aircraftNumber != null">
                 aircraft_number = #{aircraftNumber},
                 aircraft_number = #{aircraftNumber},
@@ -176,12 +176,12 @@
 
 
     <delete id="deleteSortieById" parameterType="Long">
     <delete id="deleteSortieById" parameterType="Long">
         delete
         delete
-        from phm_sortie
+        from PHM.PHM_SORTIE
         where id = #{id}
         where id = #{id}
     </delete>
     </delete>
 
 
     <delete id="deleteSortieByIds" parameterType="String">
     <delete id="deleteSortieByIds" parameterType="String">
-        delete from phm_sortie where id in
+        delete from PHM.PHM_SORTIE where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
             #{id}
         </foreach>
         </foreach>

+ 13 - 13
PHM-admin/phm-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	
 	<sql id="selectDeptVo">
 	<sql id="selectDeptVo">
         select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
         select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
-        from sys_dept d
+        from PHM.SYS_DEPT d
     </sql>
     </sql>
     
     
 	<select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
 	<select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
@@ -49,19 +49,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     
     <select id="selectDeptListByRoleId" resultType="Long">
     <select id="selectDeptListByRoleId" resultType="Long">
 		select d.dept_id
 		select d.dept_id
-		from sys_dept d
+		from PHM.SYS_DEPT d
             left join sys_role_dept rd on d.dept_id = rd.dept_id
             left join sys_role_dept rd on d.dept_id = rd.dept_id
         where rd.role_id = #{roleId}
         where rd.role_id = #{roleId}
             <if test="deptCheckStrictly">
             <if test="deptCheckStrictly">
-              and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
+              and d.dept_id not in (select d.parent_id from PHM.SYS_DEPT d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
             </if>
             </if>
 		order by d.parent_id, d.order_num
 		order by d.parent_id, d.order_num
 	</select>
 	</select>
     
     
     <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
     <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
 		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
 		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
-			(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
-		from sys_dept d
+			(select dept_name from PHM.SYS_DEPT where dept_id = d.parent_id) parent_name
+		from PHM.SYS_DEPT d
 		where d.dept_id = #{deptId}
 		where d.dept_id = #{deptId}
 	</select>
 	</select>
     
     
@@ -70,16 +70,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	</select>
 	
 	
 	<select id="hasChildByDeptId" parameterType="Long" resultType="int">
 	<select id="hasChildByDeptId" parameterType="Long" resultType="int">
-		select count(1) from sys_dept
+		select count(1) from PHM.SYS_DEPT
 		where del_flag = '0' and parent_id = #{deptId} limit 1
 		where del_flag = '0' and parent_id = #{deptId} limit 1
 	</select>
 	</select>
 	
 	
 	<select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
 	<select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
-		select * from sys_dept where instr(','||ancestors||',' ,  ','|| #{deptId} ||',')
+		select * from PHM.SYS_DEPT where instr(','||ancestors||',' ,  ','|| #{deptId} ||',')
 	</select>
 	</select>
 	
 	
 	<select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
 	<select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
-		select count(*) from sys_dept where status = 0 and del_flag = '0' and instr(','||ancestors||',' ,  ','|| #{deptId} ||',')
+		select count(*) from PHM.SYS_DEPT where status = 0 and del_flag = '0' and instr(','||ancestors||',' ,  ','|| #{deptId} ||',')
 	</select>
 	</select>
 	
 	
 	<select id="checkDeptNameUnique" resultMap="SysDeptResult">
 	<select id="checkDeptNameUnique" resultMap="SysDeptResult">
@@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	</select>
     
     
     <insert id="insertDept" parameterType="SysDept">
     <insert id="insertDept" parameterType="SysDept">
- 		insert into sys_dept(
+ 		insert into PHM.SYS_DEPT(
  			<if test="deptId != null and deptId != 0">dept_id,</if>
  			<if test="deptId != null and deptId != 0">dept_id,</if>
  			<if test="parentId != null and parentId != 0">parent_id,</if>
  			<if test="parentId != null and parentId != 0">parent_id,</if>
  			<if test="deptName != null and deptName != ''">dept_name,</if>
  			<if test="deptName != null and deptName != ''">dept_name,</if>
@@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</insert>
 	</insert>
 	
 	
 	<update id="updateDept" parameterType="SysDept">
 	<update id="updateDept" parameterType="SysDept">
- 		update sys_dept
+ 		update PHM.SYS_DEPT
  		<set>
  		<set>
  			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
  			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
  			<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
  			<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
@@ -133,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</update>
 	</update>
 	
 	
 	<update id="updateDeptChildren" parameterType="java.util.List">
 	<update id="updateDeptChildren" parameterType="java.util.List">
-	    update sys_dept set ancestors =
+	    update PHM.SYS_DEPT set ancestors =
 	    <foreach collection="depts" item="item" index="index"
 	    <foreach collection="depts" item="item" index="index"
 	        separator=" " open="case dept_id" close="end">
 	        separator=" " open="case dept_id" close="end">
 	        when #{item.deptId} then #{item.ancestors}
 	        when #{item.deptId} then #{item.ancestors}
@@ -146,14 +146,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</update>
 	</update>
 	 
 	 
 	<update id="updateDeptStatusNormal" parameterType="Long">
 	<update id="updateDeptStatusNormal" parameterType="Long">
- 	    update sys_dept set status = '0' where dept_id in 
+ 	    update PHM.SYS_DEPT set status = '0' where dept_id in 
  	    <foreach collection="array" item="deptId" open="(" separator="," close=")">
  	    <foreach collection="array" item="deptId" open="(" separator="," close=")">
         	#{deptId}
         	#{deptId}
         </foreach>
         </foreach>
 	</update>
 	</update>
 	
 	
 	<delete id="deleteDeptById" parameterType="Long">
 	<delete id="deleteDeptById" parameterType="Long">
-		update sys_dept set del_flag = '2' where dept_id = #{deptId}
+		update PHM.SYS_DEPT set del_flag = '2' where dept_id = #{deptId}
 	</delete>
 	</delete>
 
 
 </mapper> 
 </mapper> 

+ 50 - 50
PHM-admin/phm-system/src/main/resources/mapper/system/SysLogininforMapper.xml

@@ -1,57 +1,57 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.phm.system.mapper.SysLogininforMapper">
 <mapper namespace="com.phm.system.mapper.SysLogininforMapper">
+    <resultMap type="SysLogininfor" id="SysLogininforResult">
+        <id property="infoId" column="info_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="status" column="status"/>
+        <result property="ipaddr" column="ipaddr"/>
+        <result property="loginLocation" column="login_location"/>
+        <result property="browser" column="browser"/>
+        <result property="os" column="os"/>
+        <result property="msg" column="msg"/>
+        <result property="loginTime" column="login_time"/>
+    </resultMap>
 
 
-	<resultMap type="SysLogininfor" id="SysLogininforResult">
-		<id     property="infoId"        column="info_id"           />
-		<result property="userName"      column="user_name"         />
-		<result property="status"        column="status"            />
-		<result property="ipaddr"        column="ipaddr"            />
-		<result property="loginLocation" column="login_location"    />
-		<result property="browser"       column="browser"           />
-		<result property="os"            column="os"                />
-		<result property="msg"           column="msg"               />
-		<result property="loginTime"     column="login_time"        />
-	</resultMap>
+    <insert id="insertLogininfor" parameterType="SysLogininfor">
+        insert into PHM.SYS_LOGININFOR (user_name, status, ipaddr, login_location, browser, os, msg, login_time)
+        values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate())
+    </insert>
+
+    <select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">
+        select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from PHM.SYS_LOGININFOR
+        <where>
+            <if test="ipaddr != null and ipaddr != ''">
+                AND ipaddr like concat('%', #{ipaddr}, '%')
+            </if>
+            <if test="status != null and status != ''">
+                AND status = #{status}
+            </if>
+            <if test="userName != null and userName != ''">
+                AND user_name like concat('%', #{userName}, '%')
+            </if>
+            <if test="params.beginTime != null and params.beginTime != ''">
+                <!-- 开始时间检索 -->
+                AND login_time &gt;= #{params.beginTime}
+            </if>
+            <if test="params.endTime != null and params.endTime != ''">
+                <!-- 结束时间检索 -->
+                AND login_time &lt;= #{params.endTime}
+            </if>
+        </where>
+        order by info_id desc
+    </select>
+
+    <delete id="deleteLogininforByIds" parameterType="Long">
+        delete from PHM.SYS_LOGININFOR where info_id in
+        <foreach collection="array" item="infoId" open="(" separator="," close=")">
+            #{infoId}
+        </foreach>
+    </delete>
 
 
-	<insert id="insertLogininfor" parameterType="SysLogininfor">
-		insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time)
-		values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate())
-	</insert>
-	
-	<select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">
-		select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_logininfor
-		<where>
-			<if test="ipaddr != null and ipaddr != ''">
-				AND ipaddr like concat('%', #{ipaddr}, '%')
-			</if>
-			<if test="status != null and status != ''">
-				AND status = #{status}
-			</if>
-			<if test="userName != null and userName != ''">
-				AND user_name like concat('%', #{userName}, '%')
-			</if>
-			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				AND login_time &gt;= #{params.beginTime}
-			</if>
-			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				AND login_time &lt;= #{params.endTime}
-			</if>
-		</where>
-		order by info_id desc
-	</select>
-	
-	<delete id="deleteLogininforByIds" parameterType="Long">
- 		delete from sys_logininfor where info_id in
- 		<foreach collection="array" item="infoId" open="(" separator="," close=")">
- 			#{infoId}
-        </foreach> 
- 	</delete>
-    
     <update id="cleanLogininfor">
     <update id="cleanLogininfor">
-        truncate table sys_logininfor
+        truncate table PHM.SYS_LOGININFOR
     </update>
     </update>
-    
-</mapper> 
+</mapper>

+ 32 - 32
PHM-admin/phm-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -28,8 +28,8 @@
 	</resultMap>
 	</resultMap>
 
 
 	<sql id="selectMenuVo">
 	<sql id="selectMenuVo">
-        select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time 
-		from sys_menu
+        select menu_id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
+		from PHM.SYS_MENU
     </sql>
     </sql>
     
     
     <select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
     <select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
@@ -49,17 +49,17 @@
 	</select>
 	</select>
 	
 	
 	<select id="selectMenuTreeAll" resultMap="SysMenuResult">
 	<select id="selectMenuTreeAll" resultMap="SysMenuResult">
-		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 where m.menu_type in ('M', 'C') and m.status = 0
+		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 PHM.SYS_MENU m where m.menu_type in ('M', 'C') and m.status = 0
 		order by m.parent_id, m.order_num
 		order by m.parent_id, m.order_num
 	</select>
 	</select>
 	
 	
 	<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
 	<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
-		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
-		left join sys_user_role ur on rm.role_id = ur.role_id
-		left join sys_role ro on ur.role_id = ro.role_id
+		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 PHM.SYS_MENU m
+		left join PHM.SYS_ROLE_MENU rm on m.menu_id = rm.menu_id
+		left join PHM.SYS_USER_ROLE ur on rm.role_id = ur.role_id
+		left join PHM.SYS_ROLE ro on ur.role_id = ro.role_id
 		where ur.user_id = #{params.userId}
 		where ur.user_id = #{params.userId}
 		<if test="menuName != null and menuName != ''">
 		<if test="menuName != null and menuName != ''">
             AND m.menu_name like concat('%', #{menuName}, '%')
             AND m.menu_name like concat('%', #{menuName}, '%')
@@ -74,47 +74,47 @@
 	</select>
 	</select>
     
     
     <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
     <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
-		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
-			 left join sys_user_role ur on rm.role_id = ur.role_id
-			 left join sys_role ro on ur.role_id = ro.role_id
-			 left join sys_user u on ur.user_id = u.user_id
+		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 PHM.SYS_MENU m
+			 left join PHM.SYS_ROLE_MENU rm on m.menu_id = rm.menu_id
+			 left join PHM.SYS_USER_ROLE ur on rm.role_id = ur.role_id
+			 left join PHM.SYS_ROLE ro on ur.role_id = ro.role_id
+			 left join PHM.SYS_USER u on ur.user_id = u.user_id
 		where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0  AND ro.status = 0
 		where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0  AND ro.status = 0
 		order by m.parent_id, m.order_num
 		order by m.parent_id, m.order_num
 	</select>
 	</select>
 	
 	
 	<select id="selectMenuListByRoleId" resultType="Long">
 	<select id="selectMenuListByRoleId" resultType="Long">
 		select m.menu_id
 		select m.menu_id
-		from sys_menu m
-            left join sys_role_menu rm on m.menu_id = rm.menu_id
+		from PHM.SYS_MENU m
+            left join PHM.SYS_ROLE_MENU rm on m.menu_id = rm.menu_id
         where rm.role_id = #{roleId}
         where rm.role_id = #{roleId}
             <if test="menuCheckStrictly">
             <if test="menuCheckStrictly">
-              and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId})
+              and m.menu_id not in (select m.parent_id from PHM.SYS_MENU m inner join PHM.PHM.SYS_ROLE_MENU rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId})
             </if>
             </if>
 		order by m.parent_id, m.order_num
 		order by m.parent_id, m.order_num
 	</select>
 	</select>
 	
 	
 	<select id="selectMenuPerms" resultType="String">
 	<select id="selectMenuPerms" resultType="String">
 		select distinct m.perms
 		select distinct m.perms
-		from sys_menu m
-			 left join sys_role_menu rm on m.menu_id = rm.menu_id
-			 left join sys_user_role ur on rm.role_id = ur.role_id
+		from PHM.SYS_MENU m
+			 left join PHM.SYS_ROLE_MENU rm on m.menu_id = rm.menu_id
+			 left join PHM.SYS_USER_ROLE ur on rm.role_id = ur.role_id
 	</select>
 	</select>
 
 
 	<select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
 	<select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
 		select distinct m.perms
 		select distinct m.perms
-		from sys_menu m
-			 left join sys_role_menu rm on m.menu_id = rm.menu_id
-			 left join sys_user_role ur on rm.role_id = ur.role_id
-			 left join sys_role r on r.role_id = ur.role_id
+		from PHM.SYS_MENU m
+			 left join PHM.SYS_ROLE_MENU rm on m.menu_id = rm.menu_id
+			 left join PHM.SYS_USER_ROLE ur on rm.role_id = ur.role_id
+			 left join PHM.SYS_ROLE r on r.role_id = ur.role_id
 		where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
 		where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
 	</select>
 	</select>
 	
 	
 	<select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">
 	<select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">
 		select distinct m.perms
 		select distinct m.perms
-		from sys_menu m
-			 left join sys_role_menu rm on m.menu_id = rm.menu_id
+		from PHM.SYS_MENU m
+			 left join PHM.SYS_ROLE_MENU rm on m.menu_id = rm.menu_id
 		where m.status = '0' and rm.role_id = #{roleId}
 		where m.status = '0' and rm.role_id = #{roleId}
 	</select>
 	</select>
 	
 	
@@ -124,7 +124,7 @@
 	</select>
 	</select>
 	
 	
 	<select id="hasChildByMenuId" resultType="Integer">
 	<select id="hasChildByMenuId" resultType="Integer">
-	    select count(1) from sys_menu where parent_id = #{menuId}  
+	    select count(1) from PHM.SYS_MENU where parent_id = #{menuId}  
 	</select>
 	</select>
 	
 	
 	<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
 	<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
@@ -133,7 +133,7 @@
 	</select>
 	</select>
 	
 	
 	<update id="updateMenu" parameterType="SysMenu">
 	<update id="updateMenu" parameterType="SysMenu">
-		update sys_menu
+		update PHM.SYS_MENU
 		<set>
 		<set>
 			<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
 			<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
 			<if test="parentId != null">parent_id = #{parentId},</if>
 			<if test="parentId != null">parent_id = #{parentId},</if>
@@ -156,14 +156,14 @@
 	</update>
 	</update>
 
 
 	<insert id="insertMenu" parameterType="SysMenu">
 	<insert id="insertMenu" parameterType="SysMenu">
-		insert into sys_menu(
+		insert into PHM.SYS_MENU(
 		<if test="menuId != null and menuId != 0">menu_id,</if>
 		<if test="menuId != null and menuId != 0">menu_id,</if>
 		<if test="parentId != null and parentId != 0">parent_id,</if>
 		<if test="parentId != null and parentId != 0">parent_id,</if>
 		<if test="menuName != null and menuName != ''">menu_name,</if>
 		<if test="menuName != null and menuName != ''">menu_name,</if>
 		<if test="orderNum != null">order_num,</if>
 		<if test="orderNum != null">order_num,</if>
 		<if test="path != null and path != ''">path,</if>
 		<if test="path != null and path != ''">path,</if>
 		<if test="component != null and component != ''">component,</if>
 		<if test="component != null and component != ''">component,</if>
-		<if test="query != null and query != ''">`query`,</if>
+		<if test="query != null and query != ''">query,</if>
 		<if test="isFrame != null and isFrame != ''">is_frame,</if>
 		<if test="isFrame != null and isFrame != ''">is_frame,</if>
 		<if test="isCache != null and isCache != ''">is_cache,</if>
 		<if test="isCache != null and isCache != ''">is_cache,</if>
 		<if test="menuType != null and menuType != ''">menu_type,</if>
 		<if test="menuType != null and menuType != ''">menu_type,</if>
@@ -196,7 +196,7 @@
 	</insert>
 	</insert>
 	
 	
 	<delete id="deleteMenuById" parameterType="Long">
 	<delete id="deleteMenuById" parameterType="Long">
-	    delete from sys_menu where menu_id = #{menuId}
+	    delete from PHM.SYS_MENU where menu_id = #{menuId}
 	</delete>
 	</delete>
 
 
 </mapper> 
 </mapper> 

+ 5 - 5
PHM-admin/phm-system/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     
     <sql id="selectNoticeVo">
     <sql id="selectNoticeVo">
         select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark 
         select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark 
-		from sys_notice
+		from PHM.SYS_NOTICE
     </sql>
     </sql>
     
     
     <select id="selectNoticeById" parameterType="Long" resultMap="SysNoticeResult">
     <select id="selectNoticeById" parameterType="Long" resultMap="SysNoticeResult">
@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
     
     
     <insert id="insertNotice" parameterType="SysNotice">
     <insert id="insertNotice" parameterType="SysNotice">
-        insert into sys_notice (
+        insert into PHM.SYS_NOTICE (
 			<if test="noticeTitle != null and noticeTitle != '' ">notice_title, </if>
 			<if test="noticeTitle != null and noticeTitle != '' ">notice_title, </if>
 			<if test="noticeType != null and noticeType != '' ">notice_type, </if>
 			<if test="noticeType != null and noticeType != '' ">notice_type, </if>
 			<if test="noticeContent != null and noticeContent != '' ">notice_content, </if>
 			<if test="noticeContent != null and noticeContent != '' ">notice_content, </if>
@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     </insert>
 	 
 	 
     <update id="updateNotice" parameterType="SysNotice">
     <update id="updateNotice" parameterType="SysNotice">
-        update sys_notice 
+        update PHM.SYS_NOTICE 
         <set>
         <set>
             <if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle}, </if>
             <if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle}, </if>
             <if test="noticeType != null and noticeType != ''">notice_type = #{noticeType}, </if>
             <if test="noticeType != null and noticeType != ''">notice_type = #{noticeType}, </if>
@@ -76,11 +76,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     </update>
 	
 	
     <delete id="deleteNoticeById" parameterType="Long">
     <delete id="deleteNoticeById" parameterType="Long">
-        delete from sys_notice where notice_id = #{noticeId}
+        delete from PHM.SYS_NOTICE where notice_id = #{noticeId}
     </delete>
     </delete>
     
     
     <delete id="deleteNoticeByIds" parameterType="Long">
     <delete id="deleteNoticeByIds" parameterType="Long">
-        delete from sys_notice where notice_id in 
+        delete from PHM.SYS_NOTICE where notice_id in 
         <foreach item="noticeId" collection="array" open="(" separator="," close=")">
         <foreach item="noticeId" collection="array" open="(" separator="," close=")">
             #{noticeId}
             #{noticeId}
         </foreach>
         </foreach>

+ 4 - 4
PHM-admin/phm-system/src/main/resources/mapper/system/SysOperLogMapper.xml

@@ -26,11 +26,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 	<sql id="selectOperLogVo">
 	<sql id="selectOperLogVo">
         select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time, cost_time
         select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time, cost_time
-        from sys_oper_log
+        from PHM.SYS_OPER_LOG
     </sql>
     </sql>
     
     
 	<insert id="insertOperlog" parameterType="SysOperLog">
 	<insert id="insertOperlog" parameterType="SysOperLog">
-		insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time)
+		insert into PHM.SYS_OPER_LOG(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time)
         values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate())
         values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate())
 	</insert>
 	</insert>
 	
 	
@@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	</select>
 	
 	
 	<delete id="deleteOperLogByIds" parameterType="Long">
 	<delete id="deleteOperLogByIds" parameterType="Long">
- 		delete from sys_oper_log where oper_id in
+ 		delete from PHM.SYS_OPER_LOG where oper_id in
  		<foreach collection="array" item="operId" open="(" separator="," close=")">
  		<foreach collection="array" item="operId" open="(" separator="," close=")">
  			#{operId}
  			#{operId}
         </foreach> 
         </foreach> 
@@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	</select>
 	
 	
 	<update id="cleanOperLog">
 	<update id="cleanOperLog">
-        truncate table sys_oper_log
+        truncate table PHM.SYS_OPER_LOG
     </update>
     </update>
 
 
 </mapper> 
 </mapper> 

+ 7 - 7
PHM-admin/phm-system/src/main/resources/mapper/system/SysPostMapper.xml

@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	
 	<sql id="selectPostVo">
 	<sql id="selectPostVo">
         select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark 
         select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark 
-		from sys_post
+		from PHM.SYS_POST
     </sql>
     </sql>
 	
 	
 	<select id="selectPostList" parameterType="SysPost" resultMap="SysPostResult">
 	<select id="selectPostList" parameterType="SysPost" resultMap="SysPostResult">
@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	
 	<select id="selectPostListByUserId" parameterType="Long" resultType="Long">
 	<select id="selectPostListByUserId" parameterType="Long" resultType="Long">
 		select p.post_id
 		select p.post_id
-        from sys_post p
+        from PHM.SYS_POST p
 	        left join sys_user_post up on up.post_id = p.post_id
 	        left join sys_user_post up on up.post_id = p.post_id
 	        left join sys_user u on u.user_id = up.user_id
 	        left join sys_user u on u.user_id = up.user_id
 	    where u.user_id = #{userId}
 	    where u.user_id = #{userId}
@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	
 	<select id="selectPostsByUserName" parameterType="String" resultMap="SysPostResult">
 	<select id="selectPostsByUserName" parameterType="String" resultMap="SysPostResult">
 		select p.post_id, p.post_name, p.post_code
 		select p.post_id, p.post_name, p.post_code
-		from sys_post p
+		from PHM.SYS_POST p
 			 left join sys_user_post up on up.post_id = p.post_id
 			 left join sys_user_post up on up.post_id = p.post_id
 			 left join sys_user u on u.user_id = up.user_id
 			 left join sys_user u on u.user_id = up.user_id
 		where u.user_name = #{userName}
 		where u.user_name = #{userName}
@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	</select>
 	
 	
 	<update id="updatePost" parameterType="SysPost">
 	<update id="updatePost" parameterType="SysPost">
- 		update sys_post
+ 		update PHM.SYS_POST
  		<set>
  		<set>
  			<if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
  			<if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
  			<if test="postName != null and postName != ''">post_name = #{postName},</if>
  			<if test="postName != null and postName != ''">post_name = #{postName},</if>
@@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</update>
 	</update>
  	
  	
  	<insert id="insertPost" parameterType="SysPost" useGeneratedKeys="true" keyProperty="postId">
  	<insert id="insertPost" parameterType="SysPost" useGeneratedKeys="true" keyProperty="postId">
- 		insert into sys_post(
+ 		insert into PHM.SYS_POST(
  			<if test="postId != null and postId != 0">post_id,</if>
  			<if test="postId != null and postId != 0">post_id,</if>
  			<if test="postCode != null and postCode != ''">post_code,</if>
  			<if test="postCode != null and postCode != ''">post_code,</if>
  			<if test="postName != null and postName != ''">post_name,</if>
  			<if test="postName != null and postName != ''">post_name,</if>
@@ -109,11 +109,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</insert>
 	</insert>
 	
 	
 	<delete id="deletePostById" parameterType="Long">
 	<delete id="deletePostById" parameterType="Long">
-		delete from sys_post where post_id = #{postId}
+		delete from PHM.SYS_POST where post_id = #{postId}
 	</delete>
 	</delete>
 	
 	
 	<delete id="deletePostByIds" parameterType="Long">
 	<delete id="deletePostByIds" parameterType="Long">
- 		delete from sys_post where post_id in
+ 		delete from PHM.SYS_POST where post_id in
  		<foreach collection="array" item="postId" open="(" separator="," close=")">
  		<foreach collection="array" item="postId" open="(" separator="," close=")">
  			#{postId}
  			#{postId}
         </foreach> 
         </foreach> 

+ 4 - 4
PHM-admin/phm-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml

@@ -10,22 +10,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	</resultMap>
 
 
 	<delete id="deleteRoleDeptByRoleId" parameterType="Long">
 	<delete id="deleteRoleDeptByRoleId" parameterType="Long">
-		delete from sys_role_dept where role_id=#{roleId}
+		delete from PHM.SYS_ROLE_DEPT where role_id=#{roleId}
 	</delete>
 	</delete>
 	
 	
 	<select id="selectCountRoleDeptByDeptId" resultType="Integer">
 	<select id="selectCountRoleDeptByDeptId" resultType="Integer">
-	    select count(1) from sys_role_dept where dept_id=#{deptId}
+	    select count(1) from PHM.SYS_ROLE_DEPT where dept_id=#{deptId}
 	</select>
 	</select>
 	
 	
 	<delete id="deleteRoleDept" parameterType="Long">
 	<delete id="deleteRoleDept" parameterType="Long">
- 		delete from sys_role_dept where role_id in
+ 		delete from PHM.SYS_ROLE_DEPT where role_id in
  		<foreach collection="array" item="roleId" open="(" separator="," close=")">
  		<foreach collection="array" item="roleId" open="(" separator="," close=")">
  			#{roleId}
  			#{roleId}
         </foreach> 
         </foreach> 
  	</delete>
  	</delete>
 	
 	
 	<insert id="batchRoleDept">
 	<insert id="batchRoleDept">
-		insert into sys_role_dept(role_id, dept_id) values
+		insert into PHM.SYS_ROLE_DEPT(role_id, dept_id) values
 		<foreach item="item" index="index" collection="list" separator=",">
 		<foreach item="item" index="index" collection="list" separator=",">
 			(#{item.roleId},#{item.deptId})
 			(#{item.roleId},#{item.deptId})
 		</foreach>
 		</foreach>

+ 6 - 6
PHM-admin/phm-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<sql id="selectRoleVo">
 	<sql id="selectRoleVo">
 	    select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
 	    select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
             r.status, r.del_flag, r.create_time, r.remark 
             r.status, r.del_flag, r.create_time, r.remark 
-        from sys_role r
+        from PHM.SYS_ROLE r
 	        left join sys_user_role ur on ur.role_id = r.role_id
 	        left join sys_user_role ur on ur.role_id = r.role_id
 	        left join sys_user u on u.user_id = ur.user_id
 	        left join sys_user u on u.user_id = ur.user_id
 	        left join sys_dept d on u.dept_id = d.dept_id
 	        left join sys_dept d on u.dept_id = d.dept_id
@@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	
 	<select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
 	<select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
 		select r.role_id
 		select r.role_id
-        from sys_role r
+        from PHM.SYS_ROLE r
 	        left join sys_user_role ur on ur.role_id = r.role_id
 	        left join sys_user_role ur on ur.role_id = r.role_id
 	        left join sys_user u on u.user_id = ur.user_id
 	        left join sys_user u on u.user_id = ur.user_id
 	    where u.user_id = #{userId}
 	    where u.user_id = #{userId}
@@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	</select>
 	
 	
  	<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
  	<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
- 		insert into sys_role(
+ 		insert into PHM.SYS_ROLE(
  			<if test="roleId != null and roleId != 0">role_id,</if>
  			<if test="roleId != null and roleId != 0">role_id,</if>
  			<if test="roleName != null and roleName != ''">role_name,</if>
  			<if test="roleName != null and roleName != ''">role_name,</if>
  			<if test="roleKey != null and roleKey != ''">role_key,</if>
  			<if test="roleKey != null and roleKey != ''">role_key,</if>
@@ -122,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</insert>
 	</insert>
 	
 	
 	<update id="updateRole" parameterType="SysRole">
 	<update id="updateRole" parameterType="SysRole">
- 		update sys_role
+ 		update PHM.SYS_ROLE
  		<set>
  		<set>
  			<if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
  			<if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
  			<if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>
  			<if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>
@@ -139,11 +139,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</update>
 	</update>
 	
 	
 	<delete id="deleteRoleById" parameterType="Long">
 	<delete id="deleteRoleById" parameterType="Long">
- 		update sys_role set del_flag = '2' where role_id = #{roleId}
+ 		update PHM.SYS_ROLE set del_flag = '2' where role_id = #{roleId}
  	</delete>
  	</delete>
  	
  	
  	<delete id="deleteRoleByIds" parameterType="Long">
  	<delete id="deleteRoleByIds" parameterType="Long">
- 	    update sys_role set del_flag = '2' where role_id in
+ 	    update PHM.SYS_ROLE set del_flag = '2' where role_id in
  		<foreach collection="array" item="roleId" open="(" separator="," close=")">
  		<foreach collection="array" item="roleId" open="(" separator="," close=")">
  			#{roleId}
  			#{roleId}
         </foreach> 
         </foreach> 

+ 4 - 4
PHM-admin/phm-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml

@@ -10,22 +10,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	</resultMap>
 	
 	
 	<select id="checkMenuExistRole" resultType="Integer">
 	<select id="checkMenuExistRole" resultType="Integer">
-	    select count(1) from sys_role_menu where menu_id = #{menuId}
+	    select count(1) from PHM.SYS_ROLE_MENU where menu_id = #{menuId}
 	</select>
 	</select>
 
 
 	<delete id="deleteRoleMenuByRoleId" parameterType="Long">
 	<delete id="deleteRoleMenuByRoleId" parameterType="Long">
-		delete from sys_role_menu where role_id=#{roleId}
+		delete from PHM.SYS_ROLE_MENU where role_id=#{roleId}
 	</delete>
 	</delete>
 	
 	
 	<delete id="deleteRoleMenu" parameterType="Long">
 	<delete id="deleteRoleMenu" parameterType="Long">
- 		delete from sys_role_menu where role_id in
+ 		delete from PHM.SYS_ROLE_MENU where role_id in
  		<foreach collection="array" item="roleId" open="(" separator="," close=")">
  		<foreach collection="array" item="roleId" open="(" separator="," close=")">
  			#{roleId}
  			#{roleId}
         </foreach> 
         </foreach> 
  	</delete>
  	</delete>
 	
 	
 	<insert id="batchRoleMenu">
 	<insert id="batchRoleMenu">
-		insert into sys_role_menu(role_id, menu_id) values
+		insert into PHM.SYS_ROLE_MENU(role_id, menu_id) values
 		<foreach item="item" index="index" collection="list" separator=",">
 		<foreach item="item" index="index" collection="list" separator=",">
 			(#{item.roleId},#{item.menuId})
 			(#{item.roleId},#{item.menuId})
 		</foreach>
 		</foreach>

+ 26 - 26
PHM-admin/phm-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -50,15 +50,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
-        from sys_user u
-		    left join sys_dept d on u.dept_id = d.dept_id
-		    left join sys_user_role ur on u.user_id = ur.user_id
-		    left join sys_role r on r.role_id = ur.role_id
+        from PHM.SYS_USER u
+		    left join PHM.SYS_DEPT d on u.dept_id = d.dept_id
+		    left join PHM.SYS_USER_role ur on u.user_id = ur.user_id
+		    left join PHM.SYS_ROLE r on r.role_id = ur.role_id
     </sql>
     </sql>
     
     
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		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
+		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 PHM.SYS_USER u
+		left join PHM.SYS_DEPT d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}
 			AND u.user_id = #{userId}
@@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
 			AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
 		</if>
 		</if>
 		<if test="deptId != null and deptId != 0">
 		<if test="deptId != null and deptId != 0">
-			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE instr(','||ancestors||',' ,  ','|| #{deptId} ||',')  ))
+			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM PHM.SYS_DEPT t WHERE instr(','||ancestors||',' ,  ','|| #{deptId} ||',')  ))
 		</if>
 		</if>
 		<!-- 数据范围过滤 -->
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 		${params.dataScope}
@@ -87,10 +87,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    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
-			 left join sys_user_role ur on u.user_id = ur.user_id
-			 left join sys_role r on r.role_id = ur.role_id
+	    from PHM.SYS_USER u
+			 left join PHM.SYS_DEPT d on u.dept_id = d.dept_id
+			 left join PHM.SYS_USER_role ur on u.user_id = ur.user_id
+			 left join PHM.SYS_ROLE r on r.role_id = ur.role_id
 	    where u.del_flag = '0' and r.role_id = #{roleId}
 	    where u.del_flag = '0' and r.role_id = #{roleId}
 	    <if test="userName != null and userName != ''">
 	    <if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
 			AND u.user_name like concat('%', #{userName}, '%')
@@ -104,12 +104,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	
 	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    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
-			 left join sys_user_role ur on u.user_id = ur.user_id
-			 left join sys_role r on r.role_id = ur.role_id
+	    from PHM.SYS_USER u
+			 left join PHM.SYS_DEPT d on u.dept_id = d.dept_id
+			 left join PHM.SYS_USER_role ur on u.user_id = ur.user_id
+			 left join PHM.SYS_ROLE r on r.role_id = ur.role_id
 	    where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
 	    where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
-	    and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
+	    and u.user_id not in (select u.user_id from PHM.SYS_USER u inner join PHM.SYS_USER_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
 	    <if test="userName != null and userName != ''">
 	    <if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>
 		</if>
@@ -131,19 +131,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	</select>
 	
 	
 	<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
 	<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1
+		select user_id, user_name from PHM.SYS_USER where user_name = #{userName} and del_flag = '0' limit 1
 	</select>
 	</select>
 	
 	
 	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
 	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
+		select user_id, phonenumber from PHM.SYS_USER where phonenumber = #{phonenumber} and del_flag = '0' limit 1
 	</select>
 	</select>
 	
 	
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
+		select user_id, email from PHM.SYS_USER where email = #{email} and del_flag = '0' limit 1
 	</select>
 	</select>
 	
 	
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
- 		insert into sys_user(
+ 		insert into PHM.SYS_USER(
  			<if test="userId != null and userId != 0">user_id,</if>
  			<if test="userId != null and userId != 0">user_id,</if>
  			<if test="deptId != null and deptId != 0">dept_id,</if>
  			<if test="deptId != null and deptId != 0">dept_id,</if>
  			<if test="userName != null and userName != ''">user_name,</if>
  			<if test="userName != null and userName != ''">user_name,</if>
@@ -175,7 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</insert>
 	</insert>
 	
 	
 	<update id="updateUser" parameterType="SysUser">
 	<update id="updateUser" parameterType="SysUser">
- 		update sys_user
+ 		update PHM.SYS_USER
  		<set>
  		<set>
  			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
  			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
  			<if test="userName != null and userName != ''">user_name = #{userName},</if>
  			<if test="userName != null and userName != ''">user_name = #{userName},</if>
@@ -196,23 +196,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</update>
 	</update>
 	
 	
 	<update id="updateUserStatus" parameterType="SysUser">
 	<update id="updateUserStatus" parameterType="SysUser">
- 		update sys_user set status = #{status} where user_id = #{userId}
+ 		update PHM.SYS_USER set status = #{status} where user_id = #{userId}
 	</update>
 	</update>
 	
 	
 	<update id="updateUserAvatar" parameterType="SysUser">
 	<update id="updateUserAvatar" parameterType="SysUser">
- 		update sys_user set avatar = #{avatar} where user_name = #{userName}
+ 		update PHM.SYS_USER set avatar = #{avatar} where user_name = #{userName}
 	</update>
 	</update>
 	
 	
 	<update id="resetUserPwd" parameterType="SysUser">
 	<update id="resetUserPwd" parameterType="SysUser">
- 		update sys_user set password = #{password} where user_name = #{userName}
+ 		update PHM.SYS_USER set password = #{password} where user_name = #{userName}
 	</update>
 	</update>
 	
 	
 	<delete id="deleteUserById" parameterType="Long">
 	<delete id="deleteUserById" parameterType="Long">
- 		update sys_user set del_flag = '2' where user_id = #{userId}
+ 		update PHM.SYS_USER set del_flag = '2' where user_id = #{userId}
  	</delete>
  	</delete>
  	
  	
  	<delete id="deleteUserByIds" parameterType="Long">
  	<delete id="deleteUserByIds" parameterType="Long">
- 		update sys_user set del_flag = '2' where user_id in
+ 		update PHM.SYS_USER set del_flag = '2' where user_id in
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  			#{userId}
  			#{userId}
         </foreach> 
         </foreach> 

+ 4 - 4
PHM-admin/phm-system/src/main/resources/mapper/system/SysUserPostMapper.xml

@@ -10,22 +10,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	</resultMap>
 
 
 	<delete id="deleteUserPostByUserId" parameterType="Long">
 	<delete id="deleteUserPostByUserId" parameterType="Long">
-		delete from sys_user_post where user_id=#{userId}
+		delete from PHM.SYS_USER_POST where user_id=#{userId}
 	</delete>
 	</delete>
 	
 	
 	<select id="countUserPostById" resultType="Integer">
 	<select id="countUserPostById" resultType="Integer">
-	    select count(1) from sys_user_post where post_id=#{postId}  
+	    select count(1) from PHM.SYS_USER_POST where post_id=#{postId}  
 	</select>
 	</select>
 	
 	
 	<delete id="deleteUserPost" parameterType="Long">
 	<delete id="deleteUserPost" parameterType="Long">
- 		delete from sys_user_post where user_id in
+ 		delete from PHM.SYS_USER_POST where user_id in
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  			#{userId}
  			#{userId}
         </foreach> 
         </foreach> 
  	</delete>
  	</delete>
 	
 	
 	<insert id="batchUserPost">
 	<insert id="batchUserPost">
-		insert into sys_user_post(user_id, post_id) values
+		insert into PHM.SYS_USER_POST(user_id, post_id) values
 		<foreach item="item" index="index" collection="list" separator=",">
 		<foreach item="item" index="index" collection="list" separator=",">
 			(#{item.userId},#{item.postId})
 			(#{item.userId},#{item.postId})
 		</foreach>
 		</foreach>

+ 6 - 6
PHM-admin/phm-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

@@ -10,33 +10,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	</resultMap>
 
 
 	<delete id="deleteUserRoleByUserId" parameterType="Long">
 	<delete id="deleteUserRoleByUserId" parameterType="Long">
-		delete from sys_user_role where user_id=#{userId}
+		delete from PHM.SYS_USER_ROLE where user_id=#{userId}
 	</delete>
 	</delete>
 	
 	
 	<select id="countUserRoleByRoleId" resultType="Integer">
 	<select id="countUserRoleByRoleId" resultType="Integer">
-	    select count(1) from sys_user_role where role_id=#{roleId}  
+	    select count(1) from PHM.SYS_USER_ROLE where role_id=#{roleId}  
 	</select>
 	</select>
 	
 	
 	<delete id="deleteUserRole" parameterType="Long">
 	<delete id="deleteUserRole" parameterType="Long">
- 		delete from sys_user_role where user_id in
+ 		delete from PHM.SYS_USER_ROLE where user_id in
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  			#{userId}
  			#{userId}
         </foreach> 
         </foreach> 
  	</delete>
  	</delete>
 	
 	
 	<insert id="batchUserRole">
 	<insert id="batchUserRole">
-		insert into sys_user_role(user_id, role_id) values
+		insert into PHM.SYS_USER_ROLE(user_id, role_id) values
 		<foreach item="item" index="index" collection="list" separator=",">
 		<foreach item="item" index="index" collection="list" separator=",">
 			(#{item.userId},#{item.roleId})
 			(#{item.userId},#{item.roleId})
 		</foreach>
 		</foreach>
 	</insert>
 	</insert>
 	
 	
 	<delete id="deleteUserRoleInfo" parameterType="SysUserRole">
 	<delete id="deleteUserRoleInfo" parameterType="SysUserRole">
-		delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
+		delete from PHM.SYS_USER_ROLE where user_id=#{userId} and role_id=#{roleId}
 	</delete>
 	</delete>
 	
 	
 	<delete id="deleteUserRoleInfos">
 	<delete id="deleteUserRoleInfos">
-	    delete from sys_user_role where role_id=#{roleId} and user_id in
+	    delete from PHM.SYS_USER_ROLE where role_id=#{roleId} and user_id in
  	    <foreach collection="userIds" item="userId" open="(" separator="," close=")">
  	    <foreach collection="userIds" item="userId" open="(" separator="," close=")">
  	        #{userId}
  	        #{userId}
             </foreach> 
             </foreach>