细节调整

liuhaonan

2021-12-17 b5064f3acfc94b13dd6a7d4021552c079cf065e2

细节调整

 dao/src/main/java/com/sandu/ximon/dao/domain/AdvisementPlayer.java

@@ -27,4 +27,6 @@
    private String task;
    //接入时间
    private LocalDateTime createTime;

    private Long missionId;
}

 dao/src/main/java/com/sandu/ximon/dao/domain/IPVoice.java

ÎļþÒÑɾ³ý

 dao/src/main/java/com/sandu/ximon/dao/domain/PlayPlan.java

@@ -64,6 +64,11 @@
    private String offDateRange;

    /**
     * è®¡åˆ’执行状态  1未执行  2执行中  3已失效
     */
    private Integer status;

    /**
     * æ˜ŸæœŸèŒƒå›´
     */
    @TableField(typeHandler = JsonIntegerArrayTypeHandler.class)

 dao/src/main/resources/mapper/AdvisementPlayerMapper.xml

@@ -12,6 +12,7 @@
        <result property="bindingState" column="binding_state" jdbcType="INTEGER"/>
        <result property="task" column="task" jdbcType="VARCHAR"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
        <result property="missionId" column="mission_id" jdbcType="BIGINT"/>
    </resultMap>
    <select id="listAdvisementPlayerByKeyword" resultType="com.sandu.ximon.dao.domain.AdvisementPlayer">


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

@@ -20,7 +20,7 @@

    private final ClientService clientService;

    @GetMapping("/add")
    @PostMapping("/add")
    public ResponseVO<Object> addClient(@RequestBody ClientPrarm clientPrarm){
        boolean b = clientService.addClient(clientPrarm);
        if(b){
@@ -31,7 +31,7 @@
    }


    @GetMapping ("/update/{id}")
    @PostMapping ("/update/{id}")
    public ResponseVO<Object> updateClient(@PathVariable Long id,@RequestBody ClientPrarm clientPrarm){
        boolean b = clientService.updateClient(id,clientPrarm);
        if(b){
@@ -41,7 +41,7 @@
        }
    }

    @GetMapping("/delete/{id}")
    @PostMapping("/delete/{id}")
    public ResponseVO<Object> deleteClient(@PathVariable Long id){
        boolean b = clientService.deleteClient(id);
        if(b){
@@ -52,18 +52,8 @@
    }


    @PostMapping("/list")
    @GetMapping("/list")
    public ResponseVO<Object> listClient(){
       // 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 {

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

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

@@ -1,15 +1,23 @@
package com.sandu.ximon.admin.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.GroupParam;
import com.sandu.ximon.admin.param.LEDProgramParam;
import com.sandu.ximon.admin.param.LampPostParam;
import com.sandu.ximon.admin.param.ReceiveParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.LEDProgramService;
import com.sandu.ximon.dao.domain.LEDProgram;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.List;

/**
 * led节目
@@ -20,26 +28,51 @@
public class LEDProgramController {
    private final LEDProgramService ledProgramService;

    @GetMapping("/add")
    public ResponseVO<Object> addLEDProgram(@RequestBody  @Validated LEDProgramParam ledProgramParam) {
    @PostMapping("/add")
    public ResponseVO<Object> addLEDProgram(@RequestBody @Validated LEDProgramParam ledProgramParam) {
        return ResponseUtil.success(ledProgramService.addProgram(ledProgramParam));
    }

    @GetMapping("/update")
    public ResponseVO<Object> updateLEDProgram( @RequestBody @Validated LEDProgramParam ledProgramParam) {
    @PostMapping("/update")
    public ResponseVO<Object> updateLEDProgram(@RequestBody @Validated LEDProgramParam ledProgramParam) {
        return ResponseUtil.success(ledProgramService.updateProgram(ledProgramParam));
    }

    @GetMapping("/delete/{id}")
    @PostMapping("/delete/{id}")
    public ResponseVO<Object> deleteLEDProgram(@PathVariable Long id) {
        return ResponseUtil.success(ledProgramService.deleteProgram(id));
    }



    @PostMapping("/list")
    @GetMapping("/list")
    public ResponseVO<Object> listProgram() {
        return ResponseUtil.success(ledProgramService.list());
        //LambdaQueryWrapper<LEDProgram> wrapper = ledProgramService.listProgram();
        return ResponseUtil.success(ledProgramService.list(ledProgramService.listProgram()));

    }

    /**
     * æ¨¡ç³ŠæŸ¥è¯¢
     *
     * @return
     */
    @GetMapping("/listLike")
    public ResponseVO<Object> listLikeProgram(@RequestBody ReceiveParam receiveParam) {
        LambdaQueryWrapper<LEDProgram> wrapper = ledProgramService.listProgram();
        if (receiveParam.getKind() != null || receiveParam.getName() != null) {

            wrapper.like(LEDProgram::getName, receiveParam.getName())
                    .or(
                            ledProgramLambdaQueryWrapper -> {
                                ledProgramLambdaQueryWrapper.like(LEDProgram::getKind, receiveParam.getKind());
                            }
                    );

        }

       // List<LEDProgram> list = ledProgramService.list(wrapper);
        return ResponseUtil.success(ledProgramService.list(wrapper));

    }

}

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/ReceiveParam.java

@@ -3,7 +3,7 @@
import lombok.Data;

/**
 * é€šç”¨çš„一个接收类
 * é€šç”¨æŽ¥æ”¶ç±»
 */
@Data
public class ReceiveParam {
@@ -23,4 +23,6 @@
   private Integer bindState;

   private String groupName;


}

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

@@ -4,6 +4,7 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.ClientPrarm;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.mapper.ClientMapper;
import lombok.AllArgsConstructor;
@@ -38,7 +39,6 @@


    public boolean updateClient(Long id, ClientPrarm clientPrarm) {
        //Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, id));
        Client one = getById(id);
        if (one == null) {
            throw new BusinessException("该客户不存在");
@@ -77,4 +77,20 @@
    public Client findByPhone(String phone) {
        return getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getMobile, phone).last("limit 1"));
    }

    /**\
     * å…¶ä»–类用来查找客户id使用  å¦‚果没有上级客户 è¿™è¿”回用户ID
     * @param
     * @return
     */
    public Long getClientId(){
        Long userId = SecurityUtils.getUserId();
        Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, userId));
        if(one.getSuperiorId()!=null){
            return one.getSuperiorId();
        }else {
            return userId;
        }

    }
}

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

