From 7275af28b811f53d5ca9ba449c61b3c8642b8140 Mon Sep 17 00:00:00 2001 From: xuwen Date: Tue, 29 Mar 2022 17:01:03 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8B=A5=E5=B9=B2Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dh/controller/rest/AuthController.java | 18 ++++++++++++++---- .../dh/controller/rest/AuthRoleController.java | 1 + .../dh/controller/rest/PritraceController.java | 15 +-------------- .../com/cetc32/dh/entity/BaseAdminUser.java | 14 ++++++++++++-- .../com/cetc32/dh/mybatis/PritraceMapper.java | 8 +++++--- .../com/cetc32/dh/mybatis/pritraceMapper.java | 15 --------------- src/main/resources/application-xwybjb.yml | 8 ++++---- .../resources/mapper/BaseAdminUserMapper.xml | 4 ++-- src/main/resources/mapper/pritraceMapper.xml | 2 +- 9 files changed, 40 insertions(+), 45 deletions(-) delete mode 100644 src/main/java/com/cetc32/dh/mybatis/pritraceMapper.java diff --git a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java index a3c393d..bd7954f 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java @@ -17,14 +17,13 @@ import com.cetc32.dh.entity.AreaCommon; import com.cetc32.dh.entity.BaseAdminUser; import com.cetc32.dh.entity.Department; import com.cetc32.dh.listener.ContainerStartedListener; -import com.cetc32.dh.service.AdminRoleService; -import com.cetc32.dh.service.AdminUserService; -import com.cetc32.dh.service.AreaCommonService; -import com.cetc32.dh.service.DepartmentService; +import com.cetc32.dh.service.*; import com.cetc32.webutil.common.annotations.LoginRequired; import com.cetc32.webutil.common.annotations.LoginSkipped; +import com.cetc32.webutil.common.bean.LoginUser; import com.cetc32.webutil.common.util.CookieUtil; import com.cetc32.webutil.common.util.JWTUtil; +import com.cetc32.webutil.common.util.SecurityUserUtil; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -83,6 +82,8 @@ public class AuthController { @Autowired DepartmentService departmentService; + @Autowired + PritraceService pritraceService; /** * web用户登陆 * @Description 用户登陆接口，登陆过程中需要更新用户的登陆时间，loginFailed次数等 @@ -720,4 +721,13 @@ public class AuthController { public ResponseData unauthorized(@PathVariable String message) throws UnsupportedEncodingException { return ResponseData.error(message); } + @GetMapping("/pri/user") + public ResponseData pritraceCurUser(@org.springframework.lang.Nullable Integer deviceType){ + LoginUser lu= SecurityUserUtil.getUser(); + if(null == lu || org.apache.commons.lang.StringUtils.isBlank(lu.getUsername())) + return ResponseData.error(); + List pritraces = pritraceService.selectByUser(lu.getUsername()); + Listusers =userService.selectUserByDepartmentId(pritraces); + return ResponseData.success(users); + } } diff --git a/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java index 9428653..ef4e120 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java @@ -49,6 +49,7 @@ public class AuthRoleController { } @ApiOperation(value = "获取角色列表(不分页)", notes = "") + @GetMapping(value = "/list") @PostMapping(value = "/list") // public ResponseData getRolesList(){ // return ResponseData.success(adminRoleService.getRoleList()); diff --git a/src/main/java/com/cetc32/dh/controller/rest/PritraceController.java b/src/main/java/com/cetc32/dh/controller/rest/PritraceController.java index c3a1477..dded59f 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/PritraceController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/PritraceController.java @@ -21,14 +21,9 @@ import java.util.Map; @RestController @RequestMapping("/rest/pri/trace") public class PritraceController { - @Autowired - PritraceMapper pritraceMapper; @Autowired PritraceService pritraceService; - @Autowired - AdminUserService adminUserService; - @GetMapping("/user") public ResponseData findByUser(String user){ if(StringUtils.isBlank(user)) @@ -36,15 +31,7 @@ public class PritraceController { List pritraces = pritraceService.selectByUser(user); return ResponseData.success(pritraces); } - @GetMapping("/curuser") - public ResponseData pritraceCurUser(@Nullable Integer deviceType){ - LoginUser lu=SecurityUserUtil.getUser(); - if(null == lu || StringUtils.isBlank(lu.getUsername())) - return ResponseData.error(); - List pritraces = pritraceService.selectByUser(lu.getUsername()); - Listusers =adminUserService.selectUserByDepartmentId(pritraces); - return ResponseData.success(users); - } + @PostMapping("/update") public ResponseData insert(@RequestBody Map map ){ String user =(String)map.get("user"); diff --git a/src/main/java/com/cetc32/dh/entity/BaseAdminUser.java b/src/main/java/com/cetc32/dh/entity/BaseAdminUser.java index 9db4a37..5d8576e 100644 --- a/src/main/java/com/cetc32/dh/entity/BaseAdminUser.java +++ b/src/main/java/com/cetc32/dh/entity/BaseAdminUser.java @@ -548,14 +548,24 @@ public class BaseAdminUser extends NumberS { list=null; } - if(list==null || list.size()==0) + if(list==null || list.size()<=0) { this.department=null; } + else{ + Integer integer =list.get(0); + for(Integer t :list){ + if(t> integer) + integer=t; + } + this.department=integer.toString(); + ///2022.0329调整，同步调整数据字段为Integer + /* this.department =list.get(0).toString(); + } else { list=SortAndRemoveRepeat(list,Integer.class); - this.department=","+StringUtils.join(list,",")+","; + this.department=","+StringUtils.join(list,",")+",";*/ } } diff --git a/src/main/java/com/cetc32/dh/mybatis/PritraceMapper.java b/src/main/java/com/cetc32/dh/mybatis/PritraceMapper.java index dfc62c4..eea24a8 100644 --- a/src/main/java/com/cetc32/dh/mybatis/PritraceMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/PritraceMapper.java @@ -1,13 +1,15 @@ package com.cetc32.dh.mybatis; -import com.cetc32.dh.entity.Pritrace; -import org.apache.ibatis.annotations.Param; +import com.cetc32.dh.entity.PriTrace; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository public interface PritraceMapper { - int insertOnePritrace(Pritrace pritrace); + int insertOnePritrace(PriTrace pritrace); int deleteByUser(String user); + List selectByUser(String user); } diff --git a/src/main/java/com/cetc32/dh/mybatis/pritraceMapper.java b/src/main/java/com/cetc32/dh/mybatis/pritraceMapper.java deleted file mode 100644 index eea24a8..0000000 --- a/src/main/java/com/cetc32/dh/mybatis/pritraceMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.cetc32.dh.mybatis; - -import com.cetc32.dh.entity.PriTrace; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface PritraceMapper { - int insertOnePritrace(PriTrace pritrace); - int deleteByUser(String user); - List selectByUser(String user); -} - - diff --git a/src/main/resources/application-xwybjb.yml b/src/main/resources/application-xwybjb.yml index 3a51722..7e7ddf3 100644 --- a/src/main/resources/application-xwybjb.yml +++ b/src/main/resources/application-xwybjb.yml @@ -7,11 +7,11 @@ spring: application: name: dhManager datasource: - #url: jdbc:postgresql://localhost:5432/dhmanage - url: jdbc:postgresql://192.168.1.60:5432/dhmanage + url: jdbc:postgresql://180.184.65.203:5432/dhmanage + #url: jdbc:postgresql://192.168.1.60:5432/dhmanage username: postgres - password: 123456 - #password: Zdk@824. + #password: 123456 + password: Zdk@824. driver-class-name: org.postgresql.Driver # datasource: diff --git a/src/main/resources/mapper/BaseAdminUserMapper.xml b/src/main/resources/mapper/BaseAdminUserMapper.xml index 65286da..24f6b9a 100644 --- a/src/main/resources/mapper/BaseAdminUserMapper.xml +++ b/src/main/resources/mapper/BaseAdminUserMapper.xml @@ -373,7 +373,7 @@ SELECT zq_area from area_zq where zq_id in - #{id} + #{id } diff --git a/src/main/resources/mapper/pritraceMapper.xml b/src/main/resources/mapper/pritraceMapper.xml index ea1d8f7..f7107ef 100644 --- a/src/main/resources/mapper/pritraceMapper.xml +++ b/src/main/resources/mapper/pritraceMapper.xml @@ -1,7 +1,7 @@ - + -- Gitee From fc2d09534782c52af2499c6e6b362c691ff0d81f Mon Sep 17 00:00:00 2001 From: xuwen Date: Tue, 29 Mar 2022 17:09:22 +0800 Subject: [PATCH 02/19] xmlcomment --- src/main/resources/mapper/pritraceMapper.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/resources/mapper/pritraceMapper.xml b/src/main/resources/mapper/pritraceMapper.xml index f7107ef..0423a48 100644 --- a/src/main/resources/mapper/pritraceMapper.xml +++ b/src/main/resources/mapper/pritraceMapper.xml @@ -5,7 +5,7 @@ - + - select departid - from pritrace - where username = #{user} - - - insert into pritrace (username,departid) values(#{user},#{departId}) + + + + + + + + insert into pritrace + + + + + username, + + + + departid, + + + + + + + + #{user,jdbcType=VARCHAR}, + + + + #{departId,jdbcType=INTEGER}, + + + + - delete from pritrace WHERE username =#{user} - + delete from pritrace WHERE username =#{user} + -- Gitee From 4cc5e6240f5ecf176794972e01de7b8f181b4b6e Mon Sep 17 00:00:00 2001 From: xuwen Date: Tue, 29 Mar 2022 17:12:45 +0800 Subject: [PATCH 04/19] xmlcomment --- src/main/resources/mapper/pritraceMapper.xml | 47 +++++--------------- 1 file changed, 11 insertions(+), 36 deletions(-) diff --git a/src/main/resources/mapper/pritraceMapper.xml b/src/main/resources/mapper/pritraceMapper.xml index b599df7..0423a48 100644 --- a/src/main/resources/mapper/pritraceMapper.xml +++ b/src/main/resources/mapper/pritraceMapper.xml @@ -1,48 +1,23 @@ - + + + + + insert into pritrace (username,departid) values(#{user},#{departId}) - - - - - - - - insert into pritrace - - - - - username, - - - - departid, - - - - - - - - #{user,jdbcType=VARCHAR}, - - - - #{departId,jdbcType=INTEGER}, - - - - - delete from pritrace WHERE username =#{user} - + delete from pritrace WHERE username =#{user} + -- Gitee From 70d1aa7a784325742ffe30d552cd45d3d38a8ba6 Mon Sep 17 00:00:00 2001 From: xuwen Date: Tue, 29 Mar 2022 17:15:37 +0800 Subject: [PATCH 05/19] xmlcomment --- src/main/resources/mapper/pritraceMapper.xml | 47 ++++++++++++++++---- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/src/main/resources/mapper/pritraceMapper.xml b/src/main/resources/mapper/pritraceMapper.xml index 0423a48..3ba7473 100644 --- a/src/main/resources/mapper/pritraceMapper.xml +++ b/src/main/resources/mapper/pritraceMapper.xml @@ -5,6 +5,45 @@ + + + + + + + + + + insert into pritrace + + + + + username, + + + + departid, + + + + + + + + #{user,jdbcType=VARCHAR}, + + + + #{departId,jdbcType=INTEGER}, + + + + + + + delete from pritrace WHERE username =#{user} + - - insert into pritrace (username,departid) values(#{user},#{departId}) - - - - delete from pritrace WHERE username =#{user} - - -- Gitee From 672d0afa0c63df5a3e72a63520803730c007879d Mon Sep 17 00:00:00 2001 From: xuwen Date: Tue, 29 Mar 2022 17:18:12 +0800 Subject: [PATCH 06/19] xmlcomment --- src/main/resources/mapper/PritraceMapper.xml | 48 -------------------- 1 file changed, 48 deletions(-) delete mode 100644 src/main/resources/mapper/PritraceMapper.xml diff --git a/src/main/resources/mapper/PritraceMapper.xml b/src/main/resources/mapper/PritraceMapper.xml deleted file mode 100644 index b599df7..0000000 --- a/src/main/resources/mapper/PritraceMapper.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - insert into pritrace - - - - - username, - - - - departid, - - - - - - - - #{user,jdbcType=VARCHAR}, - - - - #{departId,jdbcType=INTEGER}, - - - - - - - delete from pritrace WHERE username =#{user} - - - -- Gitee From 0734055adb0d55a4dfe141fed89a96452bc39417 Mon Sep 17 00:00:00 2001 From: xuwen Date: Tue, 29 Mar 2022 17:19:22 +0800 Subject: [PATCH 07/19] xmlcomment --- src/main/resources/mapper/pritraceMapper.xml | 54 -------------------- 1 file changed, 54 deletions(-) delete mode 100644 src/main/resources/mapper/pritraceMapper.xml diff --git a/src/main/resources/mapper/pritraceMapper.xml b/src/main/resources/mapper/pritraceMapper.xml deleted file mode 100644 index 3ba7473..0000000 --- a/src/main/resources/mapper/pritraceMapper.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - insert into pritrace - - - - - username, - - - - departid, - - - - - - - - #{user,jdbcType=VARCHAR}, - - - - #{departId,jdbcType=INTEGER}, - - - - - - - delete from pritrace WHERE username =#{user} - - - - - -- Gitee From f400f7d2874371afa33e2e88d26a79fc446853c2 Mon Sep 17 00:00:00 2001 From: xuwen Date: Tue, 29 Mar 2022 17:20:45 +0800 Subject: [PATCH 08/19] xmlcomment --- src/main/resources/mapper/PriTraceMapper.xml | 23 ++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/main/resources/mapper/PriTraceMapper.xml diff --git a/src/main/resources/mapper/PriTraceMapper.xml b/src/main/resources/mapper/PriTraceMapper.xml new file mode 100644 index 0000000..0423a48 --- /dev/null +++ b/src/main/resources/mapper/PriTraceMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + insert into pritrace (username,departid) values(#{user},#{departId}) + + + + delete from pritrace WHERE username =#{user} + + + -- Gitee From b467d205e85f01dbef6e856d5ddb97436ecbb8ef Mon Sep 17 00:00:00 2001 From: xuwen Date: Wed, 30 Mar 2022 13:52:06 +0800 Subject: [PATCH 09/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8B=A5=E5=B9=B2Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dh/controller/rest/AuthController.java | 2 +- .../controller/rest/UserAuditController.java | 2 +- .../com/cetc32/dh/entity/BaseAdminUser.java | 19 +++++++++---------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java index bd7954f..873de18 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java @@ -152,7 +152,7 @@ public class AuthController { String jwtToken = JWTUtil.createToken(username, currentTimeMillis,tokenAge); List zqPoints = null;//userService.getZQPoints(user.getAreaCodeList()); LoginResult data = new LoginResult(jwtToken, - user.getDepartment(), + user.getDepartment().toString(), username, user.getId(), user.getRoleId(), diff --git a/src/main/java/com/cetc32/dh/controller/rest/UserAuditController.java b/src/main/java/com/cetc32/dh/controller/rest/UserAuditController.java index 3d18906..e1122da 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/UserAuditController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/UserAuditController.java @@ -174,7 +174,7 @@ public class UserAuditController { } continue; } - String[] departments = baseAdminUser.getDepartment().split(","); + String[] departments = baseAdminUser.getDepartment().toString().split(","); for (String department : departments) { try{ departid_int=Integer.parseInt(department); diff --git a/src/main/java/com/cetc32/dh/entity/BaseAdminUser.java b/src/main/java/com/cetc32/dh/entity/BaseAdminUser.java index 5d8576e..ad709f4 100644 --- a/src/main/java/com/cetc32/dh/entity/BaseAdminUser.java +++ b/src/main/java/com/cetc32/dh/entity/BaseAdminUser.java @@ -87,7 +87,7 @@ public class BaseAdminUser extends NumberS { * 部门 */ @Column(name = "department") - private String department; + private Integer department; /** * 密级 @@ -498,12 +498,16 @@ public class BaseAdminUser extends NumberS { } } - public String getDepartment() { + public Integer getDepartment() { return department; } public List getDepartmentList() { - return str2intList(department); + if(null == department) + return null; + ArrayLista =new ArrayList<>(); + a.add(department); + return a; } public void setDepartment(Object department) { if(department==null) @@ -525,12 +529,7 @@ public class BaseAdminUser extends NumberS { } else { - String db_str=(String)department; - if(db_str.startsWith(",") && db_str.endsWith(",")) - { - this.department=db_str; - return; - } + list.addAll(str2intList((String) department)); } } @@ -558,7 +557,7 @@ public class BaseAdminUser extends NumberS { if(t> integer) integer=t; } - this.department=integer.toString(); + this.department=integer; ///2022.0329调整，同步调整数据字段为Integer /* this.department =list.get(0).toString(); } -- Gitee From bddb3b387db5a10e373dec68bac7b7ed76ea54e9 Mon Sep 17 00:00:00 2001 From: xuwen Date: Thu, 31 Mar 2022 18:51:57 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=90=E7=A7=8D?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cetc32/dh/listener/ContainerStartedListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cetc32/dh/listener/ContainerStartedListener.java b/src/main/java/com/cetc32/dh/listener/ContainerStartedListener.java index 95ee108..1225b0c 100644 --- a/src/main/java/com/cetc32/dh/listener/ContainerStartedListener.java +++ b/src/main/java/com/cetc32/dh/listener/ContainerStartedListener.java @@ -30,7 +30,7 @@ public class ContainerStartedListener implements ApplicationRunner { private static List areas; public static List getAreas() { - if(areaCommonService.countAll()!= areas.size()){ + if(areas==null || areaCommonService.countAll()!= areas.size()){ areas =areaCommonService.selectAll(); } return areas; -- Gitee From 9168bafeb060ae3abcb9054adba5404d980a428c Mon Sep 17 00:00:00 2001 From: xuwen Date: Sat, 2 Apr 2022 19:15:28 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9F=BA=E4=BA=8Edevic?= =?UTF-8?q?eType=E7=AD=9B=E9=80=89=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dh/controller/rest/AreaCommonController.java | 4 ++-- .../com/cetc32/dh/controller/rest/AuthController.java | 10 ++++++++++ src/main/resources/application-xwybjb.yml | 2 +- src/main/resources/mapper/DepartmentMapper.xml | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/AreaCommonController.java b/src/main/java/com/cetc32/dh/controller/rest/AreaCommonController.java index 3434573..45362f6 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/AreaCommonController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/AreaCommonController.java @@ -52,10 +52,10 @@ public class AreaCommonController { @LoginSkipped public ResponseResult areaCommonTree(String id) { if (id == null) { - id = "000000"; + id = startCode; } // List areaCommonDTO = areaCommonService.getAreaTreeList(id); - return ResponseResult.success(areaCommonService.getAreaTreeList(id)); + return ResponseResult.success(areaCommonService.getAreaTreeList(startCode)); } @ApiOperation(value = "根据ID查询区域范围") diff --git a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java index 873de18..98b89cc 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java @@ -40,6 +40,7 @@ import java.io.UnsupportedEncodingException; import java.util.*; import java.util.List; import java.util.stream.Collectors; +import java.util.stream.Stream; import com.cetc32.dh.common.utils.DigestUtils; @@ -728,6 +729,15 @@ public class AuthController { return ResponseData.error(); List pritraces = pritraceService.selectByUser(lu.getUsername()); Listusers =userService.selectUserByDepartmentId(pritraces); + if(deviceType== null || deviceType<1 || deviceType>2) { + return ResponseData.success(users); + }else if(1 == deviceType){ + Stream sUsers= users.stream().filter((user)->!user.getRoleIdList().contains(4)); + users =sUsers.collect(Collectors.toList()); + }else{ + Stream sUsers= users.stream().filter((user)->user.getRoleIdList().contains(4)); + users =sUsers.collect(Collectors.toList()); + } return ResponseData.success(users); } } diff --git a/src/main/resources/application-xwybjb.yml b/src/main/resources/application-xwybjb.yml index 7e7ddf3..58e20a7 100644 --- a/src/main/resources/application-xwybjb.yml +++ b/src/main/resources/application-xwybjb.yml @@ -59,7 +59,7 @@ rootPath: /root/daohang/data myPath: ${rootPath}myPath writePath: ${rootPath}/product eip: http://localhost:8080/ -startCode: 000000 +startCode: 100000 #verifyUrl: ${sso.authcenter}/rest/auth/verify?token= #passportUrl: ${sso.authcenter}/?ReturnUrl= #defaultLoginRequiredEnable: false diff --git a/src/main/resources/mapper/DepartmentMapper.xml b/src/main/resources/mapper/DepartmentMapper.xml index 1116504..1a53d92 100644 --- a/src/main/resources/mapper/DepartmentMapper.xml +++ b/src/main/resources/mapper/DepartmentMapper.xml @@ -147,7 +147,7 @@ select * from department + order by organizationid asc limit #{results} OFFSET #{offset} @@ -152,4 +153,10 @@ where department.id not in (select organizationid from department ); + diff --git a/src/main/resources/static/css/dmaku.css b/src/main/resources/static/css/dmaku.css index 96251cd..7b688db 100644 --- a/src/main/resources/static/css/dmaku.css +++ b/src/main/resources/static/css/dmaku.css @@ -63,7 +63,7 @@ a:active, a:focus{outline:none} .zhuce_body .logo{ width:114px; height:54px; margin:53px 0 0 65px;} .zhuce_body .zhuce_kong{ position:absolute; top:50%; left:50%; width:316px; height:408px; margin-left:-158px; margin-top:-239px;} .zhuce_body .zhuce_kong .zc{width:316px; height:408px;} -.zhuce_body .zhuce_kong .zc .bj_bai{ float:left; width:314px; height:428px; padding-left:50px; background:#FFF;} +.zhuce_body .zhuce_kong .zc .bj_bai{ float:left; width:314px; height:520px; padding-left:50px; background:#FFF;} .zhuce_body .zhuce_kong .zc .bj_bai h3{ font:16px/70px "微软雅黑", "黑体"; color:#333333; width:270px; text-align:center;} .zhuce_body .zhuce_kong .zc .bj_right{ float:left;width:185px; height:408px; padding-left:41px; background:#f8f8f8;} .zhuce_kong > p{font:16px/70px "微软雅黑", "黑体"; text-align:center; color:#fff;} diff --git a/src/main/resources/static/js/selectTree/selectTree.js b/src/main/resources/static/js/selectTree/selectTree.js index 64add78..6388c4d 100644 --- a/src/main/resources/static/js/selectTree/selectTree.js +++ b/src/main/resources/static/js/selectTree/selectTree.js @@ -16,6 +16,17 @@ var relationzNodes =[ {name:'我是子节点3',id:'8',pId:6}, {name:'我是子节点4',id:'9',pId:6}, ]; +var departNodes=[ + {name:'全选',id:'1',pId:0,open:true}, + {name:'我是子节点1',id:'2',pId:1}, + {name:'我是子节点2',id:'3',pId:1}, + {name:'我是子节点3',id:'4',pId:1}, + {name:'我是子节点4',id:'5',pId:1}, + {name:'我是父亲节点1',id:'6',pId:0,open:false}, + {name:'我是子节点2',id:'7',pId:6}, + {name:'我是子节点3',id:'8',pId:6}, + {name:'我是子节点4',id:'9',pId:6}, +]; // 在这里可以去异步获取值然后赋予 relationzNodes 代码省略 $(document).ready(function(){ $.ajax({ @@ -64,7 +75,7 @@ $(document).ready(function(){ $("#areacode").html(relationTypeId);//将选中的值放到select $('.pull-left1', '#relationBtn').text(v).attr('title', v);//将中文（要显示的内容）放到button中显示 if(v == ""){//如果没有选中任何值，显示默认内容 - $('.pull-left1', '#relationBtn').text('请选择').attr('title', '请选择'); + $('.pull-left1', '#relationBtn').text('请选择区域权限').attr('title', '请选择区域权限'); } } } @@ -77,26 +88,101 @@ $(document).ready(function(){ } }); + $.ajax({ + url: "/rest/department/options", + type: "post", + dataType: "json", + data:JSON.stringify({ + 'page':1, + 'results':10000000 + }), + contentType: "application/json;charset=UTF-8", + success: function (data) { + if(!!data.list){ + departNodes= data.list; + //初始化ztree + $.fn.zTree.init($("#relationTreeDepart"),{ + check: { + enable: true, + chkStyle: "radio", + radioType: "all" + }, + data: { + simpleData: { + enable: true, + idKey:"id", + pIdKey:"organizationid", + rootPId:0, + } + }, + key:{ + name:"name" + }, + callback: { + //选中以后执行的方法，此方法除了onCheck还有onClick等 此方法中用于定义自己的业务 + onCheck: function(e, treeId, treeNode) { + + var zTree = $.fn.zTree.getZTreeObj("relationTreeDepart"), + nodes = zTree.getCheckedNodes(true), + v = "",//button 标签显示的内容 + relationTypeId="";//用于存放上面隐藏select的值 + if(nodes != null){ + for(var i=0, l=nodes.length; i"+nodes[i].name+""; + } + } + } + if(v.length > 0) { + v = v.substring(0, v.length-1); + }; + $("#department").html(relationTypeId);//将选中的值放到select + $('.pull-left1', '#relationBtnDepart').text(v).attr('title', v);//将中文（要显示的内容）放到button中显示 + if(v == ""){//如果没有选中任何值，显示默认内容 + $('.pull-left1', '#relationBtnDepart').text('请选择区域权限').attr('title', '请选择区域权限'); + } + } + } + }, departNodes); + //如果是默认选中某值，调用内部的onCheck()方法，用于将值显示在页面 + $.fn.zTree.getZTreeObj("relationTreeDepart").setting.callback.onCheck(); + } + }, + error: function () { + + } + }); }) function findUser(){ + +} +function findUser0(){ var username = $("#username").val(); //alert() + let ret; $.ajax({ url: "/rest/auth/user/exist", type: "get", dataType: "json", + async:false, contentType: "application/json;charset=UTF-8", data: {username:username}, success: function (data) { if(data.data==false){ - alert("用户名已存在"); - } + ret= true; + }else + ret= false }, error: function () { - + ret= true; } }); + console.log(ret) + return ret } function registor(){ var username = $("#username").val(); @@ -105,6 +191,7 @@ function registor(){ var areacode = $("#areacode").val(); var passwordC = $("#passwordC").val(); var realname = $("#realname").val(); + var department = $("#department").val(); if(!!!username //|| !!!areacode || !!!security @@ -116,6 +203,10 @@ function registor(){ "为必填项"); return false; } + if(findUser0()==true){ + alert("用户名已存在！") + return false; + } if(password !== passwordC){ alert("两次密码不匹配！！！") return false @@ -139,7 +230,7 @@ function registor(){ type: "POST", dataType: "json", contentType: "application/json;charset=UTF-8", - data: JSON.stringify({username:username,password:password,security:security,areacode:areacode,realName:realname}), + data: JSON.stringify({username:username,password:password,security:security,areacode:areacode,realName:realname,department:department}), success: function (data) { if(data.code == "200"){ //window.location.href=$("#ReturnUrl").val()+"?token="+data.data.token; @@ -168,3 +259,18 @@ $(document).click(function(e){ $('#relationPanel').hide(); } }); +//点击按钮 显示或者关闭列表 +$('#relationBtnDepart').on('click', function(){ + if($('#relationPanelDepart').is(":visible")){ + $('#relationPanelDepart').hide(); + }else{ + $('#relationPanelDepart').show(); + } +}); +$(document).click(function(e){ + //点击空白其他区域隐藏展开的面板 + if( $(e.target).attr('id') != "relationPanelDepart" && $(e.target).parents('#relationPanelDepart').length <= 0 && + $(e.target).attr('id')!="relationBtnDepart" && $(e.target).parents('#relationBtnDepart').length <= 0 ){ + $('#relationPanelDepart').hide(); + } +}); diff --git a/src/main/resources/templates/register.html b/src/main/resources/templates/register.html index 104064e..6575518 100644 --- a/src/main/resources/templates/register.html +++ b/src/main/resources/templates/register.html @@ -27,6 +27,22 @@
+ +
+ + + + +
- -- Gitee From f68839f55cb97651489f3ebe79785d768f471465 Mon Sep 17 00:00:00 2001 From: xuwen Date: Sun, 24 Apr 2022 15:05:01 +0800 Subject: [PATCH 14/19] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/css/dmaku.css | 48 ++++++++++++++++----- src/main/resources/static/css/gm1.css | 7 +-- src/main/resources/templates/changepwd.html | 12 +++--- src/main/resources/templates/index.html | 2 +- src/main/resources/templates/register.html | 26 ++++++----- 5 files changed, 62 insertions(+), 33 deletions(-) diff --git a/src/main/resources/static/css/dmaku.css b/src/main/resources/static/css/dmaku.css index 7b688db..9c71d76 100644 --- a/src/main/resources/static/css/dmaku.css +++ b/src/main/resources/static/css/dmaku.css @@ -60,15 +60,16 @@ a:active, a:focus{outline:none} background-repeat: no-repeat; background-size: 100% auto;} .zhuce_body{ float:left; width:100%; height:auto;} -.zhuce_body .logo{ width:114px; height:54px; margin:53px 0 0 65px;} -.zhuce_body .zhuce_kong{ position:absolute; top:50%; left:50%; width:316px; height:408px; margin-left:-158px; margin-top:-239px;} -.zhuce_body .zhuce_kong .zc{width:316px; height:408px;} -.zhuce_body .zhuce_kong .zc .bj_bai{ float:left; width:314px; height:520px; padding-left:50px; background:#FFF;} -.zhuce_body .zhuce_kong .zc .bj_bai h3{ font:16px/70px "微软雅黑", "黑体"; color:#333333; width:270px; text-align:center;} -.zhuce_body .zhuce_kong .zc .bj_right{ float:left;width:185px; height:408px; padding-left:41px; background:#f8f8f8;} +.zhuce_body .logo{ width:100%; height:54px; margin:53px 0 0 65px;} +.zhuce_body .zhuce_kong{ position:absolute; top:0; left:0; right:0;bottom:0;width:516px; height:486px; margin: auto;} +.zhuce_body .zhuce_kong .zc{width:516px; height:408px;} +.zhuce_body .zhuce_kong .zc .bj_bai{ float:left; width:514px; height:485px; padding-left:40px; background: #ffffff;border-radius:8px;} +.zhuce_body .zhuce_kong .zc .bj_bai h3{ font:16px/70px "微软雅黑", "黑体"; color:#333333; width:470px; text-align:center;} +.zhuce_body .zhuce_kong .zc .bj_right{ float:left;width:385px; height:408px; padding-left:41px; background:#f8f8f8;} .zhuce_kong > p{font:16px/70px "微软雅黑", "黑体"; text-align:center; color:#fff;} -.zhuce_body .zhuce_kong .zc .bj_bai .kuang_txt{ width:236px; height:32px; border:1px solid #dddddd; line-height:32px; padding-left:32px; color:#b1a9a9; margin-bottom:10px; } -.zhuce_body .zhuce_kong .zc .bj_bai .btn_zhuce{ width:236px; height:33px; background:#37b5f9; font-size:14px; line-height:33px; text-align:center; border:0px; color:#fff; border-radius:3px; cursor:pointer;} +.zhuce_body .zhuce_kong .zc .bj_bai .kuang_txt{ width:436px; height:32px; border:1px solid #dddddd; line-height:32px; padding-left:32px; color:#b1a9a9; margin-bottom:10px; } +.zhuce_body .zhuce_kong .zc .bj_bai .btn_zhuce{ flow:right ;width:210px; height:33px; background:#37b5f9; font-size:14px; line-height:33px; text-align:center; border:0px; color:#fff; border-radius:3px; cursor:pointer;} +.zhuce_body .zhuce_kong .zc .bj_bai .btn_fanhui{flow:left ;width:210px; height:33px; background: #83d1a9; text-decoration:none;font-size:14px; line-height:33px; text-align:center; border:0px; color:#fff; border-radius:3px; cursor:pointer;margin-top:15px} .zhuce_body .zhuce_kong .zc .bj_bai .phone{background:url(../img/zc_06.jpg) no-repeat 10px 10px;} .zhuce_body .zhuce_kong .zc .bj_bai .email{background:url(../img/zc_lock.jpg) no-repeat 10px 10px;} @@ -77,8 +78,9 @@ a:active, a:focus{outline:none} .zhuce_body .zhuce_kong .zc .bj_bai .hui_kuang{ float:left; width:97px; height:31px; border:1px solid #dddddd;} .zhuce_body .zhuce_kong .zc .bj_bai .shuaxin{ float:left; margin:0px 0 0 150px; width:14px; height:14px;} -.zhuce_body .zhuce_kong .zc .bj_bai div{ float:left; width:100%; line-height:43px;} -.zhuce_body .zhuce_kong .zc .bj_bai div input{ float:left; margin-top:15px;} +.zhuce_body .zhuce_kong .zc .bj_bai div{ float:left; width:436px; line-height:43px;} +.zhuce_body .zhuce_kong .zc .bj_bai div input{ float:right; margin-top:15px;} +.zhuce_body .zhuce_kong .zc .bj_bai .bottom_btn a{ float:left; margin-top:15px;} .zhuce_body .zhuce_kong .zc .bj_bai div span{ padding-left:5px;} .zhuce_body .zhuce_kong .zc .bj_bai div .lan{ color:#19aaf8; padding-left:0px;} @@ -93,10 +95,34 @@ a:active, a:focus{outline:none} /*登录页面*/ .zhuce_body .login_kuang{ position:absolute; top:50%; left:50%; width:512px; height:325px; margin-left:-256px; margin-top:-162px;} .zhuce_body .login_kuang .zc{ width:512px; height:auto;} -.zhuce_body .login_kuang .zc .bj_bai{ float:left; width:261px; height:256px; padding-left:38px; background:#FFF;} +.zhuce_body .login_kuang .zc .bj_bai{ float:left; width:261px; height:256px; padding-left:38px; background:#FFF;border-radius:8px;} .zhuce_body .login_kuang .zc .bj_bai h3{ font:16px/70px "微软雅黑", "黑体"; color:#37b5f9; width:230px; text-align:left;} .zhuce_body .login_kuang .zc .bj_right{ float:left;width:173px; height:256px; padding-left:37px; background:#f8f8f8;} .zhuce_body .login_kuang .zc .bj_bai .kuang_txt{ width:220px; height:32px; border:1px solid #dddddd; background:#faffbd; line-height:32px; padding-left:4px; color:#b1a9a9; margin-bottom:10px; } .zhuce_body .login_kuang .zc .bj_bai a{ color:#37b5f9; float:right; margin-right:35px;} .zhuce_body .login_kuang .zc .bj_bai .btn_zhuce{ width:227px; height:33px; background:#37b5f9; font-size:14px; line-height:33px; text-align:center; border:0px; color:#fff; border-radius:3px; cursor:pointer;} .zhuce_body .login_kuang .zc .bj_bai .btn_zhuce:hover,.login_qita_kuang .zc .left .btn_zhuce:hover{ background:#0065d0;} + + +.zhuce_body .changwd{ position:absolute; top:0; left:0; right:0;bottom:0;width:516px; height:408px; margin: auto;} +.zhuce_body .changwd .zc{width:516px; height:408px;} +.zhuce_body .changwd .zc .bj_bai{ float:left; width:514px; height:340px; padding-left:40px; background:#FFF;border-radius:8px;} +.zhuce_body .changwd .zc .bj_bai h3{ font:16px/70px "微软雅黑", "黑体"; color:#333333; width:470px; text-align:center;} +.zhuce_body .changwd .zc .bj_right{ float:left;width:385px; height:408px; padding-left:41px; background:#f8f8f8;} +.zhuce_kong > p{font:16px/70px "微软雅黑", "黑体"; text-align:center; color:#fff;} +.zhuce_body .changwd .zc .bj_bai .kuang_txt{ width:436px; height:32px; border:1px solid #dddddd; line-height:32px; padding-left:32px; color:#b1a9a9; margin-bottom:10px; } +.zhuce_body .changwd .zc .bj_bai .btn_zhuce{ flow:right ;width:210px; height:33px; background:#37b5f9; font-size:14px; line-height:33px; text-align:center; border:0px; color:#fff; border-radius:3px; cursor:pointer;} +.zhuce_body .changwd .zc .bj_bai .btn_fanhui{flow:left ;width:210px; height:33px; background: #83d1a9; text-decoration:none;font-size:14px; line-height:33px; text-align:center; border:0px; color:#fff; border-radius:3px; cursor:pointer;margin-top:15px} + +.zhuce_body .changwd .zc .bj_bai .phone{background:url(../img/zc_06.jpg) no-repeat 10px 10px;} +.zhuce_body .changwd .zc .bj_bai .email{background:url(../img/zc_lock.jpg) no-repeat 10px 10px;} +.zhuce_body .changwd .zc .bj_bai .possword{background:url(../img/zc_16.jpg) no-repeat 10px 10px;} +.zhuce_body .changwd .zc .bj_bai .yanzm{background:url(../img/zc_19.jpg) no-repeat 10px 10px; } + +.zhuce_body .changwd .zc .bj_bai .hui_kuang{ float:left; width:97px; height:31px; border:1px solid #dddddd;} +.zhuce_body .changwd .zc .bj_bai .shuaxin{ float:left; margin:0px 0 0 150px; width:14px; height:14px;} +.zhuce_body .changwd .zc .bj_bai div{ float:left; width:436px; line-height:43px;} +.zhuce_body .changwd .zc .bj_bai div input{ float:right; margin-top:15px;} +.zhuce_body .changwd .zc .bj_bai div a{ float:left; margin-top:15px;} +.zhuce_body .changwd .zc .bj_bai div span{ padding-left:5px;} +.zhuce_body .changwd .zc .bj_bai div .lan{ color:#19aaf8; padding-left:0px;} diff --git a/src/main/resources/static/css/gm1.css b/src/main/resources/static/css/gm1.css index 35f9f92..315c774 100644 --- a/src/main/resources/static/css/gm1.css +++ b/src/main/resources/static/css/gm1.css @@ -86,8 +86,6 @@ header { text-align: center; color: #999999; } .top-3 #sign .si_cen { - color: #F4F4F4; - border-bottom: 1px solid #f4f4f4; width: 100%; line-height: 50px; position: relative; @@ -117,7 +115,6 @@ header { margin-left: 95px; margin-top: 20px; padding: 2px 3px; - border: 1px solid #F4F4F4; transition: all .5s; } .top-3 #sign .si_bom .bom_2 { position: absolute; @@ -226,7 +223,7 @@ header { width: 100%; height: 40px; line-height: 40px; - border-top: 1px solid #F4F4F4; } + } .top-3 #sign .si_out ul { margin: 10px 25px; } .top-3 #sign .si_out ul li { @@ -242,7 +239,7 @@ header { border-bottom: 1px solid red; color: red; } .top-3 #sign .si_out ul .f4 { - color: #F4F4F4; } + } .top-3 #sign .si_out .rig { float: right; } .top-3 #sign .si_out h5 { diff --git a/src/main/resources/templates/changepwd.html b/src/main/resources/templates/changepwd.html index 0d17a4b..30494e8 100644 --- a/src/main/resources/templates/changepwd.html +++ b/src/main/resources/templates/changepwd.html @@ -17,12 +17,12 @@
- -
+ +
-

密码修改

+

密码修改

@@ -30,11 +30,11 @@ -
- + diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index f5581c3..6872d78 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -51,7 +51,7 @@ -
+

用户登录

diff --git a/src/main/resources/templates/register.html b/src/main/resources/templates/register.html index 6575518..1f6dbdd 100644 --- a/src/main/resources/templates/register.html +++ b/src/main/resources/templates/register.html @@ -16,12 +16,12 @@
- +
-

欢迎注册

+

欢迎注册

@@ -29,7 +29,7 @@ -
+
- -
+
-- Gitee