Merge branch 'fu-normal-push' of uskycloud/usky-modules into master

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/PmTimeConfController.java

@@ -2,6 +2,8 @@ package com.usky.iot.controller.web;
 
 
 import com.usky.common.core.bean.CommonPage;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.iot.domain.PmTimeConf;
 import com.usky.iot.domain.PmWorkReport;
 import com.usky.iot.service.PmTimeConfService;
 import com.usky.iot.service.vo.PmSubmitCountResponseVO;
@@ -52,6 +54,15 @@ public class PmTimeConfController {
         return pmTimeConfService.submitCount(submitDate);
     }
 
+    /**
+     * 提交记录分页
+     * @param queryType 查询类型
+     * @param submitDate 提交日期
+     * @param reportId 报告id
+     * @param pageNum 页码
+     * @param pageSize 页大小
+     * @return 分页结果
+     */
     @GetMapping("/submitPage")
     public CommonPage<Object> submitPage(@RequestParam(value = "queryType", required = false, defaultValue = "0") Integer queryType,
                                          @RequestParam(value = "submitDate", required = false) String submitDate,
@@ -64,5 +75,15 @@ public class PmTimeConfController {
         return pmTimeConfService.submitPage(submitDate, queryType, reportId, pageNum, pageSize);
     }
 
+    /**
+     * 获取配置时间
+     * @return 配置时间
+     */
+    @GetMapping("/timeQuery")
+    public PmTimeConf timeQuery() {
+        Integer tenantId = SecurityUtils.getTenantId();
+        return pmTimeConfService.getTimeConf(tenantId);
+    }
+
 }
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/PmTimeConfService.java

@@ -31,4 +31,10 @@ public interface PmTimeConfService extends CrudService<PmTimeConf> {
      * @return
      */
     CommonPage<Object> submitPage(String submitDate, Integer queryType, Integer reportId, Integer pageNum, Integer pageSize);
+
+    /**
+     * 获取提交时间
+     * @return
+     */
+    public PmTimeConf getTimeConf(Integer tenantId);
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/PmTimeConfServiceImpl.java

@@ -286,10 +286,10 @@ public class PmTimeConfServiceImpl extends AbstractCrudService<PmTimeConfMapper,
     }
 
     // 获取报告时间配置
-    private PmTimeConf getTimeConf(Integer tenantId) {
+    @Override
+    public PmTimeConf getTimeConf(Integer tenantId) {
         LambdaQueryWrapper<PmTimeConf> timeConfQuery = new LambdaQueryWrapper<>();
-        timeConfQuery.select(PmTimeConf::getStartTime, PmTimeConf::getOnTime, PmTimeConf::getEndTime)
-                .eq(PmTimeConf::getTenantId, tenantId)
+        timeConfQuery.eq(PmTimeConf::getTenantId, tenantId)
                 .eq(PmTimeConf::getConfType, "PM");
         return pmTimeConfMapper.selectOne(timeConfQuery);
     }