car及gps修改

src/main/java/com/tofly/zmrq/config/FilePathBean.java

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Component;
  */
 @Data
 @Component
-@ConfigurationProperties(prefix = "dyrq.ftp")
+@ConfigurationProperties(prefix = "zmrq.ftp")
 public class FilePathBean {
     private String questionmark;
     private String pdafile;
@@ -22,6 +22,7 @@ public class FilePathBean {
     private String constructionsite;
     private String maintenance;
     private String maintenanceDevice;
+    private String xj;
     private String msLog;
     private String appfile;
     private String equipmentfile;

src/main/java/com/tofly/zmrq/controller/AppFileController.java

@@ -8,9 +8,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tofly.common.core.entity.ResultRespone;
 import com.tofly.common.log.annotation.ToFlyAppLog;
+import com.tofly.common.oauth.auth.ToflyUser;
 import com.tofly.zmrq.entity.AppFile;
 import com.tofly.zmrq.service.AppFileService;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,10 +33,13 @@ import java.util.Arrays;
 @AllArgsConstructor
 @RequestMapping("/appfile")
 @Api(tags="APP文件参数表接口")
+@Slf4j
 public class AppFileController {
 
     private final  AppFileService appFileService;
 
+    private final CacheManager cacheManager;
+
     /**
     * 分页查询
     * @param page 分页对象
@@ -42,6 +49,11 @@ public class AppFileController {
     @GetMapping("/page" )
     @ApiOperation(value = "分页查询")
     public ResultRespone getAppFilePage(Page page, @ModelAttribute AppFile appFile) {
+        ToflyUser toflyUser=null;
+        Cache cache = cacheManager.getCache("user_details");
+        toflyUser= (ToflyUser) cache.get("pra_zm").get();
+        log.info("----------"+cache.toString());
+        log.info("----------"+toflyUser.getUserid() + toflyUser.getCompanyId());
       return ResultRespone.success(appFileService.page(page, Wrappers.query(appFile)));
     }
 

src/main/java/com/tofly/zmrq/controller/LedgerDonghuoController.java

@@ -10,13 +10,12 @@ import com.tofly.common.core.entity.ResultRespone;
 import com.tofly.common.log.annotation.ToFlyAppLog;
 import com.tofly.zmrq.entity.LedgerDonghuo;
 import com.tofly.zmrq.service.LedgerDonghuoService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
-import org.springframework.web.bind.annotation.ModelAttribute;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
 

src/main/java/com/tofly/zmrq/controller/LedgerQiangjianController.java

@@ -10,13 +10,12 @@ import com.tofly.common.core.entity.ResultRespone;
 import com.tofly.common.log.annotation.ToFlyAppLog;
 import com.tofly.zmrq.entity.LedgerQiangjian;
 import com.tofly.zmrq.service.LedgerQiangjianService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
-import org.springframework.web.bind.annotation.ModelAttribute;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
 

src/main/java/com/tofly/zmrq/controller/LedgerTiaoyaguiController.java

@@ -10,13 +10,12 @@ import com.tofly.common.core.entity.ResultRespone;
 import com.tofly.common.log.annotation.ToFlyAppLog;
 import com.tofly.zmrq.entity.LedgerTiaoyagui;
 import com.tofly.zmrq.service.LedgerTiaoyaguiService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
-import org.springframework.web.bind.annotation.ModelAttribute;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
 

src/main/java/com/tofly/zmrq/controller/UserdeviceController.java

@@ -12,13 +12,12 @@ import com.tofly.common.log.annotation.ToFlyAppLog;
 import com.tofly.zmrq.entity.Userdevice;
 import com.tofly.zmrq.entity.UserdeviceUpdate;
 import com.tofly.zmrq.service.UserdeviceService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
-import org.springframework.web.bind.annotation.ModelAttribute;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Arrays;
@@ -142,7 +141,7 @@ public class UserdeviceController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "isUpdate", value = "是否对比之前数据，0:不对比，直接新增 1:对比重复数据", required = true, dataType = "String"),
     })
-    public ResultRespone uploadByExcel(String isUpdate,MultipartFile file){
+    public ResultRespone uploadByExcel(String isUpdate, MultipartFile file){
         return ResultRespone.success(userdeviceService.uploadByExcel(isUpdate,file));
     }
 

src/main/java/com/tofly/zmrq/custom/controller/CustomMaintenanceController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tofly.common.core.entity.ResultRespone;
 import com.tofly.common.log.annotation.ToFlyAppLog;
 import com.tofly.common.oauth.exception.ToflyDeniedException;
+import com.tofly.common.oauth.util.SecurityUtils;
 import com.tofly.zmrq.custom.entity.*;
 import com.tofly.zmrq.custom.service.CustomMaintenanceService;
 import com.tofly.zmrq.entity.*;
@@ -24,43 +25,47 @@ public class CustomMaintenanceController {
     private final MaintenanceDeviceService maintenanceDeviceService;
     private final PlanPointTempService planPointTempService;
 
-    @ToFlyAppLog(title = "新增巡护记录")
-    @PostMapping(value = "/maintenance",headers = "content-type=multipart/form-data")
-    @ApiOperation(tags = "调压站及楼栋调压箱巡护记录表接口", value = "新增巡护记录",notes = "photos:照片文件[多个/选填];需传参数：用气片区，地址，检查起始时间，检查结束时间，巡护员,巡检计划id, 巡检计划临时点(pointId)")
-    public ResultRespone addMaintenance(HttpServletRequest request,AddMaintenance addMaintenance) {
-        if (addMaintenance.getChildPlanId() == null) {
-            throw new ToflyDeniedException("巡检计划id不能为空");
-        }
-        if (addMaintenance.getPlanTempPointId() == null) {
-            throw new ToflyDeniedException("巡检计划临时点ID");
-        }
-        //判断该计划中该点是否已上传
-        Maintenance one = maintenanceService.getOne(Wrappers.<Maintenance>lambdaQuery().eq(Maintenance::getChildPlanId, addMaintenance.getChildPlanId())
-                .eq(Maintenance::getPlanTempPointId, addMaintenance.getPlanTempPointId()));
-        if (one != null) {
-            return ResultRespone.failed(null,2,"当前计划该设备记录已上传");
-        }
-        return ResultRespone.success(customMaintenanceService.addMaintenance(request,addMaintenance));
-    }
+    private final XjFjService xjFjService;
+    private final XjLdtyxService xjLdtyxService;
+    private final XjTygService xjTygService;
 
-    @ToFlyAppLog(title = "修改巡护记录")
-    @PutMapping(value = "/maintenance",headers = "content-type=multipart/form-data")
-    @ApiOperation(tags = "调压站及楼栋调压箱巡护记录表接口", value = "修改巡护记录",notes = "photos:照片文件[多个/选填];需传参数：用气片区，地址，检查起始时间，检查结束时间，巡护员,巡检计划id, 巡检计划临时点(pointId)")
-    public ResultRespone putMaintenance(HttpServletRequest request,AddMaintenance addMaintenance) {
-        if (addMaintenance.getId() == null){
-            throw new ToflyDeniedException("巡护记录ID不能为空");
-        }
-        return ResultRespone.success(customMaintenanceService.putMaintenance(request,addMaintenance));
-    }
-
-    @GetMapping("/maintenance/page")
-    @ApiOperation(tags = "调压站及楼栋调压箱巡护记录表接口", value = "巡护记录分页查询")
-    public ResultRespone getMaintenancePage(Page page, @ModelAttribute MaintenanceSearch maintenanceSearch) {
-        return ResultRespone.success(customMaintenanceService.getMaintenancePage(page,maintenanceSearch));
-    }
+//    @ToFlyAppLog(title = "新增巡护记录")
+//    @PostMapping(value = "/maintenance",headers = "content-type=multipart/form-data")
+//    @ApiOperation(tags = "调压站及楼栋调压箱巡护记录表接口", value = "新增巡护记录",notes = "photos:照片文件[多个/选填];需传参数：用气片区，地址，检查起始时间，检查结束时间，巡护员,巡检计划id, 巡检计划临时点(pointId)")
+//    public ResultRespone addMaintenance(HttpServletRequest request,AddMaintenance addMaintenance) {
+//        if (addMaintenance.getChildPlanId() == null) {
+//            throw new ToflyDeniedException("巡检计划id不能为空");
+//        }
+//        if (addMaintenance.getPlanTempPointId() == null) {
+//            throw new ToflyDeniedException("巡检计划临时点ID");
+//        }
+//        //判断该计划中该点是否已上传
+//        Maintenance one = maintenanceService.getOne(Wrappers.<Maintenance>lambdaQuery().eq(Maintenance::getChildPlanId, addMaintenance.getChildPlanId())
+//                .eq(Maintenance::getPlanTempPointId, addMaintenance.getPlanTempPointId()));
+//        if (one != null) {
+//            return ResultRespone.failed(null,2,"当前计划该设备记录已上传");
+//        }
+//        return ResultRespone.success(customMaintenanceService.addMaintenance(request,addMaintenance));
+//    }
+//
+//    @ToFlyAppLog(title = "修改巡护记录")
+//    @PutMapping(value = "/maintenance",headers = "content-type=multipart/form-data")
+//    @ApiOperation(tags = "调压站及楼栋调压箱巡护记录表接口", value = "修改巡护记录",notes = "photos:照片文件[多个/选填];需传参数：用气片区，地址，检查起始时间，检查结束时间，巡护员,巡检计划id, 巡检计划临时点(pointId)")
+//    public ResultRespone putMaintenance(HttpServletRequest request,AddMaintenance addMaintenance) {
+//        if (addMaintenance.getId() == null){
+//            throw new ToflyDeniedException("巡护记录ID不能为空");
+//        }
+//        return ResultRespone.success(customMaintenanceService.putMaintenance(request,addMaintenance));
+//    }
+//
+//    @GetMapping("/maintenance/page")
+//    @ApiOperation(tags = "调压站及楼栋调压箱巡护记录表接口", value = "巡护记录分页查询")
+//    public ResultRespone getMaintenancePage(Page page, @ModelAttribute MaintenanceSearch maintenanceSearch) {
+//        return ResultRespone.success(customMaintenanceService.getMaintenancePage(page,maintenanceSearch));
+//    }
 
 
-    @ToFlyAppLog(title = "新增登记表")
+    @ToFlyAppLog(title = "新增记录表")
     @PostMapping(value = "/maintenancedevice",headers = "content-type=multipart/form-data")
     @ApiOperation(tags = "设备设施运行维修保养登记表接口", value = "新增登记表",notes = "photos:照片文件[多个/选填];需传参数：设备操作人,保养内容id数组,巡检计划id，巡检计划临时点(pointId)")
     public ResultRespone addMaintenanceDevice(HttpServletRequest request,AddMaintenanceDevice addMaintenanceDevice) {
@@ -89,6 +94,75 @@ public class CustomMaintenanceController {
         return ResultRespone.success(customMaintenanceService.addMaintenanceDevice(request,addMaintenanceDevice));
     }
 
+//    @ToFlyAppLog(title = "修改登记表")
+//    @PutMapping(value = "/maintenancedevice",headers = "content-type=multipart/form-data")
+//    @ApiOperation(tags = "设备设施运行维修保养登记表接口", value = "修改登记表",notes = "photos:照片文件[多个/选填];需传参数：设备操作人,保养内容id数组,巡检计划id，巡检计划临时点(pointId)")
+//    public ResultRespone putMaintenanceDevice(HttpServletRequest request,AddMaintenanceDevice addMaintenanceDevice) {
+//        if (addMaintenanceDevice.getId() == null){
+//            throw new ToflyDeniedException("登记表记录ID不能为空");
+//        }
+//        return ResultRespone.success(customMaintenanceService.putMaintenanceDevice(request,addMaintenanceDevice));
+//    }
+//
+//    @GetMapping("/maintenancedevice/page")
+//    @ApiOperation(tags = "设备设施运行维修保养登记表接口", value = "登记表分页查询")
+//    public ResultRespone getMaintenanceDevicePage(Page page, @ModelAttribute MaintenanceDeviceSearch maintenanceDeviceSearch) {
+//        return ResultRespone.success(customMaintenanceService.getMaintenanceDevicePage(page, maintenanceDeviceSearch));
+//    }
+
+
+    //--------------------------
+
+    @ToFlyAppLog(title = "新增巡检记录")
+    @PostMapping(value = "/addXj",headers = "content-type=multipart/form-data")
+    @ApiOperation(tags = "设备设施运行维修保养登记表接口", value = "新增登记表",notes = "photos:照片文件[多个/选填];audios语音文件[多个/选填]")
+    public ResultRespone addXj(HttpServletRequest request,XjUpload xjUpload) {
+        xjUpload.setCompanyId(SecurityUtils.getCompanyId());
+        if (xjUpload.getChildPlanId() == null) {
+            throw new ToflyDeniedException("巡检计划id不能为空");
+        }
+        if (xjUpload.getPlanTempPointId() == null) {
+            throw new ToflyDeniedException("巡检计划临时点ID");
+        }
+        Long typeId = xjUpload.getTypeId();
+        if (xjUpload.getTypeId() == null) {
+            throw new ToflyDeniedException("巡检检查类型不能为空");
+        }
+        Long childPlanId = xjUpload.getChildPlanId();
+        Long pointId = xjUpload.getPlanTempPointId();
+        //判断是否该计划该点存在
+        PlanPointTemp pointTemp = planPointTempService.getOne(Wrappers.<PlanPointTemp>lambdaQuery()
+                .eq(PlanPointTemp::getChildPlanId, childPlanId)
+                .eq(PlanPointTemp::getPointId, pointId));
+        if (pointTemp == null) {
+            throw new ToflyDeniedException("该计划不存在该点信息");
+        }
+        //判断该计划中该点是否已上传
+        Object one = null;
+        if(typeId == 1){
+            one = xjLdtyxService.getOne(Wrappers.<XjLdtyx>lambdaQuery()
+                    .eq(XjLdtyx::getChildPlanId, childPlanId)
+                    .eq(XjLdtyx::getPlanTempPointId, pointId));
+        }
+        else if (typeId == 2){
+            one = xjTygService.getOne(Wrappers.<XjTyg>lambdaQuery()
+                    .eq(XjTyg::getChildPlanId, childPlanId)
+                    .eq(XjTyg::getPlanTempPointId, pointId));
+        }
+        else if (typeId == 3){
+            one = xjFjService.getOne(Wrappers.<XjFj>lambdaQuery()
+                    .eq(XjFj::getChildPlanId, childPlanId)
+                    .eq(XjFj::getPlanTempPointId, pointId));
+        }
+
+
+
+        if (one != null) {
+            return ResultRespone.failed(null,2,"当前计划该设备记录已上传");
+        }
+        return ResultRespone.success(customMaintenanceService.addXj(request,xjUpload));
+    }
+
     @ToFlyAppLog(title = "修改登记表")
     @PutMapping(value = "/maintenancedevice",headers = "content-type=multipart/form-data")
     @ApiOperation(tags = "设备设施运行维修保养登记表接口", value = "修改登记表",notes = "photos:照片文件[多个/选填];需传参数：设备操作人,保养内容id数组,巡检计划id，巡检计划临时点(pointId)")
@@ -104,4 +178,5 @@ public class CustomMaintenanceController {
     public ResultRespone getMaintenanceDevicePage(Page page, @ModelAttribute MaintenanceDeviceSearch maintenanceDeviceSearch) {
         return ResultRespone.success(customMaintenanceService.getMaintenanceDevicePage(page, maintenanceDeviceSearch));
     }
+
 }

src/main/java/com/tofly/zmrq/custom/controller/CustomQrcodeController.java

@@ -8,6 +8,7 @@ import com.tofly.common.core.util.FtpUtil;
 import com.tofly.common.core.util.StringUtil;
 import com.tofly.common.core.util.io.IOUtil;
 import com.tofly.common.log.annotation.ToFlyAppLog;
+import com.tofly.common.oauth.auth.ToflyUser;
 import com.tofly.common.oauth.util.SecurityUtils;
 import com.tofly.zmrq.config.FilePathBean;
 import com.tofly.zmrq.custom.entity.CustomQrLayer;
@@ -22,6 +23,8 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
 import org.springframework.http.MediaType;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.*;
@@ -56,6 +59,9 @@ public class CustomQrcodeController {
 
     private volatile boolean logoexists=false;
 
+    @Autowired
+    private CacheManager cacheManager;
+
     /**
      * 新增和修改二维码配置信息
      * @param servletRequest

src/main/java/com/tofly/zmrq/custom/mapper/CustomDeviceUploadMapper.java

@@ -9,6 +9,6 @@ import java.util.Map;
 
 public interface CustomDeviceUploadMapper {
     List<Map> getPageByMobile(Page page, Long deptId,String startTime, String endTime);
-    List<Map> listCarWatch(Page page, @Param("carId") Long carId,@Param("deptId") Long deptId,@Param("startDate")Date startDate,@Param("endDate") Date endDate);
+    List<Map> listCarWatch(Page page, @Param("carId") Long carId,@Param("companyId") Long companyId,@Param("startDate")Date startDate,@Param("endDate") Date endDate);
 
 }

src/main/java/com/tofly/zmrq/custom/service/CustomMaintenanceService.java

@@ -10,7 +10,7 @@ public interface CustomMaintenanceService {
 
     IPage getMaintenancePage(Page page, MaintenanceSearch maintenanceSearch);
 
-    Boolean addMaintenance(HttpServletRequest request,AddMaintenance addMaintenance);
+    Boolean addXj(HttpServletRequest request,XjUpload xjUpload);
 
     Boolean putMaintenance(HttpServletRequest request,AddMaintenance addMaintenance);
 

src/main/java/com/tofly/zmrq/custom/service/impl/CustomDeviceUploadServiceImpl.java

@@ -2,6 +2,7 @@ package com.tofly.zmrq.custom.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tofly.common.oauth.exception.ToflyDeniedException;
+import com.tofly.common.oauth.util.SecurityUtils;
 import com.tofly.zmrq.custom.entity.CarUploadSearch;
 import com.tofly.zmrq.custom.entity.DeviceUpLoadSearch;
 import com.tofly.zmrq.custom.mapper.CustomDeviceUploadMapper;
@@ -37,7 +38,8 @@ public class CustomDeviceUploadServiceImpl implements CustomDeviceUploadService
 
     @Override
     public Page<Map> listCarWatch(Page page, CarUploadSearch carUploadSearch) {
-        Long deptId = carUploadSearch.getDeptId();
+//        Long deptId = carUploadSearch.getDeptId();
+        Long companyId = SecurityUtils.getCompanyId();
         Calendar cal = Calendar.getInstance();
         if (carUploadSearch.getDate() != null) {
             cal.setTime(carUploadSearch.getDate());
@@ -51,7 +53,7 @@ public class CustomDeviceUploadServiceImpl implements CustomDeviceUploadService
         cal.set(Calendar.SECOND, 59);
         Date endDate = cal.getTime();
         Long carId = carUploadSearch.getCarId();
-        return page.setRecords(customDeviceUploadMapper.listCarWatch(page,carId,deptId,startDate,endDate));
+        return page.setRecords(customDeviceUploadMapper.listCarWatch(page,carId,companyId,startDate,endDate));
     }
 }
 

src/main/java/com/tofly/zmrq/custom/service/impl/CustomMaintenanceServiceImpl.java

@@ -52,6 +52,13 @@ public class CustomMaintenanceServiceImpl implements CustomMaintenanceService {
     private final GisAboutService gisAboutService;
     private final CustomPointService customPointService;
 
+    private final XjFjService xjFjService;
+    private final XjLdtyxService xjLdtyxService;
+    private final XjTygService xjTygService;
+    private final XjConService xjConService;
+    private final XjMenuService xjMenuService;
+    private final XjFileService xjFileService;
+
     @Override
     public IPage getMaintenancePage(Page page, MaintenanceSearch maintenanceSearch) {
         return page.setRecords(customMaintenanceMapper.getMaintenancePage(page, maintenanceSearch));
@@ -102,17 +109,92 @@ public class CustomMaintenanceServiceImpl implements CustomMaintenanceService {
 //        return result;
     }
 
+//    @Transactional
+//    @Override
+//    public Boolean addMaintenance(HttpServletRequest request, AddMaintenance addMaintenance) {
+//        Long childPlanId = addMaintenance.getChildPlanId();
+//        Long pointId = addMaintenance.getPlanTempPointId();
+//        //判断该计划中该点是否已上传
+////        Maintenance one = maintenanceService.getOne(Wrappers.<Maintenance>lambdaQuery().eq(Maintenance::getChildPlanId, childPlanId)
+////                .eq(Maintenance::getPlanTempPointId, pointId));
+////        if (one != null) {
+////            throw new ToflyDeniedException("当前计划该设备记录已上传");
+////        }
+//
+//        Date now = Date8Util.getCurrentDate();
+//        //更新计划的点
+//        planPointTempService.update(Wrappers.<PlanPointTemp>lambdaUpdate()
+//                .eq(PlanPointTemp::getChildPlanId, childPlanId)
+//                .eq(PlanPointTemp::getPointId, pointId)
+//                .set(PlanPointTemp::getIsover, "1")
+//                .set(PlanPointTemp::getState, "1")
+//                .set(PlanPointTemp::getOverDate, now)
+//                .set(PlanPointTemp::getCheckState, '1')
+//                .set(PlanPointTemp::getCheckDate, now));
+//
+//        //保存记录表
+//        maintenanceService.save(addMaintenance);
+//        Long recordId = addMaintenance.getId();
+//        if (addMaintenance.getContent() == null || addMaintenance.getContent().size() == 0) {
+//            throw new ToflyDeniedException("检查内容不能为空");
+//        }
+//        //保存记录关联的检查内容
+//        addMaintenance.getContent().forEach(content -> {
+//            if (content.getParentId() == null) {
+//                throw new ToflyDeniedException("检查设施不能为空");
+//            }
+//            //记录设备信息和备注
+//            MaintenanceContent maintenanceContent = new MaintenanceContent();
+//            maintenanceContent.setRecordId(recordId);
+//            maintenanceContent.setMenuId(content.getParentId());
+//            maintenanceContent.setNote(content.getNote());
+//            maintenanceContentService.save(maintenanceContent);
+//            //存储子检查内容
+//            if (StringUtil.isNotEmpty(content.getMenuIds())) {
+//                for (Long id : content.getMenuIds()) {
+//                    MaintenanceContent maintenanceContent2 = new MaintenanceContent();
+//                    maintenanceContent2.setRecordId(recordId);
+//                    maintenanceContent2.setMenuId(Long.valueOf(id));
+//                    maintenanceContentService.save(maintenanceContent2);
+//                }
+//            }
+//        });
+//        //更新点到位情况
+//
+//        //遍历请求中key包含photo的所有文件，包括photo1，photo2中的多个文件
+//        MultiValueMap<String, MultipartFile> multiFileMap = ((MultipartHttpServletRequest) request).getMultiFileMap();
+//        multiFileMap.forEach((k, v) -> {
+//            //保存照片
+//            v.forEach(file -> {
+//                String fileName = file.getOriginalFilename();
+//                String filePath = filePathBean.getMaintenance() + IdWorker.getIdStr() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+//                boolean b = FtpUtil.uploadFile2Ftp(file, filePath);
+//                if (b) {
+//                    MaintenanceFile maintenanceFile = new MaintenanceFile();
+//                    maintenanceFile.setFilePath(filePath);
+//                    maintenanceFile.setFileName(fileName);
+//                    maintenanceFile.setMaintenanceId(addMaintenance.getId());
+//                    maintenanceFileService.save(maintenanceFile);
+//                }
+//            });
+//        });
+//        //异步更新到位比例
+//        ExecutorService executorService = Executors.newSingleThreadExecutor();
+//        executorService.execute(new Runnable() {
+//            @Override
+//            public void run() {
+//                customPointService.percentUpdate(childPlanId.toString());
+//            }
+//        });
+//        return true;
+//    }
+
+
     @Transactional
     @Override
-    public Boolean addMaintenance(HttpServletRequest request, AddMaintenance addMaintenance) {
-        Long childPlanId = addMaintenance.getChildPlanId();
-        Long pointId = addMaintenance.getPlanTempPointId();
-        //判断该计划中该点是否已上传
-//        Maintenance one = maintenanceService.getOne(Wrappers.<Maintenance>lambdaQuery().eq(Maintenance::getChildPlanId, childPlanId)
-//                .eq(Maintenance::getPlanTempPointId, pointId));
-//        if (one != null) {
-//            throw new ToflyDeniedException("当前计划该设备记录已上传");
-//        }
+    public Boolean addXj(HttpServletRequest request, XjUpload xjUpload) {
+        Long childPlanId = xjUpload.getChildPlanId();
+        Long pointId = xjUpload.getPlanTempPointId();
 
         Date now = Date8Util.getCurrentDate();
         //更新计划的点
@@ -126,51 +208,97 @@ public class CustomMaintenanceServiceImpl implements CustomMaintenanceService {
                 .set(PlanPointTemp::getCheckDate, now));
 
         //保存记录表
-        maintenanceService.save(addMaintenance);
-        Long recordId = addMaintenance.getId();
-        if (addMaintenance.getContent() == null || addMaintenance.getContent().size() == 0) {
+        Long typeId = xjUpload.getTypeId();
+        Long recordId = null;
+        if (typeId == 1) {
+            XjLdtyx xjLdtyx = new XjLdtyx();
+            xjLdtyx.setAddress(xjUpload.getAddress());
+            xjLdtyx.setCheckDate(xjUpload.getCheckDate());
+            xjLdtyx.setChildPlanId(xjUpload.getChildPlanId());
+            xjLdtyx.setPlanTempPointId(xjUpload.getPlanTempPointId());
+            xjLdtyx.setDeviceId(xjUpload.getDeviceId());
+            xjLdtyx.setNote(xjUpload.getNote());
+            xjLdtyx.setCompanyId(xjUpload.getCompanyId());
+            xjLdtyx.setRunPressure(xjUpload.getRunPressure());
+            xjLdtyx.setTruncationPressure(xjUpload.getTruncationPressure());
+            xjLdtyx.setUserid(xjUpload.getUserid());
+            xjLdtyx.setX(xjUpload.getX());
+            xjLdtyx.setY(xjUpload.getY());
+            xjLdtyxService.save(xjLdtyx);
+            recordId = xjLdtyx.getId();
+        } else if (typeId == 2) {
+            XjTyg xjTyg = new XjTyg();
+            xjTyg.setAddress(xjUpload.getAddress());
+            xjTyg.setCheckDate(xjUpload.getCheckDate());
+            xjTyg.setChildPlanId(xjUpload.getChildPlanId());
+            xjTyg.setPlanTempPointId(xjUpload.getPlanTempPointId());
+            xjTyg.setDeviceId(xjUpload.getDeviceId());
+            xjTyg.setNote(xjUpload.getNote());
+            xjTyg.setCompanyId(xjUpload.getCompanyId());
+            xjTyg.setRunPressure(xjUpload.getRunPressure());
+            xjTyg.setDiffusePressure(xjUpload.getDiffusePressure());
+            xjTyg.setWorkPressure(xjUpload.getWorkPressure());
+            xjTyg.setUserid(xjUpload.getUserid());
+            xjTyg.setX(xjUpload.getX());
+            xjTyg.setY(xjUpload.getY());
+            xjTygService.save(xjTyg);
+            recordId = xjTyg.getId();
+        } else if (typeId == 3) {
+            XjFj xjFj = new XjFj();
+            xjFj.setAddress(xjUpload.getAddress());
+            xjFj.setCheckDate(xjUpload.getCheckDate());
+            xjFj.setChildPlanId(xjUpload.getChildPlanId());
+            xjFj.setPlanTempPointId(xjUpload.getPlanTempPointId());
+            xjFj.setDeviceId(xjUpload.getDeviceId());
+            xjFj.setNote(xjUpload.getNote());
+            xjFj.setCompanyId(xjUpload.getCompanyId());
+            xjFj.setUserid(xjUpload.getUserid());
+            xjFj.setX(xjUpload.getX());
+            xjFj.setY(xjUpload.getY());
+            xjFj.setMaterial(xjUpload.getMaterial());
+            xjFj.setSpecification(xjUpload.getSpecification());
+            xjFjService.save(xjFj);
+            recordId = xjFj.getId();
+        }
+        if (xjUpload.getContent() == null || xjUpload.getContent().size() == 0) {
             throw new ToflyDeniedException("检查内容不能为空");
         }
-        //保存记录关联的检查内容
-        addMaintenance.getContent().forEach(content -> {
-            if (content.getParentId() == null) {
-                throw new ToflyDeniedException("检查设施不能为空");
-            }
-            //记录设备信息和备注
-            MaintenanceContent maintenanceContent = new MaintenanceContent();
-            maintenanceContent.setRecordId(recordId);
-            maintenanceContent.setMenuId(content.getParentId());
-            maintenanceContent.setNote(content.getNote());
-            maintenanceContentService.save(maintenanceContent);
-            //存储子检查内容
-            if (StringUtil.isNotEmpty(content.getMenuIds())) {
-                for (Long id : content.getMenuIds()) {
-                    MaintenanceContent maintenanceContent2 = new MaintenanceContent();
-                    maintenanceContent2.setRecordId(recordId);
-                    maintenanceContent2.setMenuId(Long.valueOf(id));
-                    maintenanceContentService.save(maintenanceContent2);
-                }
-            }
+        //保存记录关联的保养内容
+        Long finalRecordId = recordId;
+        xjUpload.getContent().stream().forEach(content -> {
+            XjCon xjCon = new XjCon();
+            xjCon.setRecordId(finalRecordId);
+            xjCon.setTypeId(content);
+            xjCon.setTypeId(typeId);
+            xjConService.save(xjCon);
         });
-        //更新点到位情况
+
 
         //遍历请求中key包含photo的所有文件，包括photo1，photo2中的多个文件
         MultiValueMap<String, MultipartFile> multiFileMap = ((MultipartHttpServletRequest) request).getMultiFileMap();
         multiFileMap.forEach((k, v) -> {
             //保存照片
             v.forEach(file -> {
+                XjFile xjFile = new XjFile();
+                xjFile.setRecordId(finalRecordId);
+                xjFile.setXjType(typeId);
                 String fileName = file.getOriginalFilename();
-                String filePath = filePathBean.getMaintenance() + IdWorker.getIdStr() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+                String filePath = filePathBean.getXj() + IdWorker.getIdStr() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
                 boolean b = FtpUtil.uploadFile2Ftp(file, filePath);
-                if (b) {
-                    MaintenanceFile maintenanceFile = new MaintenanceFile();
-                    maintenanceFile.setFilePath(filePath);
-                    maintenanceFile.setFileName(fileName);
-                    maintenanceFile.setMaintenanceId(addMaintenance.getId());
-                    maintenanceFileService.save(maintenanceFile);
+                xjFile.setFilePath(filePath);
+                xjFile.setFileName(fileName);
+                //移动端照片
+                if (k.contains("photo")) {
+                    xjFile.setFileType("1");
+                }
+                //移动端语音
+                if (k.contains("audio")) {
+                    xjFile.setFileType("2");
                 }
+                xjFileService.save(xjFile);
             });
         });
+        //更新到位比例
         //异步更新到位比例
         ExecutorService executorService = Executors.newSingleThreadExecutor();
         executorService.execute(new Runnable() {
@@ -191,7 +319,7 @@ public class CustomMaintenanceServiceImpl implements CustomMaintenanceService {
         Long recordId = addMaintenance.getId();
         maintenanceContentService.remove(Wrappers.<MaintenanceContent>lambdaQuery().eq(MaintenanceContent::getRecordId, recordId));
         //保存记录关联的检查内容
-        if(addMaintenance.getContent() != null) {
+        if (addMaintenance.getContent() != null) {
             addMaintenance.getContent().forEach(content -> {
                 //记录设备信息和备注
                 MaintenanceContent maintenanceContent = new MaintenanceContent();
@@ -366,7 +494,7 @@ public class CustomMaintenanceServiceImpl implements CustomMaintenanceService {
         maintenanceDeviceService.save(addMaintenanceDevice);
         Long recordId = addMaintenanceDevice.getId();
         //保存记录关联的保养内容
-        if(addMaintenanceDevice.getContent() != null) {
+        if (addMaintenanceDevice.getContent() != null) {
             addMaintenanceDevice.getContent().stream().forEach(content -> {
                 MaintenanceDeviceCon maintenanceDeviceCon = new MaintenanceDeviceCon();
                 maintenanceDeviceCon.setDeviceRecordId(recordId);
@@ -400,7 +528,7 @@ public class CustomMaintenanceServiceImpl implements CustomMaintenanceService {
             public void run() {
                 customPointService.percentUpdate(childPlanId.toString());
             }
-        });        
+        });
         return true;
     }
 
@@ -412,7 +540,7 @@ public class CustomMaintenanceServiceImpl implements CustomMaintenanceService {
         Long recordId = addMaintenanceDevice.getId();
         maintenanceDeviceConService.remove(Wrappers.<MaintenanceDeviceCon>lambdaQuery().eq(MaintenanceDeviceCon::getDeviceRecordId, recordId));
         //保存记录关联的检查内容
-        if (addMaintenanceDevice.getContent() != null){
+        if (addMaintenanceDevice.getContent() != null) {
             addMaintenanceDevice.getContent().forEach(content -> {
                 MaintenanceDeviceCon maintenanceDeviceCon = new MaintenanceDeviceCon();
                 maintenanceDeviceCon.setDeviceRecordId(recordId);

src/main/java/com/tofly/zmrq/service/impl/LedgerDonghuoServiceImpl.java

@@ -6,9 +6,9 @@ package com.tofly.zmrq.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.tofly.zmrq.entity.LedgerDonghuo;
+import com.tofly.zmrq.mapper.LedgerDonghuoMapper;
 import com.tofly.zmrq.service.LedgerDonghuoService;
 import org.springframework.stereotype.Service;
-import com.tofly.zmrq.mapper.LedgerDonghuoMapper;
 
 /**
  * 动火台账表

src/main/java/com/tofly/zmrq/service/impl/LedgerQiangjianServiceImpl.java

@@ -6,9 +6,9 @@ package com.tofly.zmrq.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.tofly.zmrq.entity.LedgerQiangjian;
+import com.tofly.zmrq.mapper.LedgerQiangjianMapper;
 import com.tofly.zmrq.service.LedgerQiangjianService;
 import org.springframework.stereotype.Service;
-import com.tofly.zmrq.mapper.LedgerQiangjianMapper;
 
 /**
  * 强检台账表

src/main/java/com/tofly/zmrq/service/impl/LedgerTiaoyaguiServiceImpl.java

@@ -6,9 +6,9 @@ package com.tofly.zmrq.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.tofly.zmrq.entity.LedgerTiaoyagui;
+import com.tofly.zmrq.mapper.LedgerTiaoyaguiMapper;
 import com.tofly.zmrq.service.LedgerTiaoyaguiService;
 import org.springframework.stereotype.Service;
-import com.tofly.zmrq.mapper.LedgerTiaoyaguiMapper;
 
 /**
  * 调压柜台账表

src/main/java/com/tofly/zmrq/service/impl/UserdeviceServiceImpl.java

@@ -9,10 +9,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.tofly.common.core.util.io.ExcelUtil;
 import com.tofly.common.oauth.exception.ToflyDeniedException;
 import com.tofly.zmrq.entity.Userdevice;
+import com.tofly.zmrq.mapper.UserdeviceMapper;
 import com.tofly.zmrq.service.UserdeviceService;
 import lombok.SneakyThrows;
 import org.springframework.stereotype.Service;
-import com.tofly.zmrq.mapper.UserdeviceMapper;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 

src/main/resources/bootstrap-pro.yml

@@ -51,6 +51,7 @@ dyrq:
     constructionsite: /zmrq/constructionsite/
     maintenance: /zmrq/maintenance/
     maintenanceDevice: /zmrq/maintenanceDevice/
+    xj: /zmrq/xj/
     msLog: /zmrq/msLog/
     appfile: /zmrq/appfile/
     equipmentfile: /zmrq/equipmentfile/

src/main/resources/customMapper/CustomDeviceUploadMapper.xml

@@ -30,6 +30,9 @@
         (select * from (select c.gpstime from TF_CAR_GPS_UPLOAD c,tf_car_baseinfo b where c.carid =b.id and GPSTIME>= #{startDate} and GPSTIME<=#{endDate} order by GPSTIME) where rownum = 1) as offTime
          from tf_car_baseinfo a
         ]]>
+        <if test="companyId != null">
+            where company_id = #{companyId}
+        </if>
     </select>
 
     <resultMap id="listCarWatchMap" type="com.tofly.zmrq.custom.entity.CarUploadResult">

src/main/resources/logback.xml

@@ -2,7 +2,7 @@
 <configuration debug="false" scan="true" scanPeriod="1 seconds">
 
     <contextName>logback</contextName>
-    <property name="log.path" value="D:/java/jdk/xnkdjars/logs/dyrq/dyrq-springboot.log"/>
+    <property name="log.path" value="./logs/zmrq/zmrq-springboot.log"/>
 
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>

src/main/resources/mapper/LedgerDonghuoMapper.xml

@@ -18,7 +18,7 @@
         <result property="createUser" column="CREATE_USER"/>
         <result property="createTime" column="CREATE_TIME"/>
         <association property="createUserName" column="CREATE_USER"
-                     select="com.tofly.baseapi.mapper.ToflyCodeCommonMapper.getUserName"></association>
+                     select="com.tofly.common.mapper.ToflyCodeCommonMapper.getUserName"></association>
     </resultMap>
 
 

src/main/resources/mapper/LedgerQiangjianMapper.xml

@@ -16,7 +16,7 @@
         <result property="createUser" column="CREATE_USER"/>
         <result property="createTime" column="CREATE_TIME"/>
         <association property="createUserName" column="CREATE_USER"
-                     select="com.tofly.baseapi.mapper.ToflyCodeCommonMapper.getUserName"></association>
+                     select="com.tofly.common.mapper.ToflyCodeCommonMapper.getUserName"></association>
     </resultMap>
 
 

src/main/resources/mapper/LedgerTiaoyaguiMapper.xml

@@ -14,7 +14,7 @@
         <result property="createUser" column="CREATE_USER"/>
         <result property="createTime" column="CREATE_TIME"/>
         <association property="createUserName" column="CREATE_USER"
-                     select="com.tofly.baseapi.mapper.ToflyCodeCommonMapper.getUserName"></association>
+                     select="com.tofly.common.mapper.ToflyCodeCommonMapper.getUserName"></association>
     </resultMap>
 
 

zmrqGps/src/main/java/com/tofly/zmrqGps/controller/EsCarGpsUploadController.java

@@ -3,7 +3,9 @@ package com.tofly.zmrqGps.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tofly.common.core.entity.ResultRespone;
 import com.tofly.common.log.annotation.ToFlyAppLog;
+import com.tofly.common.mapper.ToflyCodeCommonMapper;
 import com.tofly.common.oauth.exception.ToflyDeniedException;
+import com.tofly.common.oauth.util.SecurityUtils;
 import com.tofly.common.service.CommonOauthService;
 import com.tofly.zmrqGps.entity.EsCarGpsUpload;
 import com.tofly.zmrqGps.entity.EsCarGpsUploadQuery;
@@ -44,13 +46,12 @@ public class EsCarGpsUploadController {
 
     private final CommonOauthService commonOauthService;
 
+    private final ToflyCodeCommonMapper toflyCodeCommonMapper;
 
     @ToFlyAppLog(title="新增汽车GPS信息" )
     @ApiOperation(value = "新增汽车GPS信息")
     @PostMapping
     public ResultRespone save(@RequestBody EsCarGpsUpload esCarGpsUpload) {
-        Long companyId = commonOauthService.compareCompany(esCarGpsUpload.getCompanyId());
-        esCarGpsUpload.setCompanyId(companyId);
         return ResultRespone.success(carGpsService.cargpsSave(esCarGpsUpload));
     }
 
@@ -99,8 +100,7 @@ public class EsCarGpsUploadController {
     @GetMapping("/page")
     public ResultRespone get(Page page, @ModelAttribute EsQuery esQuery) {
         EsCarGpsUpload esCarGpsUpload = null;
-        Long companyId = commonOauthService.compareCompany(esCarGpsUpload.getCompanyId());
-        esCarGpsUpload.setCompanyId(companyId);
+        Long companyId = commonOauthService.compareCompany(esQuery.getCompanyId());
         esQuery.setCompanyId(companyId);
         QueryBuilder[] queryBuilders = EsQueryUtil.putQUery(page, esQuery);
         return ResultRespone.success(esCarGpsUploadService.getPage(esCarGpsUpload, page, queryBuilders));
@@ -110,25 +110,26 @@ public class EsCarGpsUploadController {
     @GetMapping("/getAllPage")
     public ResultRespone getAllPage(Page page, @ModelAttribute EsQuery esQuery) {
         EsCarGpsUpload esCarGpsUpload = null;
-        Long companyId = commonOauthService.compareCompany(esCarGpsUpload.getCompanyId());
-        esCarGpsUpload.setCompanyId(companyId);
+        Long companyId = commonOauthService.compareCompany(esQuery.getCompanyId());
         esQuery.setCompanyId(companyId);
         QueryBuilder[] queryBuilders = EsQueryUtil.putQUery(page, esQuery);
-        return ResultRespone.success(esCarGpsUploadService.getAllPage(esCarGpsUpload, page,
-                esSaveInfoUtil.DyMonth(esCarGpsUploadService.getIndex()), elasticsearchTemplate, queryBuilders));
+//        return ResultRespone.success(esCarGpsUploadService.getAllPage(esCarGpsUpload, page,
+//                esSaveInfoUtil.DyMonth(esCarGpsUploadService.getIndex()), elasticsearchTemplate, queryBuilders));
+        return ResultRespone.success(esCarGpsUploadService.getPage(esCarGpsUpload,page,queryBuilders));
     }
 
     @ApiOperation(value = "获取所有index的汽车GPS信息（非分页）")
     @GetMapping("/getAll")
     public ResultRespone getAllpage(@ModelAttribute EsQuery esQuery) {
         EsCarGpsUpload esCarGpsUpload = null;
-        Long companyId = commonOauthService.compareCompany(esCarGpsUpload.getCompanyId());
-        esCarGpsUpload.setCompanyId(companyId);
+//        Long companyId = commonOauthService.compareCompany(esQuery.getCompanyId());
+        Long companyId = this.toflyCodeCommonMapper.getUserCompanyId(SecurityUtils.getUserId());
         esQuery.setCompanyId(companyId);
         Page page = new Page();
         QueryBuilder[] queryBuilders = EsQueryUtil.putQUery(page, esQuery);
-        return ResultRespone.success(esCarGpsUploadService.getAll(esCarGpsUpload, page,
-                esSaveInfoUtil.DyMonth(esCarGpsUploadService.getIndex()), elasticsearchTemplate, queryBuilders));
+//        return ResultRespone.success(esCarGpsUploadService.getAll(esCarGpsUpload, page,
+//                esSaveInfoUtil.DyMonth(esCarGpsUploadService.getIndex()), elasticsearchTemplate, queryBuilders));
+        return ResultRespone.success(esCarGpsUploadService.getList(esCarGpsUpload,page,queryBuilders));
     }
 
     @ApiOperation(value = "获取汽车GPS最新位置信息")
@@ -143,8 +144,9 @@ public class EsCarGpsUploadController {
         Page page = new Page();
         page.setSize(new Long(10000));
         QueryBuilder[] queryBuilders = EsQueryUtil.CarGpsUploadQuery(page, esCarGpsUploadQuery);
-        List<EsCarGpsUpload> result = esCarGpsUploadService.getAll(esCarGpsUpload, page,
-                esSaveInfoUtil.DyMonth(esCarGpsUploadService.getIndex()), elasticsearchTemplate, queryBuilders);
+//        List<EsCarGpsUpload> result = esCarGpsUploadService.getAll(esCarGpsUpload, page,
+//                esSaveInfoUtil.DyMonth(esCarGpsUploadService.getIndex()), elasticsearchTemplate, queryBuilders);
+        List<EsCarGpsUpload> result = esCarGpsUploadService.getPage(esCarGpsUpload,page,queryBuilders).getRecords();
         Map resultMap = new HashMap<>();
         int end = result.size() - 1;
         resultMap.put("lat", result.size() == 0 ? null : result.get(0).getLocationLatitude());
@@ -163,8 +165,9 @@ public class EsCarGpsUploadController {
         Long companyId = commonOauthService.compareCompany(esCarGpsUploadQuery.getCompanyId());
         esCarGpsUploadQuery.setCompanyId(companyId);
         QueryBuilder[] queryBuilders = EsQueryUtil.CarGpsUploadQuery(page, esCarGpsUploadQuery);
-        return ResultRespone.success(esCarGpsUploadService.getAll(esCarGpsUpload, page,
-                esSaveInfoUtil.DyMonth(esCarGpsUploadService.getIndex()), elasticsearchTemplate, queryBuilders));
+//        return ResultRespone.success(esCarGpsUploadService.getAll(esCarGpsUpload, page,
+//                esSaveInfoUtil.DyMonth(esCarGpsUploadService.getIndex()), elasticsearchTemplate, queryBuilders));
+        return ResultRespone.success(esCarGpsUploadService.getList(esCarGpsUpload,page,queryBuilders));
     }
 
     @ApiOperation(value = "获取所有的汽车GPS信息（分页orderby gpstime）")
@@ -174,7 +177,8 @@ public class EsCarGpsUploadController {
         Long companyId = commonOauthService.compareCompany(esCarGpsUploadQuery.getCompanyId());
         esCarGpsUploadQuery.setCompanyId(companyId);
         QueryBuilder[] queryBuilders = EsQueryUtil.CarGpsUploadQuery(page, esCarGpsUploadQuery);
-        return ResultRespone.success(esCarGpsUploadService.getAllPage(esCarGpsUpload, page,
-                esSaveInfoUtil.DyMonth(esCarGpsUploadService.getIndex()), elasticsearchTemplate, queryBuilders));
+//        return ResultRespone.success(esCarGpsUploadService.getAllPage(esCarGpsUpload, page,
+//                esSaveInfoUtil.DyMonth(esCarGpsUploadService.getIndex()), elasticsearchTemplate, queryBuilders));
+        return ResultRespone.success(esCarGpsUploadService.getPage(esCarGpsUpload,page,queryBuilders));
     }
 }

zmrqGps/src/main/java/com/tofly/zmrqGps/controller/EsGpsUploadController.java

@@ -152,8 +152,7 @@ public class EsGpsUploadController {
     @GetMapping("/page")
     public ResultRespone get(Page page, @ModelAttribute EsQuery esQuery) {
         EsGpsUpload esGpsUpload = null;
-        Long companyId = commonOauthService.compareCompany(esGpsUpload.getCompanyId());
-        esGpsUpload.setCompanyId(companyId);
+        Long companyId = commonOauthService.compareCompany(esQuery.getCompanyId());
         esQuery.setCompanyId(companyId);
         QueryBuilder[] queryBuilders = EsQueryUtil.putQUery(page, esQuery);
 
@@ -164,20 +163,19 @@ public class EsGpsUploadController {
     @GetMapping("/getAllPage")
     public ResultRespone getAllPage(Page page, @ModelAttribute EsQuery esQuery) {
         EsGpsUpload esGpsUpload = null;
-        Long companyId = commonOauthService.compareCompany(esGpsUpload.getCompanyId());
-        esGpsUpload.setCompanyId(companyId);
+        Long companyId = commonOauthService.compareCompany(esQuery.getCompanyId());
         esQuery.setCompanyId(companyId);
         QueryBuilder[] queryBuilders = EsQueryUtil.putQUery(page, esQuery);
-        return ResultRespone.success(esGpsUploadService.getAllPage(esGpsUpload, page,
-                esSaveInfoUtil.DyMonth(esGpsUploadService.getIndex()), elasticsearchTemplate, queryBuilders));
+//        return ResultRespone.success(esGpsUploadService.getAllPage(esGpsUpload, page,
+//                esSaveInfoUtil.DyMonth(esGpsUploadService.getIndex()), elasticsearchTemplate, queryBuilders));
+        return ResultRespone.success(esGpsUploadService.getPage(esGpsUpload, page, queryBuilders));
     }
 
     @ApiOperation(value = "获取GPS信息并统计数据")
     @GetMapping("/getAllPageStatistics")
     public ResultRespone getAllPageStatistics(Page page, @ModelAttribute EsQuery esQuery) {
         EsGpsUpload esGpsUpload = null;
-        Long companyId = commonOauthService.compareCompany(esGpsUpload.getCompanyId());
-        esGpsUpload.setCompanyId(companyId);
+        Long companyId = commonOauthService.compareCompany(esQuery.getCompanyId());
         esQuery.setCompanyId(companyId);
         QueryBuilder[] queryBuilders = EsQueryUtil.putQUery(page, esQuery);
         return ResultRespone.success(esGpsUploadService.getAllPageStatistics(esGpsUpload, page,
@@ -194,8 +192,9 @@ public class EsGpsUploadController {
         esGpsUpload.setCompanyId(companyId);
         esQuery.setCompanyId(companyId);
         QueryBuilder[] queryBuilders = EsQueryUtil.putQUery(page, esQuery);
-        return ResultRespone.success(esGpsUploadService.getAll(esGpsUpload, page,
-                esSaveInfoUtil.DyMonth(esGpsUploadService.getIndex()), elasticsearchTemplate, queryBuilders));
+//        return ResultRespone.success(esGpsUploadService.getAll(esGpsUpload, page,
+//                esSaveInfoUtil.DyMonth(esGpsUploadService.getIndex()), elasticsearchTemplate, queryBuilders));
+        return ResultRespone.success(esGpsUploadService.getList(esGpsUpload, page, queryBuilders));
     }
 
 
@@ -228,8 +227,9 @@ public class EsGpsUploadController {
         esGpsUpload.setCompanyId(companyId);
         esQuery.setCompanyId(companyId);
         QueryBuilder[] queryBuilders = EsQueryUtil.putQUery(page, esQuery);
-        List<EsGpsUpload> list = esGpsUploadService.getAll(esGpsUpload, page,
-                esSaveInfoUtil.DyMonth(esGpsUploadService.getIndex()), elasticsearchTemplate, queryBuilders);
+//        List<EsGpsUpload> list = esGpsUploadService.getAll(esGpsUpload, page,
+//                esSaveInfoUtil.DyMonth(esGpsUploadService.getIndex()), elasticsearchTemplate, queryBuilders);
+        List<EsGpsUpload> list = esGpsUploadService.getList(esGpsUpload, page, queryBuilders);
         //截取分段信息
         int pointNum = 1000;
         int total = list.size();

zmrqGps/src/main/java/com/tofly/zmrqGps/controller/EsPdaDeviceUploadController.java

@@ -115,7 +115,6 @@ public class EsPdaDeviceUploadController {
     public ResultRespone get(Page page, @ModelAttribute EsQuery esQuery){
         EsPdaDeviceUpload esPdaDeviceUpload=null;
         Long companyId = commonOauthService.compareCompany(esPdaDeviceUpload.getCompanyId());
-        esPdaDeviceUpload.setCompanyId(companyId);
         esQuery.setCompanyId(companyId);
         QueryBuilder[] queryBuilders = EsQueryUtil.deviceQuery(page, esQuery);
         return ResultRespone.success(esPdaDeviceUploadService.getPage(esPdaDeviceUpload,page,queryBuilders));
@@ -126,11 +125,11 @@ public class EsPdaDeviceUploadController {
     public ResultRespone getAllPage(Page page, @ModelAttribute EsQuery esQuery){
         EsPdaDeviceUpload esPdaDeviceUpload=null;
         Long companyId = commonOauthService.compareCompany(esPdaDeviceUpload.getCompanyId());
-        esPdaDeviceUpload.setCompanyId(companyId);
         esQuery.setCompanyId(companyId);
         QueryBuilder[] queryBuilders = EsQueryUtil.deviceQuery(page, esQuery);
-        return ResultRespone.success(esPdaDeviceUploadService.getAllPage(esPdaDeviceUpload,page,
-                esSaveInfoUtil.DyMonth(esPdaDeviceUploadService.getIndex()),elasticsearchTemplate,queryBuilders));
+//        return ResultRespone.success(esPdaDeviceUploadService.getAllPage(esPdaDeviceUpload,page,
+//                esSaveInfoUtil.DyMonth(esPdaDeviceUploadService.getIndex()),elasticsearchTemplate,queryBuilders));
+        return ResultRespone.success(esPdaDeviceUploadService.getPage(esPdaDeviceUpload,page,queryBuilders));
     }
 
 
@@ -141,11 +140,11 @@ public class EsPdaDeviceUploadController {
         EsPdaDeviceUpload esPdaDeviceUpload=null;
         Page page=new Page();
         Long companyId = commonOauthService.compareCompany(esPdaDeviceUpload.getCompanyId());
-        esPdaDeviceUpload.setCompanyId(companyId);
         esQuery.setCompanyId(companyId);
         QueryBuilder[] queryBuilders = EsQueryUtil.deviceQuery(page, esQuery);
-        return ResultRespone.success(esPdaDeviceUploadService.getAll(esPdaDeviceUpload,page,
-                esSaveInfoUtil.DyMonth(esPdaDeviceUploadService.getIndex()),elasticsearchTemplate,queryBuilders));
+//        return ResultRespone.success(esPdaDeviceUploadService.getAll(esPdaDeviceUpload,page,
+//                esSaveInfoUtil.DyMonth(esPdaDeviceUploadService.getIndex()),elasticsearchTemplate,queryBuilders));
+        return ResultRespone.success(esPdaDeviceUploadService.getPage(esPdaDeviceUpload,page,queryBuilders));
     }
 
 

zmrqGps/src/main/java/com/tofly/zmrqGps/mapper/EsSaveInfoMapper.java

@@ -1,5 +1,7 @@
 package com.tofly.zmrqGps.mapper;
 
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 import java.util.Map;
 
@@ -24,4 +26,6 @@ public interface EsSaveInfoMapper {
      * @return 人巡最大速度，单位m/s
      */
     double getMaxSpeed();
+
+    Long getCarCompany(@Param("id") Long id);
 }

zmrqGps/src/main/java/com/tofly/zmrqGps/service/impl/CarGpsServiceImpl.java

@@ -44,6 +44,8 @@ public class CarGpsServiceImpl implements CarGpsService {
             esCarGpsUpload.setGpstime(Date8Util.getCurrentDate());
         }
         Long carId = esSaveInfoUtil.getCarId(esCarGpsUpload.getGpsId());
+        Long companyId = esSaveInfoMapper.getCarCompany(carId);
+        esCarGpsUpload.setCompanyId(companyId);
         esCarGpsUpload.setCarid(carId);
 //        //查询最新记录，比较时间，判断速度是否大于设置的最大容差
 //        EsCarGpsUpload lastest = queryLastestOne(elasticsearchTemplate, carId);

zmrqGps/src/main/java/com/tofly/zmrqGps/util/EsQueryUtil.java

@@ -99,11 +99,11 @@ public class EsQueryUtil {
             queryBuilder.minimumShouldMatch("100%");
             qb.filter(queryBuilder);
         }
-        if (esCarGpsUploadQuery.getCompanyId() != null) {
-            MatchQueryBuilder queryBuilder = QueryBuilders.matchQuery("companyId", esCarGpsUploadQuery.getCompanyId());
-            queryBuilder.minimumShouldMatch("100%");
-            qb.filter(queryBuilder);
-        }
+//        if (esCarGpsUploadQuery.getCompanyId() != null) {
+//            MatchQueryBuilder queryBuilder = QueryBuilders.matchQuery("companyId", esCarGpsUploadQuery.getCompanyId());
+//            queryBuilder.minimumShouldMatch("100%");
+//            qb.filter(queryBuilder);
+//        }
         QueryBuilder[] queryBuilders = new QueryBuilder[2];
         queryBuilders[0] = rangeQueryBuilder;
         queryBuilders[1] = qb;

zmrqGps/src/main/java/com/tofly/zmrqGps/util/EsSaveInfoUtil.java

@@ -2,10 +2,13 @@ package com.tofly.zmrqGps.util;
 
 import com.tofly.common.core.util.Date8Util;
 import com.tofly.common.core.util.StringUtil;
+import com.tofly.common.oauth.auth.ToflyUser;
 import com.tofly.common.service.CommonOauthService;
 import com.tofly.zmrqGps.mapper.EsSaveInfoMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
@@ -29,6 +32,9 @@ public class EsSaveInfoUtil {
 
     private volatile Map<String,Long> carGpsInfo=new HashMap<>();
 
+    @Autowired
+    private CacheManager cacheManager;
+
 
     public void checkorinsertEsInfo(String index){
         if(isSave(index)){
@@ -44,6 +50,7 @@ public class EsSaveInfoUtil {
     public void getUsersRtInfo(){
         List<Map> list = esSaveInfoMapper.getUsersRtInfo();
         log.info("初始化加载es数据:{}",list);
+
         list.parallelStream().forEach(m->{
             esindexinfo.put((String)m.get("esindex"),(String)m.get("fristtime"));
         });

zmrqGps/src/main/resources/bootstrap-loc.yml

@@ -33,11 +33,11 @@ spring:
     allow-bean-definition-overriding: true
   # 数据源
   datasource:
-    url: jdbc:oracle:thin:@192.168.2.234:1521/orcl
+    url: jdbc:oracle:thin:@192.168.2.242:1521/orcl
     driver-class-name: oracle.jdbc.OracleDriver
     #    driver-class-name: oracle.jdbc.driver.OracleDriver
-    username: c##tf_dyrq
-    password: tf_dyrq
+    username: tf_zmrq
+    password: tf_zmrq
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       initial-size: 10

zmrqGps/src/main/resources/mapper/EsSaveInfoMapper.xml

@@ -23,4 +23,8 @@
     <select id="getMaxSpeed" resultType="double">
         select round(max_speed/3.6,1) from TF_SYS_SETTING t where id = 1
     </select>
+
+    <select id="getCarCompany" parameterType="long" resultType="long">
+        select company_id from TF_CAR_BASEINFO where id = #{id}
+    </select>
 </mapper>

zmrqcar/src/main/java/com/tofly/zmrqcar/custom/mapper/CustomCarMapper.java

@@ -14,7 +14,7 @@ import java.util.Map;
 public interface CustomCarMapper {
     List<Map> getGpsCarList(Page page, @Param("gpsCarSearch") GpsCarSearch gpsCarSearch);
     List<Map> getSection(@Param("gpsCarSearch") GpsCarSearch gpsCarSearch);
-    List<Map> listCarWatch( @Param("carId") Long carId, @Param("deptId") Long deptId ,@Param("date") Date date);
-    List<Map> listCarWatch2( @Param("carId") Long carId, @Param("deptId") Long deptId ,@Param("date") Date date);
+    List<Map> listCarWatch( @Param("carId") Long carId, @Param("deptId") Long deptId ,@Param("date") Date date,@Param("companyId")Long companyId);
+    List<Map> listCarWatch2( @Param("carId") Long carId, @Param("deptId") Long deptId ,@Param("date") Date date,@Param("companyId")Long companyId);
     List<Map> getCarOilPage(Page page, @Param("carOil") CarOil carOil);
 }

zmrqcar/src/main/java/com/tofly/zmrqcar/custom/service/impl/CustomCarServiceImpl.java

@@ -160,9 +160,10 @@ public class CustomCarServiceImpl implements CustomCarService {
         String startTime = sdf.format(startDate);
         String endTime = sdf.format(endDate);
         Long carId = carUploadSearch.getCarId();
+        Long companyId = carUploadSearch.getCompanyId();
         List<Map> list1 = new ArrayList<>();
-        List<Map> list2 = customCarMapper.listCarWatch(carId, deptId, endDate);
-        List<Map> list3 = customCarMapper.listCarWatch2(carId, deptId, endDate);
+        List<Map> list2 = customCarMapper.listCarWatch(carId, deptId, endDate,companyId);
+        List<Map> list3 = customCarMapper.listCarWatch2(carId, deptId, endDate,companyId);
         list1.addAll(list2);
         list1.addAll(list3);
         Page<Map> result = new Page<>();

zmrqcar/src/main/resources/customMapper/CustomCarMapper.xml

@@ -34,6 +34,9 @@
         select a.id as carId,a.department_id as deptId,(select name from tf_smpn_department_x d where
         d.id=a.department_id)as deptName,a.car_number as carNum,a.car_pic as avatar
         from tf_car_baseinfo a where a.del_flag = 1
+        <if test="companyId != null">
+            and a.company_id = #{companyId}
+        </if>
         <if test="deptId != null">
             and a.department_id = #{deptId}
         </if>
@@ -49,6 +52,9 @@
         select a.id as carId,a.department_id as deptId,(select name from tf_smpn_department_x d where
         d.id=a.department_id)as deptName,a.car_number as carNum,a.car_pic as avatar
         from tf_car_baseinfo a where a.del_flag = 0
+        <if test="companyId != null">
+            and a.company_id = #{companyId}
+        </if>
         <if test="deptId != null">
             and a.department_id = #{deptId}
         </if>