删除docker

camera_merge
王一鸣 5 years ago
parent bb6d5215f6
commit 7774f5a15e

@ -1,28 +0,0 @@
#!/bin/bash
PWD=$(cd `dirname $0`;pwd);
TARGET='test'
set -e
help() {
echo "Usage: $1 IMAGE."
exit 1
}
if [ $# -lt 1 ];then
help $0
fi
IMAGE=$1
if [ $# -ge 2 ];then
TARGET=$2
fi
cd $PWD/..
mvn clean package -P $TARGET
cp web/target/springbootstart-web-1.0.0.jar docker/springbootstart-1.0.0.jar
docker build -t $IMAGE docker

@ -1,46 +0,0 @@
#!/bin/bash
PWD=$(cd `dirname $0`;pwd);
IMG_NAME="springbootstart"
IMG_VER='1.0.1'
PORT=8090
if [ $# -gt 1 ];then
PORT=$2
fi
if [ $# -gt 2 ];then
IMG_VER=$3
fi
NAME="springbootstart-$IMG_VER"
run() {
echo "docker run --restart=on-failure:10 --name $NAME -d -p$PORT:8080 ${IMG_NAME}:${IMG_VER}"
docker run --restart=on-failure:10 --name $NAME -d -p$PORT:8080 ${IMG_NAME}:${IMG_VER}
}
case $1 in
start)
docker start $NAME
exit $?
;;
stop)
docker stop $NAME
exit $?
;;
rm)
docker rm $NAME
exit $?
;;
run)
run
exit $?
;;
*)
echo "Usage: run.sh {start|stop|rm|run} port version." >&2
echo "port and version are optional." >&2
exit 1
;;
esac

@ -1,7 +0,0 @@
FROM tonywell/alpine-jre8:1.0.0
RUN mkdir /app
WORKDIR /app
COPY springbootstart-1.0.0.jar /app/
ENTRYPOINT ["java", "-jar", "-Xms256m", "-Xmx256m", "/app/springbootstart-1.0.0.jar"]
EXPOSE 8080

@ -1,17 +0,0 @@
version: '2'
services:
backend:
image: springbootstart:1.0.0
container_name: lipo-duoji
ports:
- "8632:8099"
- "8097:8097"
hostname: lipo-duoji
volumes:
- /home/work/lia/duoji/logs:/data/log/duoji
- /home/work/lia/duoji/data:/home/work/data
networks:
default:
external:
name: zhehe007

@ -1,22 +0,0 @@
---
- name: Ensures /home/work/lia/duoji_test dir exists
file: path=/home/work/lia/duoji_test state=directory
- name: stop admin Service
shell: docker-compose -f /home/work/lia/duoji_test/docker-compose.yml down
ignore_errors: True
- name: copy admin docker-compose.yml
copy:
src: docker-compose.yml
dest: /home/work/lia/duoji_test/docker-compose.yml
backup: yes
- name: docker-pull
shell: docker pull {{ DOCKER_REPO }}/{{ IMAGE }} && docker tag {{ DOCKER_REPO }}/{{ IMAGE }} {{ IMAGE }} && docker rmi {{ DOCKER_REPO }}/{{ IMAGE }}
- name: modify docker-compose.yml
shell: cd /home/work/lia/duoji_test && sed -i "s/springbootstart:1.0.0/{{ IMAGE }}/g" docker-compose.yml
- name: start Service
shell: docker-compose -f /home/work/lia/duoji_test/docker-compose.yml up -d

@ -1 +0,0 @@
192.168.26.214

@ -1,6 +0,0 @@
---
- name: deploy springbootstart
hosts: all
remote_user: root
roles:
- springbootstart-test

