用户绑定角色

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/service/impl/DockServiceImpl.java

@@ -15,6 +15,8 @@ import com.ccsens.common.enums.DataSourceType;
 import com.ccsens.common.exception.base.BaseException;
 import com.ccsens.common.utils.DateUtils;
 import com.ccsens.common.utils.SecurityUtils;
+import com.ccsens.common.utils.StringUtils;
+import com.ccsens.system.domain.SysUserRole;
 import com.ccsens.system.domain.dto.DockDto;
 import com.ccsens.system.domain.po.*;
 import com.ccsens.system.persist.dao.DockDao;
@@ -73,6 +75,8 @@ public class DockServiceImpl implements DockService {
     private SysDeptMapper sysDeptMapper;
     @Resource
     private SysUserMapper sysUserMapper;
+    @Resource
+    private SysUserRoleMapper userRoleMapper;
 
     @Value("${hospitalId:}")
     private Long hospitalId;
@@ -312,6 +316,7 @@ public class DockServiceImpl implements DockService {
                 user.setEmplCode(sysUser.getEmplCode());
                 List<SysUser> users = sysUserMapper.selectUserList(user);
                 if (CollUtil.isEmpty(users)) {
+                    sysUser.setDeptId(hospitalId);
                     sysUserMapper.insertUser(sysUser);
                 }
             }
@@ -350,6 +355,13 @@ public class DockServiceImpl implements DockService {
                 //获取一年后的日期
                 sysUser.setValidDate(DateUtil.offset(new Date(), DateField.YEAR, 1));
                 sysUserMapper.insertUser(sysUser);
+
+                // 新增用户与角色管理
+                SysUserRole ur = new SysUserRole();
+                ur.setUserId(sysUser.getUserId());
+                ur.setRoleId(104L);
+                userRoleMapper.batchUserRole(CollUtil.newArrayList(ur));
+
                 returnUsers.add(sysUser);
                 dockEmpl.setSync("1");
                 dockEmplMapper.updateByPrimaryKeySelective(dockEmpl);
@@ -417,8 +429,6 @@ public class DockServiceImpl implements DockService {
     }
 
 
-
-
     private void syncPmsPatient() {
         DockPatientBaseInfoExample dockPatientBaseInfoExample = new DockPatientBaseInfoExample();
         dockPatientBaseInfoExample.createCriteria().andSyncEqualTo("0").andDelFlagEqualTo((byte) 0);
@@ -657,7 +667,6 @@ public class DockServiceImpl implements DockService {
     }
 
 
-
     private void disposePmsPatient(DockPatientBaseInfo dockPatientBaseInfo, PmsPatient pmsPatient) {
 
         pmsPatient.setPatientNo(dockPatientBaseInfo.getPatientNo());

ruisi_java/ruisi-web-client/src/main/resources/application-dev.yml

@@ -11,14 +11,14 @@ spring:
 #        password: po3OynBO[M3579p6L7)o
         url: jdbc:mysql://127.0.0.1:3306/ruisi_cga?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: 123456
+        password: q7510327
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
         enabled: true
-        url: jdbc:mysql://127.0.0.1:3306/ruisi_cga_yf1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://127.0.0.1:3306/ruisi_cga_hnszyyy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: 123456
+        password: q7510327
 #        driverClassName: oracle.jdbc.driver.OracleDriver
 #        url: jdbc:oracle:thin:@200.1.8.115:1521:hisdb
 #        username: interface_lnpg
@@ -126,6 +126,6 @@ informed:
 clientVersion: v1.8.3.0
 
 # 医院id，不同医院部署的时候需要修改
-hospitalId: 174
+hospitalId: 178
 generalPassword: cga123#
 

ruisi_java/ruisi-web-client/src/main/resources/application-prod.yml

@@ -12,10 +12,10 @@ spring:
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
-        enabled: false
+        enabled: true
-        url:
+        url: jdbc:mysql://172.16.21.24:23306/ruisi_cga_hnszyyy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username:
+        username: root
-        password:
+        password: xian#2024!!!
       # 初始连接数
       initialSize: 5
       # 最小连接池数量
@@ -131,5 +131,5 @@ informed:
 clientVersion: v1.8.3.0
 
 # 医院id，不同医院部署的时候需要修改
-hospitalId: 174
+hospitalId: 178
 generalPassword: cga123#