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

diagbotman-service/src/main/java/com/diagbot/client/UserServiceClient.java

@@ -23,6 +23,9 @@ public interface UserServiceClient {
     @PostMapping(value = "/user/getUserAuthStatus")
     RespDTO<User> getUserAuthStatus(@RequestBody Long userId);
 
+    @PostMapping(value = "/user/getUserAllInfo")
+    RespDTO<List<User>> getUserAllInfo();
+
     @PostMapping(value = "/user/getUserAndOrg")
     RespDTO<Map<Long, UserOrgDTO>> getUserAndOrg(@RequestBody List<Long> userIds);
 

diagbotman-service/src/main/java/com/diagbot/client/hystrix/UserServiceHystrix.java

@@ -27,6 +27,12 @@ public class UserServiceHystrix implements UserServiceClient {
         return null;
     }
 
+    @Override
+    public RespDTO<List<User>> getUserAllInfo() {
+        log.error("【hystrix】调用{}异常", "getUserAuthStatus");
+        return null;
+    }
+
     @Override
     public RespDTO<Map<Long, UserOrgDTO>> getUserAndOrg(List<Long> userIds) {
         log.error("【hystrix】调用{}异常", "getUserAndOrg");

diagbotman-service/src/main/java/com/diagbot/facade/ProductOrderFacade.java

@@ -15,6 +15,7 @@ import com.diagbot.entity.OrderDetailStatus;
 import com.diagbot.entity.OrderDetails;
 import com.diagbot.entity.ProductOrder;
 import com.diagbot.entity.ProductOrderIndex;
+import com.diagbot.entity.User;
 import com.diagbot.entity.wrapper.ProductOrderWrapper;
 import com.diagbot.enums.AuditStatusEnum;
 import com.diagbot.enums.AuthStatusEnum;
@@ -234,6 +235,13 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
         if(productOrderVO.getOrgName()!=null&&productOrderVO.getOrgName()!=""){
             RespDTO<List<Long>> rlist = userServiceClient.getUserByOrgName(productOrderVO.getOrgName());
             productOrderIndex.setUserId(rlist.data);
+        }else{
+            RespDTO<List<User>> userInfiList = userServiceClient.getUserAllInfo();
+            List<Long> userIds =new ArrayList<>();
+            for (User user:userInfiList.data) {
+                userIds.add(user.getId());
+            }
+            productOrderIndex.setUserId(userIds);
         }
 		List<ProductOrderDTO> list =productOrderFacade.selectAllProductOrder(page,productOrderIndex).getRecords();
 		List<Long> list1 =new ArrayList<>();

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

@@ -43,6 +43,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/user/verifyNoUsername").permitAll()
                 .antMatchers("/user/verifyExistUsername").permitAll()
                 .antMatchers("/userAuthentication/getAuthInfoCount").permitAll()
+                .antMatchers("/user/getUserAllInfo").permitAll()
                 .antMatchers("/**").authenticated();
         //        .antMatchers("/**").permitAll();
     }

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

@@ -87,6 +87,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/user/verifyNoUsername", request)
                 || matchers("/user/verifyExistUsername", request)
                 || matchers("/userAuthentication/getAuthInfoCount", request)
+                || matchers("/user/getUserAllInfo", request)
                 || matchers("/", request)) {
             return true;
         }

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

