diff --git a/src/main/java/com/syjiaer/clinic/server/controller/common/SignUpController.java b/src/main/java/com/syjiaer/clinic/server/controller/common/SignUpController.java index f3542a9..2ec7e04 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/common/SignUpController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/common/SignUpController.java @@ -1,29 +1,17 @@ package com.syjiaer.clinic.server.controller.common; -import com.alibaba.fastjson2.JSONObject; -import com.syjiaer.clinic.server.common.annotations.NoAuthCheck; -import com.syjiaer.clinic.server.common.api.input.IM9001; -import com.syjiaer.clinic.server.common.api.request.SocialRequest; -import com.syjiaer.clinic.server.common.config.Config; -import com.syjiaer.clinic.server.common.util.RsaUtil; import com.syjiaer.clinic.server.common.vo.Result; import com.syjiaer.clinic.server.controller.BaseController; import com.syjiaer.clinic.server.entity.manager.ManagerUserSign; -import com.syjiaer.clinic.server.mapper.manager.ManagerUserSignMapper; import com.syjiaer.clinic.server.service.common.ManagerUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Map; @RestController @RequestMapping("/signUp") public class SignUpController extends BaseController { - @Autowired - private Config config; - @Autowired - private SocialRequest socialRequest; @Autowired private ManagerUserService managerUserService; @RequestMapping("/signUp") diff --git a/src/main/java/com/syjiaer/clinic/server/entity/manager/ManagerUserSign.java b/src/main/java/com/syjiaer/clinic/server/entity/manager/ManagerUserSign.java index 8788672..229b271 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/manager/ManagerUserSign.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/manager/ManagerUserSign.java @@ -47,4 +47,7 @@ public class ManagerUserSign implements Serializable { @ApiModelProperty("签到编号") private String signNo; + + @ApiModelProperty("服务器签到时间") + private LocalDateTime logTime; } diff --git a/src/main/java/com/syjiaer/clinic/server/service/common/ManagerUserService.java b/src/main/java/com/syjiaer/clinic/server/service/common/ManagerUserService.java index 76e5eaa..3c9c2fa 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/common/ManagerUserService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/common/ManagerUserService.java @@ -73,6 +73,7 @@ public class ManagerUserService extends BaseService { im9001.setMac(mac); im9001.setIp(ip); JSONObject jsonObject = socialRequest.call9001(im9001); + jsonObject = jsonObject.getJSONObject("signinoutb"); LocalDateTime signTime= jsonObject.getObject("sign_time",LocalDateTime.class); String signNO = jsonObject.getString("sign_no"); ManagerUserSign dbSign = managerUserSignMapper.selectOne(new QueryWrapper().eq("manager_user_id",user.getId())); @@ -82,10 +83,10 @@ public class ManagerUserService extends BaseService { update.setMac(mac); update.setSignTime(signTime); update.setSignNo(signNO); + update.setLogTime(LocalDateTime.now()); if (dbSign != null){ update.setId(dbSign.getId()); } - managerUserSignMapper.insertOrUpdate(update); return update; }