3

pom.xml

@@ -80,6 +80,12 @@
 			<version>2.8.0</version>
 		</dependency>
 
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>2.8.0</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>

src/main/java/com/abcsz/litigationcase/config/Swagger2Config.java

@@ -0,0 +1,41 @@
+package com.abcsz.litigationcase.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+/**
+ * 接口文档配置
+ *
+ * @author shengqianlei
+ * @since 1.0.0
+ */
+@EnableSwagger2
+@Configuration
+public class Swagger2Config {
+    @Bean
+    public Docket docket() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(apiInfo())
+                .select()
+                //RequestHandlerSelectors 配置要扫描接口的方式
+                .apis(RequestHandlerSelectors.basePackage("com.abcsz.litigationcase"))
+                //paths 过滤url路径 只有在...路径下PathSelectors.ant("/.../**")
+                .paths(PathSelectors.any())
+                .build();
+    }
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("诉讼案件管理系统接口文档")
+                .description("包含了系统的各种服务接口")
+                .version("1.0.0")
+                .build();
+    }
+}

src/main/java/com/abcsz/litigationcase/controller/LawFirmController.java

@@ -1,6 +1,18 @@
 package com.abcsz.litigationcase.controller;
 
 
+import com.abcsz.litigationcase.domain.ro.LawFirmRo;
+import com.abcsz.litigationcase.domain.ro.UserQueryRo;
+import com.abcsz.litigationcase.domain.ro.UserRo;
+import com.abcsz.litigationcase.domain.vo.PublicVo;
+import com.abcsz.litigationcase.domain.vo.UseQueryVo;
+import com.abcsz.litigationcase.service.LawFirmService;
+import com.abcsz.litigationcase.service.UserService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -16,6 +28,33 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/lawFirmEntity")
 public class LawFirmController {
+    @Autowired
+    private LawFirmService lawFirmService;
+
+//    @ApiOperation("事务所信息查询")
+//    @PostMapping("/query")
+//    public UseQueryVo query(@RequestBody @Validated LawFirmRo ro) throws Exception {
+//
+//        UseQueryVo vo = lawFirmService.lawFirmUpdate(ro);
+//        return vo;
+//    }
+
+    @ApiOperation("事务所信息新增")
+    @PostMapping("/insert")
+    public PublicVo insert(@RequestBody @Validated LawFirmRo ro)  {
+
+        PublicVo vo = lawFirmService.lawFirmInsert(ro);
+        return vo;
+    }
+
+
+    @ApiOperation("事务所信息修改")
+    @PostMapping("/modify")
+    public PublicVo modify(@RequestBody @Validated LawFirmRo ro)  {
+
+        PublicVo vo = lawFirmService.lawFirmModify(ro);
+        return vo;
+    }
 
 }
 

src/main/java/com/abcsz/litigationcase/controller/UserController.java

