医院相关操作注解

src/main/java/com/imed/costaccount/common/shiro/ShiroConfig.java

@@ -45,7 +45,7 @@ public class ShiroConfig {
         filterMap.put("/doc.html", "anon");
         filterMap.put("/swagger-resources/**", "anon");
         filterMap.put("/captcha.jpg", "anon");
-        filterMap.put("/costAccount/user/**","anon");
+//        filterMap.put("/costAccount/user/**","anon");
         filterMap.put("/costAccount/getHospArea/**","anon");
         filterMap.put("/costAccount/excel/**","anon");
         filterMap.put("/costAccount/hosptail/**","anon");

src/main/java/com/imed/costaccount/service/impl/HosptailServiceImpl.java

@@ -18,6 +18,8 @@ import java.util.*;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 
@@ -50,6 +52,7 @@ public class HosptailServiceImpl extends ServiceImpl<HosptailMapper, Hosptail> i
      */
     @Override
     public void saveHosptail(HosptailDto hosptailDto) {
+        hosptailDto.setCreateTime(System.currentTimeMillis());
         // TODO 可能需要补充没有传递的数据
         Hosptail hosptail = BeanUtil.convertObj(hosptailDto, Hosptail.class);
         hosptail.setCreateTime(System.currentTimeMillis());
@@ -62,6 +65,7 @@ public class HosptailServiceImpl extends ServiceImpl<HosptailMapper, Hosptail> i
      * @param hosptailDto
      */
     @Override
+    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
     public void updateByHosptail(HosptailDto hosptailDto) {
         Hosptail hosptail = baseMapper.selectOne(new QueryWrapper<Hosptail>().lambda().
                 eq(!StringUtils.isEmpty(hosptailDto.getId()), Hosptail::getId, hosptailDto.getId()));
@@ -69,7 +73,7 @@ public class HosptailServiceImpl extends ServiceImpl<HosptailMapper, Hosptail> i
             throw new CostException("不存在相关医院信息");
         }
         baseMapper.deleteById(hosptail.getId());
-        Hosptail hosptailRequest = BeanUtil.convertObj(hosptailDto, Hosptail.class);
+        Hosptail hosptailRequest = BeanUtil.convertObj(hosptail, Hosptail.class);
         hosptailRequest.setId(null);
         baseMapper.insert(hosptailRequest);
     }

src/main/java/com/imed/costaccount/service/impl/UserServiceImpl.java

@@ -157,7 +157,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             throw new CostException("用户不存在");
         }
         baseMapper.deleteById(user.getId());
-        User userRequest = BeanUtil.convertObj(userDto,User.class);
+        User userRequest = BeanUtil.convertObj(user,User.class);
         user.setId(null);
         user.setHospitalStatus(userDto.getHospitalStatus());
         if (!StringUtils.isEmpty(userDto.getPassword()) ){

src/main/java/com/imed/costaccount/web/HosptailController.java

@@ -10,6 +10,8 @@ import com.imed.costaccount.model.Hosptail;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.HosptailDto;
 import com.imed.costaccount.service.HosptailService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -23,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping("/costAccount/hosptail")
+@Api(tags = "医院相关操作")
 public class HosptailController {
     @Autowired
     private HosptailService hosptailService;
@@ -41,6 +44,7 @@ public class HosptailController {
      * @return
      */
     @GetMapping("/list")
+    @ApiOperation("分页查询医院信息")
     public Result list(@RequestParam(defaultValue = "1", value = "page") Integer page,
                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                        @RequestParam(value = "name",required = false) String name){
@@ -54,6 +58,7 @@ public class HosptailController {
      * 信息
      */
     @RequestMapping("/getById")
+    @ApiOperation("根据Id查询医院信息")
     public Result info(Integer id){
 		Hosptail hosptail = hosptailService.getById(id);
         return Result.ok(hosptail);
@@ -63,8 +68,8 @@ public class HosptailController {
      * 保存
      */
     @RequestMapping("/save")
+    @ApiOperation("保存医院信息")
     public Result save(@RequestBody HosptailDto hosptailDto){
-        hosptailDto.setCreateTime(System.currentTimeMillis());
 		hosptailService.saveHosptail(hosptailDto);
         return Result.ok();
     }
@@ -74,6 +79,7 @@ public class HosptailController {
      * 修改的操作是作废新增
      */
     @RequestMapping("/update")
+    @ApiOperation("修改医院信息")
     public Result update(@RequestBody HosptailDto hosptailDto){
         // 作废操作
         hosptailService.updateByHosptail(hosptailDto);
@@ -84,6 +90,7 @@ public class HosptailController {
      * 删除
      */
     @RequestMapping("/delete")
+    @ApiOperation("删除医院信息")
     public Result delete(@RequestBody Integer[] ids){
 		hosptailService.removeByIds(Arrays.asList(ids));
         return Result.ok();

src/main/java/com/imed/costaccount/web/UserController.java

@@ -10,7 +10,9 @@ import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.UserDto;
 import com.imed.costaccount.model.vo.UserVO;
 import com.imed.costaccount.service.UserService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -27,6 +29,7 @@ import static com.imed.costaccount.enums.ResultCodeEnum.UPDATE_INSERT_SUCCESS;
  */
 @RestController
 @RequestMapping("/costAccount/user")
+@Api(tags = "用户相关操作")
 public class UserController {
     @Autowired
     private UserService userService;
@@ -38,12 +41,12 @@ public class UserController {
      * @return
      */
     @GetMapping("/list")
-
+    @ApiOperation("分页查询用户的信息")
     public Result list(@RequestParam(defaultValue = "1", value = "page") Integer page,
                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                        @RequestParam(value = "name",required = false) String name){
-//        User user = (User) SecurityUtils.getSubject().getPrincipal();
-        PageUtils pageUtils = userService.queryList(page,pageSize,1,name);
+        User user = (User) SecurityUtils.getSubject().getPrincipal();
+        PageUtils pageUtils = userService.queryList(page,pageSize,user.getHospId(),name);
         return Result.ok(pageUtils);
     }
 
@@ -51,6 +54,7 @@ public class UserController {
      * 根据姓名获取用户信息
      */
     @GetMapping("/getByName")
+    @ApiOperation("根据用户名获取用户信息")
     public Result getByName(String name){
 		List<UserVO> user = userService.getByUserName(name);
         return Result.ok(user);
@@ -65,6 +69,7 @@ public class UserController {
      * 保存用户信息
      */
     @PostMapping("/save")
+    @ApiOperation("保存用户信息")
     public Result save(@RequestBody @Valid UserDto userDto){
 		userService.saveUser(userDto);
         return Result.ok();
@@ -76,6 +81,7 @@ public class UserController {
      * 修改的操作是作废新增
      */
     @PutMapping("/update")
+    @ApiOperation("修改用户的信息")
     public Result update(@RequestBody @Valid UserDto userDto){
         userService.updateByUser(userDto);
         return Result.ok();
@@ -85,6 +91,7 @@ public class UserController {
      * 批量删除
      */
     @DeleteMapping("/delete")
+    @ApiOperation("删除用户的信息")
     public Result delete(@RequestBody Integer[] ids){
         userService.removeByIds(Arrays.asList(ids));
         return Result.ok();