值班查岗相关接口开发

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/MhPostInspectController.java

@@ -35,9 +35,8 @@ public class MhPostInspectController {
      */
     @Log(title = "闵行支队平台查岗", businessType = BusinessType.INSERT)
     @PutMapping("postInspectPush")
-    public ApiResult<Void> updatePatrolInspectionArea(@RequestBody MhPostInspect mhPostInspect) {
-        mhPostInspectService.postInspectPush(mhPostInspect);
-        return ApiResult.success();
+    public ApiResult<MhPostInspect> postInspectPush(@RequestBody MhPostInspect mhPostInspect) {
+        return ApiResult.success(mhPostInspectService.postInspectPush(mhPostInspect));
     }
 
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/MhPostInspectService.java

@@ -41,7 +41,7 @@ public interface MhPostInspectService extends CrudService<MhPostInspect> {
      *
      * @param mhPostInspect
      */
-    void postInspectPush(MhPostInspect mhPostInspect);
+    MhPostInspect postInspectPush(MhPostInspect mhPostInspect);
 
     /**
      * webSocket推送

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/MhPostInspectServiceImpl.java

@@ -101,15 +101,12 @@ public class MhPostInspectServiceImpl extends AbstractCrudService<MhPostInspectM
 
     @Override
     @Transactional
-    public void postInspectPush(MhPostInspect mhPostInspect) {
-        String uuid = UUID.randomUUID().toString().replaceAll("-", "");
-        mhPostInspect.setInspectCode(uuid);
+    public MhPostInspect postInspectPush(MhPostInspect mhPostInspect) {
         mhPostInspect.setInspectTime(LocalDateTime.now());
         mhPostInspect.setInspectStatus(0);
         mhPostInspect.setCreator(SecurityUtils.getUsername());
         mhPostInspect.setCreateTime(LocalDateTime.now());
         this.save(mhPostInspect);
-//        String message = mhPostInspect.toString();
         //查岗时间与当前时间差
         long data1 = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8"));
         long data2 = mhPostInspect.getInspectTime().toEpochSecond(ZoneOffset.of("+8"));
@@ -120,6 +117,7 @@ public class MhPostInspectServiceImpl extends AbstractCrudService<MhPostInspectM
         for (int i = 0; i < userCompanyList.size(); i++) {
             this.webSocketPush(new TextMessage(message), userCompanyList.get(i).getUserId());
         }
+        return mhPostInspect;
     }