|
@@ -11,6 +11,7 @@ import com.management.platform.mapper.TimeTypeMapper;
|
|
import com.management.platform.mapper.UserMapper;
|
|
import com.management.platform.mapper.UserMapper;
|
|
import com.management.platform.mapper.UserWithBeisenMapper;
|
|
import com.management.platform.mapper.UserWithBeisenMapper;
|
|
import com.management.platform.service.UserFvTimeService;
|
|
import com.management.platform.service.UserFvTimeService;
|
|
|
|
+import com.management.platform.service.UserService;
|
|
import com.management.platform.service.UserWithBeisenService;
|
|
import com.management.platform.service.UserWithBeisenService;
|
|
import com.management.platform.util.BeiSenUtils;
|
|
import com.management.platform.util.BeiSenUtils;
|
|
import com.management.platform.util.HttpRespMsg;
|
|
import com.management.platform.util.HttpRespMsg;
|
|
@@ -59,11 +60,14 @@ public class UserWithBeisenController {
|
|
private UserFvTimeService userFvTimeService;
|
|
private UserFvTimeService userFvTimeService;
|
|
@Resource
|
|
@Resource
|
|
private TimeTypeMapper timeTypeMapper;
|
|
private TimeTypeMapper timeTypeMapper;
|
|
|
|
+ @Resource
|
|
|
|
+ private UserService userService;
|
|
|
|
|
|
@RequestMapping("/getByTimeWindow")
|
|
@RequestMapping("/getByTimeWindow")
|
|
public HttpRespMsg getByTimeWindow(String startTime,String stopTime){
|
|
public HttpRespMsg getByTimeWindow(String startTime,String stopTime){
|
|
HttpRespMsg httpRespMsg=new HttpRespMsg();
|
|
HttpRespMsg httpRespMsg=new HttpRespMsg();
|
|
Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
|
|
Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
|
|
|
|
+ List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, companyId));
|
|
BeisenConfig beisenConfig = beisenConfigMapper.selectById(companyId);
|
|
BeisenConfig beisenConfig = beisenConfigMapper.selectById(companyId);
|
|
if(beisenConfig==null){
|
|
if(beisenConfig==null){
|
|
httpRespMsg.setError("北森基础数据配置未完成,请联系服务商完成配置");
|
|
httpRespMsg.setError("北森基础数据配置未完成,请联系服务商完成配置");
|
|
@@ -71,6 +75,8 @@ public class UserWithBeisenController {
|
|
}
|
|
}
|
|
List<UserWithBeisen> allBeisenList = userWithBeisenService.list(new LambdaQueryWrapper<UserWithBeisen>().eq(UserWithBeisen::getCompanyId, companyId));
|
|
List<UserWithBeisen> allBeisenList = userWithBeisenService.list(new LambdaQueryWrapper<UserWithBeisen>().eq(UserWithBeisen::getCompanyId, companyId));
|
|
List<UserWithBeisen> userWithBeisenList=new ArrayList<>();
|
|
List<UserWithBeisen> userWithBeisenList=new ArrayList<>();
|
|
|
|
+ //更新电话到工时
|
|
|
|
+ List<User> needUpdateUsers=new ArrayList<>();
|
|
List<JSONArray> byTimeWindow = BeiSenUtils.getByTimeWindow("",startTime,stopTime,companyId,beisenConfig.getAppKey(),beisenConfig.getAppSecret());
|
|
List<JSONArray> byTimeWindow = BeiSenUtils.getByTimeWindow("",startTime,stopTime,companyId,beisenConfig.getAppKey(),beisenConfig.getAppSecret());
|
|
for (JSONArray array : byTimeWindow) {
|
|
for (JSONArray array : byTimeWindow) {
|
|
for (int i = 0; i < array.size(); i++) {
|
|
for (int i = 0; i < array.size(); i++) {
|
|
@@ -95,6 +101,14 @@ public class UserWithBeisenController {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
userWithBeisenList.add(userWithBeisen);
|
|
userWithBeisenList.add(userWithBeisen);
|
|
|
|
+ Optional<User> user = userList.stream().filter(u -> u.getJobNumber().equals(userWithBeisen.getJobNumber())).findFirst();
|
|
|
|
+ if(user.isPresent()){
|
|
|
|
+ User u=new User();
|
|
|
|
+ u.setId(user.get().getId());
|
|
|
|
+ u.setPhone(userWithBeisen.getMobilePhone());
|
|
|
|
+ u.setJobNumber(userWithBeisen.getJobNumber());
|
|
|
|
+ needUpdateUsers.add(u);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if(userWithBeisenList.size()>0){
|
|
if(userWithBeisenList.size()>0){
|
|
@@ -103,6 +117,9 @@ public class UserWithBeisenController {
|
|
return httpRespMsg;
|
|
return httpRespMsg;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ if(needUpdateUsers.size()>0){
|
|
|
|
+ userService.updateBatchById(needUpdateUsers);
|
|
|
|
+ }
|
|
return httpRespMsg;
|
|
return httpRespMsg;
|
|
}
|
|
}
|
|
|
|
|