Merge remote-tracking branch 'origin/dev/one' into dev/one

diagbotman-service/src/main/java/com/diagbot/web/ProductOrderController.java

@@ -92,12 +92,12 @@ public class ProductOrderController {
         return RespDTO.onSuc(productOrderFacade.waitExamOrderCou());
     }
 
-    @ApiOperation(value = "客户中心-传入用户id查询已开通的功能[by:wangfeng]", notes = "已开通信息")
+    @ApiOperation(value = "客户中心-传入用户id查询已开通的功能(传userId)[by:wangfeng]", notes = "已开通信息")
     @PostMapping("/getInformationAvailableByUserId")
     @SysLogger("getInformationAvailableByUserId")
-    public RespDTO getInformationAvailableByUserId(Long userId) {
+    public RespDTO getInformationAvailableByUserId(@RequestBody OpenedProducts openedProduct) {
         OpenedProducts openedProducts = new OpenedProducts();
-        openedProducts.setUserId(userId);
+        openedProducts.setUserId(openedProduct.getUserId());
         List<UserAndProdutDTO> UserAndProdutData = openedProductsFacade.getInformationAvailableByUserId(openedProducts);
         return RespDTO.onSuc(UserAndProdutData);
     }
@@ -112,12 +112,13 @@ public class ProductOrderController {
 
     }
 
-    @ApiOperation(value = "客户中心-传入用户id和产品id，删除开通信息[by:wangfeng]", notes = "删除开通信息")
+    @ApiOperation(value = "客户中心-传入用户userId和产品productId，删除开通信息[by:wangfeng]", notes = "删除开通信息")
     @PostMapping("/delInformationAvailable")
     @SysLogger("delInformationAvailable")
     @Transactional
-    public RespDTO delInformationAvailable(@RequestParam Long userId, Long productId) {
-
+    public RespDTO delInformationAvailable(@RequestBody OpenedProducts openedProduct) {
+    	long userId = openedProduct.getUserId(); 
+    	long productId = openedProduct.getProductId();
         return openedProductsFacade.delInformationAvailables(userId, productId);
     }
 

user-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -39,6 +39,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/user/index").permitAll()
                 .antMatchers("/user/getUserAndOrg").permitAll()
                 .antMatchers("/user/getUserByOrgName").permitAll()
+                .antMatchers("/user/resetPassword").permitAll()
                 .antMatchers("/**").authenticated();
         //        .antMatchers("/**").permitAll();
     }

user-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -47,6 +47,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                     || matchers("/getUserEnumsData", request)
                     || matchers("/userInfo/getUserInfoPag", request)
                     || matchers("/user/getPermission", request)
+                    || matchers("/user/resetPassword", request)
                     || matchers("/user/index", request)
                     || matchers("/user/getUserByOrgName", request)
                     || matchers("/user/getUserAndOrg", request)

user-service/src/main/java/com/diagbot/dto/LoginDTO.java

@@ -16,7 +16,7 @@ import java.util.List;
 @Getter
 @Setter
 public class LoginDTO {
-    private User user;
+    private UserLoginDTO userLoginDTO;
     private String token;
     private Organization organization;
     private List<MenuWrapper> menuWrappers;

user-service/src/main/java/com/diagbot/dto/UserLoginDTO.java

@@ -0,0 +1,35 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 登录返回的用户信息
+ * @author: gaodm
+ * @time: 2018/9/28 15:10
+ */
+@Getter
+@Setter
+public class UserLoginDTO {
+
+    /**
+     * 用户名
+     */
+    private String username;
+
+
+    /**
+     * 联系人
+     */
+    private String linkman;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 用户类型
+     */
+    private Integer type;
+}

user-service/src/main/java/com/diagbot/enums/ConstantEnum.java

@@ -13,7 +13,7 @@ public enum ConstantEnum implements KeyedNamed {
     //TODO 短信过期时间，上线后设为3，测试阶段设大
     SMS_EXPIRED_INTERVAL(99999, "短信失效时间(分钟)"),
 
-    IMG_EXPIRED_INTERVAL(3, "图片验证码失效时间(分钟)");
+    IMG_EXPIRED_INTERVAL(20, "图片验证码失效时间(分钟)");
 
     @Setter
     private Integer key;

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -11,6 +11,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserAndProdutUDTO;
 import com.diagbot.dto.UserInfoDTO;
 import com.diagbot.dto.UserInfoExportDTO;
+import com.diagbot.dto.UserLoginDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.entity.JWT;
 import com.diagbot.entity.Organization;
@@ -35,6 +36,7 @@ import com.diagbot.util.ListUtil;
 import com.diagbot.util.RegexValidateUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
+import com.diagbot.vo.BaseIdVO;
 import com.diagbot.vo.ImgVerVerVO;
 import com.diagbot.vo.OrganizationVO;
 import com.diagbot.vo.UserAndOrganizationVO;
@@ -89,7 +91,7 @@ public class UserFacade extends UserServiceImpl {
      * @param userSaveVO 参数
      * @return 用户信息
      */
-    public User createUser(UserSaveVO userSaveVO) {
+    public Boolean createUser(UserSaveVO userSaveVO) {
         User user = new User();
         BeanUtil.copyProperties(userSaveVO, user);
         user.setGmtCreate(new Date());
@@ -119,7 +121,7 @@ public class UserFacade extends UserServiceImpl {
 
         //用户认证业务
         doUserAuthentication(userSaveVO, user);
-        return user;
+        return true;
     }
 
 
@@ -245,7 +247,9 @@ public class UserFacade extends UserServiceImpl {
         }
         LoginDTO loginDTO = new LoginDTO();
         //添加用户
-        loginDTO.setUser(user);
+        UserLoginDTO userLoginDTO = new UserLoginDTO();
+        BeanUtil.copyProperties(user, userLoginDTO);
+        loginDTO.setUserLoginDTO(userLoginDTO);
         //添加token
         loginDTO.setToken(jwt.getAccess_token());
         //添加机构信息
@@ -682,9 +686,9 @@ public class UserFacade extends UserServiceImpl {
      * @param userId
      * @return 删除用户信息和机构信息
      */
-    public RespDTO<Boolean> updateDeleteds(String userId) {
+    public RespDTO<Boolean> updateDeleteds(BaseIdVO baseIdVO) {
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("userId", userId);
+        map.put("userId", baseIdVO.getId());
         map.put("modifier", UserUtils.getCurrentPrincipleID());
         map.put("gmtModified", DateUtil.now());
         boolean res = updateDeleted(map);

user-service/src/main/java/com/diagbot/vo/OrganizationNameVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @Description: 模糊查询机构
+ * @author wangfeng
+ * @date 2018年9月28日 下午2:44:31
+ */
+@Setter
+@Getter
+public class OrganizationNameVO {
+	
+	private String organizationName;
+
+}

user-service/src/main/java/com/diagbot/vo/ResetPasswordVO.java

@@ -18,6 +18,5 @@ public class ResetPasswordVO {
     private String username;
     @NotBlank(message = "请输入密码!")
     private String password;
-    private String diffPassword; //密码是否与修改前一样标识
 
 }

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -1,7 +1,6 @@
 package com.diagbot.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.GetConsoleUserInfoDTO;
 import com.diagbot.dto.LoginDTO;
@@ -26,7 +25,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -61,9 +59,9 @@ public class UserController {
     @PostMapping("/registry")
     @SysLogger("registry")
     @Transactional
-    public RespDTO<User> createUser(@RequestBody @Valid UserSaveVO userSaveVO) {
-        User user = userFacade.createUser(userSaveVO);
-        return RespDTO.onSuc(user);
+    public RespDTO<Boolean> createUser(@RequestBody @Valid UserSaveVO userSaveVO) {
+        Boolean res = userFacade.createUser(userSaveVO);
+        return RespDTO.onSuc(res);
     }
 
 
@@ -79,13 +77,23 @@ public class UserController {
 
     @ApiOperation(value = "重置密码[by:zhoutg]",
             notes = "username：用户名,必填<br>" +
-                    "password：密码, 必填<br> " +
-                    "diffPassword：值为Y，表示修改前和修改后密码不相同<br>")
+                    "password：密码, 必填<br> ")
     @PostMapping("/resetPassword")
     @SysLogger("resetPassword")
     @Transactional
     public RespDTO<Boolean> resetPassword(@RequestBody ResetPasswordVO resetPasswordVO) {
-        return userFacade.resetPassword(resetPasswordVO.getUsername(), resetPasswordVO.getPassword(), resetPasswordVO.getDiffPassword());
+        return userFacade.resetPassword(resetPasswordVO.getUsername(), resetPasswordVO.getPassword(), "N");
+    }
+
+
+    @ApiOperation(value = "修改密码[by:zhoutg]",
+            notes = "username：用户名,必填<br>" +
+                    "password：密码, 必填<br> ")
+    @PostMapping("/midifyPassword")
+    @SysLogger("midifyPassword")
+    @Transactional
+    public RespDTO<Boolean> midifyPassword(@RequestBody ResetPasswordVO resetPasswordVO) {
+        return userFacade.resetPassword(resetPasswordVO.getUsername(), resetPasswordVO.getPassword(), "Y");
     }
 
 

user-service/src/main/java/com/diagbot/web/UserInfoController.java

@@ -24,6 +24,8 @@ import com.diagbot.facade.OrganizationFacade;
 import com.diagbot.facade.UserAuthenticationFacade;
 import com.diagbot.facade.UserFacade;
 import com.diagbot.facade.UserOrganizationFacade;
+import com.diagbot.vo.BaseIdVO;
+import com.diagbot.vo.OrganizationNameVO;
 import com.diagbot.vo.OrganizationVO;
 import com.diagbot.vo.UserAndOrganizationVO;
 import com.diagbot.vo.UserInfoAuditVO;
@@ -85,15 +87,16 @@ public class UserInfoController {
     @PostMapping("/updateDeleted")
     @SysLogger("updateDeleted")
     @Transactional
-    public RespDTO<Boolean> updateDeleted(@RequestParam String userId) {
-        return userFacade.updateDeleteds(userId);
+    public RespDTO<Boolean> updateDeleted(@RequestBody BaseIdVO baseIdVO) {
+        return userFacade.updateDeleteds(baseIdVO);
     }
 
     @ApiOperation(value = "模糊查询机构信息[by:wangfeng]", notes = "机构信息")
     @PostMapping("/findOrganization")
     @SysLogger("findOrganization")
-    public RespDTO<Organization> findOrganization(@RequestParam String organizationName) {
+    public RespDTO<Organization> findOrganization(@RequestBody OrganizationNameVO organizationNameVO) {
         // TODO 返回机构Id和机构
+    	String organizationName = organizationNameVO.getOrganizationName();
         List<Organization> organization = organizationFacade.findOrganization(organizationName);
 
         return RespDTO.onSuc(organization);