@@ -30,9 +30,9 @@ public class UserController {
     @Autowired
     private UserService userService;
 
-    @ApiOperation("用户信息新增")
+    @ApiOperation("用户信息查询")
     @PostMapping("/query")
-    public UseQueryVo query(@RequestBody @Validated UserQueryRo ro) throws Exception {
+    public UseQueryVo query(@RequestBody @Validated UserQueryRo ro)  {
 
         UseQueryVo vo = userService.userQuery(ro);
         return vo;
@@ -40,7 +40,7 @@ public class UserController {
 
     @ApiOperation("用户信息新增")
     @PostMapping("/insert")
-    public PublicVo insert(@RequestBody @Validated UserRo ro) throws Exception {
+    public PublicVo insert(@RequestBody @Validated UserRo ro)  {
 
         PublicVo vo = userService.userInsert(ro);
         return vo;
@@ -49,7 +49,7 @@ public class UserController {
 
     @ApiOperation("用户信息修改")
     @PostMapping("/modify")
-    public PublicVo modify(@RequestBody @Validated UserRo ro) throws Exception {
+    public PublicVo modify(@RequestBody @Validated UserRo ro)  {
 
         PublicVo vo = userService.userModify(ro);
         return vo;

src/main/java/com/abcsz/litigationcase/dao/entity/LawFirmEntity.java

@@ -1,5 +1,6 @@
 package com.abcsz.litigationcase.dao.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 
@@ -8,6 +9,7 @@ import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 import java.io.Serializable;
+import java.util.Date;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -62,13 +64,15 @@ public class LawFirmEntity implements Serializable {
     private String region;
 
     @ApiModelProperty(value = "创建日期")
-    private LocalDateTime createTime;
+    private Date createTime;
 
     @ApiModelProperty(value = "更新日期")
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
+    @TableField(value = "txt_hold_1")
     private String txtHold1;
 
+    @TableField(value = "txt_hold_2")
     private String txtHold2;
 
     @ApiModelProperty(value = "是否失效 0-正常 9-失效")

src/main/java/com/abcsz/litigationcase/domain/ro/LawFirmRo.java

@@ -0,0 +1,47 @@
+package com.abcsz.litigationcase.domain.ro;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+
+@Data
+public class LawFirmRo {
+
+    @ApiModelProperty(value = "事务所名称")
+    @NotNull(message = "事务所名称不能为空")
+    private String lawFirmName;
+
+    @ApiModelProperty(value = "事务所编码")
+    @NotNull(message = "社会信用代码不能为空")
+    private String lawFirmCode;
+
+    @ApiModelProperty(value = "地址")
+    private String lawFirmAddr;
+
+    @ApiModelProperty(value = "电话")
+    private String lawFirmTel;
+
+    @ApiModelProperty(value = "营业时间")
+    private String lawFirmTime;
+
+    @ApiModelProperty(value = "描述")
+    private String lawFirmDescripe;
+
+    @ApiModelProperty(value = "法人")
+    private String legalPerson;
+
+    @ApiModelProperty(value = "图片")
+    private String picture;
+
+    @ApiModelProperty(value = "所属区域")
+    private String region;
+
+    private String txtHold1;
+
+    private String txtHold2;
+
+    @ApiModelProperty(value = "是否失效 0-正常 9-失效")
+    private Integer delFlag;
+}

src/main/java/com/abcsz/litigationcase/service/LawFirmService.java

@@ -1,6 +1,8 @@
 package com.abcsz.litigationcase.service;
 
 import com.abcsz.litigationcase.dao.entity.LawFirmEntity;
+import com.abcsz.litigationcase.domain.ro.LawFirmRo;
+import com.abcsz.litigationcase.domain.vo.PublicVo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -13,4 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface LawFirmService extends IService<LawFirmEntity> {
 
+    PublicVo lawFirmInsert(LawFirmRo ro);
+
+    PublicVo lawFirmModify(LawFirmRo ro);
 }

src/main/java/com/abcsz/litigationcase/service/impl/LawFirmServiceIml.java

@@ -1,11 +1,19 @@
 package com.abcsz.litigationcase.service.impl;
 
 import com.abcsz.litigationcase.dao.entity.LawFirmEntity;
+import com.abcsz.litigationcase.dao.entity.UserEntity;
 import com.abcsz.litigationcase.dao.mapper.LawFirmMapper;
+import com.abcsz.litigationcase.domain.ro.LawFirmRo;
+import com.abcsz.litigationcase.domain.vo.PublicVo;
 import com.abcsz.litigationcase.service.LawFirmService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 /**
  * <p>
  * 律师事务所信息 服务实现类
@@ -14,7 +22,123 @@ import org.springframework.stereotype.Service;
  * @author shengqianlei
  * @since 2022-04-21
  */
+@Slf4j
 @Service
 public class LawFirmServiceIml extends ServiceImpl<LawFirmMapper, LawFirmEntity> implements LawFirmService {
 
+    @Autowired
+    private LawFirmMapper lawFirmMapper;
+
+
+    @Override
+    public PublicVo lawFirmInsert(LawFirmRo ro) {
+        log.info("新增机构信息...");
+        PublicVo publicVo = new PublicVo();
+
+        try {
+            /* 查询该事务所是否已经存在 */
+            QueryWrapper<LawFirmEntity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("law_firm_code", ro.getLawFirmCode());
+            queryWrapper.eq("del_flag", 0);
+            LawFirmEntity lawFirmEntity = lawFirmMapper.selectOne(queryWrapper);
+            if (lawFirmEntity != null) {
+                publicVo.setRetCode("Y001");
+                publicVo.setRetMsg("该机构信息已存在，请勿重复新增");
+                log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
+                return publicVo;
+            }
+
+            LawFirmEntity lawFirmEntity1 = new LawFirmEntity();
+            lawFirmEntity1.setLawFirmName(ro.getLawFirmName());
+            lawFirmEntity1.setLawFirmCode(ro.getLawFirmCode());
+            lawFirmEntity1.setLawFirmAddr(ro.getLawFirmAddr());
+            lawFirmEntity1.setLawFirmTel(ro.getLawFirmTel());
+            lawFirmEntity1.setLawFirmTime(ro.getLawFirmTime());
+            lawFirmEntity1.setLawFirmDescripe(ro.getLawFirmDescripe());
+            lawFirmEntity1.setLegalPerson(ro.getLegalPerson());
+            lawFirmEntity1.setPicture(ro.getPicture());
+            lawFirmEntity1.setRegion(ro.getRegion());
+            lawFirmEntity1.setCreateTime(new Date());
+            lawFirmEntity1.setUpdateTime(new Date());
+            lawFirmEntity1.setTxtHold1(ro.getTxtHold1());
+            lawFirmEntity1.setTxtHold2(ro.getTxtHold2());
+            lawFirmEntity1.setDelFlag(ro.getDelFlag());
+            int count1 = lawFirmMapper.insert(lawFirmEntity1);
+            if (count1 != 1) {
+                publicVo.setRetCode("S001");
+                publicVo.setRetMsg("新增机构信息失败，请重新操作");
+                log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
+                return publicVo;
+            }
+
+        } catch (Exception e) {
+            log.error(e.getMessage() + "****" + e.getStackTrace());
+            publicVo.setRetCode("X001");
+            publicVo.setRetMsg("系统异常");
+            log.error(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
+            return publicVo;
+        }
+        publicVo.setRetCode("0000");
+        publicVo.setRetMsg("交易成功");
+        log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
+        return publicVo;
+    }
+
+    @Override
+    public PublicVo lawFirmModify(LawFirmRo ro) {
+        log.info("修改机构信息(包括删除)...");
+        PublicVo publicVo = new PublicVo();
+
+        try {
+            /* 查询该事务所是否存在 */
+            QueryWrapper<LawFirmEntity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("law_firm_code", ro.getLawFirmCode());
+            queryWrapper.eq("del_flag", 0);
+            LawFirmEntity lawFirmEntity = lawFirmMapper.selectOne(queryWrapper);
+            if (lawFirmEntity == null) {
+                publicVo.setRetCode("Y001");
+                publicVo.setRetMsg("该机构不存在，请先新增");
+                log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
+                return publicVo;
+            }
+
+            LawFirmEntity lawFirmEntity1 = new LawFirmEntity();
+            lawFirmEntity1.setLawFirmName(ro.getLawFirmName());
+            lawFirmEntity1.setLawFirmCode(ro.getLawFirmCode());
+            lawFirmEntity1.setLawFirmAddr(ro.getLawFirmAddr());
+            lawFirmEntity1.setLawFirmTel(ro.getLawFirmTel());
+            lawFirmEntity1.setLawFirmTime(ro.getLawFirmTime());
+            lawFirmEntity1.setLawFirmDescripe(ro.getLawFirmDescripe());
+            lawFirmEntity1.setLegalPerson(ro.getLegalPerson());
+            lawFirmEntity1.setPicture(ro.getPicture());
+            lawFirmEntity1.setRegion(ro.getRegion());
+            lawFirmEntity1.setUpdateTime(new Date());
+            lawFirmEntity1.setTxtHold1(ro.getTxtHold1());
+            lawFirmEntity1.setTxtHold2(ro.getTxtHold2());
+            lawFirmEntity1.setDelFlag(ro.getDelFlag());
+            QueryWrapper<LawFirmEntity> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("law_firm_code", ro.getLawFirmCode());
+            queryWrapper1.eq("del_flag", 0);
+            int count1 = lawFirmMapper.update(lawFirmEntity1, queryWrapper1);
+            if (count1 != 1) {
+                publicVo.setRetCode("S001");
+                publicVo.setRetMsg("修改机构信息失败，请重新操作");
+                log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
+                return publicVo;
+            }
+
+        } catch (Exception e) {
+            log.error(e.getMessage() + "****" + e.getStackTrace());
+            publicVo.setRetCode("X001");
+            publicVo.setRetMsg("系统异常");
+            log.error(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
+            return publicVo;
+        }
+
+        publicVo.setRetCode("0000");
+        publicVo.setRetMsg("交易成功");
+        log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
+        return publicVo;
+    }
+
 }

src/main/java/com/abcsz/litigationcase/service/impl/UserServiceIml.java

@@ -38,19 +38,19 @@ public class UserServiceIml extends ServiceImpl<UserMapper, UserEntity> implemen
 
     @Override
     public PublicVo userInsert(UserRo ro) {
-        log.info("用户信息新增....");
+        log.info("新增用户信息....");
         PublicVo publicVo = new PublicVo();
 
         try
         {
             /* 查询该用户是否已经存在 */
-            QueryWrapper<UserEntity> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("user_identity",ro.getUserIdentity());
-            queryWrapper1.eq("del_flag", 0);
-            UserEntity userEntity = userMapper.selectOne(queryWrapper1);
+            QueryWrapper<UserEntity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("user_identity",ro.getUserIdentity());
+            queryWrapper.eq("del_flag", 0);
+            UserEntity userEntity = userMapper.selectOne(queryWrapper);
             if(userEntity !=null){
                 publicVo.setRetCode("Y001");
-                publicVo.setRetMsg("该用户已存在，请勿重复新增");
+                publicVo.setRetMsg("该用户已存在，请勿重复操作");
                 log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
                 return publicVo;
             }
@@ -88,7 +88,7 @@ public class UserServiceIml extends ServiceImpl<UserMapper, UserEntity> implemen
             int count1 = userMapper.insert(userEntity1);
             if(count1 != 1){
                 publicVo.setRetCode("S001");
-                publicVo.setRetMsg("用户新增失败，请重新添加");
+                publicVo.setRetMsg("新增用户信息失败，请重新操作");
                 log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
                 return publicVo;
             }
@@ -101,23 +101,23 @@ public class UserServiceIml extends ServiceImpl<UserMapper, UserEntity> implemen
             return publicVo;
         }
         publicVo.setRetCode("0000");
-        publicVo.setRetMsg("交易成功");
+        publicVo.setRetMsg("操作成功");
         log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
         return publicVo;
     }
 
     @Override
     public PublicVo userModify(UserRo ro) {
-        log.info("用户信息修改(包括删除)...");
+        log.info("修改用户信息(包括删除)...");
         PublicVo publicVo = new PublicVo();
 
         try {
             /* 查询该用户是否存在 */
-            QueryWrapper<UserEntity> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("user_identity", ro.getUserIdentity());
-            queryWrapper1.eq("del_flag", 0);
-            UserEntity userEntity1 = userMapper.selectOne(queryWrapper1);
-            if (userEntity1 == null) {
+            QueryWrapper<UserEntity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("user_identity", ro.getUserIdentity());
+            queryWrapper.eq("del_flag", 0);
+            UserEntity userEntity = userMapper.selectOne(queryWrapper);
+            if (userEntity == null) {
                 publicVo.setRetCode("Y001");
                 publicVo.setRetMsg("该用户不存在，请先新增");
                 log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
@@ -138,29 +138,29 @@ public class UserServiceIml extends ServiceImpl<UserMapper, UserEntity> implemen
                 return publicVo;
             }
 
-            UserEntity userEntity2 = new UserEntity();
-            userEntity2.setUserAccount(ro.getUserAccount());
-            userEntity2.setUserPassword(ro.getUserPassword());
-            userEntity2.setUserName(ro.getUserName());
-            userEntity2.setUserIdentity(ro.getUserIdentity());
-            userEntity2.setUserTel(ro.getUserTel());
-            userEntity2.setUserEmail(ro.getUserEmail());
-            userEntity2.setIsAbc(ro.getIsAbc());
-            userEntity2.setLawFirmId(ro.getLawFirmId());
-            userEntity2.setModuleConfigure(ro.getModuleConfigure());
-            userEntity2.setPermitConfigure(ro.getPermitConfigure());
-            userEntity2.setUserDescripe(ro.getUserDescripe());
-            userEntity2.setUpdateTime(new Date());
-            userEntity2.setTxtHold1(ro.getTxtHold1());
-            userEntity2.setTxtHold2(ro.getTxtHold2());
-            userEntity2.setDelFlag(ro.getDelFlag());
-            QueryWrapper<UserEntity> queryWrapper2 = new QueryWrapper<>();
-            queryWrapper2.eq("user_identity", ro.getUserIdentity());
-            queryWrapper2.eq("del_flag", 0);
-            int count1 = userMapper.update(userEntity2,queryWrapper2);
+            UserEntity userEntity1 = new UserEntity();
+            userEntity1.setUserAccount(ro.getUserAccount());
+            userEntity1.setUserPassword(ro.getUserPassword());
+            userEntity1.setUserName(ro.getUserName());
+            userEntity1.setUserIdentity(ro.getUserIdentity());
+            userEntity1.setUserTel(ro.getUserTel());
+            userEntity1.setUserEmail(ro.getUserEmail());
+            userEntity1.setIsAbc(ro.getIsAbc());
+            userEntity1.setLawFirmId(ro.getLawFirmId());
+            userEntity1.setModuleConfigure(ro.getModuleConfigure());
+            userEntity1.setPermitConfigure(ro.getPermitConfigure());
+            userEntity1.setUserDescripe(ro.getUserDescripe());
+            userEntity1.setUpdateTime(new Date());
+            userEntity1.setTxtHold1(ro.getTxtHold1());
+            userEntity1.setTxtHold2(ro.getTxtHold2());
+            userEntity1.setDelFlag(ro.getDelFlag());
+            QueryWrapper<UserEntity> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("user_identity", ro.getUserIdentity());
+            queryWrapper1.eq("del_flag", 0);
+            int count1 = userMapper.update(userEntity1,queryWrapper1);
             if(count1 != 1){
                 publicVo.setRetCode("S001");
-                publicVo.setRetMsg("用户更新失败，请重新更新");
+                publicVo.setRetMsg("修改用户信息失败，请重新操作");
                 log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
                 return publicVo;
             }
@@ -175,7 +175,7 @@ public class UserServiceIml extends ServiceImpl<UserMapper, UserEntity> implemen
         }
 
         publicVo.setRetCode("0000");
-        publicVo.setRetMsg("交易成功");
+        publicVo.setRetMsg("操作成功");
         log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
         return publicVo;
     }

src/main/java/com/abcsz/litigationcase/utils/CodeGenerator.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
 import com.baomidou.mybatisplus.generator.config.*;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
-import org.junit.jupiter.api.Test;
 
 /**
  * @author shengqianlei

src/test/java/com/abcsz/litigationcase/LitigationCaseApplicationTests.java

@@ -1,6 +1,7 @@
 package com.abcsz.litigationcase;
 
-import org.junit.jupiter.api.Test;
+
+import org.junit.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest