排产消息推送

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -41,7 +41,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
-import com.yxt.anrui.portal.api.sysuser.UserQuery;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.JPushServer;
 import com.yxt.common.base.utils.PagerUtil;
@@ -376,7 +375,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送信息
-//            messageJpush(ufVo.getTaskDefKey(), businessSid, orgSidPath);
+//            messageJpush(businessSid, ufVo.getNextNodeUserSids());
             return voResultBean;
         }
         if (r == 2) {
@@ -393,37 +392,33 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         return rb;
     }
 
-    public void messageJpush(String taskDefKey, String businessSid, String orgSidPath) {
+    public void messageJpush(String businessSid, String nextSid) {
         BusVehicleApply busVehicleApply = fetchBySid(businessSid);
-        GetNodeQuery getNodeQuery = new GetNodeQuery();
-        getNodeQuery.setTaskDefKey(taskDefKey);
-        getNodeQuery.setBusinessSid(businessSid);
-        ResultBean<List<GetNodeVo>> nodeVoList = getNextNodesForSubmit(getNodeQuery);
-        //根据组织架构、角色两个参数取相关符合条件的用户信息
-        UserQuery userQuery = new UserQuery();
-        userQuery.setRoleSid(nodeVoList.getData().get(0).getCandidateGroups().get(0));
-        userQuery.setOrgSidPath(orgSidPath);
-        List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
-        StringBuilder nextNodeUserSids = new StringBuilder();
-        List<String> stringList = new ArrayList<>();
-        for (SysUserVo su : sysUserVos) {
-            stringList.add(su.getSid());
-//            nextNodeUserSids.append(su.getSid()).append(",");
-        }
-        //符合条件的用户的sid,拼接的字符串
-//        String nextNodeUserSids_ = nextNodeUserSids.toString();
+        List<String> stringList = Arrays.asList(nextSid.split(","));
+        //根据用户的sid查询用户的id
+        ResultBean<String> stringList1 = sysUserFeign.selectIdBySid(stringList);
+        List<String> stringList2 = Arrays.asList(stringList1.getData().split(","));
         //标题、内容、消息类别key、消息类别名称、
-        JPushServer.sendPushAlias("排产申请审批", busVehicleApply.getCreateByName() + "的排产申请", "msg_type", "系统消息", stringList.toArray(new String[stringList.size()]));
+        String msgSid = getMessage(stringList);
+        for (int i = 0; i < stringList2.size(); i++) {
+            JPushServer.sendPushAlias("排产申请审批", busVehicleApply.getCreateByName() + "的排产申请", "msg_type", "审批中心", stringList2.get(i));
+        }
+
+
     }
 
     public String getMessage(List<String> list) {
+        //1、buttons:int[]{3,4,5}、taskId、taskName、procInsId、taskDefKey
+        //根据taskDefKey、流程标识、以及
+
+
         // 1、保存消息体
         AppMessageDto messageDto = new AppMessageDto();
         ResultBean<List<MessageTypeVo>> messageBean = messageTypeFeign.selectAppMsgTypeList("0002");
         if (messageBean.getSuccess() && messageBean.getData() != null) {
             List<MessageTypeVo> typeVoList = messageBean.getData();
             for (MessageTypeVo message : typeVoList) {
-                if (message.getMsgType().equals("系统消息")) {
+                if (message.getMsgType().equals("审批中心")) {
                     messageDto.setMsgTypeSid(message.getMsgTypeSid());
                     messageDto.setMsgType(message.getMsgType());
                 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1317,7 +1317,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         busSalesOrderModel.setBrandName(crmVehicleDemandOrderVo.getBrandName());
                         busSalesOrderModel.setModelSid(crmVehicleDemandOrderVo.getModelSid());
                         busSalesOrderModel.setModelConfigSid(crmVehicleDemandOrderVo.getComonConfigSid());
-                        busSalesOrderModel.setModelConfig(crmVehicleDemandOrderVo.getSketChconfiguration());
+                        busSalesOrderModel.setConfig(crmVehicleDemandOrderVo.getSketChconfiguration());
                         busSalesOrderModel.setGuildPrice(new BigDecimal(crmVehicleDemandOrderVo.getSaleReferencePrice()));
                         busSalesOrderModel.setMoreConfig(crmVehicleDemandOrderVo.getOtherConfig());
                         busSalesOrderModel.setSpecialConfig(crmVehicleDemandOrderVo.getChangeOptions());

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java

@@ -196,4 +196,8 @@ public interface SysUserFeign {
     @ApiOperation(value = "获取当前分公司下所有员工的userSid和员工姓名")
     @GetMapping(value = "getUserByOrgSid")
     ResultBean<List<Map<String, String>>> getUserByOrgSid(@RequestParam("orgSid") String orgSid, @RequestParam("userSid") String userSid);
+
+    @ApiOperation(value = "根据用户sid获取用户id")
+    @PostMapping(value = "selectIdBySid")
+    ResultBean<String> selectIdBySid(@RequestBody List<String> stringList);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java

@@ -184,4 +184,9 @@ public class SysUserFeignFallback implements SysUserFeign {
 	public ResultBean<List<Map<String, String>>> getUserByOrgSid(String orgSid, String userSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<String> selectIdBySid(List<String> stringList) {
+		return null;
+	}
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java

@@ -179,4 +179,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @return
      */
     int updateAppIdAll();
+
+    String selectIdBySid(@Param("list") List<String> stringList);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml

@@ -158,7 +158,8 @@
                  LEFT JOIN sys_staff_org sso ON su.staffSid = sso.staffSid
                  LEFT JOIN sys_organization so ON sso.orgSid = so.sid
         WHERE su.sid = #{userSid}
-        ORDER BY sso.id LIMIT 1
+        ORDER BY sso.id
+        LIMIT 1
     </select>
     <!--根据用户的sid查询用户的组织信息:多个时取第一个-->
     <select id="selectUserInfoByUserSid" resultType="com.yxt.anrui.portal.api.sysuser.SysUserInfoVo">
@@ -168,7 +169,8 @@
                  LEFT JOIN sys_staff_org sso ON su.staffSid = sso.staffSid
                  LEFT JOIN sys_organization so ON sso.orgSid = so.sid
         WHERE su.sid = #{userSid}
-        ORDER BY sso.id LIMIT 1
+        ORDER BY sso.id
+        LIMIT 1
     </select>
     <!--根据员工sid更新用户表的工号以及手机号-->
     <update id="updateByStaffSid">
@@ -257,10 +259,21 @@
     </select>
 
     <update id="updateAppIdByMobile">
-        update sys_user set appId = NULL where mobile = #{mobile}
+        update sys_user
+        set appId = NULL
+        where mobile = #{mobile}
     </update>
 
     <update id="updateAppIdAll">
-        update sys_user set appId = NULL
+        update sys_user
+        set appId = NULL
     </update>
+
+    <select id="selectIdBySid" resultType="java.lang.String">
+        select group_concat(id) as ids
+        from sys_user where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java

@@ -589,4 +589,9 @@ public class SysUserRest implements SysUserFeign {
     public ResultBean<List<Map<String, String>>> getUserByOrgSid(String orgSid, String userSid) {
         return sysUserService.getUserByOrgSid(orgSid, userSid);
     }
+
+    @Override
+    public ResultBean<String> selectIdBySid(List<String> stringList) {
+        return sysUserService.selectIdBySid(stringList);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@@ -531,7 +531,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         SysUser user = baseMapper.selectByUserName(mobile);
         if (user == null) {
             user = baseMapper.selectByMobile(mobile);
-            if(user == null){
+            if (user == null) {
                 return ResultBean.fireFail().setMsg("该手机号暂时还未注册，请先注册");
             }
 
@@ -860,27 +860,27 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
 
     public ResultBean getUsersByRoleSid(String roleSid) {
         List<SysUserVo> users = baseMapper.getUsersByRoleSid(roleSid);
-        List<String> l=new ArrayList<>();
-        for(SysUserVo s:users){
-            l.add(s.getDepartmentName()==null?"":s.getDepartmentName());
+        List<String> l = new ArrayList<>();
+        for (SysUserVo s : users) {
+            l.add(s.getDepartmentName() == null ? "" : s.getDepartmentName());
         }
         HashSet set = new HashSet(l);
         //把List集合所有元素清空
         l.clear();
         //把HashSet对象添加至List集合
         l.addAll(set);
-        List<Map<String,Object>> r=new ArrayList<>();
-        for(String s:l){
-            if(StringUtils.isNotBlank(s)){
-                Map<String,Object> m=new HashMap<>();
-                List<SysUserVo> us=new ArrayList<>();
-                for(SysUserVo su:users){
-                    if(s!=null&&s.equals(su.getDepartmentName())){
+        List<Map<String, Object>> r = new ArrayList<>();
+        for (String s : l) {
+            if (StringUtils.isNotBlank(s)) {
+                Map<String, Object> m = new HashMap<>();
+                List<SysUserVo> us = new ArrayList<>();
+                for (SysUserVo su : users) {
+                    if (s != null && s.equals(su.getDepartmentName())) {
                         us.add(su);
                     }
                 }
-                m.put("dept",s);
-                m.put("users",us);
+                m.put("dept", s);
+                m.put("users", us);
                 r.add(m);
             }
         }
@@ -895,11 +895,11 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         String levelTypeKey = sysRoleService.getLevelType(query.getRoleSid());
         if (StringUtils.isNotBlank(levelTypeKey)) {
             String orgSidPath = query.getOrgSidPath();
-            if(StringUtils.isBlank(orgSidPath)){
+            if (StringUtils.isBlank(orgSidPath)) {
                 sysUserVoList = baseMapper.getUserByRoleSid(query.getRoleSid());
 
-            }else{
-                if(query.getOrgSidPath().split("/").length>=Integer.parseInt(levelTypeKey)-1){
+            } else {
+                if (query.getOrgSidPath().split("/").length >= Integer.parseInt(levelTypeKey) - 1) {
                     String levelOrgSid = query.getOrgSidPath().split("/")[Integer.parseInt(levelTypeKey) - 1];
                     sysUserVoList = baseMapper.getUserByRole(query.getRoleSid(), levelOrgSid);
                 }
@@ -914,14 +914,14 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
 
     public ResultBean<List<Map<String, String>>> getUserByOrgSid(String orgSid, String userSid) {
         ResultBean rb = ResultBean.fireFail();
-        List<Map<String, String>> user = baseMapper.getUserByOrgSid(orgSid,userSid);
+        List<Map<String, String>> user = baseMapper.getUserByOrgSid(orgSid, userSid);
         for (Map<String, String> map : user) {
             StringBuilder namePath = new StringBuilder();
             String name = map.get("name");
             String orgName = map.get("orgName");
             String postName = map.get("postName");
             namePath.append(name).append("(").append(orgName).append(" ").append(postName).append(")");
-            map.put("namePath",namePath.toString());
+            map.put("namePath", namePath.toString());
         }
         /*List<Map<String, String>> user = new ArrayList<>();
         for (Map<String, String> map : userByOrgSid) {
@@ -943,11 +943,17 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
 
     public ResultBean updateAppIdByMobile(String mobile) {
         ResultBean rb = ResultBean.fireFail();
-        if(StringUtils.isNotBlank(mobile)){
+        if (StringUtils.isNotBlank(mobile)) {
             baseMapper.updateAppIdByMobile(mobile);
-        }else{
+        } else {
             baseMapper.updateAppIdAll();
         }
         return rb.success().setMsg("解绑成功");
     }
+
+    public ResultBean<String> selectIdBySid(List<String> stringList) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        String ids = baseMapper.selectIdBySid(stringList);
+        return rb.success().setData(ids);
+    }
 }