diff --git a/src/main/java/com/cetc32/dh/beans/LoginResult.java b/src/main/java/com/cetc32/dh/beans/LoginResult.java index d85c79a0b4398d550366ef65d43cdd8d867a74ee..96e1300669a07b4fbd02816ebc8e7f8c1bf3b41a 100644 --- a/src/main/java/com/cetc32/dh/beans/LoginResult.java +++ b/src/main/java/com/cetc32/dh/beans/LoginResult.java @@ -148,7 +148,7 @@ public class LoginResult { this.realDepartment=realDepartment; this.userBD= userBD; this.userPhone=userPhone; - this.username=realName; + this.realName=realName; this.zqPoints = zqPoints; } private List str2intList(String str) diff --git a/src/main/java/com/cetc32/dh/beans/ResultUserInfo.java b/src/main/java/com/cetc32/dh/beans/ResultUserInfo.java index d2cfa7b056572bcbd8efd4d552a3a26200cf9781..0275e1f65f8164de163affb47ccc5a9841802b9d 100644 --- a/src/main/java/com/cetc32/dh/beans/ResultUserInfo.java +++ b/src/main/java/com/cetc32/dh/beans/ResultUserInfo.java @@ -177,7 +177,7 @@ public class ResultUserInfo extends NumberS { if(this.department ==null) { this.department = new ArrayList<>(); - return; + //return; } if(department instanceof String) { diff --git a/src/main/java/com/cetc32/dh/beans/ResultUserInfoDe.java b/src/main/java/com/cetc32/dh/beans/ResultUserInfoDe.java index dd6d2c24a77a208104ffd5ba9cb2c905116b5192..aa7ae1bd9cbe6695c65b7c74199dcdc3e346d496 100644 --- a/src/main/java/com/cetc32/dh/beans/ResultUserInfoDe.java +++ b/src/main/java/com/cetc32/dh/beans/ResultUserInfoDe.java @@ -1,5 +1,6 @@ package com.cetc32.dh.beans; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -26,7 +27,12 @@ public class ResultUserInfoDe extends ResultUserInfo { public void setDepartmentName(List departmentName) { this.departmentName = departmentName; } - + public void setDepartmentName(String dname) { + if(departmentName==null) + this.departmentName=new ArrayList<>(); + if(!departmentName.contains(dname)) + this.departmentName.add(dname); + } public List getRoleName() { return roleName; diff --git a/src/main/java/com/cetc32/dh/beans/UserInfo.java b/src/main/java/com/cetc32/dh/beans/UserInfo.java index 2f42f4b27cf007277c6ed147022d4cccd01d6c9f..1a0a92f9d094e1dda96272930a4be9cb4cb11d05 100644 --- a/src/main/java/com/cetc32/dh/beans/UserInfo.java +++ b/src/main/java/com/cetc32/dh/beans/UserInfo.java @@ -17,6 +17,7 @@ public class UserInfo{ private String userPhone; private String userBD; private String realDepartment; + private Integer department; public String getRealName() { return realName; @@ -82,6 +83,13 @@ public class UserInfo{ this.areacode = areacode; } + public Integer getDepartment() { + return department; + } + + public void setDepartment(Integer department) { + this.department = department; + } // private boolean isNumber(String num) // { diff --git a/src/main/java/com/cetc32/dh/common/response/ExceptionController.java b/src/main/java/com/cetc32/dh/common/response/ExceptionController.java new file mode 100644 index 0000000000000000000000000000000000000000..d30f6a05f82d9613ae5b117ad1654aae2f15a4e6 --- /dev/null +++ b/src/main/java/com/cetc32/dh/common/response/ExceptionController.java @@ -0,0 +1,69 @@ +package com.cetc32.dh.common.response; + +import org.apache.http.protocol.ResponseDate; +import org.springframework.http.HttpStatus; +import org.springframework.validation.BindingResult; +import org.springframework.validation.ObjectError; +import org.springframework.web.HttpRequestMethodNotSupportedException; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.servlet.NoHandlerFoundException; + +import javax.el.MethodNotFoundException; +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; + +@ControllerAdvice +public class ExceptionController { + @ExceptionHandler(RuntimeException.class) + @ResponseBody + public ResponseData hander500(HttpServletRequest r,Exception e){ + e.printStackTrace(); + return ResponseData.fail(500,"内部错误:"+ e.getMessage(),null); + } + /** + * 法不支持的請求方式 + * @return + * 修改信息： + */ + @ExceptionHandler(value= HttpRequestMethodNotSupportedException.class) + @ResponseBody + public ResponseData handler405(HttpRequestMethodNotSupportedException e){ + return ResponseData.fail(HttpStatus.METHOD_NOT_ALLOWED.value(),"方法不支持的請求方式",null); + } + + /** + * 非法参数 + * @return + * 修改信息： + */ + @ExceptionHandler(value = IllegalArgumentException.class) + @ResponseBody + public ResponseData handler(IllegalArgumentException e) throws IOException { +// log.error("Assert异常:-------------->{}",e.getMessage()); + return ResponseData.fail(400,e.getMessage(),null); + } + + /** + * 无效的参数 + * @return + */ + @ExceptionHandler(value = MethodArgumentNotValidException.class) + @ResponseBody + public ResponseData handler(MethodArgumentNotValidException e) throws IOException { + + BindingResult bindingResult = e.getBindingResult(); + //这一步是把异常的信息最简化 + ObjectError objectError = bindingResult.getAllErrors().stream().findFirst().get(); + return ResponseData.fail(HttpStatus.BAD_REQUEST.value(),objectError.getDefaultMessage(),null); + } + + @ExceptionHandler(value = NoHandlerFoundException.class) + @ResponseBody + public ResponseData handler(HttpServletRequest h,NoHandlerFoundException e) throws IOException { + return ResponseData.fail(HttpStatus.NOT_FOUND.value(),"404,URL未找到！"+e.getMessage(),null); + } +} 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 3434573860a98e63f3c0863ae1a1afc4bc64217d..45362f6ee1a11e3a5b879429ef6a1ee0ba16f354 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 a3c393dbca93d4cec89e1ca94fb58865af1b1280..efd37bacebe21bed6729a7a7c00a52927961314d 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; @@ -41,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; @@ -83,6 +83,8 @@ public class AuthController { @Autowired DepartmentService departmentService; + @Autowired + PritraceService pritraceService; /** * web用户登陆 * @Description 用户登陆接口，登陆过程中需要更新用户的登陆时间，loginFailed次数等 @@ -151,7 +153,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(), @@ -249,12 +251,11 @@ public class AuthController { user.setSysUserName(userInfo.getUsername()); user.setRegTime(new Date()); user.setRealName(userInfo.getRealName()); + user.setDepartment(userInfo.getDepartment()); - if(userService.insertUser(user)>0) - { + if(userService.insertUser(user)>0) { return ResponseData.success("添加成功"); - } - else { + } else { return ResponseData.error("添加失败"); } } @@ -413,6 +414,7 @@ public class AuthController { @ApiImplicitParam(name = "results", value = "每页数据条数",dataType = "Integer",defaultValue = "10"), @ApiImplicitParam(name = "userStatus", value = "用户状态（-1：待审核，0：已删除，1：正常）",dataType = "Integer",defaultValue = "1") }) + //@GetMapping(value = "/users") @PostMapping(value = "/users") //@LoginSkipped // public PageDataResult getUserList(@RequestBody UserInfo user_info){ @@ -423,6 +425,7 @@ public class AuthController { } List list =adminRoleService.getRoleList(); List users =userService.findUserByCondition(user_info); + Listdeparts = departmentService.selectByLimit(0,Integer.MAX_VALUE); for(ResultUserInfoDe u:users){ ListroleIds =u.getRole(); @@ -438,6 +441,12 @@ public class AuthController { } } } + if(null != u.getDepartment() && u.getDepartment().size()>0) + for(Department d:departs){ + if(u.getDepartment().contains(d.getId())){ + u.setDepartmentName(d.getName()); + } + } } // user_info.setUserStatus(1); return new PageDataResult(userService.countUserByCondition(user_info), @@ -720,4 +729,22 @@ 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); + 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/java/com/cetc32/dh/controller/rest/AuthRoleController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java index 942865386fb8ca75af724d0aa83c927db06ece18..ef4e12009bbdb868b6af391db342a4739f4150ab 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/DepartmentController.java b/src/main/java/com/cetc32/dh/controller/rest/DepartmentController.java index ba126c045610962eb107312ac9f9d881e522f9b2..dc2009ff1cb0f396b85a25389b63436919840414 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DepartmentController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DepartmentController.java @@ -30,7 +30,7 @@ import java.util.Map; import java.util.stream.Collectors; @LoginRequired @RestController -@RequestMapping("/department/") +@RequestMapping({"/department/","/rest/department"}) public class DepartmentController{ @Autowired DepartmentServiceImpl departmentService; @@ -44,6 +44,7 @@ public class DepartmentController{ */ @ApiOperation(value = "展示所有部门") + @LoginSkipped @PostMapping("/options") @ApiImplicitParams({ @ApiImplicitParam(name="page",value = "页码",dataType = "Integer",defaultValue = "0"), @@ -59,6 +60,7 @@ public class DepartmentController{ @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "查询ID（key值）下的范围树,非必填，默认查询全部", dataType = "Integer"), }) + @LoginSkipped @GetMapping(value = "/tree") public ResponseResult departmentTree(Integer id) { if (id ==null ){ 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 c3a1477a898884610ca3868ffb5ef375c591343a..dded59fac5524383f8c5b987ed93e986bd84b853 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/controller/rest/UserAuditController.java b/src/main/java/com/cetc32/dh/controller/rest/UserAuditController.java index 3d1890680c0cbed05c44ca96d374130f9aa38813..cff617ac8574ab5110e202adf28007fe9861d426 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/UserAuditController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/UserAuditController.java @@ -10,6 +10,7 @@ package com.cetc32.dh.controller.rest; import com.cetc32.dh.beans.ResultUserRole; import com.cetc32.dh.beans.StatisticBean; import com.cetc32.dh.common.response.ResponseData; +import com.cetc32.dh.dto.CommonTreeDTO; import com.cetc32.dh.entity.BaseAdminUser; import com.cetc32.dh.service.ActiveUserService; import com.cetc32.dh.service.AdminUserService; @@ -174,7 +175,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); @@ -267,7 +268,7 @@ public class UserAuditController { * @Athor xuwenyuan * @Date 2021.05.25 * **/ - @GetMapping("/departUsernum") + @GetMapping("/departUsernum0") //@GetMapping("/cnt/department") public ResponseData cntDepartment(){ List list = departmentService.countByDeparment(); @@ -367,4 +368,49 @@ public class UserAuditController { public ResponseData productuser(){ return ResponseData.success((new Random()).nextInt(50)); } + //@LoginSkipped + @GetMapping({"/department","/departUsernum"}) + public ResponseData departmentUserCount(){ + List commonTreeDTO = departmentService.getTreeList(1); + List reust=new ArrayList<>(); + for(CommonTreeDTO cdto:commonTreeDTO){ + StatisticBean b =null; + if(cdto.getChildren()!=null){ + for(Object c :cdto.getChildren()){ + if(c instanceof CommonTreeDTO){ + b=countDept((CommonTreeDTO) c); + if(b!=null) + reust.add(b); + } + } + }else{ + b=countDept(cdto); + if(b!=null) + reust.add(b); + } + } + return ResponseData.success(reust); + } + private StatisticBean countDept(CommonTreeDTO cdto){ + List ids =getAllKeys(cdto); + Integer count =departmentService.countInDepartments(ids); + if(count>0){ + StatisticBean b =new StatisticBean((Integer)cdto.getKey(),cdto.getTitle(),count); + return b; + } + return null; + } + private List getAllKeys(CommonTreeDTO cdto){ + List ids =new ArrayList<>(); + ids.add((Integer)cdto.getKey()); + if(cdto.getChildren()!=null){ + for(Object child :cdto.getChildren()){ + if(child instanceof CommonTreeDTO){ + ids.addAll(getAllKeys((CommonTreeDTO)child)); + } + } + } + return ids; + } + } diff --git a/src/main/java/com/cetc32/dh/controller/views/IndexController.java b/src/main/java/com/cetc32/dh/controller/views/IndexController.java index 81c5f52f08e50697ed33b2e6427ff5020338f36d..716532e35c7babb7e4b4b697175a93ca475186ef 100644 --- a/src/main/java/com/cetc32/dh/controller/views/IndexController.java +++ b/src/main/java/com/cetc32/dh/controller/views/IndexController.java @@ -7,6 +7,7 @@ import com.cetc32.webutil.common.util.CookieUtil; import com.cetc32.webutil.common.util.JWTUtil; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -34,18 +35,22 @@ public class IndexController { private Logger logger = LoggerFactory.getLogger(this.getClass()); @RequestMapping({"/index","/"}) - public String index(String ReturnUrl, ModelMap map, HttpServletRequest req){ + public String index(String ReturnUrl, ModelMap map, HttpServletRequest req, @Nullable Integer cate ){ if(ReturnUrl==null) ReturnUrl=eip; + if(null == cate){ + cate = 1; + } String token=CookieUtil.getCookieValue(req,"token",true); ReturnUrl=getSimpleUrl(ReturnUrl); - if(StringUtils.isNotBlank(token) && (System.currentTimeMillis()/1000L) 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)); } } @@ -548,14 +547,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; + ///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/listener/ContainerStartedListener.java b/src/main/java/com/cetc32/dh/listener/ContainerStartedListener.java index 95ee108c540e0ed8454456835999a21795c39626..1225b0c71a967ee9a3af0b157eb6529180ac8de4 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; diff --git a/src/main/java/com/cetc32/dh/mybatis/DepartmentMapper.java b/src/main/java/com/cetc32/dh/mybatis/DepartmentMapper.java index 252093a480af228fd6a7bc42e8e44be5d8d088bc..fcf3105f7d23a6a61f6615e431ba31fa7a10727d 100644 --- a/src/main/java/com/cetc32/dh/mybatis/DepartmentMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/DepartmentMapper.java @@ -39,4 +39,5 @@ public interface DepartmentMapper extends MyMapper { List findByKeyWord(String keyword); List countByDepartment(); + public Integer countInDepartments(@Param("list") List list); } diff --git a/src/main/java/com/cetc32/dh/mybatis/PritraceMapper.java b/src/main/java/com/cetc32/dh/mybatis/PritraceMapper.java index dfc62c43132c384cd51db7266551a7062f4563ad..eea24a8fe3e9ea7c66249ca8c1dce2c574f8246d 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 eea24a8fe3e9ea7c66249ca8c1dce2c574f8246d..0000000000000000000000000000000000000000 --- 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/java/com/cetc32/dh/service/DepartmentService.java b/src/main/java/com/cetc32/dh/service/DepartmentService.java index e734ea2d3b65739b4643e200227a79e1ba8c7c04..95f00fa8374c19bece9b1b2a5c7550b0fa3899b8 100644 --- a/src/main/java/com/cetc32/dh/service/DepartmentService.java +++ b/src/main/java/com/cetc32/dh/service/DepartmentService.java @@ -27,4 +27,5 @@ public interface DepartmentService { public List findByKeyWord(String keyword); public List getTreeList(Integer pid); public List countByDeparment(); + public Integer countInDepartments(List ids); } diff --git a/src/main/java/com/cetc32/dh/service/impl/DepartmentServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DepartmentServiceImpl.java index 2695c75ecc1047fa972dd2e1f38e76bf83df4e9d..2c5fe39189f67397fa172992f1511eaa5d43256e 100644 --- a/src/main/java/com/cetc32/dh/service/impl/DepartmentServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/DepartmentServiceImpl.java @@ -126,4 +126,11 @@ public class DepartmentServiceImpl implements DepartmentService { return departmentMapper.countByDepartment(); //return null; } + + @Override + public Integer countInDepartments(List ids) { + if(ids==null || ids.size()==0) + return 0; + return departmentMapper.countInDepartments(ids); + } } diff --git a/src/main/resources/application-xwybjb.yml b/src/main/resources/application-xwybjb.yml index 3a517225e2423825bebdfb28f3ff9e084ce9263b..95bcdb8a868f907d9b24df4e3d49cbfecd5b79fd 100644 --- a/src/main/resources/application-xwybjb.yml +++ b/src/main/resources/application-xwybjb.yml @@ -7,11 +7,13 @@ 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 + url: jdbc:postgresql://127.0.0.1:5432/dhmanage username: postgres - password: 123456 + #password: 123456 #password: Zdk@824. + password: postgres driver-class-name: org.postgresql.Driver # datasource: @@ -59,7 +61,8 @@ rootPath: /root/daohang/data myPath: ${rootPath}myPath writePath: ${rootPath}/product eip: http://localhost:8080/ -startCode: 000000 +##必须保证startCode编码方式为非0开头，否则数据将出现丢失 +startCode: 10000001 #verifyUrl: ${sso.authcenter}/rest/auth/verify?token= #passportUrl: ${sso.authcenter}/?ReturnUrl= #defaultLoginRequiredEnable: false diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml deleted file mode 100644 index 0016a48052dd3dd3e914f0770a7aae0968e90a15..0000000000000000000000000000000000000000 --- a/src/main/resources/application.yml +++ /dev/null @@ -1,4 +0,0 @@ -#spring: -# profiles: -# active: xxx -# #热部署生效 diff --git a/src/main/resources/mapper/BaseAdminUserMapper.xml b/src/main/resources/mapper/BaseAdminUserMapper.xml index 65286da8794c9794ac07657f01446ba9552c0c54..24f6b9a895fdd4af51cf0908359f5bd2f77d2969 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/DepartmentMapper.xml b/src/main/resources/mapper/DepartmentMapper.xml index 1116504ab14613b317f5aa5110e42d741e33bee7..8d4fac571beaabbae0f1527ed66081ac49618ff9 100644 --- a/src/main/resources/mapper/DepartmentMapper.xml +++ b/src/main/resources/mapper/DepartmentMapper.xml @@ -14,6 +14,7 @@ @@ -35,7 +36,7 @@ select id,name,description,organizationid from department - limit #{offset}, #{limit} + limit #{limit} offset #{offset} select department.id as id , department.name as name ,total as value from department LEFT JOIN ( - select REPLACE(department,',','') as deptid ,count(*) as total from base_admin_user where base_admin_user.department is not null group by REPLACE(department,',','') ) as usercnt + select department as deptid ,count(*) as total from base_admin_user where base_admin_user.department is not null group by department ) as usercnt on cast(usercnt.deptid as int) = department."id" where department.id not in (select organizationid from department ); + diff --git a/src/main/resources/mapper/pritraceMapper.xml b/src/main/resources/mapper/PriTraceMapper.xml similarity index 88% rename from src/main/resources/mapper/pritraceMapper.xml rename to src/main/resources/mapper/PriTraceMapper.xml index ea1d8f7669e600c52e71155ac00443356db98dea..0423a486626e8321747fde48a1f2efe684cb9065 100644 --- a/src/main/resources/mapper/pritraceMapper.xml +++ b/src/main/resources/mapper/PriTraceMapper.xml @@ -1,11 +1,11 @@ - + - + @@ -30,11 +30,11 @@ -
- + diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index f5581c38b4ef0c2568c7ea3ca4b11280a9f70830..bc14652c6c12b5ae6b32984acf54d89d113e6abb 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -6,7 +6,7 @@ 登录 - @@ -51,7 +66,7 @@ -
+

用户登录

@@ -82,7 +97,7 @@ - +
diff --git a/src/main/resources/templates/register.html b/src/main/resources/templates/register.html index 104064eb7e581ac1d44176893cd2b0e93ef80c1a..1f6dbdd794361530eb95fde20521bad91a32469f 100644 --- a/src/main/resources/templates/register.html +++ b/src/main/resources/templates/register.html @@ -16,27 +16,44 @@
- +
-

欢迎注册

+

欢迎注册

- + +
+ + + + +
+ -
+
- @@ -50,12 +67,14 @@ -
-   -
-