字典、参数管理aop调整

security-center/src/main/java/com/lantone/security/aop/DictionaryAspect.java

@@ -19,8 +19,9 @@ public class DictionaryAspect {
 
     @Autowired
     private DictionaryInfoFacade dictionaryInfoFacade;
-
-    @Pointcut("execution(public * com.lantone.security.web.DictionaryManagementController.deleteDictionary(..))")
+    @Pointcut("execution(public * com.lantone.security.web.DictionaryManagementController.addDictionary(..))" +
+            "||execution(public * com.lantone.security.web.DictionaryManagementController.updateDictionary(..))" +
+            "||execution(public * com.lantone.security.web.DictionaryManagementController.deleteDictionary(..))")
     public void basicInfoChange() {
     }
 

security-center/src/main/java/com/lantone/security/aop/HospitalSetAspect.java

@@ -20,7 +20,9 @@ public class HospitalSetAspect {
     @Autowired
     private HospitalSetFacade hospitalSetFacade;
 
-    @Pointcut("execution(public * com.lantone.security.web.UserManagementController.login(..))")
+    @Pointcut("execution(public * com.lantone.security.web.HospitalSetManagementController.addHospitalSet(..))" +
+            "||execution(public * com.lantone.security.web.HospitalSetManagementController.updateHospitalSet(..))" +
+            "||execution(public * com.lantone.security.web.HospitalSetManagementController.deleteHospitalSet(..))")
     public void basicInfoChange() {
     }
 

security-center/src/main/java/com/lantone/security/facade/DictionaryManagementFacade.java

@@ -32,25 +32,32 @@ public class DictionaryManagementFacade {
     private DictionaryInfoFacade dictionaryInfoFacade;
 
     /**
-     * @Description: 新增/修改字典
+     * @Description: 新增字典
      * @Param: [saveDictionaryVO]
      * @return: java.lang.Object
      * @Author: cy
      * @Date: 2021/7/30
      */
-    public Object saveDictionary(SaveDictionaryVO saveDictionaryVO) {
-        saveDictionaryVO.setUserId(SysUserUtils.getCurrentPrincipleId());
-        Boolean flag = false;
-        //新增-校验重复数据
+    public Object addDictionary(SaveDictionaryVO saveDictionaryVO) {
+        //数据校验
         getCheckDictionary(saveDictionaryVO);
         DictionaryInfo dictionaryInfo = new DictionaryInfo();
         BeanUtils.copyProperties(saveDictionaryVO, dictionaryInfo);
-        if (null == saveDictionaryVO.getId()) {
-            flag = addDictionary(saveDictionaryVO.getUserId(), dictionaryInfo);
-        } else if (null != saveDictionaryVO.getId()) {
-            flag = updateDictionary(saveDictionaryVO.getUserId(), dictionaryInfo);
-        }
-        return flag;
+        return addDictionary(saveDictionaryVO.getUserId(), dictionaryInfo);
+    }
+
+    /**
+     * @Description: 修改字典
+     * @Param: [saveDictionaryVO]
+     * @return: java.lang.Object
+     * @Author: cy
+     * @Date: 2021/7/30
+     */
+    public Object updateDictionary(SaveDictionaryVO saveDictionaryVO) {
+        saveDictionaryVO.setUserId(SysUserUtils.getCurrentPrincipleId());
+        DictionaryInfo dictionaryInfo = new DictionaryInfo();
+        BeanUtils.copyProperties(saveDictionaryVO, dictionaryInfo);
+        return updateDictionary(saveDictionaryVO.getUserId(), dictionaryInfo);
     }
 
     /**
@@ -106,6 +113,7 @@ public class DictionaryManagementFacade {
      * @Date: 2021/7/30
      */
     public void getCheckDictionary(SaveDictionaryVO saveDictionaryVO) {
+        saveDictionaryVO.setUserId(SysUserUtils.getCurrentPrincipleId());
         if (null == saveDictionaryVO.getId()) {
             Integer count = dictionaryInfoFacade.lambdaQuery()
                     .eq(DictionaryInfo::getIsDeleted, IsDeleteEnum.N.getKey())

security-center/src/main/java/com/lantone/security/facade/HospitalSetManagementFacade.java

@@ -29,26 +29,32 @@ public class HospitalSetManagementFacade {
     private HospitalSetFacade hospitalSetFacade;
 
     /**
-     * @Description:  新增/修改参数
+     * @Description:  新增参数
      * @Param: [saveHospitalSetVO]
      * @return: java.lang.Object
      * @Author: cy
      * @Date: 2021/7/30
      */
-    public Object saveHospitalSet(SaveHospitalSetVO saveHospitalSetVO) {
-        saveHospitalSetVO.setHospitalId(SysUserUtils.getCurrentHospitalId());
-        saveHospitalSetVO.setUserId(SysUserUtils.getCurrentPrincipleId());
-        Boolean flag = false;
-        //新增-校验重复数据
+    public Object addHospitalSet(SaveHospitalSetVO saveHospitalSetVO) {
+       // 数据校验
         checkHospitalSet(saveHospitalSetVO);
         HospitalSet hospitalSet = new HospitalSet();
         BeanUtils.copyProperties(saveHospitalSetVO, hospitalSet);
-        if (null == saveHospitalSetVO.getId()) {
-            flag = addHospitalSet(saveHospitalSetVO.getUserId(),hospitalSet);
-        } else if (null != saveHospitalSetVO.getId()) {
-            flag = updateHospitalSet(saveHospitalSetVO.getUserId(),hospitalSet);
-        }
-        return flag;
+        return addHospitalSet(saveHospitalSetVO.getUserId(),hospitalSet);
+    }
+
+    /**
+     * @Description:  修改参数
+     * @Param: [saveHospitalSetVO]
+     * @return: java.lang.Object
+     * @Author: cy
+     * @Date: 2021/7/30
+     */
+    public Object updateHospitalSet(SaveHospitalSetVO saveHospitalSetVO) {
+        saveHospitalSetVO.setUserId(SysUserUtils.getCurrentPrincipleId());
+        HospitalSet hospitalSet = new HospitalSet();
+        BeanUtils.copyProperties(saveHospitalSetVO, hospitalSet);
+        return updateHospitalSet(saveHospitalSetVO.getUserId(),hospitalSet);
     }
 
     /**
@@ -99,6 +105,8 @@ public class HospitalSetManagementFacade {
      * @Date: 2021/7/30
      */
     public void checkHospitalSet(SaveHospitalSetVO saveHospitalSetVO) {
+        saveHospitalSetVO.setHospitalId(SysUserUtils.getCurrentHospitalId());
+        saveHospitalSetVO.setUserId(SysUserUtils.getCurrentPrincipleId());
         if (null == saveHospitalSetVO.getId()) {
             Integer count = hospitalSetFacade.lambdaQuery()
                     .eq(HospitalSet::getIsDeleted, IsDeleteEnum.N.getKey())

security-center/src/main/java/com/lantone/security/facade/RegionManagementFacade.java

@@ -47,27 +47,35 @@ public class RegionManagementFacade {
     private DeptFacade deptFacade;
 
     /**
-     * @Description: 新增/修改病区
+     * @Description: 新增病区
+     * @Param: [saveRegionVo]
+     * @return: java.lang.Object
+     * @Author: cy
+     * @Date: 2021/7/30
+     */
+    public Object addRegion(SaveRegionVO saveRegionVo) {
+        //数据校验
+        getCheckRegion(saveRegionVo);
+        Region sysRegion = new Region();
+        BeanUtils.copyProperties(saveRegionVo, sysRegion);
+        List<RegionDept> sysRegionDepts = new ArrayList<>();
+        return addRegion(saveRegionVo, sysRegion, sysRegionDepts);
+    }
+
+    /**
+     * @Description: 修改病区
      * @Param: [saveRegionVo]
      * @return: java.lang.Object
      * @Author: cy
      * @Date: 2021/7/30
      */
-    public Object saveRegion(SaveRegionVO saveRegionVo) {
+    public Object updateRegion(SaveRegionVO saveRegionVo) {
         saveRegionVo.setHospitalId(SysUserUtils.getCurrentHospitalId());
         saveRegionVo.setUserId(SysUserUtils.getCurrentPrincipleId());
-        Boolean flag = false;
-        //新增-校验重复数据
-        getCheckRegion(saveRegionVo);
         Region sysRegion = new Region();
         BeanUtils.copyProperties(saveRegionVo, sysRegion);
         List<RegionDept> sysRegionDepts = new ArrayList<>();
-        if (null == saveRegionVo.getId()) {
-            flag = addRegion(saveRegionVo, sysRegion, sysRegionDepts);
-        } else if (null != saveRegionVo.getId()) {
-            flag = updateRegion(saveRegionVo, sysRegion, sysRegionDepts);
-        }
-        return flag;
+        return updateRegion(saveRegionVo, sysRegion, sysRegionDepts);
     }
 
     /**
@@ -121,6 +129,8 @@ public class RegionManagementFacade {
      * @Date: 2021/7/30
      */
     public void getCheckRegion(SaveRegionVO saveRegionVo) {
+        saveRegionVo.setHospitalId(SysUserUtils.getCurrentHospitalId());
+        saveRegionVo.setUserId(SysUserUtils.getCurrentPrincipleId());
         if (null == saveRegionVo.getId()) {
             Region region = regionFacade.lambdaQuery()
                     .eq(Region::getIsDeleted, IsDeleteEnum.N.getKey())

security-center/src/main/java/com/lantone/security/web/DictionaryManagementController.java

@@ -32,11 +32,18 @@ public class DictionaryManagementController {
     @Autowired
     private DictionaryManagementFacade dictionaryManagementFacade;
 
-    @ApiOperation(value = "新增/修改字典[by:cy]")
-    @PostMapping("/saveDictionary")
+    @ApiOperation(value = "新增字典[by:cy]")
+    @PostMapping("/addDictionary")
     @Transactional
-    public CommonResult<Object> saveDictionary(@RequestBody @Valid SaveDictionaryVO saveDictionaryVO) {
-        return CommonResult.success(dictionaryManagementFacade.saveDictionary(saveDictionaryVO));
+    public CommonResult<Object> addDictionary(@RequestBody @Valid SaveDictionaryVO saveDictionaryVO) {
+        return CommonResult.success(dictionaryManagementFacade.addDictionary(saveDictionaryVO));
+    }
+
+    @ApiOperation(value = "修改字典[by:cy]")
+    @PostMapping("/updateDictionary")
+    @Transactional
+    public CommonResult<Object> updateDictionary(@RequestBody @Valid SaveDictionaryVO saveDictionaryVO) {
+        return CommonResult.success(dictionaryManagementFacade.updateDictionary(saveDictionaryVO));
     }
 
     @ApiOperation(value = "查看字典管理[by:cy]")

security-center/src/main/java/com/lantone/security/web/HospitalSetManagementController.java

@@ -32,11 +32,18 @@ public class HospitalSetManagementController {
     @Autowired
     private HospitalSetManagementFacade hospitalSetManagementFacade;
 
-    @ApiOperation(value = "新增/修改参数[by:cy]")
-    @PostMapping("/saveHospitalSet")
+    @ApiOperation(value = "新增参数[by:cy]")
+    @PostMapping("/addHospitalSet")
     @Transactional
-    public CommonResult<Object> saveHospitalSet(@RequestBody @Valid SaveHospitalSetVO saveHospitalSetVO) {
-        return CommonResult.success(hospitalSetManagementFacade.saveHospitalSet(saveHospitalSetVO));
+    public CommonResult<Object> addHospitalSet(@RequestBody @Valid SaveHospitalSetVO saveHospitalSetVO) {
+        return CommonResult.success(hospitalSetManagementFacade.addHospitalSet(saveHospitalSetVO));
+    }
+
+    @ApiOperation(value = "修改参数[by:cy]")
+    @PostMapping("/updateHospitalSet")
+    @Transactional
+    public CommonResult<Object> updateHospitalSet(@RequestBody @Valid SaveHospitalSetVO saveHospitalSetVO) {
+        return CommonResult.success(hospitalSetManagementFacade.updateHospitalSet(saveHospitalSetVO));
     }
 
     @ApiOperation(value = "查看参数管理[by:cy]")

security-center/src/main/java/com/lantone/security/web/RegionManagementController.java

@@ -35,11 +35,18 @@ public class RegionManagementController {
     @Autowired
     private RegionManagementFacade sysRegionFacade;
 
-    @ApiOperation(value = "新增/修改病区[by:cy]")
-    @PostMapping("/saveRegion")
+    @ApiOperation(value = "新增病区[by:cy]")
+    @PostMapping("/addRegion")
     @Transactional
-    public CommonResult<Object> saveRegion(@RequestBody @Valid SaveRegionVO saveRegionVo) {
-        return CommonResult.success(sysRegionFacade.saveRegion(saveRegionVo));
+    public CommonResult<Object> addRegion(@RequestBody @Valid SaveRegionVO saveRegionVo) {
+        return CommonResult.success(sysRegionFacade.addRegion(saveRegionVo));
+    }
+
+    @ApiOperation(value = "修改病区[by:cy]")
+    @PostMapping("/updateRegion")
+    @Transactional
+    public CommonResult<Object> updateRegion(@RequestBody @Valid SaveRegionVO saveRegionVo) {
+        return CommonResult.success(sysRegionFacade.updateRegion(saveRegionVo));
     }
 
     @ApiOperation(value = "校验/禁用/启用病区管理[by:cy]")