Skip to content

A
amos-boot-biz
Commit ca8434b8 authored by tianbo's avatar tianbo
Browse files
Options

Merge branch 'developer' into developer-latentDanger

parents 56e9ee09 37c3bbde
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 25 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/ElevatorController.java
View file @ ca8434b8
package com.yeejoin.amos.boot.module.tzs.biz.controller;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.paho.client.mqttv3.MqttException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.component.emq.EmqKeeper;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
......@@ -7,6 +33,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.feign.AmosFeignService;
import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorBaseInfoDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorInfoDto;
......@@ -28,32 +55,9 @@ import com.yeejoin.amos.boot.module.tzs.biz.service.impl.TestInfoServiceImpl;
import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.paho.client.mqttv3.MqttException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.component.emq.EmqKeeper;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
* 电梯Api
......@@ -79,7 +83,8 @@ public class ElevatorController extends BaseController {
@Autowired
private MaintainInfoServiceImpl maintainInfoService;
@Autowired
private EquipFeignClient equipFeignClient;
@Autowired
private TestInfoServiceImpl testInfoService;
......@@ -366,6 +371,19 @@ public class ElevatorController extends BaseController {
return ResponseHelper.buildResponse(elevatorInfoDto);
}
/**
* 视频列表分页查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/getVideo", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "分页获取视频", notes = "分页获取视频")
public ResponseModel<Object> getVideo(Integer current, Integer size)throws Exception {
ResponseModel<Page<Map<String, Object>>> data= equipFeignClient.pageVideo(current,size,null,null,null);
return ResponseHelper.buildResponse(data!=null?data.getResult():null);
}
/**
*
......
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @ ca8434b8
......@@ -1574,4 +1574,29 @@
</sql>
</changeSet>
<changeSet id="2021-10-09" author="tw01">
<preConditions onFail="MARK_RAN">
<tableExists tableName="cb_data_dictionary"/>
</preConditions>
<comment>修改排序</comment>
<sql>
update cb_data_dictionary set sort_num = 1 where sequence_nbr = 1192 ;
update cb_data_dictionary set sort_num = 2 where sequence_nbr = 847 ;
update cb_data_dictionary set sort_num = 3 where sequence_nbr = 1193 ;
update cb_data_dictionary set sort_num = 4 where sequence_nbr = 848 ;
update cb_data_dictionary set sort_num = 5 where sequence_nbr = 849 ;
update cb_data_dictionary set sort_num = 6 where sequence_nbr = 1194 ;
update cb_data_dictionary set sort_num = 7 where sequence_nbr = 850 ;
update cb_data_dictionary set sort_num = 8 where sequence_nbr = 1195 ;
update cb_data_dictionary set sort_num = 9 where sequence_nbr = 851 ;
update cb_data_dictionary set sort_num = 10 where sequence_nbr = 1196 ;
update cb_data_dictionary set sort_num = 11 where sequence_nbr = 1197 ;
update cb_data_dictionary set sort_num = 12 where sequence_nbr = 1198 ;
update cb_data_dictionary set sort_num = 13 where sequence_nbr = 1199 ;
update cb_data_dictionary set sort_num = 14 where sequence_nbr = 1200 ;
update cb_data_dictionary set sort_num = 15 where sequence_nbr = 1201 ;
</sql>
</changeSet>
</databaseChangeLog>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment