diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/SysUser.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/SysUser.java index c394eae..2f4744e 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/SysUser.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/SysUser.java @@ -89,6 +89,88 @@ public class SysUser extends BaseEntity /** 角色ID */ private Long roleId; + public String getUserType() { + return userType; + } + + public void setUserType(String userType) { + this.userType = userType; + } + + private String userType; + private String vshisuser; + private String vshisuser1; + private String vshisuser2; + private String yljg; + private String sn; + private String snid; + private String signCert; + private String sn_pin; + + public String getVshisuser() { + return vshisuser; + } + + public void setVshisuser(String vshisuser) { + this.vshisuser = vshisuser; + } + + public String getVshisuser1() { + return vshisuser1; + } + + public void setVshisuser1(String vshisuser1) { + this.vshisuser1 = vshisuser1; + } + + public String getVshisuser2() { + return vshisuser2; + } + + public void setVshisuser2(String vshisuser2) { + this.vshisuser2 = vshisuser2; + } + + public String getYljg() { + return yljg; + } + + public void setYljg(String yljg) { + this.yljg = yljg; + } + + public String getSn() { + return sn; + } + + public void setSn(String sn) { + this.sn = sn; + } + + public String getSnid() { + return snid; + } + + public void setSnid(String snid) { + this.snid = snid; + } + + public String getSignCert() { + return signCert; + } + + public void setSignCert(String signCert) { + this.signCert = signCert; + } + + public String getSn_pin() { + return sn_pin; + } + + public void setSn_pin(String sn_pin) { + this.sn_pin = sn_pin; + } + public SysUser() { diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComUsr.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComUsr.java index f1dd427..a94ef49 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComUsr.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComUsr.java @@ -17,4 +17,8 @@ public class ComUsr { private String yhjs; private String vshisuser2; private String mm; + private String sn; + private String snid; + private String signCert; + private String sn_pin; } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComUsrMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComUsrMapper.java index 6f63e3b..3313921 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComUsrMapper.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComUsrMapper.java @@ -1,5 +1,10 @@ package com.czlis.interfaceCommon.mapper; -public interface ComUsrMapper { +import com.czlis.common.core.domain.entity.lis.ComUsr; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +public interface ComUsrMapper { + List getComUsrList(@Param("yhdh") String yhdh); } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComUsrpowerMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComUsrpowerMapper.java new file mode 100644 index 0000000..52c1736 --- /dev/null +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComUsrpowerMapper.java @@ -0,0 +1,7 @@ +package com.czlis.interfaceCommon.mapper; + +import org.apache.ibatis.annotations.Param; + +public interface ComUsrpowerMapper { + String getUserPower(@Param("yq")String yq,@Param("yhdh")String yhdh); +} diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/CommonMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/CommonMapper.java index 8902366..efcf356 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/CommonMapper.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/CommonMapper.java @@ -6,6 +6,6 @@ import java.util.Date; public interface CommonMapper { Date getCurrentTime(); - String getyhjs(@Param("yhdh")String yhdh); - String getUserPower(@Param("yq")String yq,@Param("yhdh")String yhdh); + //String getyhjs(@Param("yhdh")String yhdh); + //String getUserPower(@Param("yq")String yq,@Param("yhdh")String yhdh); } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java index 437a9dd..e46116e 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java @@ -30,6 +30,10 @@ public class CommonUtil { private LabResultMapper labResultMapper; @Autowired LabReqdetailMapper labReqdetailMapper; + @Autowired + ComUsrMapper comUsrMapper; + @Autowired + ComUsrpowerMapper comUsrpowerMapper; //====检验主表操作方法集合=== public LabPat getLabPatOne(Date jyrq, String yq, String ybh){ @@ -134,9 +138,11 @@ public class CommonUtil { public Boolean getUserPower(String yq,String yhdh,int powerIdx){ if ("LIS".equals(yhdh)) return true; if ("lis".equals(yhdh)) return true; - String yhjs= commonMapper.getyhjs(yhdh); + //String yhjs= commonMapper.getyhjs(yhdh); + List comUsrList = comUsrMapper.getComUsrList(yhdh); + String yhjs = comUsrList.get(0).getYhjs(); if ("S".equals(yhjs)) return true; - String userPower=commonMapper.getUserPower(yq,yhdh); + String userPower=comUsrpowerMapper.getUserPower(yq,yhdh); if(userPower==null) return false; if("Y".equals(userPower.substring(powerIdx - 1,1)))return true; return false; diff --git a/lis-interfaceCommon/src/main/resources/mapper/ComUsrMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/ComUsrMapper.xml new file mode 100644 index 0000000..7b85ad1 --- /dev/null +++ b/lis-interfaceCommon/src/main/resources/mapper/ComUsrMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + diff --git a/lis-interfaceCommon/src/main/resources/mapper/ComUsrpowerMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/ComUsrpowerMapper.xml new file mode 100644 index 0000000..ac2a39a --- /dev/null +++ b/lis-interfaceCommon/src/main/resources/mapper/ComUsrpowerMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + diff --git a/lis-interfaceCommon/src/main/resources/mapper/CommonMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/CommonMapper.xml index e11f992..a2d563c 100644 --- a/lis-interfaceCommon/src/main/resources/mapper/CommonMapper.xml +++ b/lis-interfaceCommon/src/main/resources/mapper/CommonMapper.xml @@ -6,12 +6,10 @@ select getdate() - + diff --git a/lis-system/src/main/java/com/czlis/system/service/impl/SysUserServiceImpl.java b/lis-system/src/main/java/com/czlis/system/service/impl/SysUserServiceImpl.java index 9df4fd4..46387b9 100644 --- a/lis-system/src/main/java/com/czlis/system/service/impl/SysUserServiceImpl.java +++ b/lis-system/src/main/java/com/czlis/system/service/impl/SysUserServiceImpl.java @@ -6,8 +6,11 @@ import java.util.stream.Collectors; import javax.validation.Validator; import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.ComUsr; import com.czlis.common.core.domain.entity.lis.LabReqmain; +import com.czlis.interfaceCommon.mapper.ComUsrMapper; import com.czlis.interfaceCommon.mapper.LabReqmainMapper; +import com.czlis.interfaceCommon.utils.CommonUtil; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -71,6 +74,8 @@ public class SysUserServiceImpl implements ISysUserService { @Autowired private LabReqmainMapper labReqmainMapper; + @Autowired + private ComUsrMapper comUsrMapper; /** * 根据条件分页查询用户列表 @@ -508,7 +513,34 @@ public class SysUserServiceImpl implements ISysUserService { */ @Override public Result syncUser() { - LabReqmain labReqmainOne = labReqmainMapper.getLabReqmainOne("20221201167643"); - return new Result("0","查询成功！",labReqmainOne); + List comUsrList = comUsrMapper.getComUsrList(""); + int j = 0; + for (ComUsr comUsr : comUsrList) { + // 验证是否存在这个用户 + SysUser u = userMapper.selectUserByUserName(comUsr.getYhdh()); + if(!StringUtils.isNull(u)) continue; + SysUser sysUser = new SysUser(); + sysUser.setDeptId(101L); + sysUser.setUserName(comUsr.getYhdh()); + sysUser.setNickName(comUsr.getYhxm()); + sysUser.setUserType("00"); + sysUser.setSex("1"); + String password = configService.selectConfigByKey("sys.user.initPassword"); + sysUser.setPassword(SecurityUtils.encryptPassword(password)); + sysUser.setStatus("0"); + sysUser.setCreateBy("admin"); + sysUser.setVshisuser(comUsr.getVshisuser()); + sysUser.setVshisuser1(comUsr.getVshisuser1()); + sysUser.setVshisuser2(comUsr.getVshisuser2()); + sysUser.setYljg(comUsr.getYljg()); + sysUser.setSn(comUsr.getSn()); + sysUser.setSnid(comUsr.getSnid()); + sysUser.setSignCert(comUsr.getSignCert()); + sysUser.setSn_pin(comUsr.getSn_pin()); + userMapper.insertUser(sysUser); + j++; + + } + return new Result("0","导入成功，共有："+j+"条数据导入！"); } } diff --git a/sql/lis8.0/updatedb_lis8.0.sql b/sql/lis8.0/updatedb_lis8.0.sql index 9486546..cc721d2 100644 --- a/sql/lis8.0/updatedb_lis8.0.sql +++ b/sql/lis8.0/updatedb_lis8.0.sql @@ -2,8 +2,47 @@ -- 修改项目脚本执行(如果存在存储过程和函数等特殊类型，则新增一个sql文件为妥) -- ---------------------------- - if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'com_dict' AND COLUMN_NAME = 'userflag') begin alter table com_dict add userflag varchar(1) end + +if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_user' AND COLUMN_NAME = 'vshisuser') +begin + alter table sys_user add vshisuser varchar(30) +end + +if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_user' AND COLUMN_NAME = 'vshisuser1') +begin + alter table sys_user add vshisuser1 varchar(30) +end + +if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_user' AND COLUMN_NAME = 'vshisuser2') +begin + alter table sys_user add vshisuser2 varchar(30) +end + +if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_user' AND COLUMN_NAME = 'yljg') +begin + alter table sys_user add yljg varchar(10) +end + +if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_user' AND COLUMN_NAME = 'sn') +begin + alter table sys_user add sn varchar(100) +end + +if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_user' AND COLUMN_NAME = 'snid') +begin + alter table sys_user add snid varchar(100) +end + +if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_user' AND COLUMN_NAME = 'signCert') +begin + alter table sys_user add signCert varchar(100) +end + +if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'sys_user' AND COLUMN_NAME = 'sn_pin') +begin + alter table sys_user add sn_pin varchar(100) +end