|
@@ -34,6 +34,9 @@ import com.fs.his.service.IFsUserNewTaskService;
|
|
|
import com.fs.his.service.IFsUserService;
|
|
import com.fs.his.service.IFsUserService;
|
|
|
import com.fs.his.utils.ConfigUtil;
|
|
import com.fs.his.utils.ConfigUtil;
|
|
|
import com.fs.his.vo.FsUserRegisterParam;
|
|
import com.fs.his.vo.FsUserRegisterParam;
|
|
|
|
|
+import com.fs.qw.domain.QwExternalContact;
|
|
|
|
|
+import com.fs.qw.mapper.QwExternalContactMapper;
|
|
|
|
|
+import com.fs.qw.service.impl.QwExternalContactServiceImpl;
|
|
|
import com.fs.system.service.ISysConfigService;
|
|
import com.fs.system.service.ISysConfigService;
|
|
|
import com.fs.watch.domain.WatchDeviceSetup;
|
|
import com.fs.watch.domain.WatchDeviceSetup;
|
|
|
import com.fs.watch.domain.WatchUser;
|
|
import com.fs.watch.domain.WatchUser;
|
|
@@ -89,6 +92,9 @@ public class AppLoginController extends AppBaseController{
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private ISysConfigService sysConfigService;
|
|
private ISysConfigService sysConfigService;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private QwExternalContactMapper qwExternalContactMapper;
|
|
|
|
|
+
|
|
|
//商城小程序appId配置常量
|
|
//商城小程序appId配置常量
|
|
|
private static final String APP_ID_CONFIG_KEY = "appStore.appId.config";
|
|
private static final String APP_ID_CONFIG_KEY = "appStore.appId.config";
|
|
|
|
|
|
|
@@ -761,7 +767,18 @@ public class AppLoginController extends AppBaseController{
|
|
|
}
|
|
}
|
|
|
FsUser fsUser = userMapper.selectFsUserByUnionid(param.getUnionId());
|
|
FsUser fsUser = userMapper.selectFsUserByUnionid(param.getUnionId());
|
|
|
if (ObjectUtil.isEmpty(fsUser)){
|
|
if (ObjectUtil.isEmpty(fsUser)){
|
|
|
- return R.error("账号不存在");
|
|
|
|
|
|
|
+ List<QwExternalContact> qwExternalContacts = qwExternalContactMapper.selectQwExternalByUnionID(param.getUnionId());
|
|
|
|
|
+ if (qwExternalContacts!=null&& !qwExternalContacts.isEmpty()){
|
|
|
|
|
+ fsUser = new FsUser();
|
|
|
|
|
+ fsUser.setUnionId(param.getUnionId());
|
|
|
|
|
+ fsUser.setNickName("匿名用户**");
|
|
|
|
|
+ fsUser.setCreateTime(new Date());
|
|
|
|
|
+ fsUser.setStatus(1);
|
|
|
|
|
+ fsUser.setMpOpenId(param.getOpenId());
|
|
|
|
|
+ fsUser.setAvatar("https://cos.his.cdwjyyh.com/fs/20240926/420728ee06e54575ba82665dedb4756b.png");
|
|
|
|
|
+ userService.insertFsUser(fsUser);
|
|
|
|
|
+ }
|
|
|
|
|
+ return R.error("请加企微后再进行观看");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if (!StringUtils.equals(fsUser.getMpOpenId(), param.getOpenId())) {
|
|
if (!StringUtils.equals(fsUser.getMpOpenId(), param.getOpenId())) {
|