@@ -245,6 +245,7 @@ public class UserFacade extends UserServiceImpl {
         Map<String, Object> paramMap = new HashMap<>();
         String name = userSaveVO.getOrganization();
         paramMap.put("name", name);
+        paramMap.put("is_deleted", IsDeleteEnum.N.getKey());
         Long orgId = 0L;
         List<Organization> list = organizationFacade.selectByMap(paramMap);
         if (ListUtil.isEmpty(list)) {
@@ -528,7 +529,7 @@ public class UserFacade extends UserServiceImpl {
         PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
         if (!StringUtil.isBlank(diffPassword) && "Y".equals(diffPassword)) {
             if (passwordEncoder.matches(password, user.getPassword())) {
-                throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "修改后密码不能与修改前相同");
+                throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "原密码和新密码不能相同");
             }
         }
         String entryPassword = passwordEncoder.encode(password);
@@ -1144,7 +1145,7 @@ public class UserFacade extends UserServiceImpl {
         for (int i = 0; i < datas.size(); i++) {
             UserInfoDTO userInfo = datas.get(i);
             list.add(new ExportUserInfoDTO(String.valueOf(i+1),
-                    DateUtil.formatDate(userInfo.getUserGmtCreate()),
+                    DateUtil.formatDateTime(userInfo.getUserGmtCreate()),
                     userInfo.getLinkman(),
                     AuthStatusEnum.getName(userInfo.getAuthStatus()),
                     userInfo.getUserName(),
@@ -1194,7 +1195,7 @@ public class UserFacade extends UserServiceImpl {
             UserInfoDTO userInfo = datas.get(i);
             list.add(new ExportOrganizationDTO(
                     String.valueOf(i+1),
-                    DateUtil.formatDate(userInfo.getOrgGmtCreate()),
+                    DateUtil.formatDateTime(userInfo.getOrgGmtCreate()),
                     userInfo.getOrgName(),
                     userInfo.getOrgPrincipal(),
                     OrganizationTypeEnum.getName(userInfo.getOrgType()),
@@ -1245,7 +1246,7 @@ public class UserFacade extends UserServiceImpl {
         for (int i = 0; i < datas.size(); i++) {
         	AuthenticationDTO userInfo = datas.get(i);
             list.add(new ExportKemaDTO(String.valueOf(i+1),
-                    DateUtil.formatDate(userInfo.getAutGmtCreate()),
+                    DateUtil.formatDateTime(userInfo.getAutGmtCreate()),
                     userInfo.getOrderNum(),
                     userInfo.getLinkman(),
                     userInfo.getOrgName(),
@@ -1268,7 +1269,7 @@ public class UserFacade extends UserServiceImpl {
         userMap.put("authStatus", 1);
         userMap.put("orgName", userExportVO.getOrgName());
         userMap.put("userName", userExportVO.getUserName());
-        List<UserInfoDTO> datas = dependentuserInfoByTime(userMap);
+        List<UserInfoDTO> datas = exportVerified(userMap);
         GsonUtil.toJson(datas);
         List<String> listName = new ArrayList<>();
 
@@ -1297,8 +1298,8 @@ public class UserFacade extends UserServiceImpl {
         for (int i = 0; i < datas.size(); i++) {
             UserInfoDTO userInfo = datas.get(i);
             list.add(new ExportVerifiedDTO(String.valueOf(i+1),
-                    DateUtil.formatDate(userInfo.getUserGmtCreate()),
-                    DateUtil.formatDate(userInfo.getPassauthTime()),
+                    DateUtil.formatDateTime(userInfo.getUserGmtCreate()),
+                    DateUtil.formatDateTime(userInfo.getPassauthTime()),
                     userInfo.getLinkman(),
                     userInfo.getOrgName(),
                     userInfo.getPosition(),

user-service/src/main/java/com/diagbot/mapper/UserMapper.java

@@ -8,12 +8,9 @@ import com.diagbot.dto.CustomerDTO;
 import com.diagbot.dto.OrganizationDTO;
 import com.diagbot.dto.UserAllDTO;
 import com.diagbot.dto.UserInfoDTO;
-import com.diagbot.dto.UserInfoExportDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.dto.UserOrgizationProductDTO;
 import com.diagbot.entity.User;
-import com.diagbot.vo.UserExportVO;
-import com.diagbot.vo.UserInfoOrganizationsVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -91,5 +88,12 @@ public interface UserMapper extends BaseMapper<User> {
 	public List<UserInfoDTO> exportOrganizations(@Param("exportOrg") Map<String, Object> exportOrg);
 	//导出认证中信息接口
 	public List<AuthenticationDTO> exportKema(@Param("exportKema") Map<String, Object> map);
+	
+	public List<UserInfoDTO> exportVerified(@Param("Verified") Map<String, Object> map);
 
+    /**
+     * 获取用户信息
+     * @return
+     */
+	public List<User> getAllUserInfos();
 }

user-service/src/main/java/com/diagbot/service/UserService.java

@@ -15,8 +15,6 @@ import com.diagbot.entity.User;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Param;
-
 /**
  * <p>
  * 服务类
@@ -77,4 +75,12 @@ public interface UserService extends IService<User> {
     public List<UserInfoDTO> exportOrganizations(Map<String, Object> map);
 
     public List<AuthenticationDTO> exportKema(Map<String, Object> map);
+    
+    public List<UserInfoDTO> exportVerified(Map<String, Object> map);
+
+    /**
+     * 获取用户信息
+     * @return
+     */
+    public List<User> getAllUserInfos();
 }

user-service/src/main/java/com/diagbot/service/impl/UserServiceImpl.java

@@ -159,6 +159,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 		return baseMapper.exportOrganizations(map);
 	}
 	
+	@Override
+	public List<UserInfoDTO> exportVerified(Map<String, Object> map){
+		return baseMapper.exportVerified(map);
+	}
 
+    /**
+     * 获取用户信息
+     * @return 用户信息
+     */
+    @Override
+    public List<User> getAllUserInfos() {
+        return baseMapper.getAllUserInfos();
+    }
 
 }

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

@@ -18,5 +18,6 @@ public class ResetPasswordVO {
     private String username;
     @NotBlank(message = "请输入密码!")
     private String password;
+    private String diffPassword; //Y: 修改密码不能相同
 
 }

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

@@ -152,12 +152,13 @@ public class UserController {
 
     @ApiOperation(value = "重置密码[by:zhoutg]",
             notes = "username：用户名,必填<br>" +
-                    "password：密码, 必填<br> ")
+                    "password：密码, 必填<br> " +
+                    "diffPassword：标志，Y：修改的密码不能和上次相同,其他值：不作限制")
     @PostMapping("/resetPassword")
     @SysLogger("resetPassword")
     @Transactional
     public RespDTO<Boolean> resetPassword(@RequestBody ResetPasswordVO resetPasswordVO) {
-        return userFacade.resetPassword(resetPasswordVO.getUsername(), resetPasswordVO.getPassword(), "N");
+        return userFacade.resetPassword(resetPasswordVO.getUsername(), resetPasswordVO.getPassword(), resetPasswordVO.getDiffPassword());
     }
 
 
@@ -190,6 +191,14 @@ public class UserController {
         return userFacade.getUserAuthStatus(userId);
     }
 
+    @PostMapping(value = "/getUserAllInfo")
+    @SysLogger("getUserAllInfo")
+    @ApiOperation(value = "远程调用，获取用户信息[by:wangyu]")
+    @ApiIgnore
+    RespDTO<List<User>> getUserAllInfo() {
+        return RespDTO.onSuc(userFacade.getAllUserInfos());
+    }
+
     @PostMapping(value = "/getUserByOrgName")
     @SysLogger("getUserByOrgName")
     @ApiOperation(value = "远程调用，根据机构名称获取用户信息[by:zhoutg]")

user-service/src/main/resources/mapper/UserMapper.xml

@@ -130,7 +130,7 @@
         org.type as orgType,
         org.principal AS orgPrincipal,
         org.address as orgAddress,
-        org.parent_id as orgParent_id,
+        org.parent_id as orgParentId,
         org.sub_num as orgSub_num,
         u.position as position,
         aut.is_reject as autIsReject,
@@ -275,7 +275,7 @@
         org.type as orgType,
         org.principal AS orgPrincipal,
         org.address as orgAddress,
-        org.parent_id as orgParent_id,
+        org.parent_id as orgParentId,
         org.sub_num as orgSub_num,
         u.position as position,
         u.auth_status as authStatus
@@ -335,7 +335,7 @@
         org.type AS orgType,
         org.principal AS orgPrincipal,
         org.address AS orgAddress,
-        org.parent_id AS orgParent_id,
+        org.parent_id AS orgParentId,
         org.sub_num AS orgSub_num
         FROM sys_user u
         LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id
@@ -396,7 +396,7 @@
         org.type AS orgType,
         org.principal AS orgPrincipal,
         org.address AS orgAddress,
-        org.parent_id AS orgParent_id,
+        org.parent_id AS orgParentId,
         org.sub_num AS orgSubNum,
         u.passauth_time AS passauthTime,
         u.position AS position,
@@ -461,7 +461,7 @@
 	<!-- SELECT u.id AS userId, u.gmt_create AS userGmtCreate, u.username AS 
 		userName, u.linkman AS linKman, u.email AS email, org.id AS orgId, org.gmt_create 
 		AS orgGmtCreate, org.name AS orgName, org.type AS orgType, org.principal 
-		AS orgPrincipal, org.address AS orgAddress, org.parent_id AS orgParent_id, 
+		AS orgPrincipal, org.address AS orgAddress, org.parent_id AS orgParentId, 
 		org.sub_num AS orgSub_num, u.position AS autPosition, u.auth_status AS authStatus 
 		FROM sys_user u LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id 
 		LEFT JOIN sys_organization org ON uorg.organization_id = org.id WHERE u.is_deleted 
@@ -587,4 +587,44 @@
 
 	ORDER BY aut.gmt_create DESC
 	</select>
+	 <select id="exportVerified" resultType="com.diagbot.dto.UserInfoDTO">
+     SELECT
+        u.id AS userId,
+        u.gmt_create AS userGmtCreate,
+        u.username AS userName,
+        u.linkman AS linkman,
+        u.email AS email,
+        org.id AS orgId,
+        org.gmt_create AS orgGmtCreate,
+        org.name AS orgName,
+        org.type AS orgType,
+        org.principal AS orgPrincipal,
+        org.address AS orgAddress,
+        org.parent_id AS orgParentId,
+        org.sub_num AS orgSubNum,
+        u.passauth_time AS passauthTime,
+        u.position AS position,
+        u.auth_status AS authStatus
+        FROM sys_user u
+        LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id
+        LEFT JOIN sys_organization org ON uorg.organization_id = org.id
+        WHERE 
+		u.is_deleted = 'N' 
+		AND u.TYPE = 0
+        <if test="Verified.orgName != null">
+            AND org.name LIKE CONCAT('%', #{Verified.orgName}, '%')
+        </if>
+        <if test="Verified.userName != null">
+            AND u.username LIKE CONCAT('%', #{Verified.userName}, '%')
+        </if>
+         <if test="Verified.startTime != null and Verified.endTime != null">
+            AND u.gmt_create BETWEEN #{Verified.startTime} and #{Verified.endTime}
+        </if>
+        AND u.auth_status = 1
+        ORDER BY u.passauth_time DESC
+    </select>
+
+    <select id="getAllUserInfos" resultMap="BaseResultMap">
+        SELECT * FROM `sys_user` where is_deleted ='N'
+    </select>
 </mapper>