From da0b0d38b425ae6c5dcedbf05dfeeda7f2da5e0b Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Fri, 12 Jul 2024 17:26:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/SysDictDataController.java | 2 -- .../PropagandaInfoController.java | 2 -- .../questioninfo/QuestionInfoController.java | 2 -- .../scriptInfo/ScriptInfoController.java | 1 - .../ServicePackageController.java | 1 - .../textmessage/TextMessageController.java | 18 +++++++++++------- .../WechatTemplateController.java | 1 - .../SignPatientManageRouteServiceImpl.java | 4 ++-- .../service/impl/SysUserServiceImpl.java | 2 +- 9 files changed, 14 insertions(+), 19 deletions(-) diff --git a/postdischarge-admin/src/main/java/com/xinelu/web/controller/system/SysDictDataController.java b/postdischarge-admin/src/main/java/com/xinelu/web/controller/system/SysDictDataController.java index 17303251..457efac7 100644 --- a/postdischarge-admin/src/main/java/com/xinelu/web/controller/system/SysDictDataController.java +++ b/postdischarge-admin/src/main/java/com/xinelu/web/controller/system/SysDictDataController.java @@ -34,7 +34,6 @@ public class SysDictDataController extends BaseController { @Resource private ISysDictTypeService dictTypeService; - @PreAuthorize("@ss.hasPermi('system:dict:list')") @GetMapping("/list") public TableDataInfo list(SysDictData dictData) { startPage(); @@ -42,7 +41,6 @@ public class SysDictDataController extends BaseController { return getDataTable(list); } - @PreAuthorize("@ss.hasPermi('system:dict:list')") @GetMapping("/getList") public R> getList(SysDictData dictData) { List list = dictDataService.selectDictDataList(dictData); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandainfo/PropagandaInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandainfo/PropagandaInfoController.java index 7fb592f5..81bf2732 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandainfo/PropagandaInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandainfo/PropagandaInfoController.java @@ -46,7 +46,6 @@ public class PropagandaInfoController extends BaseController { * 查询宣教库管理列表 */ @ApiOperation("分页查询宣教库管理列表") - @PreAuthorize("@ss.hasPermi('manage:propaganda:list')") @GetMapping("/list") public TableDataInfo list(PropagandaInfoDto propagandaInfo) { startPage(); @@ -70,7 +69,6 @@ public class PropagandaInfoController extends BaseController { * 获取宣教库管理详细信息 */ @ApiOperation("根据id获取宣教库管理详细信息") - @PreAuthorize("@ss.hasPermi('manage:propaganda:query')") @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") Long id) { return R.ok(propagandaInfoService.selectPropagandaInfoById(id)); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/questioninfo/QuestionInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/questioninfo/QuestionInfoController.java index 0b748660..cac0a928 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/questioninfo/QuestionInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/questioninfo/QuestionInfoController.java @@ -40,7 +40,6 @@ public class QuestionInfoController extends BaseController { /** * 查询问卷基本信息列表 */ - @PreAuthorize("@ss.hasPermi('system:question:list')") @GetMapping("/list") public TableDataInfo list(QuestionInfoDto questionInfo) { startPage(); @@ -63,7 +62,6 @@ public class QuestionInfoController extends BaseController { /** * 获取问卷基本信息详细信息 */ - @PreAuthorize("@ss.hasPermi('system:question:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { if (Objects.isNull(id)) { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/scriptInfo/ScriptInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/scriptInfo/ScriptInfoController.java index acb36701..b167ad15 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/scriptInfo/ScriptInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/scriptInfo/ScriptInfoController.java @@ -40,7 +40,6 @@ public class ScriptInfoController extends BaseController { * 查询话术信息列表 */ @ApiOperation("查询话术信息列表") - @PreAuthorize("@ss.hasPermi('manage:script:list')") @GetMapping("/list") public TableDataInfo list(ScriptInfoDto scriptInfo) { startPage(); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java index 4cadf98f..1083c8da 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java @@ -53,7 +53,6 @@ public class ServicePackageController extends BaseController { * 查询服务包基础信息列表 */ @ApiOperation("查询服务包基础信息列表") - @PreAuthorize("@ss.hasPermi('manage:servicepackage:list')") @GetMapping("/getList") public R> getList(ServicePackageDto servicePackage) { return R.ok(servicePackageService.selectList(servicePackage)); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/textmessage/TextMessageController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/textmessage/TextMessageController.java index 32f9cf2d..c08e7696 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/textmessage/TextMessageController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/textmessage/TextMessageController.java @@ -13,16 +13,21 @@ import com.xinelu.manage.dto.textmessage.TextMessageDTO; import com.xinelu.manage.dto.textmessage.TextMessageTaskDTO; import com.xinelu.manage.service.textmessage.ITextMessageService; import com.xinelu.manage.vo.textmessage.TextMessageTaskVO; -import com.xinelu.manage.vo.textmessage.TextMessageVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.stream.Collectors; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * 短信模板信息Controller @@ -41,7 +46,6 @@ public class TextMessageController extends BaseController { * 查询短信模板信息列表 */ @ApiOperation("查询短信模板信息列表") - @PreAuthorize("@ss.hasPermi('manage:message:list')") @GetMapping("/list") public TableDataInfo list(TextMessageDTO textMessageDTO) { PageDomain pageDomain = TableSupport.buildPageRequest(); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/wechattemplate/WechatTemplateController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/wechattemplate/WechatTemplateController.java index 6191ec45..73e1e524 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/wechattemplate/WechatTemplateController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/wechattemplate/WechatTemplateController.java @@ -42,7 +42,6 @@ public class WechatTemplateController extends BaseController { * 查询微信模板信息列表 */ @ApiOperation("查询微信模板信息列表") - @PreAuthorize("@ss.hasPermi('manage:template:list')") @GetMapping("/list") public TableDataInfo list(WechatTemplateDTO wechatTemplateDto) { startPage(); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java index 43bc4f00..55d1946c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java @@ -719,12 +719,12 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout signPatientManageRouteNode.setQuestionExpirationDate(Objects.isNull(routeNode.getQuestionExpirationDate()) ? null : routeNode.getQuestionExpirationDate()); signPatientManageRouteNode.setPhoneDialMethod(StringUtils.isBlank(routeNode.getPhoneDialMethod()) ? null : routeNode.getPhoneDialMethod()); } - if (Objects.nonNull(routeNode) && TaskContentEnum.PROPAGANDA_ARTICLE.getInfo().equals(routeNode.getTaskType())) { + if (Objects.nonNull(routeNode) && TaskNodeTypeEnum.PROPAGANDA_ARTICLE.getInfo().equals(routeNode.getTaskNodeType())) { signPatientManageRouteNode.setPropagandaInfoId(Objects.isNull(routeNode.getPropagandaInfoId()) ? null : routeNode.getPropagandaInfoId()); signPatientManageRouteNode.setPropagandaTitle(StringUtils.isBlank(routeNode.getPropagandaTitle()) ? null : routeNode.getPropagandaTitle()); signPatientManageRouteNode.setPropagandaContent(StringUtils.isBlank(routeNode.getPropagandaContent()) ? null : routeNode.getPropagandaContent()); } - if (Objects.nonNull(routeNode) && TaskContentEnum.TEXT_REMIND.getInfo().equals(routeNode.getTaskType())) { + if (Objects.nonNull(routeNode) && TaskNodeTypeEnum.TEXT_REMIND.getInfo().equals(routeNode.getTaskNodeType())) { signPatientManageRouteNode.setTextRemindContent(StringUtils.isBlank(routeNode.getTextRemindContent()) ? null : routeNode.getTextRemindContent()); } signPatientManageRouteNode.setMessagePushSign(Objects.isNull(routeNode.getMessagePushSign()) ? null : routeNode.getMessagePushSign()); diff --git a/postdischarge-system/src/main/java/com/xinelu/system/service/impl/SysUserServiceImpl.java b/postdischarge-system/src/main/java/com/xinelu/system/service/impl/SysUserServiceImpl.java index be888c96..36e17537 100644 --- a/postdischarge-system/src/main/java/com/xinelu/system/service/impl/SysUserServiceImpl.java +++ b/postdischarge-system/src/main/java/com/xinelu/system/service/impl/SysUserServiceImpl.java @@ -71,7 +71,7 @@ public class SysUserServiceImpl implements ISysUserService { * @return 用户信息集合信息 */ @Override - @DataScope(deptAlias = "d", userAlias = "u.user_id", agencyAlias = "u") + @DataScope(deptAlias = "d", agencyAlias = "u") public List selectUserList(SysUser user) { return userMapper.selectUserList(user); }