添加开发api 接口

gis_domain/src/main/java/com/gis/domain/vo/TaskestimateVo.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.Date;
 
 /**
@@ -22,10 +23,11 @@ public class TaskestimateVo implements Serializable {
     private String consumed;
 
     @ApiModelProperty(value = "日期")
-    private Date date;
-
+    private String date;
 
 
+    @ApiModelProperty(value = "名字")
+    private String name;
 
 
 

gis_web/src/main/java/com/gis/web/controller/OpenApiController.java

@@ -45,13 +45,13 @@ public class OpenApiController extends BaseController {
     @PostMapping(value = "getAllTaskestimate")
     public Result<TaskestimateVo> getAllTaskestimate(@RequestBody DateDto2 param) {
         StringBuilder builder = new StringBuilder();
-        builder.append("select account, date, consumed from zt_taskestimate where ");
+        builder.append("select a.account, a.date, a.consumed, b.realname as name from zt_taskestimate a LEFT JOIN zt_user b on b.account=a.account  where ");
         String startTime = param.getStartTime();
         String endTime = param.getEndTime();
         BaseRuntimeException.isBlank(startTime, null, "开始时间不能为空");
         BaseRuntimeException.isBlank(endTime, null, "结束时间不能为空");
-        builder.append(" date between '").append(startTime).append("' and '").append(endTime).append("'");
-        builder.append(" GROUP BY account,date");
+        builder.append(" a.date between '").append(startTime).append("' and '").append(endTime).append("'");
+        builder.append(" GROUP BY a.account,a.date");
         List<TaskestimateVo> res = taskesTimateMapper.getList(builder.toString());
 
 

run.sh

@@ -0,0 +1,69 @@
+#!/bin/sh
+APP_NAME=zentao_age.jar
+APP_PORT=8085
+APP_EVN=$2   #执行环境 sit|pro
+APP_ORDER=$1   #执行方法  start|stop|restart
+
+# 获取进程号
+APP_PID=`netstat -ntpl | grep $APP_PORT | grep LISTEN | awk '{print $7}' | awk -F "/" '{print $1}'`
+
+
+# 启动命令
+startApp(){
+    if [ ${APP_PID} ];
+    then
+    	echo "程序已经在运行了"
+    else
+    	echo "执行 start 方法"
+    	nohup java -jar -Xmx3072M -Xms512M ./$APP_NAME --spring.profiles.active=$APP_EVN --server.port=$APP_PORT > logs.log 2>error.log &  # 说明pid为空
+    	n=20
+    	echo "延迟 $n 秒后查询启动线程号"
+        sleep $n
+    	runPid=$(lsof -i :$APP_PORT | awk 'NR==2 {print $2}')
+    echo "进程号：" $runPid "端口号：" $APP_PORT
+	echo Start Success!
+fi
+}
+
+
+
+
+# 停止命令
+stopApp(){
+    echo "执行 stop 方法"
+    if [ ${APP_PID} ];
+	then
+		echo $APP_NAME "存在，执行 stop 方法"
+			kill -9 ${APP_PID} && echo 'Kill Process!'
+	else
+		echo $APP_NAME 没有运行
+    fi
+}
+
+# 重启命令
+restartApp(){
+    echo " 1 执行 restart 方法"
+	stopApp
+	APP_PID=''  #将进程号置空
+	sleep 2
+	echo "进程号：" ${APP_PID} "端口号：" ${APP_PORT}
+	echo " 2 执行 restart 方法"
+	startApp
+}
+
+# 判断执行命令 取第一个参数
+case $APP_ORDER in
+    "start")
+        startApp
+        ;;
+    "stop")
+        stopApp
+        ;;
+	"restart")
+		restartApp
+        ;;
+        *)
+     ;;
+esac
+
+