Merge remote-tracking branch 'origin/email' into release

release
wangrangrang 2 years ago
commit eb14bc3f66
  1. 17
      dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java
  2. 2
      dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java
  3. 15
      dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java
  4. 10
      dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml

@ -65,15 +65,11 @@ 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("该组织未配置税号,请先联系管理员"));
String companyCode = (String) pramsMap.get("companyCode");
if(StringUtils.isBlank(companyCode)){
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("createUser",loginname);
return ResponseEntity.ok(R.ok().put("data",this.emailMaintainService.queryByPage(pramsMap)));
@ -184,7 +180,8 @@ public class EmailMaintainController extends AbstractController {
@RequestMapping("/emailUpload")
public ResponseEntity<R> emailUpload(@RequestParam(value = "file") MultipartFile file,
@RequestParam(value = "deptId") String deptId,
@RequestParam(value = "deptName") String deptName) {
@RequestParam(value = "deptName") String deptName,
@RequestParam (value = "companyCode") String companyCode) {
try {
List<EmailMaintainExcel> emailMaintainExcels =
@ -241,7 +238,7 @@ public class EmailMaintainController extends AbstractController {
EmailMaintainVo maintainVo = new EmailMaintainVo();
maintainVo.setId(UUIDUtils.generateShortUuid());
maintainVo.setCompanyCode(deptId);
maintainVo.setCompanyCode(companyCode);
maintainVo.setDeptId(deptId);
maintainVo.setDeptName(deptName);
maintainVo.setUsername(userName);

@ -125,7 +125,7 @@ public class EmailMaintainServiceImpl implements EmailMaintainService {
@Override
public String getUserByUsername(String username) {
DynamicContextHolder.push("business_itax_read");
DynamicContextHolder.push(DbConstant.BASICS_READ);
return emailMaintainDao.getUserByUsername(username);
}

@ -192,11 +192,12 @@ public class SnEmailGatherTask {
List<Map<String, String>> mapList = Lists.newArrayList();
EmailParseUtils.saveAttachment(msg, mapList);
log.debug("获取附件的数量:"+mapList.size());
if(StringUtils.isNotEmpty(maintainVo.getUserId())){
String username = emailMaintainService.getUserByUsername(maintainVo.getUserId());
if(StringUtils.isNotEmpty(username)){
maintainVo.setUserId(username);
}
if(StringUtils.isNotEmpty(maintainVo.getCreateUser())){
// String username = emailMaintainService.getUserByUsername(maintainVo.getUserId());
// if(StringUtils.isNotEmpty(username)){
// maintainVo.setUserId(username);
// }
maintainVo.setUserId(maintainVo.getCreateUser());
}
for (Map<String, String> map : mapList) {
map.put("emailName",emailName);
@ -251,10 +252,10 @@ public class SnEmailGatherTask {
log.info("邮箱采集使用时间:{}",System.currentTimeMillis() - startTime);
} catch (MessagingException e) {
log.error("邮箱采集邮件解析异常:{}", e);
throw new RuntimeException(e);
} catch (IOException e) {
log.error("邮箱采集IO异常:{}", e);
throw new RuntimeException(e);
}catch (Exception e){
log.error("邮箱解析异常{}",e);
}finally {
//更新uid信息
if (StringUtils.isNotBlank(uid) && (uids.isEmpty() ||uids.indexOf(uid)>uids.indexOf(maintainVo.getEmailUid()))){

@ -32,8 +32,8 @@
id, dept_id, company_code, dept_name, username, user_id, email_address,email_password, create_time, del_status, modify_time
from email_maintain
<where>
<if test="deptId != null and deptId != ''">
and dept_id = #{deptId}
<if test="companyCode != null and companyCode != ''">
and company_code = #{companyCode}
</if>
<if test="username != null and username != ''">
and username = #{username}
@ -168,8 +168,12 @@
select username from sys_user where loginname = #{userCode}
</select>
<!-- <select id="getUserByUsername" resultType="java.lang.String">-->
<!-- select code from sys_user where username = #{username}-->
<!-- </select>-->
<select id="getUserByUsername" resultType="java.lang.String">
select code from sys_user where username = #{username}
select loginname from sys_user where username = #{username}
</select>
<select id="selectByEmail" resultType="java.lang.Integer">

Loading…
Cancel
Save