swagger

business-common/pom.xml

@@ -65,5 +65,15 @@
             <artifactId>itext-rtf</artifactId>
             <version>2.1.7</version>
         </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
     </dependencies>
 </project>

business-common/src/main/java/com/rongwei/bscommon/sys/config/SwaggerConfig.java

@@ -0,0 +1,39 @@
+package com.rongwei.bscommon.sys.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;
+
+@Configuration // 标明是配置类
+@EnableSwagger2 //开启swagger功能
+public class SwaggerConfig {
+    @Bean
+    public Docket createRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)  // DocumentationType.SWAGGER_2 固定的，代表swagger2
+//                .groupName("分布式任务系统") // 如果配置多个文档的时候，那么需要配置groupName来分组标识
+                .apiInfo(apiInfo()) // 用于生成API信息
+                .select() // select()函数返回一个ApiSelectorBuilder实例,用来控制接口被swagger做成文档
+                .apis(RequestHandlerSelectors.basePackage("com.rongwei.bsserver.controller")) // 用于指定扫描哪个包下的接口
+                .paths(PathSelectors.any())// 选择所有的API,如果你想只为部分API生成文档，可以配置这里
+                .build();
+    }
+
+    /**
+     * 用于定义API主界面的信息，比如可以声明所有的API的总标题、描述、版本
+     * @return
+     */
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("长兴报验项目API") //  可以用来自定义API的主标题
+                .description("长兴报验项目SwaggerAPI管理") // 可以用来描述整体的API
+                .termsOfServiceUrl("") // 用于定义服务的域名
+                .version("1.0") // 可以用来定义版本。
+                .build(); //
+    }
+}

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxSubcontractorUserDao.java

@@ -3,9 +3,7 @@ package com.rongwei.bscommon.sys.dao;
 import com.rongwei.rwadmincommon.system.domain.SysUserDo;
 import com.rongwei.rwadmincommon.system.domain.SysUserRoleDo;
 import com.rongwei.rwcommon.base.BaseDao;
-import org.apache.ibatis.annotations.Delete;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.*;
 
 import java.util.Map;
 
@@ -22,4 +20,8 @@ public interface ZhcxSubcontractorUserDao extends BaseDao<SysUserDo> {
             "(ID,USERID,ROLEID,CREATEDATE,CREATEUSERID,MODIFYDATE,MODIFYUSERID,CREATEUSERNAME,MODIFYUSERNAME) " +
             "VALUES (#{id},#{userid},#{roleid},#{createdate},#{createuserid},#{modifydate},#{modifyuserid},#{createusername},#{modifyusername})")
     int insertUserRole(SysUserRoleDo sysUserRoleDo);
+
+    @Update("UPDATE INCONTROL.ZHCX_SUPERVISION_CUSTOM_USER_MANAGE SET ACCOUNT = #{account},PHONE = #{phone},EMAIL = #{email} WHERE USERID = #{userid}")
+    int updateSupervisor(@Param("userid") String id,@Param("account") String account,
+                         @Param("phone") String phone,@Param("email") String email);
 }

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxSubcontractorUserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.rongwei.bscommon.sys.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.rongwei.bscommon.sys.dao.ZhcxSubcontractorUserDao;
 import com.rongwei.bscommon.sys.service.ZhcxSubcontractorUserService;
 import com.rongwei.bsentity.vo.SubcontractorUserVo;
@@ -7,6 +8,8 @@ import com.rongwei.bsentity.vo.SubContractorBySysUserVo;
 import com.rongwei.commonservice.service.RedisService;
 import com.rongwei.rwadmincommon.system.domain.SysUserDo;
 import com.rongwei.rwadmincommon.system.domain.SysUserRoleDo;
+import com.rongwei.rwadmincommon.system.service.SysUserRoleService;
+import com.rongwei.rwadmincommon.system.service.SysUserService;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.BaseServiceImpl;
 import com.rongwei.rwcommon.base.R;
@@ -35,14 +38,20 @@ public class ZhcxSubcontractorUserServiceImpl extends BaseServiceImpl<ZhcxSubcon
     private RedisService redisService;
     @Autowired
     private ZhcxSubcontractorUserDao zhcxSubcontractorUserDao;
