功能完善

liuhaonan

2021-12-02 34768217f342b700f2da6c3be6df13465c68ab3b

功能完善

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java

ÎļþÃû´Ó ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientCollector.java ÐÞ¸Ä
@@ -12,7 +12,7 @@
@RestController
@AllArgsConstructor
@RequestMapping("v1/client")
public class ClientCollector {
public class ClientController {

    private final ClientService clientService;

@@ -50,24 +50,22 @@

    @PostMapping("/list")
    public ResponseVO<Object> listClient(){
        Integer administratorIdentity = SecurityUtils.getAdministratorIdentity();//0 ä¸ºç®¡ç†å‘˜
        if(administratorIdentity==0){//判断 å¦‚果是管理员 å°±åˆ¤æ–­ä¸‹CustomerInspectContextHolder.getCustomerId() æœ‰æ²¡æœ‰å€¼
            Long customerId = CustomerInspectContextHolder.getCustomerId();
       // Integer administratorIdentity = SecurityUtils.getAdministratorIdentity();//0 ä¸ºç®¡ç†å‘˜
     /*   if(administratorIdentity==0){//判断 å¦‚果是管理员 å°±åˆ¤æ–­ä¸‹CustomerInspectContextHolder.getCustomerId() æœ‰æ²¡æœ‰å€¼
           // Long customerId = CustomerInspectContextHolder.getCustomerId();
            if(customerId!=null){
                return ResponseUtil.success(clientService.list());
            }
            return ResponseUtil.success(clientService.list());
        }else {
            return ResponseUtil.success(clientService.clientList(SecurityUtils.getUserId()));
        }
/*
        Long customerId = CustomerInspectContextHolder.getCustomerId();
        if (customerId!=null){
            return ResponseUtil.success(clientService.list());
        }else {
            //return ResponseUtil.success(clientService.list());
            return ResponseUtil.success(clientService.clientList(SecurityUtils.getUserId()));

        }*/
        if(SecurityUtils.getClientId().equals(SecurityUtils.getAdministratorIdentity())) {
            return ResponseUtil.success(clientService.clientList(SecurityUtils.getUserId()));
            //   }else if("0".equals(SecurityUtils.getAdministratorIdentity())){
        }else {
            return ResponseUtil.success(clientService.list());
        }

    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/security/SecurityUtils.java

@@ -40,7 +40,7 @@
            throw new BusinessException(ResponseStatusEnums.TOKEN_INVALID.getCode(), ResponseStatusEnums.TOKEN_INVALID.getMessage());
        }
        Integer administratorIdentity = getAdministratorIdentity();
        if (AdministratorEnums.ADMIN.getCode().equals(administratorIdentity) ) {
        if (AdministratorEnums.ADMIN.getCode().equals(administratorIdentity)) {
            UserDetails userDetails = (UserDetails) authentication.getPrincipal();
            UserDetailsService userDetailsService = SpringContextHolder.getBean("adminDetailsService");
            return userDetailsService.loadUserByUsername(userDetails.getUsername());
@@ -110,4 +110,12 @@
            }
        }
    }

    public static Long getClientId() {
        Integer administratorIdentity = SecurityUtils.getAdministratorIdentity();
        if (AdministratorEnums.CUSTOMER.getCode().equals(administratorIdentity)) {
            return SecurityUtils.getUserId();
        }
        return null;
    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampMissionService.java

@@ -8,6 +8,7 @@
import com.sandu.ximon.dao.domain.LampMission;
import com.sandu.ximon.dao.domain.LampPost;
import com.sandu.ximon.dao.domain.LightAdjust;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.mapper.LampMissionMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -22,15 +23,14 @@

    public boolean addLampMission(MissionParam MissionParam){
        LampMission lampMission=new LampMission();
        Long customerId = CustomerInspectContextHolder.getCustomerId();
        //Long customerId = CustomerInspectContextHolder.getCustomerId();
        //lampMission.setId(SecurityUtils.getUserId());
        Integer administratorIdentity = SecurityUtils.getAdministratorIdentity();
        if(administratorIdentity==0){
           if(customerId==null){

           }
        } lampMission.setUserId(SecurityUtils.getUserId());

       /* Integer administratorIdentity = SecurityUtils.getAdministratorIdentity();
        if(!AdministratorEnums.ADMIN.getCode().equals(administratorIdentity) ){
            lampMission.setUserId(SecurityUtils.getUserId());
        }*/
        Long clientId = SecurityUtils.getClientId();
        lampMission.setUserId(clientId);
        lampMission.setWeeks(MissionParam.getWeeks());
        lampMission.setInitial(MissionParam.getInitial());
        lampMission.setOffTime(MissionParam.getOffTime());
@@ -62,7 +62,8 @@
            throw new BusinessException("未找到该灯杆");
        }
        LampMission lampMission=new LampMission();
        lampMission.setUserId(SecurityUtils.getUserId());
        Long clientId = SecurityUtils.getClientId();
        lampMission.setUserId(clientId);
        lampMission.setWeeks(MissionParam.getWeeks());
        lampMission.setInitial(MissionParam.getInitial());
        lampMission.setOffTime(MissionParam.getOffTime());