From be001ab9fae276f19358a51e9ec5789466f0ca8b Mon Sep 17 00:00:00 2001 From: LiJianZhao Date: Sun, 27 Apr 2025 09:28:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E4=BF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/ManagerUserController.java | 7 --- .../controller/common/SignUpController.java | 18 ++++--- .../entity/manager/ManagerUserSign.java | 50 +++++++++++++++++++ .../mapper/manager/ManagerUserSignMapper.java | 18 +++++++ .../service/common/ManagerUserService.java | 41 +++++++++++++++ .../resources/xml/ManagerUserSignMapper.xml | 5 ++ 6 files changed, 124 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/syjiaer/clinic/server/entity/manager/ManagerUserSign.java create mode 100644 src/main/java/com/syjiaer/clinic/server/mapper/manager/ManagerUserSignMapper.java create mode 100644 src/main/resources/xml/ManagerUserSignMapper.xml diff --git a/src/main/java/com/syjiaer/clinic/server/controller/common/ManagerUserController.java b/src/main/java/com/syjiaer/clinic/server/controller/common/ManagerUserController.java index aa56227..62da25f 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/common/ManagerUserController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/common/ManagerUserController.java @@ -41,13 +41,6 @@ public class ManagerUserController extends BaseController { String password = (String) parms.get("password"); return success(managerUserService.login(username, password)); } - @PostMapping("signUp") - public Result signUp() { - Map parms = getParms(); - String ip = (String) parms.get("ip"); - String mac = (String) parms.get("mac"); - return success(); - } //验证token 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 94d4fbe..f3542a9 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 @@ -8,10 +8,15 @@ 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 { @@ -19,16 +24,13 @@ public class SignUpController extends BaseController { private Config config; @Autowired private SocialRequest socialRequest; + @Autowired + private ManagerUserService managerUserService; @RequestMapping("/signUp") - public Result set() { - String id = infoUtil.getMap().get("manager_id").toString(); + public Result set() { String mac = parmsUtil.getString("mac", "请输入mac地址"); String ip = parmsUtil.getString("ip", "请输入ip地址"); - IM9001 im9001 = new IM9001(); - im9001.setOpter_no(id); - im9001.setMac(mac); - im9001.setIp(ip); - - return success(socialRequest.call9001(im9001)); + ManagerUserSign signResult = managerUserService.signUp(ip, mac); + return success(signResult); } } 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 new file mode 100644 index 0000000..8788672 --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/entity/manager/ManagerUserSign.java @@ -0,0 +1,50 @@ +package com.syjiaer.clinic.server.entity.manager; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; +/** + *

+ * + *

+ * + * @author NiuZiYuan + * @since 2025-04-27 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("manager_user_sign") +@ApiModel(value = "ManagerUserSign对象", description = "") +public class ManagerUserSign implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty("用户id") + private Integer managerUserId; + + @ApiModelProperty("ip地址") + private String ip; + + @ApiModelProperty("mac地址") + private String mac; + + @ApiModelProperty("签到时间") + private LocalDateTime signTime; + + @ApiModelProperty("签到编号") + private String signNo; +} diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/manager/ManagerUserSignMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/manager/ManagerUserSignMapper.java new file mode 100644 index 0000000..49d18dc --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/mapper/manager/ManagerUserSignMapper.java @@ -0,0 +1,18 @@ +package com.syjiaer.clinic.server.mapper.manager; + +import com.syjiaer.clinic.server.entity.manager.ManagerUserSign; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + + +/** + *

+ * Mapper 接口 + *

+ * + * @author NiuZiYuan + * @since 2025-04-27 + */ +public interface ManagerUserSignMapper extends BaseMapper { + +} + 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 b36b017..76e5eaa 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 @@ -1,10 +1,15 @@ package com.syjiaer.clinic.server.service.common; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.syjiaer.clinic.server.common.api.input.IM9001; +import com.syjiaer.clinic.server.common.api.request.SocialRequest; import com.syjiaer.clinic.server.common.exception.MessageException; import com.syjiaer.clinic.server.controller.BaseController; import com.syjiaer.clinic.server.entity.manager.ManagerUser; +import com.syjiaer.clinic.server.entity.manager.ManagerUserSign; import com.syjiaer.clinic.server.mapper.manager.ManagerUserMapper; +import com.syjiaer.clinic.server.mapper.manager.ManagerUserSignMapper; import com.syjiaer.clinic.server.service.BaseService; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.security.Keys; @@ -13,12 +18,18 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.crypto.SecretKey; +import java.time.LocalDateTime; import java.util.Date; +import java.util.Map; @Service public class ManagerUserService extends BaseService { @Autowired private ManagerUserMapper managerUserMapper; + @Autowired + private ManagerUserSignMapper managerUserSignMapper; + @Autowired + private SocialRequest socialRequest; public String login(String username, String password) { if (username == null || username.isEmpty()) { @@ -48,4 +59,34 @@ public class ManagerUserService extends BaseService { public ManagerUser verify() { return getManagerUser(); } + + /** + * 医保签到 + * @param ip + * @param mac + * @return + */ + public ManagerUserSign signUp(String ip,String mac){ + ManagerUser user = getManagerUser(); + IM9001 im9001 = new IM9001(); + im9001.setOpter_no(String.valueOf(user.getId())); + im9001.setMac(mac); + im9001.setIp(ip); + JSONObject jsonObject = socialRequest.call9001(im9001); + 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())); + ManagerUserSign update = new ManagerUserSign(); + update.setManagerUserId(user.getId()); + update.setIp(ip); + update.setMac(mac); + update.setSignTime(signTime); + update.setSignNo(signNO); + if (dbSign != null){ + update.setId(dbSign.getId()); + } + + managerUserSignMapper.insertOrUpdate(update); + return update; + } } diff --git a/src/main/resources/xml/ManagerUserSignMapper.xml b/src/main/resources/xml/ManagerUserSignMapper.xml new file mode 100644 index 0000000..6ac6fd6 --- /dev/null +++ b/src/main/resources/xml/ManagerUserSignMapper.xml @@ -0,0 +1,5 @@ + + + + +