@@ -1,11 +1,12 @@
package com.sandu.ximon.admin.service;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.LEDProgramParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.LEDProgram;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.mapper.LEDProgramMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -19,11 +20,12 @@
    public boolean addProgram(LEDProgramParam receiveParam) {

        LEDProgram led = new LEDProgram();
        if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getClientId())) {
            led.setUserId(SecurityUtils.getUserId());
        }
        led.setUserId(SecurityUtils.getClientId());
        led.setPixel(receiveParam.getPixel());
        led.setSize(receiveParam.getSize());
        led.setName(receiveParam.getName());
        led.setKind(receiveParam.getKind());
        led.setProgramBase64(receiveParam.getProgramBase64());

        return save(led);
    }
@@ -38,15 +40,12 @@

        LEDProgram led = new LEDProgram();
        led.setId(receiveParam.getId());
        led.setUserId(SecurityUtils.getClientId());
        //led.setUserId(SecurityUtils.getClientId());
        led.setPixel(receiveParam.getPixel());
        led.setSize(receiveParam.getSize());
        led.setName(receiveParam.getName());
        led.setKind(receiveParam.getKind());
        if (receiveParam.getPixel() != null) {
            led.setPixel(receiveParam.getPixel());
        }
        if (receiveParam.getSize() != null) {
            led.setSize(receiveParam.getSize());
        }
        led.setProgramBase64(receiveParam.getProgramBase64());
        return updateById(led);
    }

@@ -62,4 +61,21 @@
    }


    public LambdaQueryWrapper<LEDProgram> listProgram() {
        LambdaQueryWrapper<LEDProgram> wrapper= new LambdaQueryWrapper<>();
       /* if(SecurityUtils.getClientId()!=null){
            return list(Wrappers.lambdaQuery(LEDProgram.class).eq(LEDProgram::getUserId, SecurityUtils.getClientId()));
        }else {
            return list(Wrappers.lambdaQuery(LEDProgram.class));
        }*/
        if(SecurityUtils.getClientId()!=null){
          return   wrapper=Wrappers.lambdaQuery(LEDProgram.class).eq(LEDProgram::getUserId,SecurityUtils.getClientId());
        }else {
          return   wrapper=Wrappers.lambdaQuery(LEDProgram.class);
        }


    }


}