From 020dce43863461a308770dc6f2f06531bcf51f70 Mon Sep 17 00:00:00 2001
From: wangbo <184677810@qq.com>
Date: Thu, 30 May 2019 12:35:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95url=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/permission/model/Users.java  | 12 +++-
 .../main/resources/mainOrm/master/MasterUsers.xml  | 15 +++--
 .../operate/web/controller/UsersController.java    | 77 +++++++++++-----------
 3 files changed, 59 insertions(+), 45 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java
index 1eef3ab..3de486c 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java
@@ -30,6 +30,17 @@ public class Users {
     //当前方式
     private Integer bType;
 
+    //默认页面
+    private String defaultPage;
+
+    public String getDefaultPage() {
+        return defaultPage;
+    }
+
+    public void setDefaultPage(String defaultPage) {
+        this.defaultPage = defaultPage;
+    }
+
     public Integer getbType() {
         return bType;
     }
@@ -159,7 +170,6 @@ public class Users {
     }
 
 
-
     public Integer getId() {
         return id;
     }
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml
index fcd47a0..b89f373 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml
@@ -25,19 +25,20 @@
         <result column="employee_id" property="employeeId" jdbcType="VARCHAR"/>
         <result column="other_account" property="otherAccount" jdbcType="INTEGER"/>
         <result column="zhiChenId" property="zhiChenId" jdbcType="INTEGER"/>
+        <result column="defaultpage" property="defaultPage" jdbcType="INTEGER"/>
     </resultMap>
 
     <insert id="addUsers" parameterType="com.lyms.platform.permission.model.Users">
         <selectKey order="AFTER" keyProperty="id" resultType="java.lang.Integer">SELECT LAST_INSERT_ID()</selectKey>
         insert into users
-        (foreign_id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time,ks_id,zhiChenId
+        (foreign_id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time,ks_id,zhiChenId,defaultpage
 
         <if test="id != null and id >= 0">
             ,id
         </if>
         )
         values
-        (#{foreignId},#{logincenterId},#{type},#{orgId},#{deptId},#{name},#{account},#{pwd},#{phone},#{publishId},#{publishName},#{yn},#{enable},#{modified},#{created},#{remarks},#{lastLoginTime},#{ksId},#{zhiChenId}
+        (#{foreignId},#{logincenterId},#{type},#{orgId},#{deptId},#{name},#{account},#{pwd},#{phone},#{publishId},#{publishName},#{yn},#{enable},#{modified},#{created},#{remarks},#{lastLoginTime},#{ksId},#{zhiChenId},#{defaultPage}
         <if test="id != null and id >= 0">
             ,#{id}
         </if>
@@ -108,6 +109,10 @@
             <if test="zhiChenId !=null">
                 zhiChenId =#{zhiChenId,jdbcType=VARCHAR},
             </if>
+            <if test="defaultPage !=null">
+                defaultpage=#{defaultPage,jdbcType=VARCHAR}
+            </if>
+
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
@@ -119,12 +124,12 @@ delete from users where id = #{id,jdbcType=INTEGER}
 
 
     <select id="getUsers" resultMap="UsersResultMap" parameterType="java.lang.Integer">
-select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time, ks_id,foreign_id,other_account,zhiChenId
+select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time, ks_id,foreign_id,other_account,zhiChenId,defaultpage
  from users where id = #{id,jdbcType=INTEGER}
 </select>
 
     <select id="getUsersByLoginCenterId" resultMap="UsersResultMap" parameterType="java.lang.Integer">
-  select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time, ks_id,foreign_id,other_account,zhiChenId
+  select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time, ks_id,foreign_id,other_account,zhiChenId,defaultpage
   from users where logincenter_id = #{id,jdbcType=INTEGER} and enable =1 order by  last_login_time desc
  </select>
 
@@ -230,7 +235,7 @@ select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,p
     <select id="queryUsers" resultMap="UsersResultMap" parameterType="com.lyms.platform.permission.model.UsersQuery">
         select
         id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time,
-        ks_id,foreign_id,other_account,zhiChenId
+        ks_id,foreign_id,other_account,zhiChenId,defaultpage
         from users
         <include refid="UsersCondition"/>
         <include refid="orderAndLimit"/>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
index 6a91244..c77aa5f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
@@ -207,23 +207,22 @@ public class UsersController extends BaseController {
     }
 
 
-
     @RequestMapping(value = "/usersbyorg", method = RequestMethod.GET)
     @TokenRequired
     @ResponseBody
-    public BaseListResponse getUsers(@RequestParam(value = "orgId", required = false) String orgId){
+    public BaseListResponse getUsers(@RequestParam(value = "orgId", required = false) String orgId) {
         UsersQuery usersQuery = new UsersQuery();
         List data = new ArrayList();
-        if(NumberUtils.isNumber(orgId)){
+        if (NumberUtils.isNumber(orgId)) {
             usersQuery.setYn(YnEnums.YES.getId());
             usersQuery.setType(1);
             usersQuery.setOrgId(Integer.valueOf(orgId));
             List<Users> usersList = usersService.queryUsers(usersQuery);
 
-            for(Users users1:usersList){
+            for (Users users1 : usersList) {
                 Map map = new HashMap();
-                map.put("id",users1.getId());
-                map.put("name",users1.getName());
+                map.put("id", users1.getId());
+                map.put("name", users1.getName());
                 data.add(map);
             }
         }
@@ -291,8 +290,7 @@ public class UsersController extends BaseController {
             try {
                 ids = new ArrayList<>();
                 ids.add(Integer.parseInt(orgId));
-            }catch (Exception e)
-            {
+            } catch (Exception e) {
                 FrontEndResult frontEndResult = new FrontEndResult();
                 frontEndResult.setData(null);
                 frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
@@ -553,32 +551,32 @@ public class UsersController extends BaseController {
             organizations = organizationService.queryOrganization(organizationQuery);
         } else {
             Organization organization = organizationService.getOrganization(users.getOrgId());
-            if(null!=organization&&StringUtils.isNotEmpty(organization.getCityId())){
-                BasicConfig bg= basicConfigService.getOneBasicConfigById(organization.getCityId());
-                Map<String,String> map = new HashMap<>();
-                map.put("id",organization.getCityId());
-                if(null!=bg){
-                    map.put("name",bg.getName());
+            if (null != organization && StringUtils.isNotEmpty(organization.getCityId())) {
+                BasicConfig bg = basicConfigService.getOneBasicConfigById(organization.getCityId());
+                Map<String, String> map = new HashMap<>();
+                map.put("id", organization.getCityId());
+                if (null != bg) {
+                    map.put("name", bg.getName());
                 }
                 organization.setCity(map);
             }
 
-            if(null!=organization&&StringUtils.isNotEmpty(organization.getProvinceId())){
-                BasicConfig bg= basicConfigService.getOneBasicConfigById(organization.getProvinceId());
-                Map<String,String> map = new HashMap<>();
-                map.put("id",organization.getProvinceId());
-                if(null!=bg){
-                    map.put("name",bg.getName());
+            if (null != organization && StringUtils.isNotEmpty(organization.getProvinceId())) {
+                BasicConfig bg = basicConfigService.getOneBasicConfigById(organization.getProvinceId());
+                Map<String, String> map = new HashMap<>();
+                map.put("id", organization.getProvinceId());
+                if (null != bg) {
+                    map.put("name", bg.getName());
                 }
                 organization.setProvince(map);
             }
 
-            if(null!=organization&&StringUtils.isNotEmpty(organization.getAreaId())){
-                BasicConfig bg= basicConfigService.getOneBasicConfigById(organization.getAreaId());
-                Map<String,String> map = new HashMap<>();
-                map.put("id",organization.getAreaId());
-                if(null!=bg){
-                    map.put("name",bg.getName());
+            if (null != organization && StringUtils.isNotEmpty(organization.getAreaId())) {
+                BasicConfig bg = basicConfigService.getOneBasicConfigById(organization.getAreaId());
+                Map<String, String> map = new HashMap<>();
+                map.put("id", organization.getAreaId());
+                if (null != bg) {
+                    map.put("name", bg.getName());
                 }
                 organization.setArea(map);
             }
@@ -623,8 +621,7 @@ public class UsersController extends BaseController {
         diagnoseConfigQuery.setHospitalId(hospitalId);
         //医院配置
         List<ModularFunctionConfigModel> configModels = modularFunctionConfigServcie.queryDiagnoseConfigs(diagnoseConfigQuery);
-        if (CollectionUtils.isNotEmpty(configModels))
-        {
+        if (CollectionUtils.isNotEmpty(configModels)) {
             ModularFunctionConfigModel configModel = configModels.get(0);
             map.put("modularFunction", configModel.getConfigs());
         }
@@ -854,7 +851,8 @@ public class UsersController extends BaseController {
                          @RequestParam(value = "enable", required = false) Integer enable,
                          @RequestParam(value = "remarks", required = false) String remarks,
                          @RequestParam(value = "roleIds") String roleIds,
-                         @RequestParam(value = "zhiCId") Integer zhiCId) {
+                         @RequestParam(value = "zhiCId") Integer zhiCId,
+                         @RequestParam(value = "defaultPage", required = false) String defaultPage) {
 
 
         //获取登录用户
@@ -935,6 +933,7 @@ public class UsersController extends BaseController {
             users.setModified(new Date());
             users.setCreated(new Date());
             users.setZhiChen(ZhiChenEnums.getById(zhiCId));
+            user.setDefaultPage(defaultPage);
 //            users.setLastLoginTime(new Date());
 //            users.setPwd(LoginUtil.md5(NumberUtils.getRandomString(6)));
 
@@ -943,7 +942,7 @@ public class UsersController extends BaseController {
             loginContext.setErrormsg("系统错误");
             //关联登录中心ID
             if (StringUtils.isNotBlank(phone) || StringUtils.isNotBlank(account)) {
-               /**/
+                /**/
                 String pwd = null;
                 if (StringUtils.isNotBlank(password)) {
                     pwd = MD5Utils.md5(password).toUpperCase();
@@ -1003,7 +1002,8 @@ public class UsersController extends BaseController {
                             @RequestParam(value = "roleIds", required = false) String roleIds,
                             @RequestParam(value = "orgId", required = false) Integer orgId,
                             @RequestParam(value = "deptId", required = false) Integer deptId,
-                            @RequestParam(value = "zhiCId") Integer zhiCId) {
+                            @RequestParam(value = "zhiCId") Integer zhiCId,
+                            @RequestParam(value = "defaultPage") String defaultPage) {
 
         if (StringUtils.isBlank(phone) && StringUtils.isBlank(account)) {
             ResultUtils.buildParameterErrorResultAndWrite(response, "帐号和手机号不能同时为空");
@@ -1109,12 +1109,13 @@ public class UsersController extends BaseController {
             users.setDeptId(deptId);
             users.setOrgId(orgId);
             users.setZhiChenId(zhiCId);
+            users.setDefaultPage(defaultPage);
 //            users.setPwd(LoginUtil.md5(NumberUtils.getRandomString(6)));
             usersService.updateUsers(users);
 
 
             operateLogFacade.addModifyOptLog(user.getId(),
-                    user.getOrgId(), berfore,users, OptActionEnums.UPDATE.getId(), "修改用户");
+                    user.getOrgId(), berfore, users, OptActionEnums.UPDATE.getId(), "修改用户");
 
             //如有角色,则对用户角色中间表先删除后新增
             if (StringUtils.isNotBlank(roleIds)) {
@@ -1318,16 +1319,15 @@ public class UsersController extends BaseController {
         if (StringUtils.isNotEmpty(token)) {
             String hospitalId = autoMatchFacade.getHospitalId(getUserId(request));
             iSessionProvider.removeSession(token);
-            Map<String,String> param = new HashMap<>();
+            Map<String, String> param = new HashMap<>();
             param.put("token", token);
-            if(StringUtils.isNotEmpty(hospitalId)){
+            if (StringUtils.isNotEmpty(hospitalId)) {
                 operateLogFacade.addAddOptLog(getUserId(request),
                         Integer.parseInt(hospitalId), param, OptActionEnums.ADD.getId(), "用户登出");
             }
-            if ("2100001635".equals(hospitalId))
-            {
+            if ("2100001635".equals(hospitalId)) {
                 System.out.println("威海医生登出,登出虚拟叫号!");
-                virtualCallService.callLoginOut(request,getUserId(request));
+                virtualCallService.callLoginOut(request, getUserId(request));
             }
         }
         Map<String, Object> result = new HashMap<>();
@@ -1359,7 +1359,6 @@ public class UsersController extends BaseController {
     }
 
 
-
     @RequestMapping(value = "/getSysDoctorInfo/{userId}", method = RequestMethod.GET)
     @ResponseBody
     public BaseResponse getSysDoctorInfo(@PathVariable("userId") String userId) {
@@ -1375,7 +1374,7 @@ public class UsersController extends BaseController {
             }
             if (null != departments) {
                 result.put("zhiCheng", ZhiChenEnums.getById(users.getZhiChenId()));
-                result.put("deptPhone",users.getPhone());
+                result.put("deptPhone", users.getPhone());
                 result.put("deptName", departments.getName());
             }
             objectResponse.setData(result);
-- 
1.8.3.1