@ -13,7 +13,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@Configuration
@EnableSwagger2
@Profile({"test", "dev"})
@Profile({"test", "dev","prod"})
public class SwaggerConfig {
@Bean

@ -1,6 +1,7 @@
package com.zhehekeji.web.controller;
import com.alibaba.excel.EasyExcel;
import com.github.pagehelper.PageInfo;
import com.zhehekeji.common.util.ValidatorUtil;
import com.zhehekeji.core.pojo.Result;
import com.zhehekeji.web.entity.Stock;
@ -50,7 +51,7 @@ public class StockController {
@PostMapping("/page")
@ApiOperation(value = "库存列表")
public Result<List<Stock>> page(@RequestBody PageSearch pageSearch){
public Result<PageInfo<Stock>> page(@RequestBody PageSearch pageSearch){
return Result.success(stockService.page(pageSearch));
}

@ -2,22 +2,15 @@ package com.zhehekeji.web.controller;
import com.github.pagehelper.PageInfo;
import com.zhehekeji.core.pojo.Result;
import com.zhehekeji.filter.pojo.SessionHandler;
import com.zhehekeji.web.entity.Order;
import com.zhehekeji.web.entity.Street;
import com.zhehekeji.web.mapper.StreetMapper;
import com.zhehekeji.web.pojo.OrderSearch;
import com.zhehekeji.web.pojo.street.StreetSearch;
import com.zhehekeji.web.pojo.street.StreetVO;
import com.zhehekeji.web.service.OrderService;
import com.zhehekeji.web.service.StreetService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
@Api(value = "StreetController",tags = "巷道管理")
@RestController(value = "StreetController")
@ -61,13 +54,4 @@ public class StreetController {
return Result.success(streetService.streetById(id));
}
/*@GetMapping("/userCenter")
@ApiOperation("用户中心地址")
public Result<IndexVO> userCenter(){
return Result.success(applicationService.userCenter());
}*/
}

@ -292,8 +292,8 @@ public class PtzControlModule {
NetSDKLib.PTZ_CONTROL_ABSOLUTELY absolutely = new NetSDKLib.PTZ_CONTROL_ABSOLUTELY();
absolutely.stuPosition.nPositionX = 3600;
absolutely.stuPosition.nPositionY= 0;
absolutely.stuSpeed.fPositionX = 0.9f;
absolutely.stuSpeed.fPositionY = 0f;
absolutely.stuSpeed.fPositionX = 0.2f;
absolutely.stuSpeed.fPositionY = 0.2f;
//absolutely.stuSpeed.fZoom = 0.5f;
Boolean ok = LoginModule.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId),0,dwPTZCommand,
0,0,0,0,absolutely.getPointer());

@ -107,12 +107,12 @@ public class OrderService {
if (street.getCamera1Id() != null) {
String path = PathUtil.createFileName("mp4");
PtzControlModule.downloadMp4(street.getCamera1Id(), mp4Path + path, orderNum, order.getStartTime(), order.getEndTime());
PtzControlModule.downloadMp4(street.getCamera1Id(), mp4Path + path, orderNum, order.getStartTime(), update.getEndTime());
update.setVideoPath1(path);
}
if (street.getCamera2Id() != null) {
String path = PathUtil.createFileName("mp4");
PtzControlModule.downloadMp4(street.getCamera2Id(), mp4Path + path, orderNum, order.getStartTime(), order.getEndTime());
PtzControlModule.downloadMp4(street.getCamera2Id(), mp4Path + path, orderNum, order.getStartTime(), update.getEndTime());
update.setVideoPath2(path);
}
orderMapper.updateById(update);

@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.zhehekeji.core.util.Assert;
import com.zhehekeji.web.entity.Stock;
import com.zhehekeji.web.entity.StockLog;
@ -74,10 +75,11 @@ public class StockService {
return stocks;
}
public List<Stock> page(PageSearch pageSearch) {
public PageInfo<Stock> page(PageSearch pageSearch) {
PageHelper.startPage(pageSearch.getPageNum(), pageSearch.getPageSize());
List<Stock> stocks = stockMapper.selectList(new QueryWrapper<Stock>().orderByAsc("shelve_id", "`row`", "`column`"));
return stocks;
return new PageInfo<>(stocks);
}
/**

@ -31,7 +31,7 @@ zhehe:
postToken: w89euijon2&UHBTY$%huni34ri
server:
port: 8099
userUrl: http://115.236.65.98:8007
userUrl: http://115.236.65.98:11001
picPort: 8544
cameraPassword: admin123
cameraUser: admin

Loading…
Cancel
Save