Merge remote-tracking branch 'origin/dev' into dev

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmVisitorInnerApiController.java

@@ -143,6 +143,7 @@ public class DmVisitorInnerApiController extends BaseApiController {
                     Wrappers.<DmVisitorsPo>query().lambda()
                             .eq(DmVisitorsPo::getPhone, commonDto.getVisitorTel()).last(SqlConstants.LIMIT_ONE));
         }
+        System.err.println("exec===1");
         if (v == null) {
             v = new DmVisitorsPo();
             v.setName(commonDto.getVisitorName());
@@ -158,56 +159,68 @@ public class DmVisitorInnerApiController extends BaseApiController {
             dmVisitorsMapper.updateById(v);
         }
         DmVisitRecordsPo visitRecords = new DmVisitRecordsPo();
+        System.err.println("exec===2");
+        try {
+            DmStaffPo emp = dmStaffMapper.selectOne(
+                    Wrappers.<DmStaffPo>query().lambda()
+                            .eq(DmStaffPo::getId, commonDto.getEmpId()).last(SqlConstants.LIMIT_ONE));
+            System.err.println("exec===2111-");
+            System.err.println(emp);
+            System.err.println("emp===end");
+            System.err.println(commonDto);
+            if (ObjectUtils.isNotEmpty(emp)) {
+                visitRecords.setDeptId(emp.getDeptId());
+                visitRecords.setVisitorId(v.getId());
+                System.err.println("emp===111");
+                if (StringUtils.isNotEmpty(commonDto.getVisitDate())) {
+                    visitRecords.setVisitDate(DateUtils.parseStrToDate(commonDto.getVisitDate(), "yyyy-MM-dd"));
+                }
+                System.err.println("emp===2222");
+                visitRecords.setUserId(commonDto.getEmpId());
+                visitRecords.setRecordStatus(VisitRecordStatus.getRecordStatusStart());
+                System.err.println("emp===333");
+                String code = visitRecordsService.genVisitorCode();
+                System.err.println("emp===444");
+                visitRecords.setVisitorCode(code);
+                visitRecords.setReceiverName(commonDto.getEmpName());
+                visitRecords.setReceiverPhone(commonDto.getEmpTel());
+                System.err.println("emp===555");
+                dmVisitRecordsMapper.insert(visitRecords);
+                System.err.println("exec===3--"+commonDto.getVisitorTel());
+                JSONObject json = new JSONObject();
+                if (null != commonDto.getVisitorTel()){
+
+                    DmVisitorSmsConfigPo dmVisitorSmsConfigPo = visitorSmsConfigMapper.selectOne(Wrappers.<DmVisitorSmsConfigPo>query().lambda().last(SqlConstants.LIMIT_ONE));
+
+                    DmDigitalmanPo dmDigitalmanPo = digitalmanMapper.selectByCode(digitalmanExtMapper.selectOne(Wrappers.<DmDigitalmanExtPo>query().lambda().eq(DmDigitalmanExtPo::getDeviceId, commonDto.getDevId()).last(SqlConstants.LIMIT_ONE)).getManCode());
+
+                    json.put("code", code);
+                    json.put("nickName", commonDto.getVisitorName());
+                    json.put("robotName", dmDigitalmanPo.getName());
+                    json.put("dateTime", commonDto.getVisitDate());
+                    json.put("companyName", dmVisitorSmsConfigPo!=null?dmVisitorSmsConfigPo.getCompanyName():"");
+                    json.put("companyAddr", dmVisitorSmsConfigPo!=null?dmVisitorSmsConfigPo.getCompanyAddress():"");
+                    json.put("receiverName", commonDto.getEmpName());
+                    json.put("receiverPhone", commonDto.getEmpTel());
+                    json.put("parkInfo", dmVisitorSmsConfigPo!=null?dmVisitorSmsConfigPo.getParkPrompt():"");
+                    //给访客发送短信
+                    SmsReqEntity send = new SmsReqEntity();
+                    System.err.println(json.toJSONString());
+                    System.err.println("exec===4");
+
+                        send.setPhone(commonDto.getVisitorTel());
+                        send.setTemplate(smsProperties.getVisitorTemplate());
+                        send.setDataMap(json.toJSONString());
+                        remoteSmsService.sendSms(send);
 
-        DmStaffPo emp = dmStaffMapper.selectOne(
-                Wrappers.<DmStaffPo>query().lambda()
-                        .eq(DmStaffPo::getId, commonDto.getEmpId()).last(SqlConstants.LIMIT_ONE));
-
-        if (ObjectUtils.isNotEmpty(emp)) {
-            visitRecords.setDeptId(emp.getDeptId());
-            visitRecords.setVisitorId(v.getId());
-            if (StringUtils.isNotEmpty(commonDto.getVisitDate())) {
-                visitRecords.setVisitDate(DateUtils.parseStrToDate(commonDto.getVisitDate(), "yyyy-MM-dd"));
-            }
-            visitRecords.setUserId(commonDto.getEmpId());
-            visitRecords.setRecordStatus(VisitRecordStatus.getRecordStatusStart());
-
-            String code = visitRecordsService.generateCode();
-            visitRecords.setVisitorCode(code);
-            visitRecords.setReceiverName(commonDto.getEmpName());
-            visitRecords.setReceiverPhone(commonDto.getEmpTel());
-            dmVisitRecordsMapper.insert(visitRecords);
-
-            JSONObject json = new JSONObject();
-            if (null != commonDto.getVisitorTel()){
-
-                DmVisitorSmsConfigPo dmVisitorSmsConfigPo = visitorSmsConfigMapper.selectOne(Wrappers.<DmVisitorSmsConfigPo>query().lambda().last(SqlConstants.LIMIT_ONE));
-
-                DmDigitalmanPo dmDigitalmanPo = digitalmanMapper.selectByCode(digitalmanExtMapper.selectOne(Wrappers.<DmDigitalmanExtPo>query().lambda().eq(DmDigitalmanExtPo::getDeviceId, commonDto.getDevId()).last(SqlConstants.LIMIT_ONE)).getManCode());
-
-                json.put("code", code);
-                json.put("nickName", commonDto.getVisitorName());
-                json.put("robotName", dmDigitalmanPo.getName());
-                json.put("dateTime", commonDto.getVisitDate());
-                json.put("companyName", dmVisitorSmsConfigPo!=null?dmVisitorSmsConfigPo.getCompanyName():"");
-                json.put("companyAddr", dmVisitorSmsConfigPo!=null?dmVisitorSmsConfigPo.getCompanyAddress():"");
-                json.put("receiverName", commonDto.getEmpName());
-                json.put("receiverPhone", commonDto.getEmpTel());
-                json.put("parkInfo", dmVisitorSmsConfigPo!=null?dmVisitorSmsConfigPo.getParkPrompt():"");
-                //给访客发送短信
-                SmsReqEntity send = new SmsReqEntity();
-                try {
-                    send.setPhone(commonDto.getVisitorTel());
-                    send.setTemplate(smsProperties.getVisitorTemplate());
-                    send.setDataMap(json.toJSONString());
-                    remoteSmsService.sendSms(send);
-                } catch (Exception ee) {
-                    ee.printStackTrace();
                 }
-            }
 
-        } else {
-            return output(ResponseCode.DATA_NOT_EXISTS, "员工").toJSON();
+            } else {
+                System.err.println("emp not exist");
+                return output(ResponseCode.DATA_NOT_EXISTS, "员工").toJSON();
+            }
+        } catch (Exception ee) {
+            ee.printStackTrace();
         }
 
 

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/service/impl/DmVisitRecordsServiceImpl.java

@@ -10,10 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
 import java.util.List;
-import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -33,7 +30,7 @@ public class DmVisitRecordsServiceImpl extends BaseServiceImpl<DmVisitRecordsQue
 
 
     public String generateCode() {
-        try {
+        /*try {
             Random random = SecureRandom.getInstanceStrong();
             StringBuilder codeBuilder = new StringBuilder(CODE_LENGTH);
 
@@ -44,10 +41,11 @@ public class DmVisitRecordsServiceImpl extends BaseServiceImpl<DmVisitRecordsQue
             return codeBuilder.toString();
         } catch (NoSuchAlgorithmException e) {
             e.printStackTrace();
-        }
-
+        }*/
+        String timeStr = String.valueOf(System.currentTimeMillis());
+        timeStr.substring(timeStr.length() - 4 );
 
-        return null;
+        return timeStr.substring(timeStr.length() - 4 );
     }
 
     public boolean storeCode(String code) {