feature 1.邮箱采集功能完善

dxhy-core/pom.xml

@@ -13,6 +13,11 @@
     <version>${jxpt.version}</version>
     <packaging>jar</packaging>
     <dependencies>
+        <dependency>
+            <groupId>com.dxhy</groupId>
+            <artifactId>dxhy-lq-channel</artifactId>
+            <version>${jxpt.lq.version}</version>
+        </dependency>
         <dependency>
             <groupId>javax.mail</groupId>
             <artifactId>javax.mail-api</artifactId>

dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java

@@ -54,10 +54,17 @@ public class EmailMaintainController extends AbstractController  {
 //                return ResponseEntity.ok(R.ok().put("data", ""));
 //            }
 //        }
+        Object deptId = pramsMap.get("deptId");
+        if(deptId == null || "".equals(String.valueOf(deptId))){
+            return ResponseEntity.ok(R.error("查询参数有误！"));
+        }
+        if("99".equals(String.valueOf(deptId))){
+            pramsMap.put("deptId","");
+        }
         UserInfo userInfo = getUserInfo();
         log.debug("用户信息：{}", JSONObject.toJSONString(userInfo));
         String loginname = getUserInfo().getLoginname();
-        pramsMap.put("userId",loginname);
+        pramsMap.put("createUser",loginname);
         return ResponseEntity.ok(R.ok().put("data",this.emailMaintainService.queryByPage(pramsMap)));
     }
 
@@ -75,6 +82,8 @@ public class EmailMaintainController extends AbstractController  {
             String encode = Base64Encoding.encode(emailMaintain.getEmailPassword());
             emailMaintain.setEmailPassword(encode);
         }
+        String loginname = getUserInfo().getLoginname();
+        emailMaintain.setCreateUser(loginname);
         boolean insert = this.emailMaintainService.insert(emailMaintain);
         if(insert){
             return ResponseEntity.ok(R.ok());

dxhy-core/src/main/java/com/dxhy/core/model/mailGather/EmailMaintainVo.java

@@ -28,6 +28,8 @@ public class EmailMaintainVo  extends CommonDTO {
     public String delStatus;
     public String emailUid;
 
+    public String createUser;
+
     public Date createTime;
     public Date modifyTime;
 }

dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java

@@ -53,7 +53,7 @@ public class EmailMaintainServiceImpl implements EmailMaintainService {
         PageHelper.startPage(curr, size);
         List<EmailMaintainVo> emailMaintainVos = emailMaintainDao.queryAllByLimit(pramsMap);
         PageInfo<EmailMaintainVo> pageInfo = new PageInfo<>(emailMaintainVos);
-        returnList.add(pageInfo);
+        returnList.add(pageInfo.getList());
         // 设置记录总数
         json.put("total", pageInfo.getTotal());
         json.put("datalist", returnList);

dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java

@@ -50,7 +50,7 @@ public class MailGatherLogServiceImpl implements MailGatherLogService {
         PageHelper.startPage(curr, size);
         List<MailGatherLogVo> emailMaintainVos = mailGatherLogDao.queryAllByLimit(pramsMap);
         PageInfo<MailGatherLogVo> pageInfo = new PageInfo<>(emailMaintainVos);
-        returnList.add(pageInfo);
+        returnList.add(pageInfo.getList());
         // 设置记录总数
         json.put("total", pageInfo.getTotal());
         json.put("datalist", returnList);

dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml

@@ -12,6 +12,7 @@
         <result property="emailAddress" column="email_address" jdbcType="VARCHAR"/>
         <result property="emailPassword" column="email_password" jdbcType="VARCHAR"/>
         <result property="emailUid" column="email_uid" jdbcType="VARCHAR"/>
+        <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="delStatus" column="del_status" jdbcType="VARCHAR"/>
         <result property="modifyTime" column="modify_time" jdbcType="TIMESTAMP"/>
@@ -40,6 +41,9 @@
              <if test="userId != null and userId != ''">
                 and user_id = #{userId}
             </if>
+            <if test="createUser != null and createUser != ''">
+                and create_user = #{createUser}
+            </if>
         </where>
     </select>
 
@@ -86,8 +90,8 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into email_maintain(id, dept_id, company_code, dept_name, username, user_id, email_address, email_password, create_time, del_status, modify_time)
-        values (#{id}, #{deptId}, #{companyCode}, #{deptName}, #{username}, #{userId}, #{emailAddress}, #{emailPassword}, #{createTime}, #{delStatus}, #{modifyTime})
+        insert into email_maintain(id, dept_id, company_code, dept_name, username, user_id, email_address, email_password, create_user, create_time, del_status, modify_time)
+        values (#{id}, #{deptId}, #{companyCode}, #{deptName}, #{username}, #{userId}, #{emailAddress}, #{emailPassword}, #{createUser}, #{createTime}, #{delStatus}, #{modifyTime})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">

pom.xml

@@ -36,6 +36,7 @@
     </modules>
 
     <properties>
+        <jxpt.lq.version>1.0.2</jxpt.lq.version>
         <jxpt.version>5.0.3.1</jxpt.version>
         <skipTests>true</skipTests>
         <java.version>1.8</java.version>