修改登录

db/base.sql

@@ -346,3 +346,22 @@ CREATE TABLE `mortals_xhx_area` (
   `createUserName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '创建用户名称',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='区域信息';
+
+
+CREATE TABLE `mortals_xhx_dept` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键ID，主键，自增长',
+  `parentId` bigint(20) DEFAULT NULL COMMENT '父id',
+  `ancestors` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '祖级列表',
+  `deptName` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '部门名称',
+  `deptStatus` tinyint(2) NOT NULL DEFAULT '1' COMMENT '部门状态(0.停用,1.启用)',
+  `orderNum` int(4) NOT NULL DEFAULT '0' COMMENT '顺序',
+  `remark` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '备注',
+  `createUserId` bigint(20) NOT NULL COMMENT '创建用户',
+  `createTime` datetime NOT NULL COMMENT '创建时间',
+  `updateUserId` bigint(20) DEFAULT NULL COMMENT '更新用户',
+  `updateTime` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`) USING BTREE,
+  KEY `deptStatus` (`deptStatus`) USING BTREE,
+  KEY `orderNum` (`orderNum`) USING BTREE,
+  KEY `createUserId` (`createUserId`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8 COMMENT='部门信息';

refined-manager-ui/admin/.env

@@ -2,7 +2,7 @@
 NODE_ENV = development
 
 # 地址
-VUE_APP_BASE_API =http://plm.testnew.com:8082/m
+VUE_APP_BASE_API =/basics_api
 
 # websocket地址
 VUE_APP_WEBSOCKET_API =127.0.0.1:18222/m
@@ -10,5 +10,5 @@ VUE_APP_WEBSOCKET_API =127.0.0.1:18222/m
 # 门户登录地址
 VUE_APP_PORTAL_URL = /portal_home
 
-VUE_APP_PORTAL_PORT = 17300
+VUE_APP_PORTAL_PORT = 21080
 

refined-manager-ui/admin/src/router.js

@@ -41,6 +41,19 @@ const router = new Router({
 
                 //模块配置
                 ...restBuilder('dept', 'dept'),
+                ...restBuilder('realtime/dataflow', 'realtime/dataflow'),//人员发现
+                ...restBuilder('appointment/records', 'appointment/records'), //预约签到记录表
+                ...restBuilder('care/records', 'care/records'),//预约关怀记录表
+                ...restBuilder('appointment/config', 'appointment/config'), //预约签到配置
+                ...restBuilder('appointment/config/times', 'appointment/config/times'), //预约自动签到配置时间段
+                ...restBuilder('care/config', 'care/config'), //主动关怀配置
+                ...restBuilder('care/config/times', 'care/config/times'), //主动关怀时间段
+                ...restBuilder('appointment/constraint', 'appointment/constraint'), //预约自动签到服务约束
+                ...restBuilder('care/constraint', 'care/constraint'), //主动关怀服务约束
+                ...restBuilder('care/constraint/track', 'care/constraint/track'), //主动关怀服务追踪
+                ...restBuilder('care/constraint/track', 'care/constraint/track'), //主动关怀服务追踪
+                ...restBuilder('person', 'person'), //注册人员
+                ...restBuilder('device', 'device'), //设备业务
 
 
                 //以下为基础路由配置

refined-manager-ui/admin/vue.config.js

@@ -17,7 +17,7 @@ module.exports = {
 		hot: true,//自动保存
 		proxy: {
 			'/refined': {
-				target: 'http://127.0.0.1:17400',
+				target: 'http://127.0.0.1:21080',
 				changeOrigin: true,
 				secure: false,
 				cookieDomainRewrite: 'localhost',

refined-manager-ui/package-lock.json

-{
-  "name": "study-manager-ui",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "dependencies": {
-        "jwt-decode": "^3.1.2"
-      }
-    },
-    "node_modules/jwt-decode": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmmirror.com/jwt-decode/-/jwt-decode-3.1.2.tgz",
-      "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="
-    }
-  },
-  "dependencies": {
-    "jwt-decode": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmmirror.com/jwt-decode/-/jwt-decode-3.1.2.tgz",
-      "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="
-    }
-  }
-}

refined-manager-ui/package.json

-{
-  "dependencies": {
-    "jwt-decode": "^3.1.2"
-  }
-}

refined-manager-ui/yarn.lock

-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"jwt-decode@^3.1.2":
-  "integrity" "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="
-  "resolved" "https://registry.npmmirror.com/jwt-decode/-/jwt-decode-3.1.2.tgz"
-  "version" "3.1.2"

refined-manager/pom.xml

@@ -22,6 +22,7 @@
 			</activation>
 			<properties>
 				<profiles.active>develop</profiles.active>
+				<profiles.platform.type>standalone</profiles.platform.type>
 				<profiles.server.port>21080</profiles.server.port>
 				<profiles.server.path>/refined</profiles.server.path>
 				<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
@@ -38,6 +39,7 @@
 			<id>test</id>
 			<properties>
 				<profiles.active>test</profiles.active>
+				<profiles.platform.type>cloud</profiles.platform.type>
 				<profiles.server.port>21080</profiles.server.port>
 				<profiles.server.path>/refined</profiles.server.path>
 				<profiles.publish.path>/home/publish</profiles.publish.path>

refined-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -27,6 +27,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -43,6 +44,7 @@ import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
 @RestController
 @Slf4j
 @RequestMapping("login")
+@ConditionalOnExpression("'${platform.type:null}'=='cloud'")
 public class LoginController extends BaseCRUDJsonBodyMappingController<UserService, UserEntity, Long> {
 
     @Autowired