优化修改密码功能

Api/src/main/java/com/java110/api/listener/AbstractServiceApiDataFlowListener.java

@@ -127,7 +127,7 @@ public abstract class AbstractServiceApiDataFlowListener implements ServiceDataF
                 responseEntity = tmpRestTemplate.exchange(serviceUrl, HttpMethod.POST, httpEntity, String.class);
             }
         } catch (HttpStatusCodeException e) { //这里spring 框架 在4XX 或 5XX 时抛出 HttpServerErrorException 异常，需要重新封装一下
-            responseEntity = new ResponseEntity<String>("请求下游系统异常，" + e.getResponseBodyAsString(), e.getStatusCode());
+            responseEntity = new ResponseEntity<String>( e.getResponseBodyAsString(), e.getStatusCode());
         }
         return responseEntity;
     }
@@ -175,7 +175,7 @@ public abstract class AbstractServiceApiDataFlowListener implements ServiceDataF
                 responseEntity = tmpRestTemplate.exchange(service.getUrl(), HttpMethod.POST, httpEntity, String.class);
             }
         } catch (HttpStatusCodeException e) { //这里spring 框架 在4XX 或 5XX 时抛出 HttpServerErrorException 异常，需要重新封装一下
-            responseEntity = new ResponseEntity<String>("请求下游系统异常，" + e.getResponseBodyAsString(), e.getStatusCode());
+            responseEntity = new ResponseEntity<String>( e.getResponseBodyAsString(), e.getStatusCode());
         }
 
         logger.debug("API 服务调用下游服务请求：{}，返回为：{}", httpEntity, responseEntity);

Api/src/main/java/com/java110/api/listener/users/ChangeStaffPwdListener.java

@@ -6,6 +6,8 @@ import com.java110.api.listener.AbstractServiceApiDataFlowListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.factory.DataFlowFactory;
+import com.java110.core.smo.user.IUserInnerServiceSMO;
+import com.java110.dto.user.UserDto;
 import com.java110.entity.center.AppService;
 import com.java110.event.service.api.ServiceDataFlowEvent;
 import com.java110.utils.constant.BusinessTypeConstant;
@@ -13,14 +15,19 @@ import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.constant.ServiceCodeConstant;
 import com.java110.utils.exception.ListenerExecuteException;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 修改员工 2018年12月6日
  * Created by wuxw on 2018/5/18.
