配置时间

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/ExpireDateConfigController.java

@@ -0,0 +1,107 @@
+package org.jeecg.modules.smscheck.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.smscheck.entity.ExpireDateConfig;
+import org.jeecg.modules.smscheck.entity.SmsCheckCompany;
+import org.jeecg.modules.smscheck.service.ExpireDateConfigService;
+import org.jeecg.modules.smscheck.service.ISmsCheckCompanyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@RestController
+@RequestMapping("/sys/expire")
+@Slf4j
+public class ExpireDateConfigController extends JeecgController<ExpireDateConfig, ExpireDateConfigService> {
+
+    @Autowired
+    private ExpireDateConfigService expireDateConfigService;
+
+
+
+
+    /**
+     * 分页列表查询
+     *
+     * @param expireDateConfig 对象
+     * @param pageNo 页码
+     * @param pageSize 每页条数
+     * @param request 请求
+     * @return 结果
+     */
+    @GetMapping(value = "/list")
+    public Result<IPage<ExpireDateConfig>> queryPageList(ExpireDateConfig expireDateConfig,
+                                                        @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                        HttpServletRequest request) {
+        QueryWrapper<ExpireDateConfig> queryWrapper = QueryGenerator.initQueryWrapper(expireDateConfig, request.getParameterMap());
+        Page<ExpireDateConfig> page = new Page<>(pageNo, pageSize);
+        IPage<ExpireDateConfig> pageList = expireDateConfigService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 编辑
+     *
+     * @param expireDateConfig 对象
+     * @return 结果
+     */
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+    public Result<String> edit(@RequestBody ExpireDateConfig expireDateConfig) {
+        QueryWrapper<ExpireDateConfig> expireDateConfigQueryWrapper = new QueryWrapper<ExpireDateConfig>();
+        expireDateConfigQueryWrapper.eq("config_name", expireDateConfig.getConfigName());
+        List<ExpireDateConfig> list = expireDateConfigService.list(expireDateConfigQueryWrapper);
+
+        QueryWrapper<ExpireDateConfig> expireDateConfigQueryWrapper2 = new QueryWrapper<ExpireDateConfig>();
+        expireDateConfigQueryWrapper2.eq("id", expireDateConfig.getId());
+         ExpireDateConfig expireDateConfig1 = expireDateConfigService.getOne(expireDateConfigQueryWrapper2);
+         //名字变了
+         if (!expireDateConfig1.getConfigName().equals(expireDateConfig.getConfigName())){
+             if (!list.isEmpty()){
+                 return Result.error("配置名称已存在!");
+             }
+         }
+        expireDateConfigService.updateById(expireDateConfig);
+        return Result.OK("编辑成功!");
+    }
+
+    @RequestMapping(value = "/check", method = {RequestMethod.GET})
+    public Result<String> check(@RequestParam(name="name") String name) {
+        QueryWrapper<ExpireDateConfig> expireDateConfigQueryWrapper = new QueryWrapper<ExpireDateConfig>();
+        expireDateConfigQueryWrapper.eq("config_name", name);
+        List<ExpireDateConfig> list = expireDateConfigService.list(expireDateConfigQueryWrapper);
+       if (!list.isEmpty()){
+           return Result.error("配置名称已存在!");
+       }
+        return Result.OK();
+    }
+
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody ExpireDateConfig expireDateConfig) {
+        QueryWrapper<ExpireDateConfig> expireDateConfigQueryWrapper = new QueryWrapper<ExpireDateConfig>();
+        expireDateConfigQueryWrapper.eq("config_name", expireDateConfig.getConfigName());
+        List<ExpireDateConfig> list = expireDateConfigService.list(expireDateConfigQueryWrapper);
+        if (!list.isEmpty()){
+            return Result.error("配置名称已存在!");
+        }
+        expireDateConfigService.save(expireDateConfig);
+        return Result.OK("添加成功！");
+    }
+
+
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name="id") String id) {
+        expireDateConfigService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+}

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/ExpireDateConfig.java

