Merge branch 'caihaohan' into lixuetao

# Conflicts: # adc-da-main/target/classes/application-dev.properties # adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java # adc-da-report/target/classes/com/adc/da/report/controller/ReportManageConroller.class # adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class # adc-da-report/target/classes/com/adc/da/report/util/PdfUtil.class # adc-da-report/target/classes/com/adc/da/report/util/PptUtil.class # adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml # adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java # adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java # adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java # adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml # adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class # adc-da-sys/target/classes/com/adc/da/sys/service/RoleEOService.class # adc-da-sys/target/classes/dozer/dozer-mappings-ddm.xml # pom.xml
2023-04-24 11:15:18 +08:00
parent 95c9eb1904 162338e916
commit 6d3e7fe66e
36 changed files with 1530 additions and 177 deletions
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mappings xmlns="http://dozer.sourceforge.net" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://dozer.sourceforge.net
+          http://dozer.sourceforge.net/schema/beanmapping.xsd">
+    <!--由于VO 和 EO 字段名称非完全对应,且有的字段类型不一样,所有需要依靠dozer进行转换-->
+    <!--调用时依靠Controller 中
+        @Resource private BeanMapper beanMapper 进行自动装配，然后调用相应方法进行匹配-->
+
+
+    <mapping>
+        <!--角色对应实体类-->
+        <class-a>com.adc.da.sys.entity.RoleEO</class-a>
+        <class-b>com.adc.da.sys.vo.ddm.DdmRoleVO</class-b>
+
+        <!--区别字段-->
+        <field>
+            <a>id</a>
+            <b>rid</b>
+        </field>
+        <field>
+            <a>name</a>
+            <b>roleName</b>
+        </field>
+        <field>
+            <a>name</a>
+            <b>roleCode</b>
+        </field>
+        <field>
+            <a>remarks</a>
+            <b>rdesc</b>
+        </field>
+        <field>
+            <a>delFlag</a>
+            <b>enabled</b>
+        </field>
+        <field>
+            <a>menuEOIdList</a>
+            <b>menusstr</b>
+        </field>
+        <field>
+            <a>menuEOList</a>
+            <b>menus</b>
+        </field>
+    </mapping>
+
+    <mapping>
+        <!--菜单对应实体类-->
+        <class-a>com.adc.da.sys.entity.MenuEO</class-a>
+        <class-b>com.adc.da.sys.vo.MenuVO</class-b>
+    </mapping>
+    <mapping date-format="yyyy-MM-dd HH:mm:ss">
+        <!--日志对应实体类，存在时间格式转换 -->
+        <class-a>com.adc.da.log.entity.LogEO</class-a>
+        <class-b>com.adc.da.log.vo.LogVO</class-b>
+    </mapping>
+
+</mappings>