@@ -30,6 +37,9 @@ public class ChangeStaffPwdListener extends AbstractServiceApiDataFlowListener {
 
     private final static Logger logger = LoggerFactory.getLogger(ChangeStaffPwdListener.class);
 
+    @Autowired
+    private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
 
     @Override
     public String getServiceCode() {
@@ -109,28 +119,16 @@ public class ChangeStaffPwdListener extends AbstractServiceApiDataFlowListener {
      */
     private JSONObject builderStaffInfo(JSONObject paramObj, DataFlowContext dataFlowContext) {
 
-        //首先根据员工ID查询员工信息，根据员工信息修改相应的数据
-        ResponseEntity responseEntity = null;
-        AppService appService = DataFlowFactory.getService(dataFlowContext.getAppId(), ServiceCodeConstant.SERVICE_CODE_QUERY_USER_USERINFO);
-        if (appService == null) {
-            throw new ListenerExecuteException(1999, "当前没有权限访问" + ServiceCodeConstant.SERVICE_CODE_QUERY_USER_USERINFO);
+        UserDto userDto = new UserDto();
+        userDto.setStatusCd("0");
+        userDto.setUserId(paramObj.getString("userId"));
+        List<UserDto> userDtos = userInnerServiceSMOImpl.getUserHasPwd(userDto);
 
-        }
-        String requestUrl = appService.getUrl() + "?userId=" + paramObj.getString("userId");
-        HttpHeaders header = new HttpHeaders();
-        header.add(CommonConstant.HTTP_SERVICE.toLowerCase(), ServiceCodeConstant.SERVICE_CODE_QUERY_USER_USERINFO);
-        dataFlowContext.getRequestHeaders().put("REQUEST_URL", requestUrl);
-        HttpEntity<String> httpEntity = new HttpEntity<String>("", header);
-        doRequest(dataFlowContext, appService, httpEntity);
-        responseEntity = dataFlowContext.getResponseEntity();
-
-        if (responseEntity.getStatusCode() != HttpStatus.OK) {
-            dataFlowContext.setResponseEntity(responseEntity);
-        }
+        Assert.listOnlyOne(userDtos, "数据错误查询到多条用户信息或单条");
 
-        JSONObject userInfo = JSONObject.parseObject(responseEntity.getBody().toString());
+        JSONObject userInfo = JSONObject.parseObject(JSONObject.toJSONString(userDtos.get(0)));
 
-        if (!paramObj.getString("oldPwd").equals(userInfo.getString("password"))) {
+        if (!paramObj.getString("oldPwd").equals(userDtos.get(0).getPassword())) {
             throw new IllegalArgumentException("原始密码错误");
         }
         userInfo.putAll(paramObj);

Api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java

@@ -102,7 +102,7 @@ public class ApiServiceSMOImpl extends LoggerEngine implements IApiServiceSMO {
         } catch (DecryptException e) { //解密异常
             responseEntity = new ResponseEntity<String>("解密异常：" + e.getMessage(), HttpStatus.NON_AUTHORITATIVE_INFORMATION);
         } catch (BusinessException e) {
-            responseEntity = new ResponseEntity<String>("业务处理异常：" + e.getMessage(), HttpStatus.BAD_REQUEST);
+            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.BAD_REQUEST);
         } catch (NoAuthorityException e) {
             responseEntity = new ResponseEntity<String>("鉴权失败：" + e.getMessage(), HttpStatus.UNAUTHORIZED);
         } catch (InitConfigDataException e) {

AppFrontService/src/main/java/com/java110/app/smo/AppAbstractComponentSMO.java

@@ -49,7 +49,7 @@ public abstract class AppAbstractComponentSMO extends AbstractComponentSMO {
         try {
             responseEntity = restTemplate.exchange(url, httpMethod, httpEntity, String.class);
         } catch (HttpStatusCodeException e) { //这里spring 框架 在4XX 或 5XX 时抛出 HttpServerErrorException 异常，需要重新封装一下
-            responseEntity = new ResponseEntity<String>("请求下游系统异常，" + e.getResponseBodyAsString(), e.getStatusCode());
+            responseEntity = new ResponseEntity<String>( e.getResponseBodyAsString(), e.getStatusCode());
         } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         } finally {

AppFrontService/src/main/java/com/java110/app/smo/payment/impl/ToNotifySMOImpl.java

@@ -155,7 +155,7 @@ public class ToNotifySMOImpl implements IToNotifySMO {
         try {
             responseEntity = restTemplate.exchange(url, httpMethod, httpEntity, String.class);
         } catch (HttpStatusCodeException e) { //这里spring 框架 在4XX 或 5XX 时抛出 HttpServerErrorException 异常，需要重新封装一下
-            responseEntity = new ResponseEntity<String>("请求下游系统异常，" + e.getResponseBodyAsString(), e.getStatusCode());
+            responseEntity = new ResponseEntity<String>( e.getResponseBodyAsString(), e.getStatusCode());
         } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         } finally {

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/UpdateApplicationKeyPwd.java

@@ -104,7 +104,7 @@ public class UpdateApplicationKeyPwd implements Runnable {
         try {
             responseEntity = restTemplate.exchange(url, httpMethod, httpEntity, String.class);
         } catch (HttpStatusCodeException e) { //这里spring 框架 在4XX 或 5XX 时抛出 HttpServerErrorException 异常，需要重新封装一下
-            responseEntity = new ResponseEntity<String>("请求下游系统异常，" + e.getResponseBodyAsString(), e.getStatusCode());
+            responseEntity = new ResponseEntity<String>( e.getResponseBodyAsString(), e.getStatusCode());
         } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         } finally {

UserService/src/main/java/com/java110/user/dao/IUserServiceDao.java

@@ -386,4 +386,13 @@ public interface IUserServiceDao {
      * @throws DAOException DAO异常
      */
     List<Map> getUsers(Map info) throws DAOException;
+
+    /**
+     * 查询用户密码
+     * 根据bId 查询组织信息
+     * @param info bId 信息
+     * @return 组织信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getUserHasPwd(Map info) throws DAOException;
 }

UserService/src/main/java/com/java110/user/dao/impl/UserServiceDaoImpl.java

@@ -690,4 +690,19 @@ public class UserServiceDaoImpl extends BaseServiceDao implements IUserServiceDa
 
         return businessStaffs;
     }
+
+    /**
+     * 查询用户密码
+     * 根据bId 查询组织信息
+     * @param info bId 信息
+     * @return 组织信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getUserHasPwd(Map info) throws DAOException{
+        logger.debug("查询用户密码 入参 info : {}",info);
+
+        List<Map> businessStaffs = sqlSessionTemplate.selectList("userServiceDaoImpl.getUserHasPwd",info);
+       return businessStaffs;
+    }
 }

UserService/src/main/java/com/java110/user/smo/impl/UserInnerServiceSMOImpl.java

@@ -90,6 +90,15 @@ public class UserInnerServiceSMOImpl implements IUserInnerServiceSMO {
         return staffs;
     }
 
+    @Override
+    public List<UserDto> getUserHasPwd(@RequestBody UserDto userDto) {
+        //校验是否传了 分页信息
+        List<UserDto> staffs = BeanConvertUtil.covertBeanList(userServiceDaoImpl.getUserHasPwd(BeanConvertUtil.beanCovertMap(userDto)), UserDto.class);
+
+        return staffs;
+
+    }
+
     private void freshUserAttrs(List<UserDto> userDtos) {
 
         Map param = null;

java110-bean/src/main/java/com/java110/dto/user/UserDto.java

@@ -48,6 +48,7 @@ public class UserDto extends PageDto implements Serializable {
     private String staffName;
 
     private String openId;
+    private String statusCd;
 
     private List<UserAttrDto> userAttrs;
 
@@ -196,4 +197,12 @@ public class UserDto extends PageDto implements Serializable {
     public void setUserAttrs(List<UserAttrDto> userAttrs) {
         this.userAttrs = userAttrs;
     }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
 }

java110-core/src/main/java/com/java110/core/base/AppBase.java

@@ -135,7 +135,7 @@ public class AppBase extends BaseCache {
         try {
             responseEntity = restTemplate.exchange(url, httpMethod, httpEntity, String.class);
         } catch (HttpStatusCodeException e) { //这里spring 框架 在4XX 或 5XX 时抛出 HttpServerErrorException 异常，需要重新封装一下
-            responseEntity = new ResponseEntity<String>("请求下游系统异常，" + e.getResponseBodyAsString(), e.getStatusCode());
+            responseEntity = new ResponseEntity<String>( e.getResponseBodyAsString(), e.getStatusCode());
         } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         } finally {

java110-core/src/main/java/com/java110/core/smo/user/IUserInnerServiceSMO.java

@@ -79,4 +79,7 @@ public interface IUserInnerServiceSMO {
      */
     @RequestMapping(value = "/getUsers", method = RequestMethod.POST)
     List<UserDto> getUsers(@RequestBody UserDto userDto);
+
+    @RequestMapping(value = "/getUserHasPwd", method = RequestMethod.POST)
+    List<UserDto> getUserHasPwd(@RequestBody UserDto userDto);
 }

java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml

@@ -573,4 +573,31 @@
 
     </select>
 
+    <!-- 查询用户密码 -->
+    <select id="getUserHasPwd" parameterType="Map" resultType="Map">
+        select u.user_id, u.user_id userId,u.name,u.name userName,u.email,u.address,u.password,u.location_cd,u.location_cd locationCd,
+        u.age,u.sex,u.tel,u.level_cd,u.b_id,u.password
+        from u_user u
+        <if test="openId != null and openId !=''">
+            ,u_user_attr ua
+        </if>
+        where 1= 1
+        <if test="openId != null and openId != ''">
+            and u.user_id = ua.user_id
+            and ua.spec_cd = '100201911001'
+            and ua.value = #{openId}
+            and ua.status_cd = '0'
+        </if>
+        <if test="bId != null and bId !=''">
+            and u.b_id = #{bId}
+        </if>
+        <if test="userId != null and userId != ''">
+            and u.user_id = #{userId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and u.status_cd = #{statusCd}
+        </if>
+
+    </select>
+
 </mapper>

java110-event/src/main/java/com/java110/event/app/AppEventPublishing.java

@@ -228,7 +228,7 @@ public class AppEventPublishing extends LoggerEngine{
             listener.soDataService(event);
         }catch (Exception e){
             LoggerEngine.error("发布侦听失败",e);
-            throw new RuntimeException("发布侦听失败,"+listener+ event + e);
+            throw new RuntimeException(e.getMessage());
         }
     }
 

java110-event/src/main/java/com/java110/event/center/DataFlowEventPublishing.java

@@ -196,7 +196,7 @@ public class DataFlowEventPublishing extends LoggerEngine {
             listener.soService(event);
         }catch (Exception e){
             LoggerEngine.error("发布侦听失败",e);
-            throw new RuntimeException("发布侦听失败,"+listener+ event + e);
+            throw new RuntimeException(e.getMessage());
         }
     }
 

java110-event/src/main/java/com/java110/event/service/BusinessServiceDataFlowEventPublishing.java

@@ -115,7 +115,8 @@ public class BusinessServiceDataFlowEventPublishing extends LoggerEngine {
 
             multicastEvent(businessTypeCd,targetDataFlowEvent, asyn);
         }catch (Exception e){
-            throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR,"发布侦听失败，失败原因为："+e);
+            logger.error("发布侦听失败",e);
+            throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR,e.getMessage());
         }
 
     }
@@ -168,7 +169,7 @@ public class BusinessServiceDataFlowEventPublishing extends LoggerEngine {
             listener.soService(event);
         }catch (Exception e){
             LoggerEngine.error("发布侦听失败",e);
-            throw new RuntimeException("发布侦听失败,"+listener+ event + e);
+            throw new RuntimeException(e.getMessage());
         }
     }
 }

java110-event/src/main/java/com/java110/event/service/api/ServiceDataFlowEventPublishing.java

@@ -136,7 +136,7 @@ public class ServiceDataFlowEventPublishing extends LoggerEngine {
             multicastEvent(serviceCode, targetDataFlowEvent, asyn);
         } catch (Exception e) {
             logger.error("发布侦听失败，失败原因为：", e);
-            throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, "发布侦听失败，失败原因为：" + e.getMessage());
+            throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, e.getMessage());
         }
 
     }
@@ -199,7 +199,7 @@ public class ServiceDataFlowEventPublishing extends LoggerEngine {
             listener.soService(event);
         } catch (Exception e) {
             LoggerEngine.error("发布侦听失败", e);
-            throw new RuntimeException("发布侦听失败," + listener + event + e);
+            throw new RuntimeException(e.getMessage());
         }
     }
 }