+    @Autowired
+    private SysUserRoleService sysUserRoleService;
+    @Autowired
+    private SysUserService sysUserService;
 
     @Override
     public void batchSaveList(SubcontractorUserVo subcontractorUserVo) {
         List<SubContractorBySysUserVo> list = subcontractorUserVo.getUserList();
         String roleid = subcontractorUserVo.getRoleid();
         for(SubContractorBySysUserVo userVo : list){
+            SysUserDo user = this.getById(userVo.getId());
             String opertionType = "insert";
-            if(StringUtils.isBlank(userVo.getPassword())){
+            if(user != null){
+                userVo.setPassword(null);
                 opertionType = "update";
             }
             SysUserVo currUser = null;
@@ -60,7 +69,10 @@ public class ZhcxSubcontractorUserServiceImpl extends BaseServiceImpl<ZhcxSubcon
                 userVo.setPassword(secPas);
             }
             R r = this.saveOrUpdate(userVo,currUser,roleid,opertionType);
-            SysUserDo user = this.getById(userVo.getId());
+            if(StringUtils.isNotBlank(userVo.getSupervisorId())){
+                zhcxSubcontractorUserDao.updateSupervisor(userVo.getId(),userVo.getAccount(),userVo.getMobile(),userVo.getEmail());
+            }
+
         }
     }
 
@@ -78,7 +90,7 @@ public class ZhcxSubcontractorUserServiceImpl extends BaseServiceImpl<ZhcxSubcon
         }
         else
         {
-            zhcxSubcontractorUserDao.updateById(sysUser);
+            sysUserService.updateById(sysUser);
             log.info("更新用户信息");
         }
         // 2.保存用户组织结构
@@ -99,9 +111,9 @@ public class ZhcxSubcontractorUserServiceImpl extends BaseServiceImpl<ZhcxSubcon
     private void saveUserRole(SubContractorBySysUserVo sysUser, SysUserVo currUser, String roleid,String opertionType) {
         // 先删除用户原有的角色
         String userId = sysUser.getId();
-        Map<String, Object> params = new HashMap<>(5);
-        params.put("userid", userId);
-        zhcxSubcontractorUserDao.deleteUserRole(params);
+        //Map<String, Object> params = new HashMap<>(5);
+        //params.put("userid", userId);
+        //zhcxSubcontractorUserDao.deleteUserRole(params);
         SysUserRoleDo sysUserRoleDo = new SysUserRoleDo();
         sysUserRoleDo.setUserid(userId);
         if (StringUtils.isBlank(sysUser.getRoleid())) {
@@ -127,6 +139,10 @@ public class ZhcxSubcontractorUserServiceImpl extends BaseServiceImpl<ZhcxSubcon
         sysUserRoleDo.setModifydate(new Date());
         sysUserRoleDo.setModifyuserid(currUser.getId());
         sysUserRoleDo.setModifyusername(currUser.getName());
-        zhcxSubcontractorUserDao.insertUserRole(sysUserRoleDo);
+        UpdateWrapper<SysUserRoleDo> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("USERID", sysUserRoleDo.getUserid());
+        updateWrapper.eq("ROLEID", sysUserRoleDo.getRoleid());
+        sysUserRoleService.saveOrUpdate(sysUserRoleDo,updateWrapper);
+        //zhcxSubcontractorUserDao.insertUserRole(sysUserRoleDo);
     }
 }

business-entity/pom.xml

@@ -29,5 +29,15 @@
             <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
     </dependencies>
 </project>

business-entity/src/main/java/com/rongwei/bsentity/vo/SubContractorBySysUserVo.java

@@ -2,6 +2,7 @@ package com.rongwei.bsentity.vo;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.rongwei.rwadmincommon.system.domain.SysUserDo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -9,6 +10,8 @@ import java.io.Serializable;
 @Data
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class SubContractorBySysUserVo extends SysUserDo implements Serializable {
-
+    @ApiModelProperty("监理信角色id")
     private String roleid;
+    @ApiModelProperty("监理id")
+    private String supervisorId;
 }

business-entity/src/main/java/com/rongwei/bsentity/vo/SubcontractorUserVo.java

@@ -1,5 +1,6 @@
 package com.rongwei.bsentity.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -7,8 +8,9 @@ import java.util.List;
 @Data
 public class SubcontractorUserVo {
 
+    @ApiModelProperty("监理信息")
     List<SubContractorBySysUserVo> userList;
-
+    @ApiModelProperty("角色id")
     String roleid;
 
 }

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxSubcontractorUserController.java

@@ -3,6 +3,8 @@ package com.rongwei.bsserver.controller;
 import com.rongwei.bscommon.sys.service.ZhcxSubcontractorUserService;
 import com.rongwei.bsentity.vo.SubcontractorUserVo;
 import com.rongwei.rwcommon.base.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -15,13 +17,14 @@ import java.util.List;
  * @author zhuang
  * 分包商账号
  */
+@Api("分包商监理接口")
 @RestController
 @RequestMapping("/zhcxSubcontractorUser")
 public class ZhcxSubcontractorUserController {
 
     @Autowired
     private ZhcxSubcontractorUserService zhcxSubcontractorUserService;
-
+    @ApiOperation("分包商监理注册用户")
     @PostMapping("/batchSaveList")
     public R batchSaveList(@RequestBody SubcontractorUserVo subcontractorUserVo){
         zhcxSubcontractorUserService.batchSaveList(subcontractorUserVo);