This commit is contained in:
parent
0a3ce9df58
commit
be001ab9fa
|
|
@ -41,13 +41,6 @@ public class ManagerUserController extends BaseController {
|
||||||
String password = (String) parms.get("password");
|
String password = (String) parms.get("password");
|
||||||
return success(managerUserService.login(username, password));
|
return success(managerUserService.login(username, password));
|
||||||
}
|
}
|
||||||
@PostMapping("signUp")
|
|
||||||
public Result<String> signUp() {
|
|
||||||
Map<String, Object> parms = getParms();
|
|
||||||
String ip = (String) parms.get("ip");
|
|
||||||
String mac = (String) parms.get("mac");
|
|
||||||
return success();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//验证token
|
//验证token
|
||||||
|
|
|
||||||
|
|
@ -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.util.RsaUtil;
|
||||||
import com.syjiaer.clinic.server.common.vo.Result;
|
import com.syjiaer.clinic.server.common.vo.Result;
|
||||||
import com.syjiaer.clinic.server.controller.BaseController;
|
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.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/signUp")
|
@RequestMapping("/signUp")
|
||||||
public class SignUpController extends BaseController {
|
public class SignUpController extends BaseController {
|
||||||
|
|
@ -19,16 +24,13 @@ public class SignUpController extends BaseController {
|
||||||
private Config config;
|
private Config config;
|
||||||
@Autowired
|
@Autowired
|
||||||
private SocialRequest socialRequest;
|
private SocialRequest socialRequest;
|
||||||
|
@Autowired
|
||||||
|
private ManagerUserService managerUserService;
|
||||||
@RequestMapping("/signUp")
|
@RequestMapping("/signUp")
|
||||||
public Result<JSONObject> set() {
|
public Result<ManagerUserSign> set() {
|
||||||
String id = infoUtil.getMap().get("manager_id").toString();
|
|
||||||
String mac = parmsUtil.getString("mac", "请输入mac地址");
|
String mac = parmsUtil.getString("mac", "请输入mac地址");
|
||||||
String ip = parmsUtil.getString("ip", "请输入ip地址");
|
String ip = parmsUtil.getString("ip", "请输入ip地址");
|
||||||
IM9001 im9001 = new IM9001();
|
ManagerUserSign signResult = managerUserService.signUp(ip, mac);
|
||||||
im9001.setOpter_no(id);
|
return success(signResult);
|
||||||
im9001.setMac(mac);
|
|
||||||
im9001.setIp(ip);
|
|
||||||
|
|
||||||
return success(socialRequest.call9001(im9001));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
/**
|
||||||
|
* <p>
|
||||||
|
*
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @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;
|
||||||
|
}
|
||||||
|
|
@ -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;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <p>
|
||||||
|
* Mapper 接口
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @author NiuZiYuan
|
||||||
|
* @since 2025-04-27
|
||||||
|
*/
|
||||||
|
public interface ManagerUserSignMapper extends BaseMapper<ManagerUserSign> {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -1,10 +1,15 @@
|
||||||
package com.syjiaer.clinic.server.service.common;
|
package com.syjiaer.clinic.server.service.common;
|
||||||
|
|
||||||
|
import com.alibaba.fastjson2.JSONObject;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
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.common.exception.MessageException;
|
||||||
import com.syjiaer.clinic.server.controller.BaseController;
|
import com.syjiaer.clinic.server.controller.BaseController;
|
||||||
import com.syjiaer.clinic.server.entity.manager.ManagerUser;
|
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.ManagerUserMapper;
|
||||||
|
import com.syjiaer.clinic.server.mapper.manager.ManagerUserSignMapper;
|
||||||
import com.syjiaer.clinic.server.service.BaseService;
|
import com.syjiaer.clinic.server.service.BaseService;
|
||||||
import io.jsonwebtoken.Jwts;
|
import io.jsonwebtoken.Jwts;
|
||||||
import io.jsonwebtoken.security.Keys;
|
import io.jsonwebtoken.security.Keys;
|
||||||
|
|
@ -13,12 +18,18 @@ import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import javax.crypto.SecretKey;
|
import javax.crypto.SecretKey;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class ManagerUserService extends BaseService {
|
public class ManagerUserService extends BaseService {
|
||||||
@Autowired
|
@Autowired
|
||||||
private ManagerUserMapper managerUserMapper;
|
private ManagerUserMapper managerUserMapper;
|
||||||
|
@Autowired
|
||||||
|
private ManagerUserSignMapper managerUserSignMapper;
|
||||||
|
@Autowired
|
||||||
|
private SocialRequest socialRequest;
|
||||||
|
|
||||||
public String login(String username, String password) {
|
public String login(String username, String password) {
|
||||||
if (username == null || username.isEmpty()) {
|
if (username == null || username.isEmpty()) {
|
||||||
|
|
@ -48,4 +59,34 @@ public class ManagerUserService extends BaseService {
|
||||||
public ManagerUser verify() {
|
public ManagerUser verify() {
|
||||||
return getManagerUser();
|
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<ManagerUserSign>().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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
|
<mapper namespace="com.syjiaer.clinic.server.mapper.manager.ManagerUserSignMapper">
|
||||||
|
|
||||||
|
</mapper>
|
||||||
Loading…
Reference in New Issue