修改文字

whepi-doc/creatYeWeiHui.sql

@@ -8,7 +8,7 @@ CREATE TABLE tp_user  (
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (user_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '用户ID临时表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '用户ID临时表';
 
 -- 在临时表插入user_id,之后直接使用插入的user_id
 insert into tp_user

whepi-doc/group.sql

@@ -17,7 +17,7 @@ create table jm_buy (
     INDEX user_id(user_id) USING BTREE
 )
 ENGINE = InnoDB
-DEFAULT CHARSET = utf8
+DEFAULT CHARSET = utf8mb4
 COMMENT = '居民团购表'
 ;
 
@@ -41,6 +41,6 @@ create table jm_tuangou (
     INDEX uptown_id(uptown_id) USING BTREE
 )
 ENGINE = InnoDB
-DEFAULT CHARSET = utf8
+DEFAULT CHARSET = utf8mb4
 COMMENT = '团购表'
 ;

whepi-doc/login.sql

@@ -15,7 +15,7 @@ create table sys_user
   update_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新日期',
   primary key ( user_id ),
   UNIQUE INDEX `login_name`(`login_name`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT = '用户资料';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT = '用户资料';
 
 -- insert into sys_user
 -- select ur.user_id,'账户','密码',ur.role_id as user_type,uo.nick_name,'Y',now(),now() from sys_uptown_home uh
@@ -40,7 +40,7 @@ create table sys_user_open
   create_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '建立时间',
   update_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新日期',
   primary key ( user_id, open_id )
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT = '用户open';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT = '用户open';
 
 -- ----------------------------
 -- Table structure for sys_user_role
@@ -56,7 +56,7 @@ CREATE TABLE sys_user_role  (
   user_update 	bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',
   time_update 	datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (ur_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '用户角色关系表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '用户角色关系表';
 
 -- ----------------------------
 -- Table structure for sys_owner
@@ -72,7 +72,7 @@ CREATE TABLE sys_owner  (
   user_update       bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (owner_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '业委会表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '业委会表';
 
 -- ----------------------------
 -- Table structure for sys_owner_linkman
@@ -88,7 +88,7 @@ CREATE TABLE sys_owner_linkman  (
   user_update       bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (owner_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '业委会联系人表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '业委会联系人表';
 
 -- ----------------------------
 -- Table structure for sys_uptown_home
@@ -106,7 +106,7 @@ CREATE TABLE sys_uptown_home  (
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (house_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '小区家庭表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '小区家庭表';
 
 -- ----------------------------
 -- Table structure for sys_area
@@ -121,7 +121,7 @@ CREATE TABLE sys_area  (
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (area_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '省市区表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '省市区表';
 
 -- ----------------------------
 -- Table structure for sys_area_street
@@ -134,7 +134,7 @@ CREATE TABLE sys_area_street  (
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (street_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '区街道表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '区街道表';
 
 -- ----------------------------
 -- Table structure for sys_area_com
@@ -147,7 +147,7 @@ CREATE TABLE sys_area_com  (
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (com_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '街道社区表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '街道社区表';
 
 -- ----------------------------
 -- Table structure for sys_uptown
@@ -164,7 +164,7 @@ CREATE TABLE sys_uptown  (
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (uptown_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '小区表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '小区表';
 
 DROP TABLE IF EXISTS sys_uptown_unit;
 CREATE TABLE sys_uptown_unit  (
@@ -176,7 +176,7 @@ CREATE TABLE sys_uptown_unit  (
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (unit_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '栋,单元信息表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '栋,单元信息表';
 
 DROP TABLE IF EXISTS sys_uptown_house;
 CREATE TABLE sys_uptown_house  (
@@ -187,4 +187,4 @@ CREATE TABLE sys_uptown_house  (
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (house_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '门牌信息表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '门牌信息表';

whepi-doc/mrsb.sql

@@ -19,7 +19,7 @@ CREATE TABLE ms_report  (
   user_update       bigint(20) NOT NULL DEFAULT 0                           COMMENT '修改人',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (report_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '每日上报表'
+) ENGINE = InnoDB default charset=utf8mb4 comment = '每日上报表'
 
 
 -- ----------------------------
@@ -53,4 +53,4 @@ CREATE TABLE ms_suspected  (
   user_update       bigint(20) NOT NULL DEFAULT 0                           COMMENT '修改人',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (suspected_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '家庭疑似表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '家庭疑似表';

whepi-doc/task.sql

@@ -22,7 +22,7 @@ create table qz_task (
     INDEX user_id(user_id) USING BTREE
 )
 ENGINE = InnoDB
-DEFAULT CHARSET = utf8
+DEFAULT CHARSET = utf8mb4
 COMMENT = '家庭求助表'
 ;
 
@@ -42,4 +42,4 @@ CREATE TABLE qz_task_reply (
     time_update       datetime(0)   NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
     PRIMARY KEY (reply_id) USING BTREE,
     INDEX task_id(task_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '家庭求助回复表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '家庭求助回复表';

whepi-doc/whepi.sql

@@ -28,6 +28,6 @@ create table tb_user
   primary key ( user_id )
 )
   ENGINE=InnoDB
-  DEFAULT CHARSET=utf8
+  DEFAULT CHARSET=utf8mb4
   COMMENT = '用户资料'
 ;

whepi-doc/xgfy.sql

@@ -17,7 +17,7 @@ CREATE TABLE ow_owner  (
   user_update       bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (owner_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '业委会';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '业委会';
 -- ----------------------------
 -- Table structure for re_health_sign
 -- ----------------------------
@@ -36,7 +36,7 @@ CREATE TABLE re_health_sign  (
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (sign_id) USING BTREE,
   INDEX resident_id(resident_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '健康签到表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '健康签到表';
 
 -- ----------------------------
 -- Table structure for re_help
@@ -55,7 +55,7 @@ CREATE TABLE re_help  (
   user_update       bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (help_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '家庭求助表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '家庭求助表';
 
 -- ----------------------------
 -- Table structure for re_help_reply
@@ -71,7 +71,7 @@ CREATE TABLE re_help_reply  (
   user_update       bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (reply_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '家庭求助回复表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '家庭求助回复表';
 
 -- ----------------------------
 -- Table structure for re_resident
@@ -95,7 +95,7 @@ CREATE TABLE re_resident  (
   user_update       bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (resident_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '居民表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '居民表';
 
 -- ----------------------------
 -- Table structure for sh_shop
@@ -119,7 +119,7 @@ CREATE TABLE sh_shop  (
   user_update       bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (shop_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '商店信息';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '商店信息';
 
 -- ----------------------------
 -- Table structure for sh_shop_mat
@@ -136,7 +136,7 @@ CREATE TABLE sh_shop_mat  (
   user_update       bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (mat_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '商店物资信息';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '商店物资信息';
 
 -- ----------------------------
 -- Table structure for sys_file
@@ -153,4 +153,4 @@ CREATE TABLE sys_file  (
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (file_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '附件上传表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '附件上传表';

whepi-web/src/main/java/com/bofeng/wx/controller/UserOpenController.java

@@ -64,10 +64,10 @@ public class UserOpenController {
                              @RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType) throws JsonProcessingException {
         List<UserRole> list = new ArrayList<>();
         if (userId == 0) {
-//            UserOpen userOpen = homeService.getUserOpen();
-//            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
-            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
+            UserOpen userOpen = homeService.getUserOpen();
+            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+//            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
+//            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
             userId = userOpen.getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\"" + userOpen.getUserId() + "\"");