@@ -0,0 +1,70 @@
+package org.jeecg.modules.smscheck.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+@Data
+@TableName("expire_date_config")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="expire_date_config对象", description="超时配置")
+public class ExpireDateConfig  implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    /** 客户id */
+    @ApiModelProperty(value = "配置名称")
+    private String configName;
+
+    @ApiModelProperty(value = "数值")
+    private Integer configNumber;
+
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    @Excel(name = "创建人", width = 15)
+    private java.lang.String createBy;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.util.Date createTime;
+
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    @Excel(name = "更新人", width = 15)
+    private java.lang.String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.util.Date updateTime;
+
+}

tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/ExpireDateConfigMapper.java

@@ -0,0 +1,10 @@
+package org.jeecg.modules.smscheck.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.jeecg.modules.smscheck.entity.BusinessReminderCard;
+import org.jeecg.modules.smscheck.entity.ExpireDateConfig;
+
+@Mapper
+public interface ExpireDateConfigMapper   extends BaseMapper<ExpireDateConfig> {
+}

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/ExpireDateConfigService.java

@@ -0,0 +1,8 @@
+package org.jeecg.modules.smscheck.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.smscheck.entity.ExpireDateConfig;
+import org.jeecg.modules.smscheck.entity.SmsTruckCustomerData;
+
+public interface ExpireDateConfigService extends IService<ExpireDateConfig> {
+}

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/impl/ExpireDateConfigServiceImpl.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.smscheck.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.smscheck.entity.BusinessReminderCard;
+import org.jeecg.modules.smscheck.entity.ExpireDateConfig;
+import org.jeecg.modules.smscheck.mapper.BusinessReminderCardMapper;
+import org.jeecg.modules.smscheck.mapper.ExpireDateConfigMapper;
+import org.jeecg.modules.smscheck.service.BusinessReminderCardService;
+import org.jeecg.modules.smscheck.service.ExpireDateConfigService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ExpireDateConfigServiceImpl  extends ServiceImpl<ExpireDateConfigMapper, ExpireDateConfig> implements ExpireDateConfigService {
+
+}

tnc-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.RandomUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.exceptions.ClientException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import io.swagger.annotations.Api;
@@ -18,9 +19,12 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.*;
 import org.jeecg.common.util.encryption.EncryptedString;
 import org.jeecg.modules.base.service.BaseCommonService;
+import org.jeecg.modules.smscheck.entity.ExpireDateConfig;
+import org.jeecg.modules.smscheck.service.ExpireDateConfigService;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.entity.SysTenant;
 import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.entity.SysUserDepart;
 import org.jeecg.modules.system.model.SysLoginModel;
 import org.jeecg.modules.system.service.*;
 import org.jeecg.modules.system.service.impl.SysBaseApiImpl;
@@ -45,6 +49,10 @@ import java.util.*;
 public class LoginController {
 	@Autowired
 	private ISysUserService sysUserService;
+
+	@Autowired
+	private ExpireDateConfigService expireDateConfigService;
+
 	@Autowired
 	private SysBaseApiImpl sysBaseApi;
 	@Autowired
@@ -196,9 +204,19 @@ public class LoginController {
 				long diffInMilliseconds = Math.abs(new Date().getTime() - sysUser.getUpdateTime().getTime());
 				// 将毫秒数转换为天数
 				long diffInDays = diffInMilliseconds / (24 * 60 * 60 * 1000);
-				if (diffInDays>30 ){
-					return Result.error("密码过期请先修改密码...");
+				QueryWrapper<ExpireDateConfig> expireDateConfigQueryWrapper = new QueryWrapper<ExpireDateConfig>();
+				expireDateConfigQueryWrapper.eq("config_name", "密码过期时间");
+				ExpireDateConfig one = expireDateConfigService.getOne(expireDateConfigQueryWrapper);
+				if (one!=null && one.getConfigNumber()!=null){
+					if (diffInDays>one.getConfigNumber() ){
+						return Result.error("密码过期请先修改密码...");
+					}
+				}else {
+					if (diffInDays>30 ){
+						return Result.error("密码过期请先修改密码...");
+					}
 				}
+
 			}
 		}