Skip to content

A
amos-boot-biz
Commit 7621d26a authored by chenhao's avatar chenhao
Browse files
Options

修改联系人的方法，以及获取地址方法，删除对于的定时器

parent 7c1fe64d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 87 additions and 82 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java
View file @ 7621d26a
...@@ -88,4 +88,5 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> { ...@@ -88,4 +88,5 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
void updatelistByParentId(String codex, String code); void updatelistByParentId(String codex, String code);
List< Map<String,String>> getPersonSimpleDetail();
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml
View file @ 7621d26a
...@@ -633,5 +633,30 @@ GROUP BY ...@@ -633,5 +633,30 @@ GROUP BY
</update> </update>
<select id ='getPersonSimpleDetail' resultType='Map'>
SELECT
person.biz_org_name as name,
cdf.field_value as phone
FROM
(
SELECT
sequence_nbr,
biz_org_name
FROM
cb_org_usr
WHERE
biz_org_type = 'PERSON'
AND is_delete = 0
) person
LEFT JOIN (
SELECT
field_value,
instance_id
FROM
cb_dynamic_form_instance
WHERE
group_code = '246'
AND field_code = 'telephone'
) cdf ON person.sequence_nbr = cdf.instance_id
</select>
</mapper> </mapper>
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @ 7621d26a
package com.yeejoin.amos.boot.module.common.biz.service.impl; package com.yeejoin.amos.boot.module.common.biz.service.impl;
import java.io.Serializable;
import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.component.emq.EmqKeeper;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
...@@ -43,33 +72,6 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult; ...@@ -43,33 +72,6 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege; import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.RoleModel; import com.yeejoin.amos.feign.privilege.model.RoleModel;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.component.emq.EmqKeeper;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import javax.annotation.Resource;
import java.io.Serializable;
import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
/** /**
* 机构/部门/人员表 服务实现类 * 机构/部门/人员表 服务实现类
...@@ -499,7 +501,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -499,7 +501,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
orgUsr.setRecUserName(user.getRealName()); orgUsr.setRecUserName(user.getRealName());
orgUsr.setRecUserId(user.getUserId()); orgUsr.setRecUserId(user.getUserId());
OrgUsrDto orgUsrDto = new OrgUsrDto(); OrgUsrDto orgUsrDto = new OrgUsrDto();
BeanUtils.copyProperties(orgUsr,orgUsrDto); BeanUtils.copyProperties(orgUsr, orgUsrDto);
// 单位新增情况 // 单位新增情况
OrgUsrDto model = createWithModel(orgUsrDto); OrgUsrDto model = createWithModel(orgUsrDto);
// save(orgUsr); // save(orgUsr);
...@@ -1191,11 +1193,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1191,11 +1193,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
@Override @Override
public List<OrgUsrExcelDto> exportToExcel(Map par) { public List<OrgUsrExcelDto> exportToExcel(Map par) {
String parentId = par.containsKey("parentId")?par.get("parentId").toString():null; String parentId = par.containsKey("parentId") ? par.get("parentId").toString() : null;
String bizOrgName = par.containsKey("bizOrgName")?par.get("bizOrgName").toString():null; String bizOrgName = par.containsKey("bizOrgName") ? par.get("bizOrgName").toString() : null;
String internalPositionCode = par.containsKey("internalPositionCode")?par.get("internalPositionCode").toString():null; String internalPositionCode = par.containsKey("internalPositionCode")
String positionType= par.containsKey("positionType")?par.get("positionType").toString():null; ? par.get("internalPositionCode").toString()
return orgUsrMapper.exportToExcel(parentId,bizOrgName,internalPositionCode,positionType); : null;
String positionType = par.containsKey("positionType") ? par.get("positionType").toString() : null;
return orgUsrMapper.exportToExcel(parentId, bizOrgName, internalPositionCode, positionType);
} }
@Override @Override
...@@ -1542,6 +1546,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1542,6 +1546,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
wrapper.eq(OrgUsr::getBizOrgType, OrgPersonEnum.人员.getKey()); wrapper.eq(OrgUsr::getBizOrgType, OrgPersonEnum.人员.getKey());
return this.baseMapper.selectList(wrapper); return this.baseMapper.selectList(wrapper);
} }
/** /**
* 查询组织机构下面的人员信息 * 查询组织机构下面的人员信息
* *
...@@ -1656,7 +1661,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1656,7 +1661,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
break; break;
} }
} }
if (!map.containsKey("postType") || map.get("postType") == null || StringUtils.isBlank(map.get("postType").toString())) { if (!map.containsKey("postType") || map.get("postType") == null
|| StringUtils.isBlank(map.get("postType").toString())) {
continue; continue;
} }
map.put("userName", orgUsr.getBizOrgName()); map.put("userName", orgUsr.getBizOrgName());
...@@ -1690,13 +1696,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1690,13 +1696,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
@Override @Override
public List<OrgUsr> selectCompanyUsers(Long orgUnitId) { public List<OrgUsr> selectCompanyUsers(Long orgUnitId) {
OrgUsr orgUsr = this.getById(orgUnitId); OrgUsr orgUsr = this.getById(orgUnitId);
if(null == orgUnitId) { if (null == orgUnitId) {
return null; return null;
} }
LambdaQueryWrapper<OrgUsr> queryWrapper = new LambdaQueryWrapper(); LambdaQueryWrapper<OrgUsr> queryWrapper = new LambdaQueryWrapper();
queryWrapper.like(OrgUsr::getBizOrgCode,orgUsr.getBizOrgCode()); queryWrapper.like(OrgUsr::getBizOrgCode, orgUsr.getBizOrgCode());
queryWrapper.eq(OrgUsr::getBizOrgType,CommonConstant.BIZ_ORG_TYPE_PERSON); queryWrapper.eq(OrgUsr::getBizOrgType, CommonConstant.BIZ_ORG_TYPE_PERSON);
queryWrapper.eq(OrgUsr::getIsDelete,false); queryWrapper.eq(OrgUsr::getIsDelete, false);
List<OrgUsr> list = this.list(queryWrapper); List<OrgUsr> list = this.list(queryWrapper);
return list; return list;
} }
...@@ -1705,7 +1711,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1705,7 +1711,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
public OrgUsr selectByAmosOrgId(Long id) { public OrgUsr selectByAmosOrgId(Long id) {
QueryWrapper<OrgUsr> queryWrapper = new QueryWrapper<>(); QueryWrapper<OrgUsr> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("amos_org_id",id); queryWrapper.eq("amos_org_id", id);
OrgUsr orgUsr = orgUsrMapper.selectOne(queryWrapper); OrgUsr orgUsr = orgUsrMapper.selectOne(queryWrapper);
return orgUsr; return orgUsr;
...@@ -1713,8 +1719,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1713,8 +1719,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
@Override @Override
public AgencyUserModel getAmosIdByOrgUserId(String orgUserId) throws Exception { public AgencyUserModel getAmosIdByOrgUserId(String orgUserId) throws Exception {
OrgUsr orgUsr = this.baseMapper.selectOne(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getSequenceNbr, OrgUsr orgUsr = this.baseMapper
orgUserId)); .selectOne(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getSequenceNbr, orgUserId));
if (ValidationUtil.isEmpty(orgUsr)) { if (ValidationUtil.isEmpty(orgUsr)) {
throw new Exception("账号不存在"); throw new Exception("账号不存在");
} }
...@@ -1731,13 +1737,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1731,13 +1737,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
throw new Exception("账号不存在"); throw new Exception("账号不存在");
} }
List<String> orgUserIdList = Lists.newArrayList(orgUserIds.split(",")); List<String> orgUserIdList = Lists.newArrayList(orgUserIds.split(","));
List<OrgUsr> orgUsrList = this.baseMapper.selectList(new LambdaQueryWrapper<OrgUsr>().in(OrgUsr::getSequenceNbr, List<OrgUsr> orgUsrList = this.baseMapper
orgUserIdList)); .selectList(new LambdaQueryWrapper<OrgUsr>().in(OrgUsr::getSequenceNbr, orgUserIdList));
if (ValidationUtil.isEmpty(orgUsrList)) { if (ValidationUtil.isEmpty(orgUsrList)) {
throw new Exception("账号不存在"); throw new Exception("账号不存在");
} }
List<AgencyUserModel> amosUserList = List<AgencyUserModel> amosUserList = Privilege.agencyUserClient.queryByIds(
Privilege.agencyUserClient.queryByIds(Joiner.on(",").join(orgUsrList.stream().map(OrgUsr::getAmosOrgId).collect(Collectors.toList())), false).getResult(); Joiner.on(",").join(orgUsrList.stream().map(OrgUsr::getAmosOrgId).collect(Collectors.toList())), false)
.getResult();
if (ValidationUtil.isEmpty(amosUserList)) { if (ValidationUtil.isEmpty(amosUserList)) {
throw new Exception("账号不存在"); throw new Exception("账号不存在");
} }
...@@ -1748,7 +1755,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1748,7 +1755,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
@Override @Override
public List<OrgUsrFormDto> getUnSyncOrgCompanyList(List<Long> companyIdList) { public List<OrgUsrFormDto> getUnSyncOrgCompanyList(List<Long> companyIdList) {
LambdaQueryWrapper<OrgUsr> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OrgUsr> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.notIn(OrgUsr::getSequenceNbr, companyIdList).eq(OrgUsr::getIsDelete, false).eq(OrgUsr::getBizOrgType, "COMPANY"); queryWrapper.notIn(OrgUsr::getSequenceNbr, companyIdList).eq(OrgUsr::getIsDelete, false)
.eq(OrgUsr::getBizOrgType, "COMPANY");
List<OrgUsr> unSyncCompanyList = this.baseMapper.selectList(queryWrapper); List<OrgUsr> unSyncCompanyList = this.baseMapper.selectList(queryWrapper);
List<OrgUsrFormDto> allUnSyncCompanyList = Lists.newArrayList(); List<OrgUsrFormDto> allUnSyncCompanyList = Lists.newArrayList();
if (!ValidationUtil.isEmpty(unSyncCompanyList)) { if (!ValidationUtil.isEmpty(unSyncCompanyList)) {
...@@ -1764,11 +1772,15 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1764,11 +1772,15 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
return allUnSyncCompanyList; return allUnSyncCompanyList;
} }
public OrgUsr getDetailById(Long id) {
public OrgUsr getDetailById( Long id){
LambdaQueryWrapper<OrgUsr> queryWrapper = new LambdaQueryWrapper<OrgUsr>(); LambdaQueryWrapper<OrgUsr> queryWrapper = new LambdaQueryWrapper<OrgUsr>();
queryWrapper.eq(OrgUsr::getIsDelete, false); queryWrapper.eq(OrgUsr::getIsDelete, false);
queryWrapper.eq(OrgUsr::getSequenceNbr, id); queryWrapper.eq(OrgUsr::getSequenceNbr, id);
return this.baseMapper.selectOne(queryWrapper); return this.baseMapper.selectOne(queryWrapper);
} }
public List<Map<String, String>> getPersonSimpleDetail() {
return orgUsrMapper.getPersonSimpleDetail();
}
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/GetContactNameSchedulerJob.java deleted 100644 → 0
View file @ 7c1fe64d
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@Component
public class GetContactNameSchedulerJob {
@Autowired
RedisUtils redisUtils;
@Autowired
AlertCalledServiceImpl alertCalledServiceImpl;
@Value("${redis.cache.failure.time}")
private long time;
/**
* 每天凌晨12:01执行方法，更新联系人在缓存中的数据
*/
@Scheduled(cron = "0 01 00 ? * *")
public void excuteJob() {
List<Map<String, String>> contactName = alertCalledServiceImpl.getContactName();
redisUtils.set(RedisKey.CONTACT_USER, contactName, time);
}
}
amos-boot-system-jcs/src/main/java/com/yeejoin/amos/AmosJcsApplication.java
View file @ 7621d26a
...@@ -19,7 +19,6 @@ import org.springframework.core.env.Environment; ...@@ -19,7 +19,6 @@ import org.springframework.core.env.Environment;
import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler; import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
...@@ -39,7 +38,6 @@ import com.yeejoin.amos.boot.biz.common.utils.oConvertUtils; ...@@ -39,7 +38,6 @@ import com.yeejoin.amos.boot.biz.common.utils.oConvertUtils;
@EnableFeignClients @EnableFeignClients
@EnableAsync @EnableAsync
@EnableEurekaClient @EnableEurekaClient
@EnableScheduling
@MapperScan({ "org.typroject.tyboot.demo.face.orm.dao*", "org.typroject.tyboot.face.*.orm.dao*", @MapperScan({ "org.typroject.tyboot.demo.face.orm.dao*", "org.typroject.tyboot.face.*.orm.dao*",
"org.typroject.tyboot.core.auth.face.orm.dao*", "org.typroject.tyboot.component.*.face.orm.dao*", "org.typroject.tyboot.core.auth.face.orm.dao*", "org.typroject.tyboot.component.*.face.orm.dao*",
"com.yeejoin.amos.boot.module.*.api.mapper", "com.yeejoin.amos.boot.biz.common.dao.mapper" }) "com.yeejoin.amos.boot.module.*.api.mapper", "com.yeejoin.amos.boot.biz.common.dao.mapper" })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment