【CHG】增加推送消息参数字段

railway-admin/src/main/java/com/railway/web/controller/business/push/BusPushMsgController.java

@@ -22,54 +22,54 @@ import java.util.List;
 @RequestMapping(value = "business/push/bus/push/msg")
 public class BusPushMsgController extends BaseController {
 
-    private final IBusPushMsgService busPushMsgService;
+  private final IBusPushMsgService busPushMsgService;
 
-    public BusPushMsgController(IBusPushMsgService busPushMsgService) {
-        this.busPushMsgService = busPushMsgService;
-    }
+  public BusPushMsgController(IBusPushMsgService busPushMsgService) {
+    this.busPushMsgService = busPushMsgService;
+  }
 
-    @ApiOperation(value = "新增")
-    @PostMapping("/add")
-    public AjaxResult add(@Validated @RequestBody BusPushMsg busPushMsg) {
-        return toAjax(busPushMsgService.create(busPushMsg));
-    }
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody BusPushMsg busPushMsg) {
+    return toAjax(busPushMsgService.create(busPushMsg));
+  }
 
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{ids}")
-    public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
-        return toAjax(busPushMsgService.delete(ids));
-    }
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@PathVariable(value = "ids") String[] ids) {
+    return toAjax(busPushMsgService.delete(ids));
+  }
 
-    @ApiOperation(value = "更新")
-    @PutMapping("/update")
-    public AjaxResult update(@RequestBody @Valid BusPushMsg busPushMsg) {
-        return toAjax(busPushMsgService.update(busPushMsg));
-    }
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid BusPushMsg busPushMsg) {
+    return toAjax(busPushMsgService.update(busPushMsg));
+  }
 
-    @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/{id}"})
-    public AjaxResult getInfo(@PathVariable(value = "id") String id) {
-        BusPushMsg info = busPushMsgService.getInfo(id);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("info",info);
-        return ajax;
-    }
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(@PathVariable(value = "id") String id) {
+    BusPushMsg info = busPushMsgService.getInfo(id);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
 
-    @ApiOperation(value = "列表")
-    @GetMapping(value = "list")
-    public TableDataInfo getList(BusPushMsg busPushMsg) {
-        startPage();
-        List<BusPushMsg> list = busPushMsgService.getList(busPushMsg);
-        return getDataTable(list);
-    }
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(BusPushMsg busPushMsg) {
+    startPage();
+    List<BusPushMsg> list = busPushMsgService.getList(busPushMsg);
+    return getDataTable(list);
+  }
 
-    @ApiOperation(value = "最近的5条消息")
-    @GetMapping(value = "getListTop5")
-    public AjaxResult getListTop5(BusPushMsg busPushMsg) {
-        List<BusPushMsg> list = busPushMsgService.getListTop5(busPushMsg);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("rows",list);
-        return ajax;
-    }
+  @ApiOperation(value = "最近的5条消息")
+  @GetMapping(value = "getListTop5")
+  public AjaxResult getListTop5(BusPushMsg busPushMsg) {
+    List<BusPushMsg> list = busPushMsgService.getListTop5(busPushMsg);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("rows", list);
+    return ajax;
+  }
 
 }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcabServiceImpl.java

@@ -1,11 +1,13 @@
 package com.railway.business.catenary.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.railway.business.baseinfo.domain.BaseDeptStation;
 import com.railway.business.baseinfo.service.IBaseStationService;
 import com.railway.business.catenary.domain.BusJcab;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.enums.JcebOrderFieldEnum;
 import com.railway.business.catenary.enums.JcebStatusEnum;
+import com.railway.business.catenary.enums.JcebTypeEnum;
 import com.railway.business.catenary.enums.SortTypeEnum;
 import com.railway.business.catenary.util.JcebQueryUtil;
 import com.railway.business.push.service.IBusPushMsgService;
@@ -125,11 +127,17 @@ public abstract class BusJcabServiceImpl {
    */
   protected void setSubmit(BusJcab jcab) {
     jcab.setSubmitState(JcebStatusEnum.REPORTED.getCode());
+  }
+
+  /**
+   * 推送提交结果
+   */
+  protected void pushSubmit(BusJcab jcab) {
     List<Long> leaderIds = stationService.getStationLeaderId(jcab.getDeptStationId());
-    String title = getJcebName() + "检查表需确认" ;
-    String content = "有一条" + getJcebName() + "检查表需确认,请您及时处理";
+    String title = getJcebTypeEnum().getType() + "检查表需确认" ;
+    String content = "有一条" + getJcebTypeEnum().getType() + "检查表需确认,请您及时处理";
     for(Long id : leaderIds){
-      busPushMsgService.create(id, title, content);
+      busPushMsgService.create(id, title, content, getPushParam(jcab));
     }
   }
 
@@ -139,9 +147,9 @@ public abstract class BusJcabServiceImpl {
   protected void setReject(BusJcab jcab) {
     jcab.setConfirmUser(SecurityUtils.getUsername());
     jcab.setSubmitState(JcebStatusEnum.RETURNED.getCode());
-    String title = getJcebName() + "检查表被退回" ;
-    String content = "您提交的" + getJcebName() + "检查表被退回，点击查看详情";
-    busPushMsgService.create(jcab.getCreateBy(), title, content);
+    String title = getJcebTypeEnum().getType() + "检查表被退回" ;
+    String content = "您提交的" + getJcebTypeEnum().getType() + "检查表被退回，点击查看详情";
+    busPushMsgService.create(jcab.getCreateBy(), title, content, getPushParam(jcab));
   }
 
   /**
@@ -150,15 +158,22 @@ public abstract class BusJcabServiceImpl {
   protected void setConfirm(BusJcab jcab) {
     jcab.setConfirmUser(SecurityUtils.getUsername());
     jcab.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
-    String title = getJcebName() + "检查表已确认" ;
-    String content = "您提交的" + getJcebName() + "检查表已确认，点击查看详情";
-    busPushMsgService.create(jcab.getCreateBy(), title, content);
+    String title = getJcebTypeEnum().getType() + "检查表已确认" ;
+    String content = "您提交的" + getJcebTypeEnum().getType() + "检查表已确认，点击查看详情";
+    busPushMsgService.create(jcab.getCreateBy(), title, content, getPushParam(jcab));
+  }
+
+  protected String getPushParam(BusJcab jcab){
+    JSONObject json = new JSONObject();
+    json.put("type", getJcebTypeEnum().getCode());
+    json.put("id", jcab.getId());
+    return json.toJSONString();
   }
 
   /**
    * 获取检查表类型名
    * @return 类型名
    */
-  abstract String getJcebName();
+  abstract JcebTypeEnum getJcebTypeEnum();
 
 }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbBlqServiceImpl.java

@@ -65,8 +65,8 @@ public class BusJcbBlqServiceImpl extends BusJcabServiceImpl implements IBusJcbB
    * @return 类型名
    */
   @Override
-  String getJcebName() {
-    return JcebTypeEnum.Blq.getType();
+  JcebTypeEnum getJcebTypeEnum() {
+    return JcebTypeEnum.Blq;
   }
 
   /**
@@ -111,13 +111,19 @@ public class BusJcbBlqServiceImpl extends BusJcabServiceImpl implements IBusJcbB
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
-  public int submit(BusJcbBlq busJcbBlq) {
-    setSubmit(busJcbBlq);
-    if(StringUtils.isEmpty(busJcbBlq.getId())){
-      return create(busJcbBlq);
+  public int submit(BusJcbBlq bean) {
+    setSubmit(bean);
+    int ret;
+    if(StringUtils.isEmpty(bean.getId())){
+      ret = create(bean);
     }else {
-      return update(busJcbBlq);
+      ret = update(bean);
     }
+    // 推送消息
+    if(ret > 0) {
+      pushSubmit(bean);
+    }
+    return ret;
   }
 
   /**

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbDmcgyqServiceImpl.java

@@ -77,8 +77,8 @@ public class BusJcbDmcgyqServiceImpl extends BusJcabServiceImpl implements IBusJ
    * @return 类型名
    */
   @Override
-  String getJcebName() {
-    return JcebTypeEnum.Dmcgyq.getType();
+  JcebTypeEnum getJcebTypeEnum() {
+    return JcebTypeEnum.Dmcgyq;
   }
 
   /**
@@ -121,13 +121,19 @@ public class BusJcbDmcgyqServiceImpl extends BusJcabServiceImpl implements IBusJ
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
-  public int submit(BusJcbDmcgyq busJcbDmcgyq) {
-    setSubmit(busJcbDmcgyq);
-    if(StringUtils.isEmpty(busJcbDmcgyq.getId())){
-      return create(busJcbDmcgyq);
+  public int submit(BusJcbDmcgyq bean) {
+    setSubmit(bean);
+    int ret;
+    if(StringUtils.isEmpty(bean.getId())){
+      ret = create(bean);
     }else {
-      return update(busJcbDmcgyq);
+      ret = update(bean);
     }
+    // 推送消息
+    if(ret > 0) {
+      pushSubmit(bean);
+    }
+    return ret;
   }
 
   /**

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbFdfxjyqServiceImpl.java

@@ -69,8 +69,8 @@ public class BusJcbFdfxjyqServiceImpl extends BusJcabServiceImpl implements IBus
    * @return 类型名
    */
   @Override
-  String getJcebName() {
-    return JcebTypeEnum.Fdfxjyq.getType();
+  JcebTypeEnum getJcebTypeEnum() {
+    return JcebTypeEnum.Fdfxjyq;
   }
 
   /**
@@ -115,14 +115,20 @@ public class BusJcbFdfxjyqServiceImpl extends BusJcabServiceImpl implements IBus
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
-  public int submit(BusJcbFdfxjyq busJcbFdfxjyq) {
-    setSubmit(busJcbFdfxjyq);
-    log.info("id = {}, isEmpty = {}", busJcbFdfxjyq.getId(), StringUtils.isEmpty(busJcbFdfxjyq.getId()));
-    if(StringUtils.isEmpty(busJcbFdfxjyq.getId())){
-      return create(busJcbFdfxjyq);
+  public int submit(BusJcbFdfxjyq bean) {
+    setSubmit(bean);
+    int ret;
+    log.info("id = {}, isEmpty = {}", bean.getId(), StringUtils.isEmpty(bean.getId()));
+    if(StringUtils.isEmpty(bean.getId())){
+      ret = create(bean);
     }else {
-      return update(busJcbFdfxjyq);
+      ret = update(bean);
     }
+    // 推送消息
+    if(ret > 0) {
+      pushSubmit(bean);
+    }
+    return ret;
   }
 
   /**

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbGlkgServiceImpl.java

@@ -47,18 +47,24 @@ public class BusJcbGlkgServiceImpl extends BusJcabServiceImpl implements IBusJcb
 
 	/**
 	 * 提交
-	 * @param busJcbGlkg 数据对象
+	 * @param bean 数据对象
 	 * @return 提交结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public int submit(BusJcbGlkg busJcbGlkg) {
-		setSubmit(busJcbGlkg);
-		if(StringUtils.isEmpty(busJcbGlkg.getId())){
-			return create(busJcbGlkg);
+	public int submit(BusJcbGlkg bean) {
+		setSubmit(bean);
+		int ret;
+		if(StringUtils.isEmpty(bean.getId())){
+			ret = create(bean);
 		}else {
-			return update(busJcbGlkg);
+			ret = update(bean);
+		}
+		// 推送消息
+		if(ret > 0) {
+			pushSubmit(bean);
 		}
+		return ret;
 	}
 
 	/**
@@ -114,8 +120,8 @@ public class BusJcbGlkgServiceImpl extends BusJcabServiceImpl implements IBusJcb
 	 * @return 类型名
 	 */
 	@Override
-	String getJcebName() {
-		return JcebTypeEnum.Glkg.getType();
+	JcebTypeEnum getJcebTypeEnum() {
+		return JcebTypeEnum.Glkg;
 	}
 
 	/**

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbJcxcServiceImpl.java

@@ -68,8 +68,8 @@ public class BusJcbJcxcServiceImpl extends BusJcabServiceImpl implements IBusJcb
    * @return 类型名
    */
   @Override
-  String getJcebName() {
-    return JcebTypeEnum.Jcxc.getType();
+  JcebTypeEnum getJcebTypeEnum() {
+    return JcebTypeEnum.Jcxc;
   }
 
   /**
@@ -112,13 +112,19 @@ public class BusJcbJcxcServiceImpl extends BusJcabServiceImpl implements IBusJcb
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
-  public int submit(BusJcbJcxc busJcbJcxc) {
-    setSubmit(busJcbJcxc);
-    if (StringUtils.isEmpty(busJcbJcxc.getId())) {
-      return create(busJcbJcxc);
+  public int submit(BusJcbJcxc bean) {
+    setSubmit(bean);
+    int ret;
+    if (StringUtils.isEmpty(bean.getId())) {
+      ret = create(bean);
     } else {
-      return update(busJcbJcxc);
+      ret = update(bean);
     }
+    // 推送消息
+    if(ret > 0) {
+      pushSubmit(bean);
+    }
+    return ret;
   }
 
   /**

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbWjcxcServiceImpl.java

@@ -68,8 +68,8 @@ public class BusJcbWjcxcServiceImpl extends BusJcabServiceImpl implements IBusJc
    * @return 类型名
    */
   @Override
-  String getJcebName() {
-    return JcebTypeEnum.Wjcxc.getType();
+  JcebTypeEnum getJcebTypeEnum() {
+    return JcebTypeEnum.Wjcxc;
   }
 
   /**
@@ -112,13 +112,19 @@ public class BusJcbWjcxcServiceImpl extends BusJcabServiceImpl implements IBusJc
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
-  public int submit(BusJcbWjcxc busJcbWjcxc) {
-    setSubmit(busJcbWjcxc);
-    if (StringUtils.isEmpty(busJcbWjcxc.getId())) {
-      return create(busJcbWjcxc);
+  public int submit(BusJcbWjcxc bean) {
+    setSubmit(bean);
+    int ret;
+    if (StringUtils.isEmpty(bean.getId())) {
+      ret = create(bean);
     } else {
-      return update(busJcbWjcxc);
+      ret = update(bean);
     }
+    // 推送消息
+    if(ret > 0) {
+      pushSubmit(bean);
+    }
+    return ret;
   }
 
   /**

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebGjsfxServiceImpl.java

@@ -62,8 +62,8 @@ public class BusJcebGjsfxServiceImpl extends BusJcebServiceImpl<BusJcebGjsfx>
    * @return 类型名
    */
   @Override
-  String getJcebName() {
-    return JcebTypeEnum.Gjsfx.getType();
+  JcebTypeEnum getJcebTypeEnum() {
+    return JcebTypeEnum.Gjsfx;
   }
 
   /**
@@ -99,13 +99,19 @@ public class BusJcebGjsfxServiceImpl extends BusJcebServiceImpl<BusJcebGjsfx>
    * @return 提交结果
    */
   @Override
-  public int submit(BusJcebGjsfx busJcebGjsfx) {
-    setSubmit(busJcebGjsfx);
-    if (StringUtils.isEmpty(busJcebGjsfx.getId())) {
-      return create(busJcebGjsfx);
+  public int submit(BusJcebGjsfx bean) {
+    setSubmit(bean);
+    int ret;
+    if (StringUtils.isEmpty(bean.getId())) {
+      ret = create(bean);
     } else {
-      return update(busJcebGjsfx);
+      ret = update(bean);
     }
+    // 推送消息
+    if(ret > 0) {
+      pushSubmit(bean);
+    }
+    return ret;
   }
 
   /**

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebJddzServiceImpl.java

@@ -63,8 +63,8 @@ public class BusJcebJddzServiceImpl extends BusJcebServiceImpl<BusJcebJddz>
    * @return 类型名
    */
   @Override
-  String getJcebName() {
-    return JcebTypeEnum.Jddz.getType();
+  JcebTypeEnum getJcebTypeEnum() {
+    return JcebTypeEnum.Jddz;
   }
 
   /**
@@ -100,13 +100,19 @@ public class BusJcebJddzServiceImpl extends BusJcebServiceImpl<BusJcebJddz>
    * @return 提交结果
    */
   @Override
-  public int submit(BusJcebJddz busJcebJddz) {
-    setSubmit(busJcebJddz);
-    if(StringUtils.isEmpty(busJcebJddz.getId())){
-      return create(busJcebJddz);
+  public int submit(BusJcebJddz bean) {
+    setSubmit(bean);
+    int ret;
+    if(StringUtils.isEmpty(bean.getId())){
+      ret = create(bean);
     } else {
-      return update(busJcebJddz);
+      ret = update(bean);
     }
+    // 推送消息
+    if(ret > 0) {
+      pushSubmit(bean);
+    }
+    return ret;
   }
 
   /**
@@ -143,8 +149,9 @@ public class BusJcebJddzServiceImpl extends BusJcebServiceImpl<BusJcebJddz>
     Map<String, Object> params = new HashMap<>();
     if(!list.isEmpty()) {
       params.put("operator", list.get(0).getOperator());
-      if(JcebStatusEnum.COMPLETED.getCode().equals(list.get(0).getSubmitState()))
+      if(JcebStatusEnum.COMPLETED.getCode().equals(list.get(0).getSubmitState())) {
         params.put("confirmUser", list.get(0).getUpdateBy());
+      }
     }
     list = list.stream()
             .map(x -> {x.setSfhg(StringUtils.YES_VALUE.equals(x.getSfhg()) ? "合格" : "不合格"); return x;})

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebJyzqsjlServiceImpl.java

@@ -64,8 +64,8 @@ public class BusJcebJyzqsjlServiceImpl extends BusJcebServiceImpl<BusJcebJyzqsjl
    * @return 类型名
    */
   @Override
-  String getJcebName() {
-    return JcebTypeEnum.Jyzqsjl.getType();
+  JcebTypeEnum getJcebTypeEnum() {
+    return JcebTypeEnum.Jyzqsjl;
   }
 
   /**
@@ -101,13 +101,19 @@ public class BusJcebJyzqsjlServiceImpl extends BusJcebServiceImpl<BusJcebJyzqsjl
    * @return 提交结果
    */
   @Override
-  public int submit(BusJcebJyzqsjl busJcebJyzqsjl) {
-    setSubmit(busJcebJyzqsjl);
-    if (StringUtils.isEmpty(busJcebJyzqsjl.getId())) {
-      return create(busJcebJyzqsjl);
+  public int submit(BusJcebJyzqsjl bean) {
+    setSubmit(bean);
+    int ret;
+    if (StringUtils.isEmpty(bean.getId())) {
+      ret = create(bean);
     } else {
-      return update(busJcebJyzqsjl);
+      ret = update(bean);
     }
+    // 推送消息
+    if(ret > 0) {
+      pushSubmit(bean);
+    }
+    return ret;
   }
 
   /**

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebLbjghjlServiceImpl.java

@@ -62,8 +62,8 @@ public class BusJcebLbjghjlServiceImpl extends BusJcebServiceImpl<BusJcebLbjghjl
    * @return 类型名
    */
   @Override
-  String getJcebName() {
-    return JcebTypeEnum.Lbjghjl.getType();
+  JcebTypeEnum getJcebTypeEnum() {
+    return JcebTypeEnum.Lbjghjl;
   }
 
   /**
@@ -99,13 +99,19 @@ public class BusJcebLbjghjlServiceImpl extends BusJcebServiceImpl<BusJcebLbjghjl
    * @return 提交结果
    */
   @Override
-  public int submit(BusJcebLbjghjl busJcebLbjghjl) {
-    setSubmit(busJcebLbjghjl);
-    if (StringUtils.isEmpty(busJcebLbjghjl.getId())) {
-      return create(busJcebLbjghjl);
+  public int submit(BusJcebLbjghjl bean) {
+    setSubmit(bean);
+    int ret;
+    if (StringUtils.isEmpty(bean.getId())) {
+      ret = create(bean);
     } else {
-      return update(busJcebLbjghjl);
+      ret = update(bean);
     }
+    // 推送消息
+    if(ret > 0) {
+      pushSubmit(bean);
+    }
+    return ret;
   }
 
   /**

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebQmjcjlServiceImpl.java

@@ -61,8 +61,8 @@ public class BusJcebQmjcjlServiceImpl extends BusJcebServiceImpl<BusJcebQmjcjl>
    * @return 类型名
    */
   @Override
-  String getJcebName() {
-    return JcebTypeEnum.Qmjcjl.getType();
+  JcebTypeEnum getJcebTypeEnum() {
+    return JcebTypeEnum.Qmjcjl;
   }
 
   /**
@@ -98,13 +98,19 @@ public class BusJcebQmjcjlServiceImpl extends BusJcebServiceImpl<BusJcebQmjcjl>
    * @return 提交结果
    */
   @Override
-  public int submit(BusJcebQmjcjl busJcebQmjcjl) {
-    setSubmit(busJcebQmjcjl);
-    if (StringUtils.isEmpty(busJcebQmjcjl.getId())) {
-      return create(busJcebQmjcjl);
+  public int submit(BusJcebQmjcjl bean) {
+    setSubmit(bean);
+    int ret;
+    if (StringUtils.isEmpty(bean.getId())) {
+      ret = create(bean);
     } else {
-      return update(busJcebQmjcjl);
+      ret = update(bean);
     }
+    // 推送消息
+    if(ret > 0) {
+      pushSubmit(bean);
+    }
+    return ret;
   }
 
   /**

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebServiceImpl.java

@@ -1,5 +1,6 @@
 package com.railway.business.catenary.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.Page;
 import com.railway.business.baseinfo.domain.BaseDeptStation;
 import com.railway.business.baseinfo.service.IBaseStationService;
@@ -9,6 +10,7 @@ import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import com.railway.business.catenary.enums.JcebOrderFieldEnum;
 import com.railway.business.catenary.enums.JcebStatusEnum;
+import com.railway.business.catenary.enums.JcebTypeEnum;
 import com.railway.business.catenary.mapper.BusJcebMapper;
 import com.railway.business.catenary.service.IBusJcebService;
 import com.railway.business.catenary.util.JcebQueryUtil;
@@ -142,11 +144,17 @@ public abstract class BusJcebServiceImpl<T extends BusJceb> implements IBusJcebS
    */
   protected void setSubmit(BusJceb jceb) {
     jceb.setSubmitState(JcebStatusEnum.REPORTED.getCode());
+  }
+
+  /**
+   * 推送提交结果
+   */
+  protected void pushSubmit(BusJceb jceb) {
     List<Long> leaderIds = stationService.getStationLeaderId(jceb.getDeptStationId());
-    String title = getJcebName() + "检测表需确认" ;
-    String content = "有一条" + getJcebName() + "检测表需确认,请您及时处理";
+    String title = getJcebTypeEnum().getType() + "检测表需确认" ;
+    String content = "有一条" + getJcebTypeEnum() + "检测表需确认,请您及时处理";
     for(Long id : leaderIds){
-      busPushMsgService.create(id, title, content);
+      busPushMsgService.create(id, title, content, getPushParam(jceb));
     }
   }
 
@@ -155,9 +163,9 @@ public abstract class BusJcebServiceImpl<T extends BusJceb> implements IBusJcebS
    */
   protected void setReject(BusJceb jceb) {
     jceb.setSubmitState(JcebStatusEnum.RETURNED.getCode());
-    String title = getJcebName() + "检测表被退回" ;
-    String content = "您提交的" + getJcebName() + "检测表被退回，点击查看详情";
-    busPushMsgService.create(jceb.getCreateBy(), title, content);
+    String title = getJcebTypeEnum() + "检测表被退回" ;
+    String content = "您提交的" + getJcebTypeEnum() + "检测表被退回，点击查看详情";
+    busPushMsgService.create(jceb.getCreateBy(), title, content, getPushParam(jceb));
   }
 
   /**
@@ -165,15 +173,22 @@ public abstract class BusJcebServiceImpl<T extends BusJceb> implements IBusJcebS
    */
   protected void setConfirm(BusJceb jceb) {
     jceb.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
-    String title = getJcebName() + "检测表已确认" ;
-    String content = "您提交的" + getJcebName() + "检测表已确认，点击查看详情";
-    busPushMsgService.create(jceb.getCreateBy(), title, content);
+    String title = getJcebTypeEnum() + "检测表已确认" ;
+    String content = "您提交的" + getJcebTypeEnum() + "检测表已确认，点击查看详情";
+    busPushMsgService.create(jceb.getCreateBy(), title, content, getPushParam(jceb));
+  }
+
+  protected String getPushParam(BusJceb jceb){
+    JSONObject json = new JSONObject();
+    json.put("type", getJcebTypeEnum().getCode());
+    json.put("id", jceb.getId());
+    return json.toJSONString();
   }
 
   /**
    * 获取检查表类型名
    * @return 类型名
    */
-  abstract String getJcebName();
+  abstract JcebTypeEnum getJcebTypeEnum();
 
 }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebXsjcjlServiceImpl.java

@@ -64,8 +64,8 @@ public class BusJcebXsjcjlServiceImpl extends BusJcebServiceImpl<BusJcebXsjcjl>
    * @return 类型名
    */
   @Override
-  String getJcebName() {
-    return JcebTypeEnum.Xsjcjl.getType();
+  JcebTypeEnum getJcebTypeEnum() {
+    return JcebTypeEnum.Xsjcjl;
   }
 
   /**
@@ -101,13 +101,19 @@ public class BusJcebXsjcjlServiceImpl extends BusJcebServiceImpl<BusJcebXsjcjl>
    * @return 提交结果
    */
   @Override
-  public int submit(BusJcebXsjcjl busJcebXsjcjl) {
-    setSubmit(busJcebXsjcjl);
-    if(StringUtils.isEmpty(busJcebXsjcjl.getId())){
-      return create(busJcebXsjcjl);
+  public int submit(BusJcebXsjcjl bean) {
+    setSubmit(bean);
+    int ret;
+    if(StringUtils.isEmpty(bean.getId())){
+      ret = create(bean);
     } else {
-      return update(busJcebXsjcjl);
+      ret = update(bean);
     }
+    // 推送消息
+    if(ret > 0) {
+      pushSubmit(bean);
+    }
+    return ret;
   }
 
   /**

railway-business/src/main/java/com/railway/business/push/domain/BusPushMsg.java

@@ -8,51 +8,53 @@ import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
+
 /**
  * 个推消息表
+ *
  * @author author 2021-11-22
  */
 @Data
 @ApiModel("个推消息表")
 @EqualsAndHashCode(callSuper = true)
-public class BusPushMsg extends BaseEntity{
+public class BusPushMsg extends BaseEntity {
 
-    @ApiModelProperty(value = "主键", hidden = true)
-    private Long id;
+  @ApiModelProperty(value = "主键", hidden = true)
+  private Long id;
 
-    @ApiModelProperty(value = "用户id")
-    private Long userId;
+  @ApiModelProperty(value = "用户id")
+  private Long userId;
 
-    @ApiModelProperty(value = "客户端id，app端提供")
-    private String clientId;
+  @ApiModelProperty(value = "客户端id，app端提供")
+  private String clientId;
 
-    @ApiModelProperty(value = "客户端类型：0-android;1-ios")
-    private Integer clientType;
+  @ApiModelProperty(value = "客户端类型：0-android;1-ios")
+  private Integer clientType;
 
-    @ApiModelProperty(value = "消息标题")
-    private String title;
+  @ApiModelProperty(value = "消息标题")
+  private String title;
 
-    @ApiModelProperty(value = "消息内容")
-    private String content;
+  @ApiModelProperty(value = "消息内容")
+  private String content;
 
-    @ApiModelProperty(value = "ios专用")
-    private String iosAlertMsg;
+  @ApiModelProperty(value = "消息其他参数")
+  private String param;
 
-    @ApiModelProperty(value = "推送时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date pushTime;
+  @ApiModelProperty(value = "ios专用")
+  private String iosAlertMsg;
 
-    @ApiModelProperty(value = "推送状态：0-未推送；1-推送成功；2-推送失败；3-服务器响应异常；")
-    private String pushStatus;
+  @ApiModelProperty(value = "推送时间")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private Date pushTime;
 
-    @ApiModelProperty(value = "推送结果说明")
-    private String pushResultDesc;
+  @ApiModelProperty(value = "推送状态：0-未推送；1-推送成功；2-推送失败；3-服务器响应异常；")
+  private String pushStatus;
 
-    @ApiModelProperty(value = "推送轮数")
-    private Integer pushLoop;
+  @ApiModelProperty(value = "推送结果说明")
+  private String pushResultDesc;
 
-    public BusPushMsg() {
-    }
+  @ApiModelProperty(value = "推送轮数")
+  private Integer pushLoop;
 
 }

railway-business/src/main/java/com/railway/business/push/enums/PushEnum.java

@@ -1,28 +1,34 @@
 package com.railway.business.push.enums;
 
+/**
+ * @author fenghao
+ */
+
 public enum PushEnum {
 
-    /** 推送状态 */
-    GE_TUI_OK("ok", "成功"),
-    PUSH_STATUS_NOT("0","未推送"),
-    PUSH_STATUS_SUCCES("1", "推送成功"),
-    PUSH_STATUS_ERROR_PUSH("2", "推送失败"),
-    PUSH_STATUS_ERROR_SERVE("3", "服务器响应异常"),
-    ;
+  /**
+   * 推送状态
+   */
+  GE_TUI_OK("ok", "成功"),
+  PUSH_STATUS_NOT("0", "未推送"),
+  PUSH_STATUS_SUCCES("1", "推送成功"),
+  PUSH_STATUS_ERROR_PUSH("2", "推送失败"),
+  PUSH_STATUS_ERROR_SERVE("3", "服务器响应异常"),
+  ;
 
-    private final String code;
-    private final String info;
+  private final String code;
+  private final String info;
 
-    PushEnum(String code, String info) {
-        this.code = code;
-        this.info = info;
-    }
+  PushEnum(String code, String info) {
+    this.code = code;
+    this.info = info;
+  }
 
-    public String getCode() {
-        return code;
-    }
+  public String getCode() {
+    return code;
+  }
 
-    public String getInfo() {
-        return info;
-    }
+  public String getInfo() {
+    return info;
+  }
 }

railway-business/src/main/java/com/railway/business/push/enums/PushTypeEnum.java

@@ -0,0 +1,52 @@
+package com.railway.business.push.enums;
+
+/**
+ * 推送类型
+ *
+ * @author ZhaoMn
+ */
+public enum PushTypeEnum {
+
+  /**
+   * 检测表类型
+   */
+  JCEB_Gjsfx("gjsfx", "关节式分相"),
+  JCEB_Jddz("jddz", "接地电阻"),
+  JCEB_Jyzqsjl("jyzqsjl", "绝缘子清扫记录"),
+  JCEB_Lbjghjl("lbjghjl", "零部件更换记录"),
+  JCEB_Qmjcjl("qmjcjl", "全面检查记录"),
+  JCEB_Xsjcjl("xsjcjl", "巡视检查记录"),
+
+  /**
+   * 检测表类型
+   */
+  JCAB_Blq("blq", "避雷器"),
+  JCAB_Dmcgyq("dmcgyq", "地面磁感应器"),
+  JCAB_Fdfxjyq("fdfxjyq", "dxf分选绝缘器"),
+  JCAB_Glkg("glkg", "隔离开关"),
+  JCAB_Jcxc("jcxc", "交叉线岔"),
+  JCAB_Wjcxc("wjcxc", "无交叉线岔"),
+
+  /**
+   * 安全工具
+   */
+  SAFE_TOOL_SJ("experimentStart", "送检记录"),
+  SAFE_TOOL_JY("experimentEnd", "检验完成"),
+  ;
+
+  private final String code;
+  private final String info;
+
+  PushTypeEnum(String code, String info) {
+    this.code = code;
+    this.info = info;
+  }
+
+  public String getCode() {
+    return code;
+  }
+
+  public String getInfo() {
+    return info;
+  }
+}

railway-business/src/main/java/com/railway/business/push/service/IBusPushMsgService.java

@@ -12,12 +12,12 @@ public interface IBusPushMsgService{
     /**
      * 消息推送
      */
-    void create(String userName, String title, String content);
+    void create(String userName, String title, String content, String param);
 
     /**
      * 消息推送
      */
-    void create(Long userId, String title, String content);
+    void create(Long userId, String title, String content, String param);
 
     /**
     * 新增

railway-business/src/main/java/com/railway/business/push/service/impl/BusPushMsgServiceImpl.java

@@ -49,10 +49,6 @@ public class BusPushMsgServiceImpl implements IBusPushMsgService {
    * SDK 与服务器端通过 Appkey 互相识别
    */
   private final String appKey;
-  /**
-   * 服务端API鉴权码
-   */
-  private final String masterSecret;
 
   /**
    * 批量单传使用
@@ -64,7 +60,10 @@ public class BusPushMsgServiceImpl implements IBusPushMsgService {
     this.busPushMsgMapper = busPushMsgMapper;
     this.appId = configService.selectConfigByKey("getui.appId");
     this.appKey = configService.selectConfigByKey("getui.appKey");
-    this.masterSecret = configService.selectConfigByKey("getui.masterSecret");
+    /*
+     * 服务端API鉴权码
+     */
+    String masterSecret = configService.selectConfigByKey("getui.masterSecret");
     this.sysUserService = sysUserService;
 
     push = new IGtPush(appKey, masterSecret);
@@ -74,22 +73,23 @@ public class BusPushMsgServiceImpl implements IBusPushMsgService {
    * 消息推送
    */
   @Override
-  public void create(String userName, String title, String content) {
+  public void create(String userName, String title, String content, String param) {
     SysUser user = sysUserService.selectUserByUserName(userName);
-    create(user, title, content);
+    create(user, title, content, param);
   }
 
   /**
    * 消息推送
    */
   @Override
-  public void create(Long userId, String title, String content) {
+  public void create(Long userId, String title, String content, String param) {
     SysUser user = sysUserService.selectUserById(userId);
-    create(user, title, content);
+    create(user, title, content, param);
   }
 
-  private void create(SysUser user, String title, String content) {
+  private void create(SysUser user, String title, String content, String param) {
     BusPushMsg pushMsg = new BusPushMsg();
+    pushMsg.setParam(param);
     pushMsg.setUserId(user.getUserId());
     String mobileId = StringUtils.isEmpty(user.getMobileId()) ? "0" : user.getMobileId();
     pushMsg.setClientId(mobileId);