[合并] ‘caihaohan’合并到 ‘lixuetao’ 解决冲突

adc-da-main/target/classes/application-dev.properties

@@ -35,7 +35,7 @@
 #spring.datasource.mysql.password = root
 
 spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://121.36.69.172:3307/report-library?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+spring.datasource.url = jdbc:mysql://121.36.69.172:3307/report-library?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
 spring.datasource.username = root
 spring.datasource.password = hzwlsoft.com
 
@@ -86,11 +86,6 @@ MAIL_POP_PORT=110
 #MAIL_USERNAME=64459@Any3.com
 #MAIL_PASSWORD=65316975Xiaoq
 
-
-
-
-
-
 IPANDPORT=http://localhost:7061/
 
 #redis
@@ -133,10 +128,8 @@ huawei.OBS.fileMaxSize=10 #文件上传最大M数
 
 logging.level.com.adc: debug
 
-
-# ======= ddm权限接口 集成 =========
-ddm-identity=changan_test
-ddm-company=9
-ddm-ras-public-key=
-
+# ==== IAM????
+iam.url=https://iamuat.faw-vw.com/
+iam.appkey=xxxx
+iam.appSecret=xxx
 

adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml

@@ -162,4 +162,13 @@
         ORDER BY year DESC
     </select>
 
+
+    <select id="getAddReportPage" resultType="com.adc.da.report.vo.ReportVo">
+        select * from TT_REPORT_MANAGE
+
+        <where>
+            del = 0
+        </where>
+    </select>
+
 </mapper>

adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java

@@ -3,11 +3,7 @@ package com.adc.da.sys.service.iservice;
 import com.adc.da.sys.entity.UserEO;
 import com.adc.da.sys.vo.UserImportVO;
 import com.adc.da.sys.vo.UserVO;
-import com.adc.da.sys.vo.ddm.DdmUserQueryVO;
-import com.adc.da.sys.vo.ddm.DdmUserVO;
-import com.adc.da.util.http.PageInfo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -25,13 +21,13 @@ public interface IUserEoService {
      */
     UserEO getUserByLoginName(String userName,String usid);
 
-    /**
-     * 根据邮箱和id查询用户数量
-     * @param email
-     * @param usid
-     * @return
-     */
-    int getUserCountByEmail(String email,String usid);
+//    /**
+//     * 根据邮箱和id查询用户数量
+//     * @param email
+//     * @param usid
+//     * @return
+//     */
+//    int getUserCountByEmail(String email,String usid);
 
     /**
      * 新增或者编辑用户
@@ -55,13 +51,10 @@ public interface IUserEoService {
 
     UserEO getUserByLoginNameNotDeleted(String userName);
 
-    public PageInfo<DdmUserVO> getUserPage(DdmUserQueryVO query);
+
 
     public void importExcelUser(List<UserImportVO> list);
 
     List<Map<String, Object>> allList(String account, String roleName);
 
-    List<UserEO> getUserByMail(List<String> mailList);
-
-    List<UserEO> getUserByAccount(List<String> mailList);
 }

adc-da-sys/target/classes/dozer/dozer-mappings-ddm.xml

@@ -6,43 +6,6 @@
     <!--调用时依靠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>