bug修改

无关风月

2025-01-08 54c55e5947d56431620cc8733e07ef81e63e9ff7

bug修改

 manage/src/main/java/com/jilongda/manage/authority/controller/LoginController.java

@@ -1,6 +1,9 @@
package com.jilongda.manage.authority.controller;

import com.jilongda.manage.authority.dto.LoginDTO;
import com.jilongda.manage.authority.model.SecUser;
import com.jilongda.manage.model.TStore;
import com.jilongda.manage.service.TStoreService;
import com.jilongda.manage.utils.MsgUtils;
import com.jilongda.common.basic.ApiResult;
import com.jilongda.common.basic.Constant;
@@ -47,6 +50,8 @@
    private final RedisAutoTemplate redisAutoTemplate;
    private final MsgUtils msgUtils;
    private final SecUserService secUserService;
    @Autowired
    private TStoreService storeService;

    @Autowired
    public LoginController(AuthenticationManager authenticationManager, SecurityUtils securityUtils, PasswordEncoder passwordEncoder, RedisAutoTemplate redisAutoTemplate, MsgUtils msgUtils, SecUserService secUserService) {
@@ -75,6 +80,17 @@
        // 先检验是否登录
        String username = loginDto.getAccount();
        String password = loginDto.getPassword();
        // 超级管理员不做校验
        if (!username.equals("admin")){
            SecUser user = secUserService.lambdaQuery().eq(SecUser::getAccount, username).one();
            TStore store = storeService.getById(user.getStoreId());
            if (store==null){
                return ApiResult.failed(500, "门店不存在");
            }
            if (store.getStatus() == 2){
                return ApiResult.failed(500, "门店已被禁用");
            }
        }
        try {
            Map<String, Object> token = securityUtils.login(username, password, authenticationManager, SecurityUserDetails.class, 1);
            return ApiResult.success(token);

 manage/src/main/resources/mapping/TStoreMapper.xml

@@ -39,7 +39,6 @@
            </if>
            AND isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        </where>
        ORDER BY createTime DESC
    </select>

</mapper>

 optometrist/src/main/java/com/jilongda/optometrist/authority/controller/LoginController.java

@@ -13,8 +13,10 @@
import com.jilongda.optometrist.authority.model.SecUser;
import com.jilongda.optometrist.authority.service.SecUserService;
import com.jilongda.optometrist.model.TOptometrist;
import com.jilongda.optometrist.model.TStore;
import com.jilongda.optometrist.security.SecurityUserDetails;
import com.jilongda.optometrist.service.TOptometristService;
import com.jilongda.optometrist.service.TStoreService;
import com.jilongda.optometrist.utils.MsgUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -52,6 +54,8 @@
    private final SecUserService secUserService;
    @Autowired
    private TOptometristService optometristService;
    @Autowired
    private TStoreService storeService;

    @Autowired
    public LoginController(AuthenticationManager authenticationManager, SecurityUtils securityUtils, PasswordEncoder passwordEncoder, RedisAutoTemplate redisAutoTemplate, MsgUtils msgUtils, SecUserService secUserService) {
@@ -78,6 +82,10 @@
        if (two!=null){
            return ApiResult.failed(500, "账号已被禁用");
        }
        TStore store = storeService.getById(one.getStoreId());
        if (store.getStatus()==2){
            return ApiResult.failed(500, "门店已被禁用");
        }
        // 先检验是否登录
        String phone = dto.getPhone();
        String code = dto.getCode();

 optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java

@@ -23,6 +23,7 @@

import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
@@ -108,7 +109,17 @@
        tOptometristVO.setStoreName(byId1.getName());
        tOptometristVO.setName(byId.getName());
        tOptometristVO.setPhone(byId.getPhone());
        Date start = new Date();
        Date end = new Date();
        // 获取今日凌晨00：00：00和今日23：59：59
        start.setHours(0);
        start.setMinutes(0);
        start.setSeconds(0);
        end.setHours(23);
        end.setMinutes(59);
        end.setSeconds(59);
        int size = optometryService.lambdaQuery().eq(TOptometry::getOptometristId, userId)
                .between(TOptometry::getCreateTime, start, end)
                .eq(TOptometry::getStatus, 3).list().size();
        tOptometristVO.setOptometryCount(size);
        // 查询今日的排号列表