Merge remote-tracking branch 'origin/issue-850' into develop

contact-center/app/src/main/java/com/cskefu/cc/acd/ACDAgentService.java

@@ -325,7 +325,7 @@ public class ACDAgentService {
              */
             AgentService service = null;
             if (StringUtils.isNotBlank(agentUser.getAgentserviceid())) {
-                service = agentServiceRes.getReferenceById(agentUser.getAgentserviceid());
+                service = agentServiceRes.findById(agentUser.getAgentserviceid()).orElse(null);
             } else if (agentStatus != null) {
                 // 该访客没有和坐席对话，因此没有 AgentService
                 // 当做留言处理，创建一个新的 AgentService
@@ -339,8 +339,7 @@ public class ACDAgentService {
                     service.setSessiontimes(System.currentTimeMillis() - service.getServicetime().getTime());
                 }
 
-                final AgentUserTask agentUserTask = agentUserTaskRes.getReferenceById(
+                final AgentUserTask agentUserTask = agentUserTaskRes.findById(agentUser.getId()).orElse(null);
-                        agentUser.getId());
                 if (agentUserTask != null) {
                     service.setAgentreplyinterval(agentUserTask.getAgentreplyinterval());
                     service.setAgentreplytime(agentUserTask.getAgentreplytime());
@@ -514,7 +513,7 @@ public class ACDAgentService {
 
         AgentService agentService = new AgentService();
         if (StringUtils.isNotBlank(agentUser.getAgentserviceid())) {
-            AgentService existAgentService = agentServiceRes.getReferenceById(agentUser.getAgentserviceid());
+            AgentService existAgentService = agentServiceRes.findById(agentUser.getAgentserviceid()).orElse(null);
             if (existAgentService != null) {
                 agentService = existAgentService;
             } else {
@@ -581,7 +580,7 @@ public class ACDAgentService {
             agentService.setOwner(agentUser.getOwner());
             agentService.setTimes(0);
 
-            final User agent = userRes.getReferenceById(agentService.getAgentno());
+            final User agent = userRes.findById(agentService.getAgentno()).orElse(null);
             agentUser.setAgentname(agent.getUname());
             agentUser.setAgentno(agentService.getAgentno());
 

contact-center/app/src/main/java/com/cskefu/cc/acd/ACDChatbotService.java

@@ -44,7 +44,7 @@ public class ACDChatbotService {
         AgentService agentService = new AgentService();    //放入缓存的对象
         Date now = new Date();
         if (StringUtils.isNotBlank(agentUser.getAgentserviceid())) {
-            agentService = agentServiceRes.getReferenceById(agentUser.getAgentserviceid());
+            agentService = agentServiceRes.findById(agentUser.getAgentserviceid()).orElse(null);
             agentService.setEndtime(now);
             if (agentService.getServicetime() != null) {
                 agentService.setSessiontimes(System.currentTimeMillis() - agentService.getServicetime().getTime());

contact-center/app/src/main/java/com/cskefu/cc/acd/ACDPolicyService.java

@@ -162,7 +162,7 @@ public class ACDPolicyService {
         }
 
         if (agentUser != null && StringUtils.isNotBlank(agentUser.getAgentno())) {
-            User user = userRes.getReferenceById(agentUser.getAgentno());
+            User user = userRes.findById(agentUser.getAgentno()).orElse(null);
             if (user != null && !user.isSuperadmin()) {
                 // 用户不为空，并且不是超级管理员
                 // 指定坐席

contact-center/app/src/main/java/com/cskefu/cc/acd/middleware/visitor/ACDVisBindingMw.java

@@ -55,7 +55,7 @@ public class ACDVisBindingMw implements Middleware<ACDComposeContext> {
         if (StringUtils.isNotBlank(ctx.getOrganid())) {
             logger.info("[apply] bind skill {}", ctx.getOrganid());
             // 绑定技能组
-            Organ organ = organRes.getReferenceById(ctx.getOrganid());
+            Organ organ = organRes.findById(ctx.getOrganid()).orElse(null);
             if (organ != null) {
                 ctx.getAgentUser().setSkill(organ.getId());
                 ctx.setOrgan(organ);
@@ -71,7 +71,7 @@ public class ACDVisBindingMw implements Middleware<ACDComposeContext> {
             // 绑定坐席有可能是因为前端展示了技能组和坐席
             // 也有可能是坐席发送了邀请，该访客接收邀请
             ctx.getAgentUser().setAgentno(ctx.getAgentno());
-            User agent = userRes.getReferenceById(ctx.getAgentno());
+            User agent = userRes.findById(ctx.getAgentno()).orElse(null);
             ctx.setAgent(agent);
             ctx.getAgentUser().setAgentname(agent.getUname());
         } else {

contact-center/app/src/main/java/com/cskefu/cc/activemq/AgentAuditSubscription.java

@@ -67,7 +67,7 @@ public class AgentAuditSubscription {
                 // 查找关联的会话监控信息
                 final AgentUserAudit agentUserAudit = cache.findOneAgentUserAuditById(
                         json.get("agentUserId").getAsString()).orElseGet(() -> {
-                    final AgentUser agentUser = agentUserRes.getReferenceById(json.get("agentUserId").getAsString());
+                    final AgentUser agentUser = agentUserRes.findById(json.get("agentUserId").getAsString()).orElse(null);
                     if (agentUser != null) {
                         return agentAuditProxy.updateAgentUserAudits(agentUser);
                     } else {

contact-center/app/src/main/java/com/cskefu/cc/basic/MainUtils.java

@@ -887,7 +887,7 @@ public class MainUtils {
         Template templet = null;
         if ((templet = MainContext.getCache().findOneSystemById(id)) == null) {
             TemplateRepository templateRes = MainContext.getContext().getBean(TemplateRepository.class);
-            templet = templateRes.getReferenceById(id);
+            templet = templateRes.findById(id).orElse(null);
             MainContext.getCache().putSystemById(id, templet);
         }
         return templet;
@@ -1026,7 +1026,7 @@ public class MainUtils {
         SystemConfig config = MainUtils.getSystemConfig();
         if (config != null && config.isEnablemail() && config.getEmailid() != null) {
             SystemMessage systemMessage = MainContext.getContext().getBean(
-                    SystemMessageRepository.class).getReferenceById(config.getEmailid());
+                    SystemMessageRepository.class).findById(config.getEmailid()).orElse(null);
             MailSender sender = new MailSender(
                     systemMessage.getSmtpserver(), systemMessage.getMailfrom(), systemMessage.getSmtpuser(),
                     decryption(systemMessage.getSmtppassword()), systemMessage.getSeclev(), systemMessage.getSslport());
@@ -1230,7 +1230,7 @@ public class MainUtils {
         SystemConfig config = MainUtils.getSystemConfig();
         if (config != null) {
             SystemMessage systemMessage = MainContext.getContext().getBean(
-                    SystemMessageRepository.class).getReferenceById(id);
+                    SystemMessageRepository.class).findById(id).orElse(null);
             if (systemMessage == null) {
                 return false;
             }

contact-center/app/src/main/java/com/cskefu/cc/controller/ApplicationController.java

@@ -116,7 +116,7 @@ public class ApplicationController extends Handler {
         // 呼叫中心信息
         if (MainContext.hasModule(Constants.CSKEFU_MODULE_CALLCENTER) && logined.isCallcenter()) {
             extensionRes.findByAgentno(logined.getId()).ifPresent(ext -> {
-                PbxHost one = pbxHostRes.getReferenceById(ext.getHostid());
+                PbxHost one = pbxHostRes.findById(ext.getHostid()).orElse(null);
                 Map<String, Object> webrtcData = new HashMap<>();
                 webrtcData.put("callCenterWebrtcIP", one.getWebrtcaddress());
                 webrtcData.put("callCenterWebRtcPort", one.getWebrtcport());
@@ -143,7 +143,7 @@ public class ApplicationController extends Handler {
     @ResponseBody
     public String setOrgan(HttpServletRequest request, @Valid String organ) {
         if (StringUtils.isNotBlank(organ)) {
-            Organ currentOrgan = organRepository.getReferenceById(organ);
+            Organ currentOrgan = organRepository.findById(organ).orElse(null);
             if (currentOrgan != null) {
                 request.getSession(true).setAttribute(Constants.ORGAN_SESSION_NAME, currentOrgan);
             }

contact-center/app/src/main/java/com/cskefu/cc/controller/LoginController.java

@@ -138,7 +138,7 @@ public class LoginController extends Handler {
                             try {
                                 flagid = MainUtils.decryption(cookie.getValue());
                                 if (StringUtils.isNotBlank(flagid)) {
-                                    User user = userRepository.getReferenceById(flagid);
+                                    User user = userRepository.findById(flagid).orElse(null);
                                     if (user != null) {
                                         view = this.processLogin(request, user, referer);
                                     }

contact-center/app/src/main/java/com/cskefu/cc/controller/admin/OrganController.java

@@ -141,10 +141,10 @@ public class OrganController extends Handler {
     public ModelAndView add(ModelMap map, HttpServletRequest request, @Valid String parent, @Valid String area) {
         map.addAttribute("areaList", areaRepository.findAll());
         if (!StringUtils.isBlank(parent)) {
-            map.addAttribute("organ", organRepository.getReferenceById(parent));
+            map.addAttribute("organ", organRepository.findById(parent)).orElse(null);
         }
         if (!StringUtils.isBlank(area)) {
-            map.addAttribute("area", areaRepository.getReferenceById(area));
+            map.addAttribute("area", areaRepository.findById(area)).orElse(null);
         }
 
         map.addAttribute("organList", getOwnOragans(request));
@@ -182,7 +182,7 @@ public class OrganController extends Handler {
     public ModelAndView seluser(ModelMap map, HttpServletRequest request, @Valid String organ) {
         Map<String, Organ> organs = organProxy.findAllOrganByParent(super.getOrgan(request));
         map.addAttribute("userList", userProxy.findUserInOrgans(organs.keySet()));
-        Organ organData = organRepository.getReferenceById(organ);
+        Organ organData = organRepository.findById(organ).orElse(null);
         map.addAttribute("userOrganList", userProxy
                 .findByOrganAndDatastatus(organ, false));
         map.addAttribute("organ", organData);
@@ -208,7 +208,7 @@ public class OrganController extends Handler {
 
         if (users != null && users.length > 0) {
             List<String> chosen = new ArrayList<>(Arrays.asList(users));
-            Organ organData = organRepository.getReferenceById(organ);
+            Organ organData = organRepository.findById(organ).orElse(null);
             List<User> organUserList = userRepository.findAllById(chosen);
             for (final User user : organUserList) {
                 OrganUser ou = organUserRes.findByUseridAndOrgan(user.getId(), organ);
@@ -283,7 +283,7 @@ public class OrganController extends Handler {
         ModelAndView view = request(super.createView("/admin/organ/edit"));
         Organ currentOrgan = super.getOrgan(request);
         map.addAttribute("areaList", areaRepository.findAll());
-        view.addObject("organData", organRepository.getReferenceById(id));
+        view.addObject("organData", organRepository.findById(id)).orElse(null);
         view.addObject("isRootOrgan", id.equals(currentOrgan.getId()));
         map.addAttribute("organList", getOwnOragans(request));
         return view;
@@ -308,14 +308,14 @@ public class OrganController extends Handler {
         }
         map.addAttribute("cacheList", Dict.getInstance().getDic(Constants.CSKEFU_SYSTEM_AREA_DIC));
 
-        map.addAttribute("organData", organRepository.getReferenceById(id));
+        map.addAttribute("organData", organRepository.findById(id)).orElse(null);
         return request(super.createView("/admin/organ/area"));
     }
 
     @RequestMapping("/area/update")
     @Menu(type = "admin", subtype = "organ")
     public ModelAndView areaupdate(HttpServletRequest request, @Valid Organ organ) {
-        Organ tempOrgan = organRepository.getReferenceById(organ.getId());
+        Organ tempOrgan = organRepository.findById(organ.getId()).orElse(null);
         String msg = "admin_organ_update_success";
         if (tempOrgan != null) {
             tempOrgan.setArea(organ.getArea());
@@ -332,7 +332,7 @@ public class OrganController extends Handler {
     public ModelAndView delete(HttpServletRequest request, @Valid Organ organ) {
         String msg = "admin_organ_delete";
 
-        Organ organSelf = organRepository.getReferenceById(organ.getId());
+        Organ organSelf = organRepository.findById(organ.getId()).orElse(null);
         List<Organ> organParentAre = organRepository.findByParent(organSelf.getId());
         if (organ != null && organParentAre != null && organParentAre.size() > 0) {
             msg = "admin_oran_not_delete";
@@ -351,7 +351,7 @@ public class OrganController extends Handler {
     @RequestMapping("/auth/save")
     @Menu(type = "admin", subtype = "role")
     public ModelAndView authsave(HttpServletRequest request, @Valid String id, @Valid String menus) {
-        Organ organData = organRepository.getReferenceById(id);
+        Organ organData = organRepository.findById(id).orElse(null);
         List<OrganRole> organRoleList = organRoleRes.findByOrgan(organData);
         organRoleRes.deleteAll(organRoleList);
         if (!StringUtils.isBlank(menus)) {

contact-center/app/src/main/java/com/cskefu/cc/controller/admin/RoleController.java

@@ -146,7 +146,7 @@ public class RoleController extends Handler {
     public ModelAndView seluser(ModelMap map, HttpServletRequest request, @Valid String role) {
         Organ currentOrgan = super.getOrgan(request);
         map.addAttribute("userList", userProxy.findUserInOrgans(Arrays.asList(currentOrgan.getId())));
-        Role roleData = roleRepository.getReferenceById(role);
+        Role roleData = roleRepository.findById(role).orElse(null);
         map.addAttribute("userRoleList", userRoleRes.findByRole(roleData));
         map.addAttribute("role", roleData);
         return request(super.createView("/admin/role/seluser"));
@@ -156,7 +156,7 @@ public class RoleController extends Handler {
     @Menu(type = "admin", subtype = "saveuser", admin = true)
     public ModelAndView saveuser(HttpServletRequest request, @Valid String[] users, @Valid String role) {
         Organ currentOrgan = super.getOrgan(request);
-        Role roleData = roleRepository.getReferenceById(role);
+        Role roleData = roleRepository.findById(role).orElse(null);
         List<UserRole> userRoleList = userRoleRes.findByRole(roleData);
         if (users != null && users.length > 0) {
             for (String user : users) {
@@ -193,7 +193,7 @@ public class RoleController extends Handler {
     @Menu(type = "admin", subtype = "role")
     public ModelAndView edit(ModelMap map, HttpServletRequest request, @Valid String id) {
         ModelAndView view = request(super.createView("/admin/role/edit"));
-        view.addObject("roleData", roleRepository.getReferenceById(id));
+        view.addObject("roleData", roleRepository.findById(id)).orElse(null);
         return view;
     }
 
@@ -204,7 +204,7 @@ public class RoleController extends Handler {
         String msg = "";
         if (tempRoleExist == null) {
             msg = "admin_role_update_success";
-            Role tempRole = roleRepository.getReferenceById(role.getId());
+            Role tempRole = roleRepository.findById(role.getId()).orElse(null);
             tempRole.setName(role.getName());
             tempRole.setUpdatetime(new Date());
             roleRepository.save(tempRole);
@@ -236,7 +236,7 @@ public class RoleController extends Handler {
             map.addAttribute("resourceList", sysDicRes.findByDicid(sysDic.getId()));
         }
         map.addAttribute("sysDic", sysDic);
-        Role role = roleRepository.getReferenceById(id);
+        Role role = roleRepository.findById(id).orElse(null);
         map.addAttribute("role", role);
         map.addAttribute("roleAuthList", roleAuthRes.findByRoleid(role.getId()));
         return request(super.createView("/admin/role/auth"));

contact-center/app/src/main/java/com/cskefu/cc/controller/admin/UsersController.java

@@ -124,14 +124,14 @@ public class UsersController extends Handler {
     @Menu(type = "admin", subtype = "user")
     public ModelAndView edit(ModelMap map, HttpServletRequest request, @Valid String id) {
         ModelAndView view = request(super.createView("/admin/user/edit"));
-        User user = userRepository.getReferenceById(id);
+        User user = userRepository.findById(id).orElse(null);
         if (user != null && MainContext.hasModule(Constants.CSKEFU_MODULE_CALLCENTER)) {
             // 加载呼叫中心信息
             extensionRes.findByAgentno(user.getId()).ifPresent(p -> {
                 user.setExtensionId(p.getId());
                 user.setExtension(p);
 
-                PbxHost one = pbxHostRes.getReferenceById(p.getHostid());
+                PbxHost one = pbxHostRes.findById(p.getHostid()).orElse(null);
                 user.setPbxhostId(one.getId());
                 user.setPbxHost(one);
             });
@@ -145,7 +145,7 @@ public class UsersController extends Handler {
     public ModelAndView delete(HttpServletRequest request, @Valid User user) {
         String msg = "admin_user_delete";
         if (user != null) {
-            User dbUser = userRepository.getReferenceById(user.getId());
+            User dbUser = userRepository.findById(user.getId()).orElse(null);
             if (dbUser.isSuperadmin()) {
                 msg = "admin_user_abandoned";
             } else {

contact-center/app/src/main/java/com/cskefu/cc/controller/admin/channel/ChannelController.java

@@ -138,7 +138,7 @@ public class ChannelController extends Handler {
     public ModelAndView delete(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String confirm) {
         boolean execute;
         if (execute = MainUtils.secConfirm(secRes, confirm)) {
-            Channel channel = snsAccountRes.getReferenceById(id);
+            Channel channel = snsAccountRes.findById(id).orElse(null);
             if (snsAccountRes != null) {
                 // 删除网站渠道记录
                 snsAccountRes.delete(channel);
@@ -160,8 +160,8 @@ public class ChannelController extends Handler {
     @RequestMapping("/edit")
     @Menu(type = "admin", subtype = "send", admin = true)
     public ModelAndView edit(ModelMap map, HttpServletRequest request, @Valid String id) {
-        Channel channel = snsAccountRes.getReferenceById(id);
+        Channel channel = snsAccountRes.findById(id).orElse(null);
-        Organ organ = organRes.getReferenceById(channel.getOrgan());
+        Organ organ = organRes.findById(channel.getOrgan()).orElse(null);
         map.put("organ", organ);
         map.addAttribute("channel", channel);
         return request(super.createView("/admin/channel/im/edit"));
@@ -170,7 +170,7 @@ public class ChannelController extends Handler {
     @RequestMapping("/update")
     @Menu(type = "admin", subtype = "send", admin = true)
     public ModelAndView update(HttpServletRequest request, @Valid Channel channel) throws NoSuchAlgorithmException {
-        Channel oldChannel = snsAccountRes.getReferenceById(channel.getId());
+        Channel oldChannel = snsAccountRes.findById(channel.getId()).orElse(null);
         if (oldChannel != null) {
             oldChannel.setName(channel.getName());
             oldChannel.setBaseURL(channel.getBaseURL());

contact-center/app/src/main/java/com/cskefu/cc/controller/admin/config/SystemMessageController.java

@@ -84,14 +84,14 @@ public class SystemMessageController extends Handler {
     @Menu(type = "admin", subtype = "email")
     public ModelAndView edit(ModelMap map, HttpServletRequest request, @Valid String id) {
         map.put("organList", organRes.findAll());
-        map.addAttribute("email", systemMessageRepository.getReferenceById(id));
+        map.addAttribute("email", systemMessageRepository.findById(id)).orElse(null);
         return request(super.createView("/admin/email/edit"));
     }
 
     @RequestMapping("/email/update")
     @Menu(type = "admin", subtype = "user", admin = true)
     public ModelAndView update(HttpServletRequest request, @Valid SystemMessage email) throws NoSuchAlgorithmException {
-        SystemMessage temp = systemMessageRepository.getReferenceById(email.getId());
+        SystemMessage temp = systemMessageRepository.findById(email.getId()).orElse(null);
         if (email != null) {
             email.setCreatetime(temp.getCreatetime());
             email.setMsgtype(MainContext.SystemMessageType.EMAIL.toString());
@@ -108,7 +108,7 @@ public class SystemMessageController extends Handler {
     @RequestMapping("/email/delete")
     @Menu(type = "admin", subtype = "user")
     public ModelAndView delete(HttpServletRequest request, @Valid SystemMessage email) {
-        SystemMessage temp = systemMessageRepository.getReferenceById(email.getId());
+        SystemMessage temp = systemMessageRepository.findById(email.getId()).orElse(null);
         if (email != null) {
             systemMessageRepository.delete(temp);
         }
@@ -145,14 +145,14 @@ public class SystemMessageController extends Handler {
     @Menu(type = "admin", subtype = "sms")
     public ModelAndView smsedit(ModelMap map, HttpServletRequest request, @Valid String id) {
         map.addAttribute("smsType", Dict.getInstance().getDic("com.dic.sms.type"));
-        map.addAttribute("sms", systemMessageRepository.getReferenceById(id));
+        map.addAttribute("sms", systemMessageRepository.findById(id)).orElse(null);
         return request(super.createView("/admin/sms/edit"));
     }
 
     @RequestMapping("/sms/update")
     @Menu(type = "admin", subtype = "sms", admin = true)
     public ModelAndView smsupdate(HttpServletRequest request, @Valid SystemMessage sms) throws NoSuchAlgorithmException {
-        SystemMessage temp = systemMessageRepository.getReferenceById(sms.getId());
+        SystemMessage temp = systemMessageRepository.findById(sms.getId()).orElse(null);
         if (sms != null) {
             sms.setCreatetime(temp.getCreatetime());
             sms.setMsgtype(MainContext.SystemMessageType.SMS.toString());
@@ -169,7 +169,7 @@ public class SystemMessageController extends Handler {
     @RequestMapping("/sms/delete")
     @Menu(type = "admin", subtype = "sms")
     public ModelAndView smsdelete(HttpServletRequest request, @Valid SystemMessage sms) {
-        SystemMessage temp = systemMessageRepository.getReferenceById(sms.getId());
+        SystemMessage temp = systemMessageRepository.findById(sms.getId()).orElse(null);
         if (sms != null) {
             systemMessageRepository.delete(temp);
         }

contact-center/app/src/main/java/com/cskefu/cc/controller/admin/system/MetadataController.java

@@ -79,14 +79,14 @@ public class MetadataController extends Handler {
     @RequestMapping("/edit")
     @Menu(type = "admin", subtype = "metadata", admin = true)
     public ModelAndView edit(ModelMap map, HttpServletRequest request, @Valid String id) {
-        map.addAttribute("metadata", metadataRes.getReferenceById(id));
+        map.addAttribute("metadata", metadataRes.findById(id)).orElse(null);
         return request(super.createView("/admin/system/metadata/edit"));
     }
 
     @RequestMapping("/update")
     @Menu(type = "admin", subtype = "metadata", admin = true)
     public ModelAndView update(ModelMap map, HttpServletRequest request, @Valid MetadataTable metadata) throws SQLException {
-        MetadataTable table = metadataRes.getReferenceById(metadata.getId());
+        MetadataTable table = metadataRes.findById(metadata.getId()).orElse(null);
         table.setName(metadata.getName());
         table.setFromdb(metadata.isFromdb());
         table.setListblocktemplet(metadata.getListblocktemplet());
@@ -98,7 +98,7 @@ public class MetadataController extends Handler {
     @RequestMapping("/properties/edit")
     @Menu(type = "admin", subtype = "metadata", admin = true)
     public ModelAndView propertiesedit(ModelMap map, HttpServletRequest request, @Valid String id) {
-        map.addAttribute("tp", tablePropertiesRes.getReferenceById(id));
+        map.addAttribute("tp", tablePropertiesRes.findById(id)).orElse(null);
         map.addAttribute("sysdicList", sysDicRes.findByParentid("0"));
         map.addAttribute("dataImplList", Dict.getInstance().getDic("com.dic.data.impl"));
 
@@ -108,7 +108,7 @@ public class MetadataController extends Handler {
     @RequestMapping("/properties/update")
     @Menu(type = "admin", subtype = "metadata", admin = true)
     public ModelAndView propertiesupdate(ModelMap map, HttpServletRequest request, @Valid TableProperties tp) throws SQLException {
-        TableProperties tableProperties = tablePropertiesRes.getReferenceById(tp.getId());
+        TableProperties tableProperties = tablePropertiesRes.findById(tp.getId()).orElse(null);
         tableProperties.setName(tp.getName());
         tableProperties.setSeldata(tp.isSeldata());
         tableProperties.setSeldatacode(tp.getSeldatacode());
@@ -133,7 +133,7 @@ public class MetadataController extends Handler {
     @RequestMapping("/delete")
     @Menu(type = "admin", subtype = "metadata", admin = true)
     public ModelAndView delete(ModelMap map, HttpServletRequest request, @Valid String id) throws SQLException {
-        MetadataTable table = metadataRes.getReferenceById(id);
+        MetadataTable table = metadataRes.findById(id).orElse(null);
         metadataRes.delete(table);
         return request(super.createView("redirect:/admin/metadata/index.html"));
     }
@@ -150,7 +150,7 @@ public class MetadataController extends Handler {
     @RequestMapping("/properties/delete")
     @Menu(type = "admin", subtype = "metadata", admin = true)
     public ModelAndView propertiesdelete(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String tbid) throws SQLException {
-        TableProperties prop = tablePropertiesRes.getReferenceById(id);
+        TableProperties prop = tablePropertiesRes.findById(id).orElse(null);
         tablePropertiesRes.delete(prop);
         return request(super.createView("redirect:/admin/metadata/table.html?id=" + (!StringUtils.isBlank(tbid) ? tbid : prop.getDbtableid())));
     }
@@ -169,7 +169,7 @@ public class MetadataController extends Handler {
     public ModelAndView table(ModelMap map, HttpServletRequest request, @Valid String id) throws SQLException {
         map.addAttribute("propertiesList", tablePropertiesRes.findByDbtableid(id));
         map.addAttribute("tbid", id);
-        map.addAttribute("table", metadataRes.getReferenceById(id));
+        map.addAttribute("table", metadataRes.findById(id)).orElse(null);
         return request(super.createView("/admin/system/metadata/table"));
     }
 
@@ -267,7 +267,7 @@ public class MetadataController extends Handler {
     @Menu(type = "admin", subtype = "metadata", admin = true)
     public ModelAndView clean(ModelMap map, HttpServletRequest request, @Valid String id) throws SQLException, BeansException, ClassNotFoundException {
         if (!StringUtils.isBlank(id)) {
-            MetadataTable table = metadataRes.getReferenceById(id);
+            MetadataTable table = metadataRes.findById(id).orElse(null);
         }
         return request(super.createView("redirect:/admin/metadata/index.html"));
     }
@@ -277,7 +277,7 @@ public class MetadataController extends Handler {
     @Menu(type = "admin", subtype = "metadata", admin = true)
     public ModelAndView synctoes(ModelMap map, HttpServletRequest request, @Valid String id) throws SQLException, BeansException, ClassNotFoundException {
         if (!StringUtils.isBlank(id)) {
-            MetadataTable table = metadataRes.getReferenceById(id);
+            MetadataTable table = metadataRes.findById(id).orElse(null);
             if (table.isFromdb() && !StringUtils.isBlank(table.getListblocktemplet())) {
                 SysDic dic = Dict.getInstance().getDicItem(table.getListblocktemplet());
             }
@@ -290,7 +290,7 @@ public class MetadataController extends Handler {
     @Menu(type = "admin", subtype = "metadata", admin = true)
     public ModelAndView synctodb(ModelMap map, HttpServletRequest request, @Valid String id) throws SQLException, BeansException, ClassNotFoundException {
         if (!StringUtils.isBlank(id)) {
-            MetadataTable table = metadataRes.getReferenceById(id);
+            MetadataTable table = metadataRes.findById(id).orElse(null);
             if (table.isFromdb() && !StringUtils.isBlank(table.getListblocktemplet())) {
                 SysDic dic = Dict.getInstance().getDicItem(table.getListblocktemplet());
             }

contact-center/app/src/main/java/com/cskefu/cc/controller/admin/system/SysDicController.java

@@ -78,7 +78,7 @@ public class SysDicController extends Handler {
     @RequestMapping("/edit")
     @Menu(type = "admin", subtype = "sysdic")
     public ModelAndView edit(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String p) {
-        map.addAttribute("sysDic", sysDicRes.getReferenceById(id));
+        map.addAttribute("sysDic", sysDicRes.findById(id)).orElse(null);
         map.addAttribute("p", p);
         return request(super.createView("/admin/system/sysdic/edit"));
     }
@@ -88,7 +88,7 @@ public class SysDicController extends Handler {
     public ModelAndView update(HttpServletRequest request, @Valid SysDic dic, @Valid String p) {
         List<SysDic> sysDicList = sysDicRes.findByCodeOrName(dic.getCode(), dic.getName());
         if (sysDicList.size() == 0 || (sysDicList.size() == 1 && sysDicList.get(0).getId().equals(dic.getId()))) {
-            SysDic sysDic = sysDicRes.getReferenceById(dic.getId());
+            SysDic sysDic = sysDicRes.findById(dic.getId()).orElse(null);
             sysDic.setName(dic.getName());
             sysDic.setCode(dic.getCode());
             sysDic.setCtype(dic.getCtype());
@@ -104,7 +104,7 @@ public class SysDicController extends Handler {
     @RequestMapping("/delete")
     @Menu(type = "admin", subtype = "sysdic")
     public ModelAndView delete(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String p) {
-        SysDic sysDic = sysDicRes.getReferenceById(id);
+        SysDic sysDic = sysDicRes.findById(id).orElse(null);
         sysDicRes.deleteAll(sysDicRes.findByDicid(id));
         sysDicRes.delete(sysDic);
 
@@ -116,7 +116,7 @@ public class SysDicController extends Handler {
     @RequestMapping("/dicitem")
     @Menu(type = "admin", subtype = "sysdic")
     public ModelAndView dicitem(ModelMap map, HttpServletRequest request, @Valid String id) {
-        map.addAttribute("sysDic", sysDicRes.getReferenceById(id));
+        map.addAttribute("sysDic", sysDicRes.findById(id)).orElse(null);
         map.addAttribute("sysDicList", sysDicRes.findByParentid(id, PageRequest.of(super.getP(request), super.getPs(request), Direction.DESC, "createtime")));
         return request(super.createView("/admin/system/sysdic/dicitem"));
     }
@@ -124,7 +124,7 @@ public class SysDicController extends Handler {
     @RequestMapping("/dicitem/add")
     @Menu(type = "admin", subtype = "sysdic")
     public ModelAndView dicitemadd(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String p) {
-        map.addAttribute("sysDic", sysDicRes.getReferenceById(id));
+        map.addAttribute("sysDic", sysDicRes.findById(id)).orElse(null);
         map.addAttribute("p", p);
         return request(super.createView("/admin/system/sysdic/dicitemadd"));
     }
@@ -170,7 +170,7 @@ public class SysDicController extends Handler {
     @RequestMapping("/dicitem/batadd")
     @Menu(type = "admin", subtype = "sysdic")
     public ModelAndView dicitembatadd(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String p) {
-        map.addAttribute("sysDic", sysDicRes.getReferenceById(id));
+        map.addAttribute("sysDic", sysDicRes.findById(id)).orElse(null);
         map.addAttribute("p", p);
         return request(super.createView("/admin/system/sysdic/batadd"));
     }
@@ -198,7 +198,7 @@ public class SysDicController extends Handler {
 
             }
         }
-        reloadSysDicItem(sysDicRes.getReferenceById(sysDic.getParentid()));
+        reloadSysDicItem(sysDicRes.findById(sysDic.getParentid())).orElse(null);
 
         return request(super.createView("redirect:/admin/sysdic/dicitem.html?id=" + sysDic.getParentid() + "&p=" + p));
     }
@@ -206,7 +206,7 @@ public class SysDicController extends Handler {
     @RequestMapping("/dicitem/edit")
     @Menu(type = "admin", subtype = "sysdic")
     public ModelAndView dicitemedit(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String p) {
-        map.addAttribute("sysDic", sysDicRes.getReferenceById(id));
+        map.addAttribute("sysDic", sysDicRes.findById(id)).orElse(null);
         map.addAttribute("p", p);
         return request(super.createView("/admin/system/sysdic/dicitemedit"));
     }
@@ -216,7 +216,7 @@ public class SysDicController extends Handler {
     public ModelAndView dicitemupdate(HttpServletRequest request, @Valid SysDic dic, @Valid String p) {
         List<SysDic> sysDicList = sysDicRes.findByDicidAndName(dic.getDicid(), dic.getName());
         if (sysDicList.size() == 0 || (sysDicList.size() == 1 && sysDicList.get(0).getId().equals(dic.getId()))) {
-            SysDic sysDic = sysDicRes.getReferenceById(dic.getId());
+            SysDic sysDic = sysDicRes.findById(dic.getId()).orElse(null);
             sysDic.setName(dic.getName());
             sysDic.setCode(dic.getCode());
             sysDic.setCtype(dic.getCtype());
@@ -235,7 +235,7 @@ public class SysDicController extends Handler {
     @Menu(type = "admin", subtype = "sysdic")
     public ModelAndView dicitemdelete(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String p) {
         sysDicRes.deleteAll(sysDicRes.findByDicid(id));
-        SysDic dic = sysDicRes.getReferenceById(id);
+        SysDic dic = sysDicRes.findById(id).orElse(null);
         sysDicRes.delete(dic);
         reloadSysDicItem(dic);
         return request(super.createView("redirect:/admin/sysdic/dicitem.html?id=" + dic.getParentid() + "&p=" + p));

contact-center/app/src/main/java/com/cskefu/cc/controller/admin/system/TemplateController.java

@@ -95,7 +95,7 @@ public class TemplateController extends Handler {
     @RequestMapping("/list")
     @Menu(type = "admin", subtype = "template", admin = true)
     public ModelAndView list(ModelMap map, HttpServletRequest request, @Valid String type) {
-        map.addAttribute("sysDic", dicRes.getReferenceById(type));
+        map.addAttribute("sysDic", dicRes.findById(type)).orElse(null);
         map.addAttribute("templateList", templateRes.findByTemplettype(type));
         return request(super.createView("/admin/system/template/list"));
     }
@@ -103,7 +103,7 @@ public class TemplateController extends Handler {
     @RequestMapping("/add")
     @Menu(type = "admin", subtype = "template", admin = true)
     public ModelAndView add(ModelMap map, HttpServletRequest request, @Valid String type) {
-        map.addAttribute("sysDic", dicRes.getReferenceById(type));
+        map.addAttribute("sysDic", dicRes.findById(type)).orElse(null);
         return request(super.createView("/admin/system/template/add"));
     }
 
@@ -112,7 +112,7 @@ public class TemplateController extends Handler {
     public ModelAndView save(HttpServletRequest request, @Valid Template template) {
         template.setCreatetime(new Date());
 
-        SysDic dic = dicRes.getReferenceById(template.getTemplettype());
+        SysDic dic = dicRes.findById(template.getTemplettype()).orElse(null);
         if (dic != null && StringUtils.isBlank(template.getCode())) {
             template.setCode(dic.getCode());
         }
@@ -124,17 +124,17 @@ public class TemplateController extends Handler {
     @RequestMapping("/edit")
     @Menu(type = "admin", subtype = "template", admin = true)
     public ModelAndView edit(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String type) {
-        map.addAttribute("sysDic", dicRes.getReferenceById(type));
+        map.addAttribute("sysDic", dicRes.findById(type)).orElse(null);
-        map.addAttribute("template", templateRes.getReferenceById(id));
+        map.addAttribute("template", templateRes.findById(id)).orElse(null);
         return request(super.createView("/admin/system/template/edit"));
     }
 
     @RequestMapping("/update")
     @Menu(type = "admin", subtype = "template", admin = true)
     public ModelAndView update(HttpServletRequest request, @Valid Template template) {
-        Template oldTemplate = templateRes.getReferenceById(template.getId());
+        Template oldTemplate = templateRes.findById(template.getId()).orElse(null);
         if (oldTemplate != null) {
-            SysDic dic = dicRes.getReferenceById(oldTemplate.getTemplettype());
+            SysDic dic = dicRes.findById(oldTemplate.getTemplettype()).orElse(null);
             if (dic != null) {
                 oldTemplate.setCode(dic.getCode());
             }
@@ -156,15 +156,15 @@ public class TemplateController extends Handler {
     @RequestMapping("/code")
     @Menu(type = "admin", subtype = "template", admin = true)
     public ModelAndView code(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String type) {
-        map.addAttribute("sysDic", dicRes.getReferenceById(type));
+        map.addAttribute("sysDic", dicRes.findById(type)).orElse(null);
-        map.addAttribute("template", templateRes.getReferenceById(id));
+        map.addAttribute("template", templateRes.findById(id)).orElse(null);
         return request(super.createView("/admin/system/template/code"));
     }
 
     @RequestMapping("/codesave")
     @Menu(type = "admin", subtype = "template", admin = true)
     public ModelAndView codesave(HttpServletRequest request, @Valid Template template) {
-        Template oldTemplate = templateRes.getReferenceById(template.getId());
+        Template oldTemplate = templateRes.findById(template.getId()).orElse(null);
         if (oldTemplate != null) {
             oldTemplate.setTemplettext(template.getTemplettext());
             oldTemplate.setTemplettitle(template.getTemplettitle());

contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiAgentUserController.java

@@ -158,8 +158,8 @@ public class ApiAgentUserController extends Handler {
         if (StringUtils.isNotBlank(agentUserId) &&
                 StringUtils.isNotBlank(transAgentId) &&
                 StringUtils.isNotBlank(agentServiceId)) {
-            final User targetAgent = userRes.getReferenceById(transAgentId);
+            final User targetAgent = userRes.findById(transAgentId).orElse(null);
-            final AgentService agentService = agentServiceRes.getReferenceById(agentServiceId);
+            final AgentService agentService = agentServiceRes.findById(agentServiceId).orElse(null);
 
             /**
              * 更新AgentUser
@@ -295,7 +295,7 @@ public class ApiAgentUserController extends Handler {
         final User logined = super.getUser(request);
         JsonObject resp = new JsonObject();
 
-        final AgentUser agentUser = agentUserRes.getReferenceById(payload.get("id").getAsString());
+        final AgentUser agentUser = agentUserRes.findById(payload.get("id").getAsString()).orElse(null);
         if (agentUser != null) {
             if ((StringUtils.equals(
                     logined.getId(), agentUser.getAgentno()) || logined.isAdmin())) {

contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiContactNotesController.java

@@ -84,7 +84,7 @@ public class ApiContactNotesController extends Handler {
     private JsonObject creater(final String creater) {
         JsonObject data = new JsonObject();
         // 增加创建人
-        User u = userRes.getReferenceById(creater);
+        User u = userRes.findById(creater).orElse(null);
         if (u != null) {
             data.addProperty("creater", u.getId());
             data.addProperty("creatername", u.getUname());
@@ -98,7 +98,7 @@ public class ApiContactNotesController extends Handler {
                 JsonArray y = new JsonArray();
 
                 for (final OrganUser organ : organs) {
-                    Organ o = organRes.getReferenceById(organ.getOrgan());
+                    Organ o = organRes.findById(organ.getOrgan()).orElse(null);
                     if (o != null) {
                         JsonObject x = new JsonObject();
                         x.addProperty("createrorgan", o.getName());
@@ -125,7 +125,7 @@ public class ApiContactNotesController extends Handler {
         JsonObject resp = new JsonObject();
         // TODO 增加权限检查
         if (j.has("id") && StringUtils.isNotBlank(j.get("id").getAsString())) {
-            ContactNotes cn = contactNotesRes.getReferenceById(j.get("id").getAsString());
+            ContactNotes cn = contactNotesRes.findById(j.get("id").getAsString()).orElse(null);
             if (cn != null) {
                 JsonObject data = new JsonObject();
                 data.addProperty("contactid", cn.getContactid());
@@ -211,7 +211,7 @@ public class ApiContactNotesController extends Handler {
         if ((!payload.has("contactid")) || StringUtils.isBlank(payload.get("contactid").getAsString())) {
             return "参数传递不合法，没有[contactid]。";
         } else {
-            Contacts c = contactsRes.getReferenceById(payload.get("contactid").getAsString());
+            Contacts c = contactsRes.findById(payload.get("contactid").getAsString()).orElse(null);
             if (c == null)
                 return "参数不合法，不存在该联系人。";
         }
@@ -246,7 +246,7 @@ public class ApiContactNotesController extends Handler {
             return resp;
         }
         final String cid = j.get("contactid").getAsString();
-        Contacts c = contactsRes.getReferenceById(cid);
+        Contacts c = contactsRes.findById(cid).orElse(null);
 
         if (c == null) {
             resp.addProperty(RestUtils.RESP_KEY_RC, RestUtils.RESP_RC_FAIL_4);

contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiContactTagsController.java

@@ -127,7 +127,7 @@ public class ApiContactTagsController extends Handler {
 
         final String tagId = j.get("tagId").getAsString();
         final String contactid = j.get("contactid").getAsString();
-        Tag tag = tagRes.getReferenceById(tagId);
+        Tag tag = tagRes.findById(tagId).orElse(null);
 
         if (tag == null) {
             resp.addProperty(RestUtils.RESP_KEY_RC, RestUtils.RESP_RC_FAIL_2);
@@ -165,7 +165,7 @@ public class ApiContactTagsController extends Handler {
             return resp;
         }
 
-        TagRelation t = tagRelationRes.getReferenceById(j.get("xid").getAsString());
+        TagRelation t = tagRelationRes.findById(j.get("xid").getAsString()).orElse(null);
         if (t == null) {
             resp.addProperty(RestUtils.RESP_KEY_RC, RestUtils.RESP_RC_FAIL_4);
             resp.addProperty(RestUtils.RESP_KEY_ERROR, "该联系人没有打这个标签。");

contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiContactsController.java

@@ -129,7 +129,7 @@ public class ApiContactsController extends Handler {
     public ResponseEntity<RestResult> delete(HttpServletRequest request, @Valid String id) {
         RestResult result = new RestResult(RestResultType.OK);
         if (!StringUtils.isBlank(id)) {
-            Contacts contacts = contactsRepository.getReferenceById(id);
+            Contacts contacts = contactsRepository.findById(id).orElse(null);
             if (contacts != null) {    //系统管理员， 不允许 使用 接口删除
                 contacts.setDatastatus(true);
                 contactsRepository.save(contacts);

contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiOrganController.java

@@ -80,7 +80,7 @@ public class ApiOrganController extends Handler{
 		RestResult result = new RestResult(RestResultType.OK) ; 
     	Organ organ = null ;
     	if(!StringUtils.isBlank(id)){
-    		organ = organRepository.getReferenceById(id) ;
+    		organ = organRepository.findById(id).orElse(null);
     		if(organ != null){	//系统管理员， 不允许 使用 接口删除
     			organRepository.delete(organ);
     		}else{

contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiUserController.java

@@ -172,7 +172,7 @@ public class ApiUserController extends Handler {
         String parent = payload.get("parent").getAsString();
         Organ parentOrgan = super.getOrgan(request);
         if (StringUtils.isNotEmpty(parent)) {
-            parentOrgan = organRes.getReferenceById(parent);
+            parentOrgan = organRes.findById(parent).orElse(null);
         }
 
         String roleId = payload.get("role").getAsString();
@@ -184,7 +184,7 @@ public class ApiUserController extends Handler {
         JsonObject resp = userProxy.createNewUser(user, parentOrgan);
 
         if (StringUtils.isNotEmpty(roleId)) {
-            Role role = roleRes.getReferenceById(roleId);
+            Role role = roleRes.findById(roleId).orElse(null);
             UserRole userRole = new UserRole();
             userRole.setUser(user);
             userRole.setRole(role);
@@ -214,7 +214,7 @@ public class ApiUserController extends Handler {
             return resp;
         }
 
-        final User previous = userRes.getReferenceById(updated.getId());
+        final User previous = userRes.findById(updated.getId()).orElse(null);
         if (previous != null) {
             String msg = userProxy.validUserUpdate(updated, previous);
             if (StringUtils.equals(msg, "edit_user_success")) {
@@ -318,7 +318,7 @@ public class ApiUserController extends Handler {
         if (payload.has("id")) {
             String id = payload.get("id").getAsString();
             if (StringUtils.isNotBlank(id)) {
-                User user = userRes.getReferenceById(id);
+                User user = userRes.findById(id).orElse(null);
                 if (user == null) {
                     // 用户不存在
                     resp.addProperty(RestUtils.RESP_KEY_RC, RestUtils.RESP_RC_SUCC);

contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AccountController.java

@@ -283,7 +283,7 @@ public class AccountController extends Handler {
     @Menu(type = "customer", subtype = "customer")
     public ModelAndView delete(HttpServletRequest request, @Valid Account account, @Valid String p, @Valid String ekind) {
         if (account != null) {
-            account = accountRes.getReferenceById(account.getId());
+            account = accountRes.findById(account.getId()).orElse(null);
             account.setDatastatus(true);                            //客户和联系人都是 逻辑删除
             accountRes.save(account);
         }
@@ -293,7 +293,7 @@ public class AccountController extends Handler {
     @RequestMapping("/edit")
     @Menu(type = "customer", subtype = "customer")
     public ModelAndView edit(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String ekind) {
-        map.addAttribute("entCustomer", accountRes.getReferenceById(id));
+        map.addAttribute("entCustomer", accountRes.findById(id)).orElse(null);
         map.addAttribute("ekindId", ekind);
         return request(super.createView("/apps/customer/edit"));
     }
@@ -302,7 +302,7 @@ public class AccountController extends Handler {
     @Menu(type = "customer", subtype = "customer")
     public ModelAndView update(HttpServletRequest request, @Valid CustomerGroupForm customerGroupForm, @Valid String ekindId) {
         final User logined = super.getUser(request);
-        Account customer = accountRes.getReferenceById(customerGroupForm.getEntcustomer().getId());
+        Account customer = accountRes.findById(customerGroupForm.getEntcustomer().getId()).orElse(null);
         String msg = "";
 
         List<PropertiesEvent> events = PropertiesEventUtil.processPropertiesModify(request, customerGroupForm.getEntcustomer(), customer, "id", "creater", "createtime", "updatetime");    //记录 数据变更 历史

contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AgentAuditController.java

@@ -266,7 +266,7 @@ public class AgentAuditController extends Handler {
         }
         ModelAndView view = request(super.createView(mainagentuser));
         final User logined = super.getUser(request);
-        AgentUser agentUser = agentUserRepository.getReferenceById(id);
+        AgentUser agentUser = agentUserRepository.findById(id).orElse(null);
 
         if (agentUser != null) {
             view.addObject("curagentuser", agentUser);
@@ -278,7 +278,7 @@ public class AgentAuditController extends Handler {
 
             view.addObject("inviteData", OnlineUserProxy.consult(agentUser.getAppid()));
 
-            AgentUserTask agentUserTask = agentUserTaskRes.getReferenceById(id);
+            AgentUserTask agentUserTask = agentUserTaskRes.findById(id).orElse(null);
             agentUserTask.setTokenum(0);
             agentUserTaskRes.save(agentUserTask);
 
@@ -298,7 +298,7 @@ public class AgentAuditController extends Handler {
             );
             AgentService agentService = null;
             if (StringUtils.isNotBlank(agentUser.getAgentserviceid())) {
-                agentService = this.agentServiceRes.getReferenceById(agentUser.getAgentserviceid());
+                agentService = this.agentServiceRes.findById(agentUser.getAgentserviceid()).orElse(null);
                 view.addObject("curAgentService", agentService);
                 if (agentService != null) {
                     /**
@@ -308,7 +308,7 @@ public class AgentAuditController extends Handler {
                 }
             }
             if (MainContext.ChannelType.WEBIM.toString().equals(agentUser.getChanneltype())) {
-                PassportWebIMUser passportWebIMUser = onlineUserRes.getReferenceById(agentUser.getUserid());
+                PassportWebIMUser passportWebIMUser = onlineUserRes.findById(agentUser.getUserid()).orElse(null);
                 if (passportWebIMUser != null) {
                     if (passportWebIMUser.getLogintime() != null) {
                         if (MainContext.OnlineUserStatusEnum.OFFLINE.toString().equals(passportWebIMUser.getStatus())) {
@@ -329,7 +329,7 @@ public class AgentAuditController extends Handler {
                                     .toString()));
             view.addObject("tagRelationList", tagRelationRes.findByUserid(agentUser.getUserid()));
 
-            AgentService service = agentServiceRes.getReferenceById(agentUser.getAgentserviceid());
+            AgentService service = agentServiceRes.findById(agentUser.getAgentserviceid()).orElse(null);
             if (service != null) {
                 view.addObject("tags", tagRes.findByTagtypeAndSkill(MainContext.ModelType.USER.toString(), service.getSkill()));
             }
@@ -366,7 +366,7 @@ public class AgentAuditController extends Handler {
             List<Organ> skillGroups = organRes.findByIdInAndSkill(ownOrgans.keySet(), true);
 
             // 选择当前用户的默认技能组
-            AgentService agentService = agentServiceRes.getReferenceById(agentserviceid);
+            AgentService agentService = agentServiceRes.findById(agentserviceid).orElse(null);
 
             String currentOrgan = agentService.getSkill();
 
@@ -399,7 +399,7 @@ public class AgentAuditController extends Handler {
             map.addAttribute("agentuserid", agentuserid);
             map.addAttribute("agentno", agentnoid);
             map.addAttribute("skillGroups", skillGroups);
-            map.addAttribute("agentservice", this.agentServiceRes.getReferenceById(agentserviceid));
+            map.addAttribute("agentservice", this.agentServiceRes.findById(agentserviceid)).orElse(null);
             map.addAttribute("currentorgan", currentOrgan);
         }
 
@@ -474,8 +474,8 @@ public class AgentAuditController extends Handler {
         if (StringUtils.isNotBlank(userid) &&
                 StringUtils.isNotBlank(agentuserid) &&
                 StringUtils.isNotBlank(agentno)) {
-            final User targetAgent = userRes.getReferenceById(agentno);
+            final User targetAgent = userRes.findById(agentno).orElse(null);
-            final AgentService agentService = agentServiceRes.getReferenceById(agentserviceid);
+            final AgentService agentService = agentServiceRes.findById(agentserviceid).orElse(null);
             /**
              * 更新AgentUser
              */
@@ -573,7 +573,7 @@ public class AgentAuditController extends Handler {
     public ModelAndView end(HttpServletRequest request, @Valid String id) {
         final User logined = super.getUser(request);
 
-        final AgentUser agentUser = agentUserRes.getReferenceById(id);
+        final AgentUser agentUser = agentUserRes.findById(id).orElse(null);
 
         if (agentUser != null) {
             if ((StringUtils.equals(
@@ -600,7 +600,7 @@ public class AgentAuditController extends Handler {
         map.addAttribute("agentuserid", agentuserid);
         map.addAttribute("agentserviceid", agentserviceid);
         map.addAttribute("userid", userid);
-        map.addAttribute("agentUser", agentUserRes.getReferenceById(userid));
+        map.addAttribute("agentUser", agentUserRes.findById(userid)).orElse(null);
         return request(super.createView("/apps/cca/blacklistadd"));
     }
 

contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AgentController.java

@@ -277,7 +277,7 @@
              Integer current) throws IOException {
          String mainagentuserconter = "/apps/agent/mainagentuserconter";
          ModelAndView view = request(super.createView(mainagentuserconter));
-         AgentUser agentUser = agentUserRes.getReferenceById(id);
+         AgentUser agentUser = agentUserRes.findById(id).orElse(null);
          if (agentUser != null) {
              view.addObject("curagentuser", agentUser);
              view.addObject(
@@ -294,7 +294,7 @@
              String iconid) throws IOException {
          String mainagentuserconter = "/apps/agent/mainagentuserconter";
          ModelAndView view = request(super.createView(mainagentuserconter));
-         ChatMessage labelid = this.chatMessageRes.getReferenceById(iconid);
+         ChatMessage labelid = this.chatMessageRes.findById(iconid).orElse(null);
          if (labelid != null) {
              if (labelid.isIslabel() == false) {
                  labelid.setIslabel(true);
@@ -317,7 +317,7 @@
      ) throws IOException {
          String mainagentuserconter = "/apps/agent/mainagentusersearch";
          ModelAndView view = request(super.createView(mainagentuserconter));
-         AgentUser agentUser = agentUserRes.getReferenceById(id);
+         AgentUser agentUser = agentUserRes.findById(id).orElse(null);
 
          if (agentUser != null) {
              Page<ChatMessage> agentUserMessageList = null;
@@ -344,7 +344,7 @@
              String thisid) throws IOException, ParseException {
          String mainagentuserconter = "/apps/agent/mainagentuserconter";
          ModelAndView view = request(super.createView(mainagentuserconter));
-         AgentUser agentUser = agentUserRes.getReferenceById(id);
+         AgentUser agentUser = agentUserRes.findById(id).orElse(null);
          if (agentUser != null) {
              SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
              Date date = formatter.parse(createtime);
@@ -381,7 +381,7 @@
 
          ModelAndView view = request(super.createView(mainagentuser));
          final User logined = super.getUser(request);
-         AgentUser agentUser = agentUserRes.getReferenceById(id);
+         AgentUser agentUser = agentUserRes.findById(id).orElse(null);
 
          if (agentUser != null) {
              view.addObject("curagentuser", agentUser);
@@ -392,7 +392,7 @@
              }
 
              view.addObject("inviteData", OnlineUserProxy.consult(agentUser.getAppid()));
-             AgentUserTask agentUserTask = agentUserTaskRes.getReferenceById(id);
+             AgentUserTask agentUserTask = agentUserTaskRes.findById(id).orElse(null);
              agentUserTask.setTokenum(0);
              agentUserTaskRes.save(agentUserTask);
 
@@ -411,7 +411,7 @@
                                      "updatetime")));
              AgentService agentService = null;
              if (StringUtils.isNotBlank(agentUser.getAgentserviceid())) {
-                 agentService = this.agentServiceRes.getReferenceById(agentUser.getAgentserviceid());
+                 agentService = this.agentServiceRes.findById(agentUser.getAgentserviceid()).orElse(null);
                  view.addObject("curAgentService", agentService);
                  if (agentService != null) {
                      /**
@@ -427,7 +427,7 @@
                      view.addObject("weiXinUser", passportWechatUser);
                  }
              } else if (MainContext.ChannelType.WEBIM.toString().equals(agentUser.getChanneltype())) {
-                 PassportWebIMUser passportWebIMUser = onlineUserRes.getReferenceById(agentUser.getUserid());
+                 PassportWebIMUser passportWebIMUser = onlineUserRes.findById(agentUser.getUserid()).orElse(null);
                  if (passportWebIMUser != null) {
                      if (passportWebIMUser.getLogintime() != null) {
                          if (MainContext.OnlineUserStatusEnum.OFFLINE.toString().equals(passportWebIMUser.getStatus())) {
@@ -442,10 +442,10 @@
                  }
              } else if (MainContext.ChannelType.PHONE.toString().equals(agentUser.getChanneltype())) {
                  if (agentService != null && StringUtils.isNotBlank(agentService.getOwner())) {
-                     StatusEvent statusEvent = this.statusEventRes.getReferenceById(agentService.getOwner());
+                     StatusEvent statusEvent = this.statusEventRes.findById(agentService.getOwner()).orElse(null);
                      if (statusEvent != null) {
                          if (StringUtils.isNotBlank(statusEvent.getHostid())) {
-                                 view.addObject("pbxHost", pbxHostRes.getReferenceById(statusEvent.getHostid()));
+                                 view.addObject("pbxHost", pbxHostRes.findById(statusEvent.getHostid())).orElse(null);
                          }
                          view.addObject("statusEvent", statusEvent);
                      }
@@ -460,7 +460,7 @@
              view.addObject("tagRelationList", tagRelationRes.findByUserid(agentUser.getUserid()));
          }
 
-         AgentService service = agentServiceRes.getReferenceById(agentUser.getAgentserviceid());
+         AgentService service = agentServiceRes.findById(agentUser.getAgentserviceid()).orElse(null);
          if (service != null) {
              view.addObject("tags", tagRes.findByTagtypeAndSkill(MainContext.ModelType.USER.toString(), service.getSkill()));
          }
@@ -636,7 +636,7 @@
          for (AgentUser agentUser : agentUserList) {
              if (agentUser != null && super.getUser(request).getId().equals(agentUser.getAgentno())) {
                  acdAgentService.finishAgentUser(agentUser);
-                 AgentService agentService = agentServiceRes.getReferenceById(agentUser.getAgentserviceid());
+                 AgentService agentService = agentServiceRes.findById(agentUser.getAgentserviceid()).orElse(null);
                  if (agentService != null) {
                      agentService.setStatus(MainContext.AgentUserStatusEnum.END.toString());
                      agentServiceList.add(agentService);
@@ -664,7 +664,7 @@
          logger.info("[end] end id {}", id);
          final User logined = super.getUser(request);
 
-         final AgentUser agentUser = agentUserRes.getReferenceById(id);
+         final AgentUser agentUser = agentUserRes.findById(id).orElse(null);
 
          if (agentUser != null) {
              if ((StringUtils.equals(
@@ -689,7 +689,7 @@
      @Menu(type = "apps", subtype = "agent")
      public ModelAndView readmsg(HttpServletRequest request, @Valid String userid) {
 
-         AgentUserTask agentUserTask = agentUserTaskRes.getReferenceById(userid);
+         AgentUserTask agentUserTask = agentUserTaskRes.findById(userid).orElse(null);
          agentUserTask.setTokenum(0);
          agentUserTaskRes.save(agentUserTask);
          return request(super.createView("/public/success"));
@@ -702,7 +702,7 @@
          map.addAttribute("agentuserid", agentuserid);
          map.addAttribute("agentserviceid", agentserviceid);
          map.addAttribute("userid", userid);
-         map.addAttribute("agentUser", agentUserRes.getReferenceById(userid));
+         map.addAttribute("agentUser", agentUserRes.findById(userid)).orElse(null);
          return request(super.createView("/apps/agent/blacklistadd"));
      }
 
@@ -781,7 +781,7 @@
 
          JSONObject result = new JSONObject();
          HttpHeaders headers = RestUtils.header();
-         final AgentUser agentUser = agentUserRes.getReferenceById(id);
+         final AgentUser agentUser = agentUserRes.findById(id).orElse(null);
 
          if (multipart != null && multipart.getOriginalFilename().lastIndexOf(".") > 0) {
              try {
@@ -806,7 +806,7 @@
      @RequestMapping("/message/image")
      @Menu(type = "resouce", subtype = "image", access = true)
      public ModelAndView messageimage(HttpServletResponse response, ModelMap map, @Valid String id, @Valid String t) throws IOException {
-         ChatMessage message = chatMessageRes.getReferenceById(id);
+         ChatMessage message = chatMessageRes.findById(id).orElse(null);
          map.addAttribute("chatMessage", message);
          map.addAttribute("agentUser", cache.findOneAgentUserByUserId(message.getUserid()));
     	/*if(StringUtils.isNotBlank(t)){
@@ -835,7 +835,7 @@
                  }
                  // 写入临时文件
                  FileCopyUtils.copy(image.getBytes(), tempFile);
-                 ChatMessage chatMessage = chatMessageRes.getReferenceById(id);
+                 ChatMessage chatMessage = chatMessageRes.findById(id).orElse(null);
                  chatMessage.setCooperation(true);
                  chatMessageRes.save(chatMessage);
 
@@ -845,7 +845,7 @@
                  MainUtils.scaleImage(imageFile, tempFile, 0.1F);
 
                  // 保存到数据库
-                 StreamingFile sf = streamingFileRes.getReferenceById(fileid);
+                 StreamingFile sf = streamingFileRes.findById(fileid).orElse(null);
                  if (sf != null) {
                      sf.setCooperation(jpaBlobHelper.createBlobWithFile(imageFile));
                      streamingFileRes.save(sf);
@@ -913,7 +913,7 @@
              /**
               * 获得联系人
               */
-             Contacts contacts = contactsRes.getReferenceById(contactsid);
+             Contacts contacts = contactsRes.findById(contactsid).orElse(null);
              if (contacts != null) {
                  map.addAttribute("contacts", contacts);
              }
@@ -921,7 +921,7 @@
              /**
               * 在关联联系人后，更新AgentUser的显示的名字
               */
-             AgentUser agentUser = agentUserRes.getReferenceById(agentuserid);
+             AgentUser agentUser = agentUserRes.findById(agentuserid).orElse(null);
              if (agentUser != null) {
                  agentUser.setUsername(contacts.getName());
                  agentUser.setNickname(contacts.getName());
@@ -939,7 +939,7 @@
                  onlineUserRes.save(passportWebIMUser);
              }
 
-             AgentService agentService = agentServiceRes.getReferenceById(agentserviceid);
+             AgentService agentService = agentServiceRes.findById(agentserviceid).orElse(null);
              if (agentService != null) {
                  agentService.setContactsid(contactsid);
                  agentService.setUsername(contacts.getName());
@@ -971,7 +971,7 @@
      public ModelAndView cleanAssociated(ModelMap map, HttpServletRequest request, final @RequestParam String currentAgentUserContactsId) {
          String contactsid = null;
          if (StringUtils.isNotEmpty(currentAgentUserContactsId)) {
-             AgentUserContacts agentUserContacts = agentUserContactsRes.getReferenceById(currentAgentUserContactsId);
+             AgentUserContacts agentUserContacts = agentUserContactsRes.findById(currentAgentUserContactsId).orElse(null);
              if (agentUserContacts != null) {
                  agentUserContactsRes.delete(agentUserContacts);
              }
@@ -984,7 +984,7 @@
      @RequestMapping(value = "/evaluation")
      @Menu(type = "apps", subtype = "evaluation")
      public String evaluation(HttpServletRequest request, @Valid String agentuserid) {
-         AgentUser agentUser = agentUserRes.getReferenceById(agentuserid);
+         AgentUser agentUser = agentUserRes.findById(agentuserid).orElse(null);
 
          Message outMessage = new Message();
          outMessage.setChannelMessage(agentUser);
@@ -1012,7 +1012,7 @@
              @Valid String agentuserid,
              @Valid String channel) {
          if (StringUtils.isNotBlank(userid) && StringUtils.isNotBlank(agentuserid)) {
-             AgentUser agentUser = this.agentUserRes.getReferenceById(agentuserid);
+             AgentUser agentUser = this.agentUserRes.findById(agentuserid).orElse(null);
              if (agentUser != null && StringUtils.isNotBlank(agentUser.getAgentserviceid())) {
                  List<AgentServiceSummary> summaries = this.serviceSummaryRes.findByAgentserviceid(
                          agentUser.getAgentserviceid());
@@ -1020,7 +1020,7 @@
                      map.addAttribute("summary", summaries.get(0));
                  }
              }
-             AgentService service = agentServiceRes.getReferenceById(agentserviceid);
+             AgentService service = agentServiceRes.findById(agentserviceid).orElse(null);
              if (service != null) {
                  map.addAttribute(
                          "tags", tagRes.findByTagtypeAndSkill(
@@ -1048,7 +1048,7 @@
          if (StringUtils.isNotBlank(userid) && StringUtils.isNotBlank(agentuserid)) {
              summary.setCreater(super.getUser(request).getId());
              summary.setCreatetime(new Date());
-             AgentService service = agentServiceRes.getReferenceById(agentserviceid);
+             AgentService service = agentServiceRes.findById(agentserviceid).orElse(null);
              summary.setAgent(service.getAgentno());
              summary.setAgentno(service.getAgentno());
              summary.setSkill(service.getSkill());
@@ -1096,7 +1096,7 @@
              List<Organ> skillGroups = organRes.findByIdInAndSkill(ownOrgans.keySet(), true);
 
              // 选择当前用户的默认技能组
-             AgentService agentService = agentServiceRes.getReferenceById(agentserviceid);
+             AgentService agentService = agentServiceRes.findById(agentserviceid).orElse(null);
 
              String currentOrgan = agentService.getSkill();
 
@@ -1131,7 +1131,7 @@
              map.addAttribute("agentuserid", agentuserid);
              map.addAttribute("skillGroups", skillGroups);
              map.addAttribute("agentno", agentService.getAgentno());
-             map.addAttribute("agentservice", this.agentServiceRes.getReferenceById(agentserviceid));
+             map.addAttribute("agentservice", this.agentServiceRes.findById(agentserviceid)).orElse(null);
              map.addAttribute("currentorgan", currentOrgan);
          }
 
@@ -1193,7 +1193,7 @@
              @RequestParam(value = "agentuser") String agentuser,
              @Valid Contacts contacts) throws CSKefuException {
          logger.info("[agent ctrl] calloutcontactsave agentuser [{}]", agentuser);
-         AgentUser au = agentUserRes.getReferenceById(agentuser);
+         AgentUser au = agentUserRes.findById(agentuser).orElse(null);
          if (au == null) {
              throw new CSKefuException("不存在该服务记录");
          }
@@ -1223,7 +1223,7 @@
      @RequestMapping("/calloutcontact/update")
      @Menu(type = "apps", subtype = "calloutcontact")
      public ModelAndView update(HttpServletRequest request, @Valid Contacts contacts) {
-         Contacts data = contactsRes.getReferenceById(contacts.getId());
+         Contacts data = contactsRes.findById(contacts.getId()).orElse(null);
          if (data != null) {
              List<PropertiesEvent> events = PropertiesEventUtil.processPropertiesModify(
                      request, contacts, data, "id", "creater", "createtime", "updatetime");    //记录 数据变更 历史

contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AgentSettingsController.java

@@ -160,7 +160,7 @@ public class AgentSettingsController extends Handler {
     @Menu(type = "setting", subtype = "tag")
     public ModelAndView blacklistdelete(ModelMap map, HttpServletRequest request, @Valid String id) {
         if (!StringUtils.isBlank(id)) {
-            BlackEntity tempBlackEntity = blackListRes.getReferenceById(id);
+            BlackEntity tempBlackEntity = blackListRes.findById(id).orElse(null);
             if (tempBlackEntity != null) {
                 blackListRes.delete(tempBlackEntity);
                 cache.deleteSystembyId(tempBlackEntity.getUserid());
@@ -206,7 +206,7 @@ public class AgentSettingsController extends Handler {
     @RequestMapping("/tag/edit")
     @Menu(type = "setting", subtype = "tag")
     public ModelAndView tagedit(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String tagtype) {
-        map.put("tag", tagRes.getReferenceById(id));
+        map.put("tag", tagRes.findById(id)).orElse(null);
         map.addAttribute("tagtype", tagtype);
         return request(super.createView("/apps/setting/agent/tagedit"));
     }
@@ -322,7 +322,7 @@ public class AgentSettingsController extends Handler {
     @Menu(type = "setting", subtype = "adv")
     public ModelAndView advedit(ModelMap map, HttpServletRequest request, @Valid String adpos, @Valid String id) {
         map.addAttribute("adpos", adpos);
-        map.put("ad", adTypeRes.getReferenceById(id));
+        map.put("ad", adTypeRes.findById(id)).orElse(null);
         return request(super.createView("/apps/setting/agent/adedit"));
     }
 
@@ -356,7 +356,7 @@ public class AgentSettingsController extends Handler {
     @RequestMapping("/adv/delete")
     @Menu(type = "setting", subtype = "adv")
     public ModelAndView advdelete(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String adpos) {
-        AdType adType = adTypeRes.getReferenceById(id);
+        AdType adType = adTypeRes.findById(id).orElse(null);
         if (adType != null) {
             adTypeRes.deleteById(id);
             MainUtils.initAdv(adType.getSkill());

contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AppsController.java

@@ -241,7 +241,7 @@ public class AppsController extends Handler {
     @RequestMapping({"/apps/profile/save"})
     @Menu(type = "apps", subtype = "content")
     public ModelAndView profile(ModelMap map, HttpServletRequest request, @Valid User user, @Valid String index) {
-        User tempUser = userRes.getReferenceById(user.getId());
+        User tempUser = userRes.findById(user.getId()).orElse(null);
         final User logined = super.getUser(request);
         // 用户名不可修改
         user.setUsername(logined.getUsername());

contact-center/app/src/main/java/com/cskefu/cc/controller/apps/ContactsController.java

@@ -229,7 +229,7 @@ public class ContactsController extends Handler {
     @Menu(type = "contacts", subtype = "contacts")
     public ModelAndView delete(HttpServletRequest request, @Valid Contacts contacts, @Valid String p, @Valid String ckind) {
         if (contacts != null) {
-            contacts = contactsRes.getReferenceById(contacts.getId());
+            contacts = contactsRes.findById(contacts.getId()).orElse(null);
             contacts.setDatastatus(true);                            //客户和联系人都是 逻辑删除
             contactsRes.save(contacts);
         }
@@ -286,7 +286,7 @@ public class ContactsController extends Handler {
     @RequestMapping("/edit")
     @Menu(type = "contacts", subtype = "contacts")
     public ModelAndView edit(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String ckind) {
-        map.addAttribute("contacts", contactsRes.getReferenceById(id));
+        map.addAttribute("contacts", contactsRes.findById(id)).orElse(null);
         map.addAttribute("ckindId", ckind);
         return request(super.createView("/apps/contacts/edit"));
     }
@@ -297,7 +297,7 @@ public class ContactsController extends Handler {
         if (id == null) {
             return null; // id is required. Block strange requst anyway with g2.min, https://github.com/alibaba/BizCharts/issues/143
         }
-        map.addAttribute("contacts", contactsRes.getReferenceById(id));
+        map.addAttribute("contacts", contactsRes.findById(id)).orElse(null);
 
         return request(super.createView("/apps/contacts/detail"));
 
@@ -342,7 +342,7 @@ public class ContactsController extends Handler {
     @Menu(type = "contacts", subtype = "contacts")
     public ModelAndView update(HttpServletRequest request, @Valid Contacts contacts, @Valid String ckindId) {
         final User logined = super.getUser(request);
-        Contacts data = contactsRes.getReferenceById(contacts.getId());
+        Contacts data = contactsRes.findById(contacts.getId()).orElse(null);
         String msg = "";
 
         String skypeIDReplace = contactsProxy.sanitizeSkypeId(contacts.getSkypeid());
@@ -550,7 +550,7 @@ public class ContactsController extends Handler {
             map.put("ckind", ckind);
         }
         if (StringUtils.isNotBlank(agentserviceid)) {
-            AgentService service = agentServiceRes.getReferenceById(agentserviceid);
+            AgentService service = agentServiceRes.findById(agentserviceid).orElse(null);
         }
         Page<Contacts> contactsList = contactsRes.findByCreaterAndSharesAndDatastatus(
                 logined.getId(), logined.getId(), false,
@@ -591,7 +591,7 @@ public class ContactsController extends Handler {
             contacts.setCreater(logined.getId());
 
             if (StringUtils.isNotBlank(agentserviceid)) {
-                AgentService agentService = agentServiceRes.getReferenceById(agentserviceid);
+                AgentService agentService = agentServiceRes.findById(agentserviceid).orElse(null);
                 contacts.setOrgan(agentService.getSkill());
             }
 
@@ -611,7 +611,7 @@ public class ContactsController extends Handler {
     @RequestMapping("/embed/edit")
     @Menu(type = "contacts", subtype = "embededit")
     public ModelAndView embededit(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String agentserviceid) {
-        map.addAttribute("contacts", contactsRes.getReferenceById(id));
+        map.addAttribute("contacts", contactsRes.findById(id)).orElse(null);
         if (StringUtils.isNotBlank(agentserviceid)) {
             map.addAttribute("agentserviceid", agentserviceid);
         }
@@ -622,7 +622,7 @@ public class ContactsController extends Handler {
     @Menu(type = "contacts", subtype = "embedupdate")
     public ModelAndView embedupdate(HttpServletRequest request, @Valid Contacts contacts, @Valid String agentserviceid) {
         final User logined = super.getUser(request);
-        Contacts data = contactsRes.getReferenceById(contacts.getId());
+        Contacts data = contactsRes.findById(contacts.getId()).orElse(null);
         String msg = "";
         String skypeIDReplace = contactsProxy.sanitizeSkypeId(contacts.getSkypeid());
         Contacts theOnlyContact = contactsRes.findByskypeidAndDatastatus(

contact-center/app/src/main/java/com/cskefu/cc/controller/apps/EntIMController.java

@@ -98,7 +98,7 @@ public class EntIMController extends Handler {
         Map<String, Organ> organs = new HashMap<>();
         user.getOrgans().values().stream().forEach(o -> {
             if (!StringUtils.equals(o.getParent(), "0")) {
-                Organ parent = organRes.getReferenceById(o.getParent());
+                Organ parent = organRes.findById(o.getParent()).orElse(null);
                 organs.put(parent.getId(), parent);
             }
 
@@ -112,7 +112,7 @@ public class EntIMController extends Handler {
 
         user.getAffiliates().stream().forEach(p -> {
             if (!organs.containsKey(p)) {
-                Organ organ = organRes.getReferenceById(p);
+                Organ organ = organRes.findById(p).orElse(null);
                 organs.put(p, organ);
             }
         });
@@ -175,7 +175,7 @@ public class EntIMController extends Handler {
     @Menu(type = "im", subtype = "entim")
     public ModelAndView chat(HttpServletRequest request, HttpServletResponse response, @Valid String userid) {
         ModelAndView view = request(super.createView("/apps/entim/chat"));
-        User entImUser = userRes.getReferenceById(userid);
+        User entImUser = userRes.findById(userid).orElse(null);
 
         if (entImUser != null) {
             userProxy.attachOrgansPropertiesForUser(entImUser);
@@ -242,7 +242,7 @@ public class EntIMController extends Handler {
     @Menu(type = "im", subtype = "entim")
     public ModelAndView groupMore(HttpServletRequest request, HttpServletResponse response, @Valid String id) {
         ModelAndView view = request(super.createView("/apps/entim/group/index"));
-        IMGroup imGroup = imGroupRes.getReferenceById(id);
+        IMGroup imGroup = imGroupRes.findById(id).orElse(null);
         view.addObject("imGroup", imGroup);
         view.addObject("imGroupUserList", imGroupUserRes.findByImgroup(imGroup));
         view.addObject("contextid", id);
@@ -276,7 +276,7 @@ public class EntIMController extends Handler {
         users.stream().forEach(u -> userProxy.attachOrgansPropertiesForUser(u));
         view.addObject("userList", users);
 
-        IMGroup imGroup = imGroupRes.getReferenceById(id);
+        IMGroup imGroup = imGroupRes.findById(id).orElse(null);
         List<Organ> organs = organRes.findAllById(affiliates);
 
         view.addObject("imGroup", imGroup);
@@ -329,7 +329,7 @@ public class EntIMController extends Handler {
             @Valid String tipmsg
     ) {
         ModelAndView view = request(super.createView("/apps/entim/group/tipmsg"));
-        IMGroup imGroup = imGroupRes.getReferenceById(id);
+        IMGroup imGroup = imGroupRes.findById(id).orElse(null);
         if (imGroup != null) {
             imGroup.setTipmessage(tipmsg);
             imGroupRes.save(imGroup);

contact-center/app/src/main/java/com/cskefu/cc/controller/apps/IMController.java

@@ -433,7 +433,7 @@ public class IMController extends Handler {
         sessionMessage.put("uid", uid);
         cache.putSystemMapById(sessionid, sessionMessage);
 
-        PassportWebIMUser passportWebIMUser = onlineUserRes.getReferenceById(userid);
+        PassportWebIMUser passportWebIMUser = onlineUserRes.findById(userid).orElse(null);
         String updateusername;
         if (passportWebIMUser != null) {
             updateusername = username + "@" + company_name;
@@ -858,8 +858,7 @@ public class IMController extends Handler {
                             agentUserRepository.findOneByUserid(userid).ifPresent(p -> {
                                 // 关联AgentService的联系人
                                 if (StringUtils.isNotBlank(p.getAgentserviceid())) {
-                                    AgentService agentService = agentServiceRepository.getReferenceById(
+                                    AgentService agentService = agentServiceRepository.findById(p.getAgentserviceid()).orElse(null);
-                                            p.getAgentserviceid());
                                     agentService.setContactsid(contacts1.getId());
                                 }
 
@@ -918,7 +917,7 @@ public class IMController extends Handler {
                     // 是否使用机器人客服
                     if (invite.isAi() && MainContext.hasModule(Constants.CSKEFU_MODULE_CHATBOT)) {
                         // 查找机器人
-                        bot = chatbotRes.getReferenceById(invite.getAiid());
+                        bot = chatbotRes.findById(invite.getAiid()).orElse(null);
                         if (bot != null) {
                             // 判断是否接受访客切换坐席类型
                             isEnableExchangeAgentType = !StringUtils.equals(

contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/AgentSummaryController.java

@@ -116,14 +116,14 @@ public class AgentSummaryController extends Handler {
     @RequestMapping(value = "/process")
     @Menu(type = "agent", subtype = "agentsummary")
     public ModelAndView process(ModelMap map, HttpServletRequest request, @Valid final String id) {
-        AgentServiceSummary summary = serviceSummaryRes.getReferenceById(id);
+        AgentServiceSummary summary = serviceSummaryRes.findById(id).orElse(null);
         map.addAttribute("summary", summary);
         map.put("summaryTags", tagRes.findByTagtype(MainContext.ModelType.SUMMARY.toString()));
         if (summary != null && !StringUtils.isBlank(summary.getAgentserviceid())) {
-            AgentService service = agentServiceRes.getReferenceById(summary.getAgentserviceid());
+            AgentService service = agentServiceRes.findById(summary.getAgentserviceid()).orElse(null);
             map.addAttribute("service", service);
             if (!StringUtils.isBlank(summary.getContactsid())) {
-                Contacts contacts = contactsRes.getReferenceById(summary.getContactsid());
+                Contacts contacts = contactsRes.findById(summary.getContactsid()).orElse(null);
                 map.addAttribute("contacts", contacts);
             }
         }
@@ -134,7 +134,7 @@ public class AgentSummaryController extends Handler {
     @RequestMapping(value = "/save")
     @Menu(type = "agent", subtype = "agentsummary")
     public ModelAndView save(ModelMap map, HttpServletRequest request, @Valid final AgentServiceSummary summary) {
-        AgentServiceSummary oldSummary = serviceSummaryRes.getReferenceById(summary.getId());
+        AgentServiceSummary oldSummary = serviceSummaryRes.findById(summary.getId()).orElse(null);
         if (oldSummary != null) {
             oldSummary.setProcess(true);
             oldSummary.setUpdatetime(new Date());

contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/ChatServiceController.java

@@ -183,7 +183,7 @@ public class ChatServiceController extends Handler {
         Map<String, Organ> ownOrgans = organProxy.findAllOrganByParent(targetOrgan);
 
         if (StringUtils.isNotBlank(id)) {
-            AgentService agentService = agentServiceRes.getReferenceById(id);
+            AgentService agentService = agentServiceRes.findById(id).orElse(null);
             List<Organ> skillGroups = organRes.findByIdInAndSkill(ownOrgans.keySet(), true);
             Set<String> organs = ownOrgans.keySet();
             String currentOrgan = agentService.getSkill();
@@ -221,8 +221,8 @@ public class ChatServiceController extends Handler {
     @Menu(type = "apps", subtype = "transfersave")
     public ModelAndView transfersave(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String agentno, @Valid String memo) throws CharacterCodingException {
         if (StringUtils.isNotBlank(id)) {
-            AgentService agentService = agentServiceRes.getReferenceById(id);
+            AgentService agentService = agentServiceRes.findById(id).orElse(null);
-            final User targetAgent = userRes.getReferenceById(agentno);
+            final User targetAgent = userRes.findById(agentno).orElse(null);
             AgentUser agentUser = null;
             Optional<AgentUser> agentUserOpt = cache.findOneAgentUserByUserId(
                     agentService.getUserid());
@@ -288,7 +288,7 @@ public class ChatServiceController extends Handler {
                     }
                 }
             } else {
-                agentUser = agentUserRepository.getReferenceById(agentService.getAgentuserid());
+                agentUser = agentUserRepository.findById(agentService.getAgentuserid()).orElse(null);
                 if (agentUser != null) {
                     agentUser.setAgentno(agentno);
                     agentUser.setAgentname(targetAgent.getUname());
@@ -314,11 +314,10 @@ public class ChatServiceController extends Handler {
     @Menu(type = "service", subtype = "current", admin = true)
     public ModelAndView end(ModelMap map, HttpServletRequest request, @Valid String id) throws Exception {
         if (StringUtils.isNotBlank(id)) {
-            AgentService agentService = agentServiceRes.getReferenceById(id);
+            AgentService agentService = agentServiceRes.findById(id).orElse(null);
             if (agentService != null) {
                 User user = super.getUser(request);
-                AgentUser agentUser = agentUserRepository.getReferenceById(
+                AgentUser agentUser = agentUserRepository.findById(agentService.getAgentuserid()).orElse(null);
-                        agentService.getAgentuserid());
                 if (agentUser != null) {
                     acdAgentService.finishAgentUser(agentUser);
                 }
@@ -345,7 +344,7 @@ public class ChatServiceController extends Handler {
             final HttpServletRequest request,
             final @Valid String id) throws Exception {
         if (StringUtils.isNotBlank(id)) {
-            AgentService agentService = agentServiceRes.getReferenceById(id);
+            AgentService agentService = agentServiceRes.findById(id).orElse(null);
             if (agentService != null) {
                 final User user = super.getUser(request);
                 if (StringUtils.isBlank(agentService.getAgentno())) {
@@ -463,7 +462,7 @@ public class ChatServiceController extends Handler {
     @RequestMapping("/quene/transfer/save")
     @Menu(type = "service", subtype = "quenetransfer", admin = true)
     public ModelAndView transferSave(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String skillid) {
-        AgentUser agentUser = agentUserRes.getReferenceById(id);
+        AgentUser agentUser = agentUserRes.findById(id).orElse(null);
         if (agentUser != null && agentUser.getStatus().equals(MainContext.AgentUserStatusEnum.INQUENE.toString())) {
             agentUser.setAgentno(null);
             agentUser.setSkill(skillid);
@@ -479,7 +478,7 @@ public class ChatServiceController extends Handler {
     @Menu(type = "service", subtype = "invite", admin = true)
     public ModelAndView invite(ModelMap map, HttpServletRequest request, @Valid String id) throws Exception {
         final User logined = super.getUser(request);
-        AgentUser agentUser = agentUserRes.getReferenceById(id);
+        AgentUser agentUser = agentUserRes.findById(id).orElse(null);
         if (agentUser != null && agentUser.getStatus().equals(MainContext.AgentUserStatusEnum.INQUENE.toString())) {
             acdAgentService.assignVisitorAsInvite(logined.getId(), agentUser);
         }
@@ -524,7 +523,7 @@ public class ChatServiceController extends Handler {
     @Menu(type = "service", subtype = "offline", admin = true)
     public ModelAndView offline(ModelMap map, HttpServletRequest request, @Valid String id) {
 
-        AgentStatus agentStatus = agentStatusRepository.getReferenceById(id);
+        AgentStatus agentStatus = agentStatusRepository.findById(id).orElse(null);
         if (agentStatus != null) {
             agentStatusRepository.delete(agentStatus);
         }

contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/OnlineUserController.java

@@ -132,9 +132,9 @@ public class OnlineUserController extends Handler {
 
                 agentUserContactsRes.findOneByUserid(
                         userid).ifPresent(p -> {
-                    map.put("contacts", contactsRes.getReferenceById(p.getContactsid()));
+                    map.put("contacts", contactsRes.findById(p.getContactsid())).orElse(null);
                 });
-                AgentService service = agentServiceRes.getReferenceById(agentservice);
+                AgentService service = agentServiceRes.findById(agentservice).orElse(null);
                 if (service != null) {
                     map.addAttribute(
                             "tags", tagRes.findByTagtypeAndSkill(MainContext.ModelType.USER.toString(), service.getSkill()));
@@ -160,7 +160,7 @@ public class OnlineUserController extends Handler {
                     map.put("weiXinUser", passportWechatUser);
                 }
             } else if (MainContext.ChannelType.WEBIM.toString().equals(channel)) {
-                PassportWebIMUser passportWebIMUser = onlineUserRes.getReferenceById(userid);
+                PassportWebIMUser passportWebIMUser = onlineUserRes.findById(userid).orElse(null);
                 if (passportWebIMUser != null) {
                     map.put("onlineUser", passportWebIMUser);
                 }
@@ -179,7 +179,7 @@ public class OnlineUserController extends Handler {
     @RequestMapping("/online/chatmsg")
     @Menu(type = "service", subtype = "chatmsg", admin = true)
     public ModelAndView onlinechat(ModelMap map, HttpServletRequest request, String id, String title) {
-        AgentService agentService = agentServiceRes.getReferenceById(id);
+        AgentService agentService = agentServiceRes.findById(id).orElse(null);
         map.put("curAgentService", agentService);
         cache.findOneAgentUserByUserId(agentService.getUserid()).ifPresent(p -> {
             map.put("curagentuser", p);

contact-center/app/src/main/java/com/cskefu/cc/controller/apps/service/ProcessedSummaryController.java

@@ -124,14 +124,14 @@ public class ProcessedSummaryController extends Handler {
     @RequestMapping(value = "/process")
     @Menu(type = "agent", subtype = "processed")
     public ModelAndView process(ModelMap map, HttpServletRequest request, @Valid final String id) {
-        AgentServiceSummary summary = serviceSummaryRes.getReferenceById(id);
+        AgentServiceSummary summary = serviceSummaryRes.findById(id).orElse(null);
         map.addAttribute("summary", summary);
         map.put("summaryTags", tagRes.findByTagtype(MainContext.ModelType.SUMMARY.toString()));
         if (summary != null && !StringUtils.isBlank(summary.getAgentserviceid())) {
-            AgentService service = agentServiceRes.getReferenceById(summary.getAgentserviceid());
+            AgentService service = agentServiceRes.findById(summary.getAgentserviceid()).orElse(null);
             map.addAttribute("service", service);
             if (!StringUtils.isBlank(summary.getContactsid())) {
-                Contacts contacts = contactsRes.getReferenceById(summary.getContactsid());
+                Contacts contacts = contactsRes.findById(summary.getContactsid()).orElse(null);
                 map.addAttribute("contacts", contacts);
             }
         }
@@ -142,7 +142,7 @@ public class ProcessedSummaryController extends Handler {
     @RequestMapping(value = "/save")
     @Menu(type = "agent", subtype = "processed")
     public ModelAndView save(ModelMap map, HttpServletRequest request, @Valid final AgentServiceSummary summary) {
-        AgentServiceSummary oldSummary = serviceSummaryRes.getReferenceById(summary.getId());
+        AgentServiceSummary oldSummary = serviceSummaryRes.findById(summary.getId()).orElse(null);
         if (oldSummary != null) {
             oldSummary.setProcess(true);
             oldSummary.setUpdatetime(new Date());

contact-center/app/src/main/java/com/cskefu/cc/controller/resource/MediaController.java

@@ -75,7 +75,7 @@ public class MediaController extends Handler {
                       @Valid String id,
                       @RequestParam(value = "original", required = false) boolean original,
                       @RequestParam(value = "cooperation", required = false) boolean cooperation) throws IOException, SQLException {
-        StreamingFile sf = streamingFileRes.getReferenceById(id);
+        StreamingFile sf = streamingFileRes.findById(id).orElse(null);
         if (sf != null) {
             response.setHeader("Content-Type", sf.getMime());
             response.setContentType(sf.getMime());
@@ -147,9 +147,9 @@ public class MediaController extends Handler {
     @Menu(type = "resouce", subtype = "file")
     public void file(HttpServletResponse response, HttpServletRequest request, @Valid String id) throws IOException, SQLException {
         if (StringUtils.isNotBlank(id)) {
-            AttachmentFile attachmentFile = attachementRes.getReferenceById(id);
+            AttachmentFile attachmentFile = attachementRes.findById(id).orElse(null);
             if (attachmentFile != null && attachmentFile.getFileid() != null) {
-                StreamingFile sf = streamingFileRes.getReferenceById(attachmentFile.getFileid());
+                StreamingFile sf = streamingFileRes.findById(attachmentFile.getFileid()).orElse(null);
                 if (sf != null) {
                     response.setContentType(attachmentFile.getFiletype());
                     response.setHeader("Content-Disposition", "attachment;filename=" + java.net.URLEncoder.encode(attachmentFile.getTitle(), "UTF-8"));

contact-center/app/src/main/java/com/cskefu/cc/peer/im/ComposeMw1.java

@@ -97,7 +97,7 @@ public class ComposeMw1 implements Middleware<PeerContext> {
      * @param ctx
      */
     private void prcessAgentUserTask(final PeerContext ctx) {
-        AgentUserTask agentUserTask = agentUserTaskRes.getReferenceById(ctx.getMessage().getAgentUser().getId());
+        AgentUserTask agentUserTask = agentUserTaskRes.findById(ctx.getMessage().getAgentUser().getId()).orElse(null);
 
         if (agentUserTask != null) {
             final ChatMessage received = (ChatMessage) ctx.getMessage().getChannelMessage();

contact-center/app/src/main/java/com/cskefu/cc/persistence/impl/OrganDataExchangeImpl.java

@@ -29,7 +29,7 @@ public class OrganDataExchangeImpl implements DataExchangeInterface {
     private OrganRepository organRes;
 
     public String getDataById(String id) {
-        Organ organ = organRes.getReferenceById(id);
+        Organ organ = organRes.findById(id).orElse(null);
         return organ != null ? organ.getName() : id;
     }
 

contact-center/app/src/main/java/com/cskefu/cc/persistence/impl/ServiceDataExchangeImpl.java

@@ -29,7 +29,7 @@ public class ServiceDataExchangeImpl implements DataExchangeInterface {
     private TagRepository tagRes;
 
     public String getDataById(String id) {
-        Tag tag = tagRes.getReferenceById(id);
+        Tag tag = tagRes.findById(id).orElse(null);
         return tag != null ? tag.getTag() : id;
     }
 

contact-center/app/src/main/java/com/cskefu/cc/persistence/impl/TagDataExchangeImpl.java

@@ -25,7 +25,7 @@ public class TagDataExchangeImpl implements DataExchangeInterface {
     private TagRepository tagRes;
 
     public String getDataById(String id) {
-        Tag tag = tagRes.getReferenceById(id);
+        Tag tag = tagRes.findById(id).orElse(null);
         return tag != null ? tag.getTag() : id;
     }
 

contact-center/app/src/main/java/com/cskefu/cc/persistence/impl/UserDataExchangeImpl.java

@@ -29,7 +29,7 @@ public class UserDataExchangeImpl implements DataExchangeInterface {
     private UserRepository userRes;
 
     public String getDataById(String id) {
-        User user = userRes.getReferenceById(id);
+        User user = userRes.findById(id).orElse(null);
         return user != null ? user.getUsername() : id;
     }
 

contact-center/app/src/main/java/com/cskefu/cc/plugins/chatbot/ApiChatbotController.java

@@ -185,7 +185,7 @@ public class ApiChatbotController extends Handler {
         }
 
         final String id = j.get("id").getAsString();
-        Chatbot c = chatbotRes.getReferenceById(id);
+        Chatbot c = chatbotRes.findById(id).orElse(null);
 
         if (c == null) {
             resp.addProperty(RestUtils.RESP_KEY_RC, RestUtils.RESP_RC_FAIL_4);
@@ -244,7 +244,7 @@ public class ApiChatbotController extends Handler {
         }
 
         final String id = j.get("id").getAsString();
-        Chatbot c = chatbotRes.getReferenceById(id);
+        Chatbot c = chatbotRes.findById(id).orElse(null);
 
         if (c == null) {
             resp.addProperty(RestUtils.RESP_KEY_RC, RestUtils.RESP_RC_FAIL_4);
@@ -288,7 +288,7 @@ public class ApiChatbotController extends Handler {
         }
         final String id = j.get("id").getAsString();
 
-        Chatbot c = chatbotRes.getReferenceById(id);
+        Chatbot c = chatbotRes.findById(id).orElse(null);
 
         if (c == null) {
             resp.addProperty(RestUtils.RESP_KEY_RC, RestUtils.RESP_RC_FAIL_4);
@@ -427,7 +427,7 @@ public class ApiChatbotController extends Handler {
             o.addProperty("snsurl", snsAccountOpt.get().getBaseURL());
 
             // 创建人
-            User user = userRes.getReferenceById(c.getCreater());
+            User user = userRes.findById(c.getCreater()).orElse(null);
             if (user != null) {
                 o.addProperty("creater", c.getCreater());
                 o.addProperty("creatername", user.getUname());
@@ -462,7 +462,7 @@ public class ApiChatbotController extends Handler {
         }
         final String id = j.get("id").getAsString();
 
-        Chatbot c = chatbotRes.getReferenceById(id);
+        Chatbot c = chatbotRes.findById(id).orElse(null);
         if (c == null) {
             resp.addProperty(RestUtils.RESP_KEY_RC, RestUtils.RESP_RC_FAIL_3);
             resp.addProperty(RestUtils.RESP_KEY_ERROR, "不合法的参数，不存在该聊天机器人。");

contact-center/app/src/main/java/com/cskefu/cc/plugins/chatbot/ChatbotController.java

@@ -129,7 +129,7 @@ public class ChatbotController extends Handler {
 
         ModelAndView view = request(super.createView("/admin/system/chatbot/edit"));
         if (id != null) {
-            Chatbot c = chatbotRes.getReferenceById(id);
+            Chatbot c = chatbotRes.findById(id).orElse(null);
             Optional<Channel> snsAccountOpt = snsAccountRes.findBySnsid(c.getSnsAccountIdentifier());
             view.addObject("snsurl", snsAccountOpt.get().getType() == "webim" ? snsAccountOpt.get().getBaseURL() : snsAccountOpt.get().getName());
             view.addObject("bot", c);

contact-center/app/src/main/java/com/cskefu/cc/plugins/chatbot/ChatbotEventHandler.java

@@ -102,7 +102,7 @@ public class ChatbotEventHandler {
 
                 // send out welcome message
                 if (invite != null) {
-                    Chatbot chatbot = getChatbotRes().getReferenceById(invite.getAiid());
+                    Chatbot chatbot = getChatbotRes().findById(invite.getAiid()).orElse(null);
                     com.chatopera.bot.sdk.Chatbot bot = new com.chatopera.bot.sdk.Chatbot(
                             chatbot.getClientId(), chatbot.getSecret(), chatbot.getBaseUrl());
                     Response result = bot.command("GET", "/");
@@ -156,7 +156,7 @@ public class ChatbotEventHandler {
 
                 InetSocketAddress address = (InetSocketAddress) client.getRemoteAddress();
                 String ip = MainUtils.getIpAddr(client.getHandshakeData().getHttpHeaders(), address.getHostString());
-                PassportWebIMUser passportWebIMUser = getOnlineUserRes().getReferenceById(user);
+                PassportWebIMUser passportWebIMUser = getOnlineUserRes().findById(user).orElse(null);
 
                 if (passportWebIMUser == null) {
                     passportWebIMUser = new PassportWebIMUser();

contact-center/app/src/main/java/com/cskefu/cc/plugins/chatbot/ChatbotEventSubscription.java

@@ -100,7 +100,7 @@ public class ChatbotEventSubscription {
 
     private void chat(final ChatMessage request) throws MalformedURLException, ChatbotException, JSONException {
         Chatbot c = chatbotRes
-                .getReferenceById(request.getAiid());
+                .findById(request.getAiid()).orElse(null);
 
         final String botProvider = StringUtils.isNotBlank(c.getBaseUrl()) ? c.getBaseUrl() : botProviderDefault;
 

contact-center/app/src/main/java/com/cskefu/cc/plugins/messenger/MessengerChannelController.java

@@ -121,9 +121,9 @@ public class MessengerChannelController extends Handler {
     @RequestMapping("/edit")
     @Menu(type = "admin", subtype = "messenger")
     public ModelAndView edit(ModelMap map, HttpServletRequest request, @Valid String id) {
-        FbMessenger fbMessenger = fbMessengerRepository.getReferenceById(id);
+        FbMessenger fbMessenger = fbMessengerRepository.findById(id).orElse(null);
 
-        Organ fbOrgan = organRepository.getReferenceById(fbMessenger.getOrgan());
+        Organ fbOrgan = organRepository.findById(fbMessenger.getOrgan()).orElse(null);
         map.addAttribute("organ", fbOrgan);
         map.addAttribute("fb", fbMessenger);
 
@@ -134,7 +134,7 @@ public class MessengerChannelController extends Handler {
     @Menu(type = "admin", subtype = "messenger")
     public ModelAndView update(ModelMap map, HttpServletRequest request, @Valid FbMessenger fbMessenger) {
         String msg = "update_ok";
-        FbMessenger oldMessenger = fbMessengerRepository.getReferenceById(fbMessenger.getId());
+        FbMessenger oldMessenger = fbMessengerRepository.findById(fbMessenger.getId()).orElse(null);
         oldMessenger.setName(fbMessenger.getName());
         if (fbMessenger.getStatus() != null) {
             oldMessenger.setStatus(fbMessenger.getStatus());
@@ -155,7 +155,7 @@ public class MessengerChannelController extends Handler {
     @Menu(type = "admin", subtype = "messenger")
     public ModelAndView delete(ModelMap map, HttpServletRequest request, @Valid String id) {
         String msg = "delete_ok";
-        FbMessenger fbMessenger = fbMessengerRepository.getReferenceById(id);
+        FbMessenger fbMessenger = fbMessengerRepository.findById(id).orElse(null);
         fbMessengerRepository.deleteById(id);
 
         channelRepository.findBySnsid(fbMessenger.getPageId()).ifPresent(snsAccount -> {
@@ -168,8 +168,8 @@ public class MessengerChannelController extends Handler {
     @RequestMapping("/setting")
     @Menu(type = "admin", subtype = "messenger")
     public ModelAndView setting(ModelMap map, HttpServletRequest request, @Valid String id) {
-        FbMessenger fbMessenger = fbMessengerRepository.getReferenceById(id);
+        FbMessenger fbMessenger = fbMessengerRepository.findById(id).orElse(null);
-        Organ fbOrgan = organRepository.getReferenceById(fbMessenger.getOrgan());
+        Organ fbOrgan = organRepository.findById(fbMessenger.getOrgan()).orElse(null);
 
         map.mergeAttributes(fbMessenger.parseConfigMap());
         map.addAttribute("organ", fbOrgan);
@@ -183,7 +183,7 @@ public class MessengerChannelController extends Handler {
     public ModelAndView saveSetting(ModelMap map, HttpServletRequest request, @Valid String id, @RequestBody MultiValueMap<String, String> formData) {
         String msg = "update_ok";
 
-        FbMessenger fbMessenger = fbMessengerRepository.getReferenceById(id);
+        FbMessenger fbMessenger = fbMessengerRepository.findById(id).orElse(null);
         if (fbMessenger != null) {
             fbMessenger.setConfigMap(formData.toSingleValueMap());
             fbMessengerRepository.save(fbMessenger);
@@ -196,7 +196,7 @@ public class MessengerChannelController extends Handler {
     @Menu(type = "admin", subtype = "messenger")
     @ResponseBody
     public String setStatus(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String status) {
-        FbMessenger fbMessenger = fbMessengerRepository.getReferenceById(id);
+        FbMessenger fbMessenger = fbMessengerRepository.findById(id).orElse(null);
         fbMessenger.setStatus(status);
         fbMessengerRepository.save(fbMessenger);
         return "ok";

contact-center/app/src/main/java/com/cskefu/cc/plugins/messenger/MessengerChatbot.java

@@ -133,7 +133,7 @@ public class MessengerChatbot {
         agentUserRes.findOneByUseridAndStatusNotAndChanneltype(fromId, MainContext.AgentUserStatusEnum.END.toString(), MainContext.ChannelType.MESSENGER.toString()).ifPresent(agentUser -> {
             if (agentUser.isChatbotops()) {
                 Date now = new Date();
-                AgentService agentService = agentServiceRes.getReferenceById(agentUser.getAgentserviceid());
+                AgentService agentService = agentServiceRes.findById(agentUser.getAgentserviceid()).orElse(null);
                 agentService.setStatus(MainContext.AgentUserStatusEnum.END.toString());
                 agentService.setEndtime(now);
                 agentServiceRes.save(agentService);

contact-center/app/src/main/java/com/cskefu/cc/plugins/messenger/MessengerEventSubscription.java

@@ -49,7 +49,7 @@ public class MessengerEventSubscription {
         String otnId = payload.getString("otnId");
         Date sendtime = (Date) payload.getTimestamp("sendtime");
 
-        FbOTN otn = otnRepository.getReferenceById(otnId);
+        FbOTN otn = otnRepository.findById(otnId).orElse(null);
         FbMessenger fbMessenger = fbMessengerRepository.findOneByPageId(otn.getPageId());
         if (fbMessenger != null && otn != null) {
             if (otn.getStatus().equals("create") && otn.getSendtime() != null && otn.getSendtime().equals(sendtime)) {

contact-center/app/src/main/java/com/cskefu/cc/plugins/messenger/MessengerMessageProxy.java

@@ -120,7 +120,7 @@ public class MessengerMessageProxy {
     private String host;
 
     public void acceptOTNReq(String fromId, String toId, String otnToken, String ref) {
-        FbOTN otn = otnRepository.getReferenceById(ref);
+        FbOTN otn = otnRepository.findById(ref).orElse(null);
         if (otn != null) {
             FbOtnFollow follow = new FbOtnFollow();
             follow.setId(MainUtils.getUUID());
@@ -140,7 +140,7 @@ public class MessengerMessageProxy {
     }
 
     public void acceptMeLink(String fromId, String toId, String ref) {
-        FbOTN otn = otnRepository.getReferenceById(ref);
+        FbOTN otn = otnRepository.findById(ref).orElse(null);
         if (otn != null) {
             if (StringUtils.isNotBlank(otn.getPreSubMessage())) {
                 Object obj = JSON.parse(otn.getPreSubMessage());
@@ -240,7 +240,7 @@ public class MessengerMessageProxy {
                     agentUser, passportWebIMUser, channel).orElseThrow(
                     () -> new CSKefuException("Can not resolve AgentService Object."));
         } else {
-            agentService = agentServiceRes.getReferenceById(agentUser.getAgentserviceid());
+            agentService = agentServiceRes.findById(agentUser.getAgentserviceid()).orElse(null);
         }
 
 

contact-center/app/src/main/java/com/cskefu/cc/plugins/messenger/MessengerOTNController.java

@@ -120,7 +120,7 @@ public class MessengerOTNController extends Handler {
     @RequestMapping("/edit")
     @Menu(type = "admin", subtype = "messenger")
     public ModelAndView edit(ModelMap map, @Valid String id, HttpServletRequest request) {
-        map.addAttribute("otn", otnRepository.getReferenceById(id));
+        map.addAttribute("otn", otnRepository.findById(id)).orElse(null);
         return request(super.createView("/admin/channel/messenger/otn/edit"));
     }
 
@@ -128,7 +128,7 @@ public class MessengerOTNController extends Handler {
     @Menu(type = "admin", subtype = "messenger")
     public ModelAndView update(ModelMap map, @Valid FbOTN otn, HttpServletRequest request) {
         String msg = "update_ok";
-        FbOTN oldOtn = otnRepository.getReferenceById(otn.getId());
+        FbOTN oldOtn = otnRepository.findById(otn.getId()).orElse(null);
         if (oldOtn != null) {
             Date oldSendtime = oldOtn.getSendtime();
 
@@ -162,7 +162,7 @@ public class MessengerOTNController extends Handler {
     public ModelAndView send(ModelMap map, @Valid String id, HttpServletRequest request) {
         String msg = "send_ok";
 
-        FbOTN otn = otnRepository.getReferenceById(id);
+        FbOTN otn = otnRepository.findById(id).orElse(null);
         FbMessenger fbMessenger = fbMessengerRepository.findOneByPageId(otn.getPageId());
         if (fbMessenger != null && otn != null && otn.getStatus().equals("create")) {
             otn.setStatus("sending");

contact-center/app/src/main/java/com/cskefu/cc/proxy/AgentProxy.java

@@ -136,7 +136,7 @@ public class AgentProxy {
         outMessage.setChannelMessage(chatMessage);
 
         // 处理超时回复
-        AgentUserTask agentUserTask = agentUserTaskRes.getReferenceById(agentUser.getId());
+        AgentUserTask agentUserTask = agentUserTaskRes.findById(agentUser.getId()).orElse(null);
         agentUserTask.setWarnings("0");
         agentUserTask.setWarningtime(null);
 

contact-center/app/src/main/java/com/cskefu/cc/proxy/AgentServiceProxy.java

@@ -159,10 +159,10 @@ public class AgentServiceProxy {
             }
         } else if (MainContext.ChannelType.PHONE.toString().equals(agentUser.getChanneltype())) {
             if (agentService != null && StringUtils.isNotBlank(agentService.getOwner())) {
-                StatusEvent statusEvent = statusEventRes.getReferenceById(agentService.getOwner());
+                StatusEvent statusEvent = statusEventRes.findById(agentService.getOwner()).orElse(null);
                 if (statusEvent != null) {
                     if (StringUtils.isNotBlank(statusEvent.getHostid())) {
-                         view.addObject("pbxHost", pbxHostRes.getReferenceById(statusEvent.getHostid()));
+                         view.addObject("pbxHost", pbxHostRes.findById(statusEvent.getHostid())).orElse(null);
                     }
                     view.addObject("statusEvent", statusEvent);
                 }
@@ -215,7 +215,7 @@ public class AgentServiceProxy {
             // 坐席服务记录
             AgentService agentService = null;
             if (StringUtils.isNotBlank(agentUser.getAgentserviceid())) {
-                agentService = agentServiceRes.getReferenceById(agentUser.getAgentserviceid());
+                agentService = agentServiceRes.findById(agentUser.getAgentserviceid()).orElse(null);
                 view.addObject("curAgentService", agentService);
                 /**
                  * 获取关联数据
@@ -237,7 +237,7 @@ public class AgentServiceProxy {
             view.addObject("tagRelationList", tagRelationRes.findByUserid(agentUser.getUserid()));
         }
 
-        AgentService service = agentServiceRes.getReferenceById(agentUser.getAgentserviceid());
+        AgentService service = agentServiceRes.findById(agentUser.getAgentserviceid()).orElse(null);
         if (service != null) {
             view.addObject("tags", tagRes.findByTagtypeAndSkill(MainContext.ModelType.USER.toString(), service.getSkill()));
         }

contact-center/app/src/main/java/com/cskefu/cc/proxy/AgentUserProxy.java

@@ -117,7 +117,7 @@ public class AgentUserProxy {
             String channel = StringUtils.split(channels, ",")[0];
 
             // 查找联系人
-            final Contacts contact = contactsRes.getReferenceById(contactid);
+            final Contacts contact = contactsRes.findById(contactid).orElse(null);
 
             // 查找 OnlineUser
             passportWebIMUser = onlineUserRes.findOneByContactidAndChannel(
@@ -444,7 +444,7 @@ public class AgentUserProxy {
     public AgentUser resolveAgentUser(final String userid, final String agentuserid) throws CSKefuException {
         Optional<AgentUser> opt = cache.findOneAgentUserByUserId(userid);
         if (!opt.isPresent()) {
-            AgentUser au = agentUserRes.getReferenceById(agentuserid);
+            AgentUser au = agentUserRes.findById(agentuserid).orElse(null);
             if (au == null) {
                 throw new CSKefuException("Invalid transfer request, agent user not exist.");
             } else {
@@ -475,7 +475,7 @@ public class AgentUserProxy {
      * @return
      */
     public Optional<AgentUser> findOne(final String id) {
-        return Optional.ofNullable(agentUserRes.getReferenceById(id));
+        return Optional.ofNullable(agentUserRes.findById(id)).orElse(null);
     }
 
     /**

contact-center/app/src/main/java/com/cskefu/cc/proxy/BlackEntityProxy.java

@@ -65,7 +65,7 @@ public class BlackEntityProxy {
         blackEntityUpdated.setAgentid(owner.getId());
         blackEntityUpdated.setAgentserviceid(agentserviceid);
         if (agentserviceid != null){
-            AgentService service = agentServiceRes.getReferenceById(agentserviceid);
+            AgentService service = agentServiceRes.findById(agentserviceid).orElse(null);
             blackEntityUpdated.setSkill(service.getSkill());
             blackEntityUpdated.setAgentusername(service.getAgentusername());
         }
@@ -80,7 +80,7 @@ public class BlackEntityProxy {
                     new Date(System.currentTimeMillis() + pre.getControltime() * 3600 * 1000L));
         }
 
-        AgentService agentService = agentServiceRes.getReferenceById(agentserviceid);
+        AgentService agentService = agentServiceRes.findById(agentserviceid).orElse(null);
         if (agentService != null) {
             blackEntityUpdated.setChannel(agentService.getChanneltype());
             blackEntityUpdated.setAgentuser(agentService.getUsername());

contact-center/app/src/main/java/com/cskefu/cc/proxy/OnlineUserProxy.java

@@ -62,7 +62,7 @@ public class OnlineUserProxy {
      * @throws Exception
      */
     public static PassportWebIMUser user(final String id) {
-        return getOnlineUserRes().getReferenceById(id);
+        return getOnlineUserRes().findById(id).orElse(null);
     }
 
     /**
@@ -268,7 +268,7 @@ public class OnlineUserProxy {
                 Optional<AgentUserContacts> agentUserContactOpt = agentUserContactsRes.findOneByUserid(
                         userid);
                 if (agentUserContactOpt.isPresent()) {
-                    contacts = getContactsRes().getReferenceById(agentUserContactOpt.get().getContactsid());
+                    contacts = getContactsRes().findById(agentUserContactOpt.get().getContactsid()).orElse(null);
                 }
             }
         }
@@ -514,7 +514,7 @@ public class OnlineUserProxy {
      * @throws Exception
      */
     public static void refuseInvite(final String user) {
-        PassportWebIMUser passportWebIMUser = getOnlineUserRes().getReferenceById(user);
+        PassportWebIMUser passportWebIMUser = getOnlineUserRes().findById(user).orElse(null);
         if (passportWebIMUser != null) {
             passportWebIMUser.setInvitestatus(MainContext.OnlineUserInviteStatus.REFUSE.toString());
             passportWebIMUser.setRefusetimes(passportWebIMUser.getRefusetimes() + 1);

contact-center/app/src/main/java/com/cskefu/cc/proxy/OrganProxy.java

@@ -45,7 +45,7 @@ public class OrganProxy {
             return false;
         }
 
-        Organ parent = organRes.getReferenceById(organ.getParent());
+        Organ parent = organRes.findById(organ.getParent()).orElse(null);
         if (parent == null) {
             return false;
         } else {
@@ -75,7 +75,7 @@ public class OrganProxy {
             return "admin_organ_update_not_standard";
         }
 
-        Organ tempOrgan = organRes.getReferenceById(organ.getId());
+        Organ tempOrgan = organRes.findById(organ.getId()).orElse(null);
         if (tempOrgan != null) {
             tempOrgan.setName(organ.getName());
             tempOrgan.setUpdatetime(new Date());
@@ -95,7 +95,7 @@ public class OrganProxy {
     }
 
     private void processChild(Map<String, Organ> organs, String organId) {
-        Organ organ = organRes.getReferenceById(organId);
+        Organ organ = organRes.findById(organId).orElse(null);
         if (organ != null) {
             organs.put(organId, organ);
             List<Organ> childOrgans = organRes.findByParent(organId);

contact-center/app/src/main/java/com/cskefu/cc/proxy/UserProxy.java

@@ -102,7 +102,7 @@ public class UserProxy {
     }
 
     public User findOne(final String id) {
-        return userRes.getReferenceById(id);
+        return userRes.findById(id).orElse(null);
     }
 
     public List<String> findUserIdsInOrgan(final String organ) {
@@ -173,7 +173,7 @@ public class UserProxy {
      */
     public HashMap<String, String> getSkillsMapByAgentno(final String agentno) {
 
-        final User user = userRes.getReferenceById(agentno);
+        final User user = userRes.findById(agentno).orElse(null);
         if (user == null)
             return new HashMap<>();
 
@@ -457,9 +457,9 @@ public class UserProxy {
 
         // 检查作为呼叫中心坐席的信息
         if (MainContext.hasModule(Constants.CSKEFU_MODULE_CALLCENTER) && user.isCallcenter()) {
-            final PbxHost pbxHost = pbxHostRes.getReferenceById(user.getPbxhostId());
+            final PbxHost pbxHost = pbxHostRes.findById(user.getPbxhostId()).orElse(null);
             if (pbxHost != null) {
-                Extension extension = extensionRes.getReferenceById(user.getExtensionId());
+                Extension extension = extensionRes.findById(user.getExtensionId()).orElse(null);
                 if (extension != null) {
                     if (StringUtils.isNotBlank(extension.getAgentno())) {
                         // 呼叫中心该分机已经绑定
@@ -617,7 +617,7 @@ public class UserProxy {
 
         for (final OrganUser organ : organs) {
             // 添加直属部门到organs
-            final Organ o = organRes.getReferenceById(organ.getOrgan());
+            final Organ o = organRes.findById(organ.getOrgan()).orElse(null);
             user.getOrgans().put(organ.getOrgan(), o);
             if (o.isSkill()) {
                 skills.put(o.getId(), o.getName());

contact-center/app/src/main/java/com/cskefu/cc/socketio/util/HumanUtils.java

@@ -69,8 +69,7 @@ public class HumanUtils {
                 agentUser.getNickname()) ? agentUser.getNickname() : "";
 
         if (agentUser != null && StringUtils.isNotBlank(agentUser.getAgentserviceid())) {
-            AgentService agentService = getAgentServiceRes().getReferenceById(
+            AgentService agentService = getAgentServiceRes().findById(agentUser.getAgentserviceid()).orElse(null);
-                    agentUser.getAgentserviceid());
             if (StringUtils.isNotBlank(agentService.getUsername())) {
                 userNickName = agentService.getUsername();
             }
@@ -117,7 +116,7 @@ public class HumanUtils {
 
             if (StringUtils.equals(chatMessage.getType(), "message")) {
                 // 处理超时回复
-                AgentUserTask agentUserTask = getAgentUserTaskRes().getReferenceById(agentUser.getId());
+                AgentUserTask agentUserTask = getAgentUserTaskRes().findById(agentUser.getId()).orElse(null);
                 agentUserTask.setLastgetmessage(new Date());
                 agentUserTask.setWarnings("1");
                 agentUserTask.setWarningtime(null);

contact-center/app/src/main/java/com/cskefu/cc/util/CallCenterUtils.java

@@ -51,7 +51,7 @@ public class CallCenterUtils {
             if (StringUtils.isNotBlank(ext.getSiptrunk())) {
                 sipTrunk = MainContext.getCache().findOneSystemById(ext.getSiptrunk());
                 if (sipTrunk == null) {
-                    sipTrunk = sipTrunkRes.getReferenceById(ext.getSiptrunk());
+                    sipTrunk = sipTrunkRes.findById(ext.getSiptrunk()).orElse(null);
                     if (sipTrunk != null) {
                         MainContext.getCache().putSystemById(sipTrunk.getId(), sipTrunk);
                     }

contact-center/app/src/main/java/com/cskefu/cc/util/dsdata/ExcelImportProecess.java

@@ -297,7 +297,7 @@ public class ExcelImportProecess extends DataProcess {
                 JobDetailRepository batchRes = MainContext.getContext().getBean(JobDetailRepository.class);
                 JobDetail batch = this.event.getDSData().getJobDetail();
                 if (batch == null) {
-                    batch = batchRes.getReferenceById(event.getBatid());
+                    batch = batchRes.findById(event.getBatid()).orElse(null);
                 }
                 if (batch != null) {
                     batch.setNamenum(batch.getNamenum() + pages.intValue());