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

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.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.iot.domain.PmTimeConf;
 import com.usky.iot.domain.PmWorkReport;
@@ -9,12 +11,9 @@ import com.usky.iot.service.PmTimeConfService;
 import com.usky.iot.service.vo.PmSubmitCountResponseVO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -85,5 +84,36 @@ public class PmTimeConfController {
         return pmTimeConfService.getTimeConf(tenantId);
     }
 
+    /**
+     * 添加配置时间
+     * @param pmTimeConf 配置时间
+     */
+    @Log(title = "新增配置时间", businessType = BusinessType.INSERT)
+    @PostMapping("/addTimeConf")
+    public void addTimeConf(@RequestBody PmTimeConf pmTimeConf) {
+        pmTimeConfService.addOrUpdateTimeConf(pmTimeConf);
+    }
+
+    /**
+     * 修改配置时间
+     * @param pmTimeConf 配置时间
+     */
+    @Log(title = "修改配置时间", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateTimeConf")
+    public void updateTimeConf(@RequestBody PmTimeConf pmTimeConf) {
+        pmTimeConfService.addOrUpdateTimeConf(pmTimeConf);
+    }
+
+    /**
+     * 打开或关闭提醒
+     * @param isOpen 是否开启 0：关闭 1：开启
+     * @param id 配置id
+     */
+    @PutMapping("/isOpen")
+    public void isOpen(@RequestParam(value = "isOpen") Integer isOpen,
+                       @RequestParam(value = "id") Integer id) {
+        pmTimeConfService.isOpen(isOpen, id);
+    }
+
 }
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/PmTimeConf.java

@@ -83,5 +83,10 @@ public class PmTimeConf implements Serializable {
      */
     private Integer tenantId;
 
+    /**
+     * 通知人
+     */
+    private String notifier;
+
 
 }

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

@@ -42,4 +42,17 @@ public interface PmTimeConfService extends CrudService<PmTimeConf> {
      * @return
      */
     public PmTimeConf getTimeConf(Integer tenantId);
+
+    /**
+     * 添加或修改报告统计时间配置
+     * @param pmTimeConf
+     */
+    public void addOrUpdateTimeConf(PmTimeConf pmTimeConf);
+
+    /**
+     * 获取迟交报告
+     * @param isOpen 是否开启（0：关闭，1：开启）
+     * @param id 配置id
+     */
+    void isOpen(Integer isOpen, Integer id);
 }

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

@@ -15,6 +15,7 @@ import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.iot.service.vo.PmReportReadersVO;
 import com.usky.iot.service.vo.PmSubmitCountResponseVO;
 import com.usky.system.domain.SysUser;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -313,6 +314,82 @@ public class PmTimeConfServiceImpl extends AbstractCrudService<PmTimeConfMapper,
         return pmTimeConfMapper.selectOne(timeConfQuery);
     }
 
+    @Override
+    public void addOrUpdateTimeConf(PmTimeConf pmTimeConf) {
+        String username = SecurityUtils.getUsername();
+        Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
+        LocalDateTime now = LocalDateTime.now();
+        if (pmTimeConf.getId() == null) {
+            Integer tenantId = SecurityUtils.getTenantId();
+            verificationTimeConf(pmTimeConf);
+            pmTimeConf.setTenantId(tenantId);
+            pmTimeConf.setCreateBy(username);
+            pmTimeConf.setCreateTime(now);
+            pmTimeConf.setDeptId(deptId);
+            pmTimeConfMapper.insert(pmTimeConf);
+        } else {
+            verificationTimeConf(pmTimeConf);
+            pmTimeConf.setUpdateBy(username);
+            pmTimeConf.setUpdateTime(now);
+            pmTimeConfMapper.updateById(pmTimeConf);
+        }
+    }
+
+    @Override
+    public void isOpen(Integer isOpen, Integer id) {
+        Long userId = SecurityUtils.getUserId();
+        String username = SecurityUtils.getUsername();
+        LocalDateTime now = LocalDateTime.now();
+        PmTimeConf pmTimeConf = pmTimeConfMapper.selectById(id);
+        if (pmTimeConf == null){
+            throw new BusinessException("配置不存在！联系管理员后重试");
+        }
+
+        if (isOpen == 1) {
+            pmTimeConf.setNotifier(pmTimeConf.getNotifier() + "," + userId);
+        } else if (isOpen == 0) {
+            pmTimeConf.setNotifier(pmTimeConf.getNotifier().replace("," + userId, ""));
+        } else {
+            throw new BusinessException("参数异常，报告提醒开关操作失败！");
+        }
+
+        pmTimeConf.setUpdateBy(username);
+        pmTimeConf.setUpdateTime(now);
+        pmTimeConfMapper.updateById(pmTimeConf);
+    }
+
+    private void verificationTimeConf(PmTimeConf pmTimeConf) {
+        if (StringUtils.isBlank(pmTimeConf.getConfName())) {
+            throw new BusinessException("配置名称不能为空！");
+        } else if (pmTimeConf.getConfName().length() > 64) {
+            throw new BusinessException("配置名称长度不能超过64个字符！");
+        }
+
+        if (StringUtils.isBlank(pmTimeConf.getConfType())) {
+            throw new BusinessException("配置类型不能为空！");
+        } else if (pmTimeConf.getConfType().length() > 64) {
+            throw new BusinessException("配置类型长度不能超过64个字符！");
+        }
+
+        if (pmTimeConf.getStartTime() == null) {
+            throw new BusinessException("开始时间不能为空！");
+        } else if (pmTimeConf.getStartTime().isAfter(pmTimeConf.getEndTime())) {
+            throw new BusinessException("开始时间不能大于结束时间！");
+        }
+
+        if (pmTimeConf.getEndTime() == null) {
+            throw new BusinessException("结束时间不能为空！");
+        } else if (pmTimeConf.getEndTime().isBefore(pmTimeConf.getStartTime())) {
+            throw new BusinessException("结束时间不能小于开始时间！");
+        }
+
+        if (pmTimeConf.getOnTime() == null) {
+            throw new BusinessException("准时时间不能为空！");
+        } else if (pmTimeConf.getOnTime().isBefore(pmTimeConf.getStartTime()) || pmTimeConf.getOnTime().isAfter(pmTimeConf.getEndTime())) {
+            throw new BusinessException("准时时间必须在开始时间和结束时间之间！");
+        }
+    }
+
     // 查询用户信息
     private List<SysUser> users(Integer tenantId) {
         LambdaQueryWrapper<SysUser> userQuery = new LambdaQueryWrapper<>();

service-iot/service-iot-biz/src/main/resources/mapper/iot/PmTimeConfMapper.xml

@@ -14,6 +14,9 @@
         <result column="update_time" property="updateTime" />
         <result column="dept_id" property="deptId" />
         <result column="tenant_id" property="tenantId" />
+        <result column="conf_name" property="confName" />
+        <result column="conf_type" property="confType" />
+        <result column="notifier" property="notifier" />
     </resultMap>
 
 </mapper>