Merge branch 'dev_pingyin_7_22' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BaseGridDailyworkController.java

@@ -21,9 +21,9 @@ package com.epmet.opendata.controller;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
-import com.epmet.opendata.dto.form.HistoryDataSyncFormDTO;
 import com.epmet.opendata.dto.form.UpsertPatrolRecordForm;
 import com.epmet.opendata.service.BaseGridDailyworkService;
+import com.epmet.opendata.service.GridstaffWorkInfoPingyinService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -43,6 +43,8 @@ public class BaseGridDailyworkController {
 
     @Autowired
     private BaseGridDailyworkService baseGridDailyworkService;
+    @Autowired
+    private GridstaffWorkInfoPingyinService gridstaffWorkInfoPingyinService;
 
     /**
      * @Author sun
@@ -64,20 +66,9 @@ public class BaseGridDailyworkController {
     @PostMapping("syncV2")
     public Result getStaffBaseInfoV2(@RequestBody(required = false) UpsertPatrolRecordForm formDTO) {
         ValidatorUtils.validateEntity(formDTO, DefaultGroup.class);
-        baseGridDailyworkService.insertBaseGridWorkRecordV2(formDTO);
+        gridstaffWorkInfoPingyinService.insertBaseGridWorkRecordV2(formDTO);
         return new Result();
     }
 
-    /**
-     * Desc: 历史数据处理
-     * @param formDTO
-     * @author zxc
-     * @date 2022/7/22 13:24
-     */
-    @PostMapping("historyDataSync")
-    public Result historyDataSync(@RequestBody HistoryDataSyncFormDTO formDTO){
-        baseGridDailyworkService.historyDataSync(formDTO);
-        return new Result();
-    }
 
 }