diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBizAdvisoryInfo/controller/H5ApiAdvisoryInfoController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBizAdvisoryInfo/controller/H5ApiAdvisoryInfoController.java index 076a74a..d27158d 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBizAdvisoryInfo/controller/H5ApiAdvisoryInfoController.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBizAdvisoryInfo/controller/H5ApiAdvisoryInfoController.java @@ -1,5 +1,7 @@ package com.nu.modules.nuBizAdvisoryInfo.controller; +import cn.hutool.json.JSONArray; +import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.nu.modules.nuBizAdvisoryInfo.entity.NuBizAdvisoryInfo; import com.nu.modules.nuBizAdvisoryInfo.service.INuBizAdvisoryInfoService; @@ -86,4 +88,5 @@ public class H5ApiAdvisoryInfoController extends JeecgController { + @Autowired + private INuBizCustomerInfoService nuBizCustomerInfoService; + + /** + * 分页列表查询 + * + * @param nuBizCustomerInfo + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "客户信息-分页列表查询") + @ApiOperation(value="客户信息-分页列表查询", notes="客户信息-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(NuBizCustomerInfo nuBizCustomerInfo, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuBizCustomerInfo, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = nuBizCustomerInfoService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param nuBizCustomerInfo + * @return + */ + @AutoLog(value = "客户信息-添加") + @ApiOperation(value="客户信息-添加", notes="客户信息-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody NuBizCustomerInfo nuBizCustomerInfo) { + nuBizCustomerInfoService.save(nuBizCustomerInfo); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param nuBizCustomerInfo + * @return + */ + @AutoLog(value = "客户信息-编辑") + @ApiOperation(value="客户信息-编辑", notes="客户信息-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody NuBizCustomerInfo nuBizCustomerInfo) { + nuBizCustomerInfoService.updateById(nuBizCustomerInfo); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "客户信息-通过id删除") + @ApiOperation(value="客户信息-通过id删除", notes="客户信息-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + nuBizCustomerInfoService.removeById(id); + return Result.OK("删除成功!"); + } + + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "客户信息-通过id查询") + @ApiOperation(value="客户信息-通过id查询", notes="客户信息-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + NuBizCustomerInfo nuBizCustomerInfo = nuBizCustomerInfoService.getById(id); + if(nuBizCustomerInfo==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(nuBizCustomerInfo); + } + + + @AutoLog(value = "客户信息-退住") + @ApiOperation(value="客户信息-退住", notes="客户信息-退住") + @RequestMapping(value = "/editTuizhu", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result editTuizhu(@RequestBody NuBizCustomerInfo nuBizCustomerInfo) { + nuBizCustomerInfoService.editTuizhu(nuBizCustomerInfo); + return Result.OK("编辑成功!"); + } +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBizCustomerInfo/entity/NuBizCustomerInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBizCustomerInfo/entity/NuBizCustomerInfo.java index 972135d..c5ccc3c 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBizCustomerInfo/entity/NuBizCustomerInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBizCustomerInfo/entity/NuBizCustomerInfo.java @@ -50,7 +50,7 @@ public class NuBizCustomerInfo implements Serializable { /**性别*/ @Excel(name = "性别", width = 15) @ApiModelProperty(value = "性别") - @Dict(dicCode = "sex") +// @Dict(dicCode = "sex") private java.lang.String customerSex; /**年龄*/ @Excel(name = "年龄", width = 15) @@ -165,4 +165,24 @@ public class NuBizCustomerInfo implements Serializable { /**所属部门*/ @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; + + /**签发机关*/ + private java.lang.String issuingAuthority; + /**有效开始日期*/ + @DateTimeFormat(pattern="yyyy-MM-dd") + private java.util.Date startTime; + /**有效结束日期*/ + @DateTimeFormat(pattern="yyyy-MM-dd") + private java.util.Date endTime; + /**发卡日期*/ + @DateTimeFormat(pattern="yyyy-MM-dd") + private java.util.Date cardIssuing; + /**血型*/ + private java.lang.String bloodType; + /**兵役状况*/ + private java.lang.String militaryType; + /**监护人id*/ + private java.lang.String guardianId; + + } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java index 5b2d412..9df9c68 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java @@ -324,7 +324,13 @@ public class JwtUtil { if(returnValue!=null){returnValue = returnValue + moshi;} return returnValue; } - + + public static String getNuBizAdvisoryInfoUser(String key) { + String username = JwtUtil.getUsername(key); + //1.优先获取 SysUserCacheInfo + return username; + } + // public static void main(String[] args) { // String token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE1NjUzMzY1MTMsInVzZXJuYW1lIjoiYWRtaW4ifQ.xjhud_tWCNYBOg_aRlMgOdlZoWFFKB_givNElHNw3X0"; // System.out.println(JwtUtil.getUsername(token)); diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java index 095f0db..4254df4 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java @@ -77,7 +77,16 @@ public class JwtFilter extends BasicHttpAuthenticationFilter { JwtToken jwtToken = new JwtToken(token); // 提交给realm进行登入，如果错误他会抛出异常并被捕获 - getSubject(request, response).login(jwtToken); + try { + getSubject(request, response).login(jwtToken); + } catch (Exception e) { + log.error("-------JwtFilter executeLogin error-------", e); + String username = JwtUtil.getNuBizAdvisoryInfoUser(token); + if(StringUtils.isEmpty(username)){ + throw new RuntimeException("Token失效，请重新登录"); + } + } +// getSubject(request, response).login(jwtToken); // 如果没有抛出异常则代表登入成功，返回true return true; }