加入remark 标签

加入自动部署
更新spring-core 5.2

gis_cms/src/main/java/com/gis/cms/controller/GoodsController.java

@@ -27,9 +27,9 @@ import java.util.List;
  * 文物、文档公用一张表
  */
 @Slf4j
-@Api(tags = "文物管理")
+@Api(tags = "v1.1-文物管理")
 @RestController
-@RequestMapping("cms/goods")
+@RequestMapping("/cms/goods")
 public class GoodsController  {
 
     @Autowired
@@ -66,8 +66,8 @@ public class GoodsController  {
 
 
     @WebControllerLog(description = "文物管理-新增&编辑", addDb = true)
-    @ApiOperation(value = "文物-新增&编辑", notes = "默认封面图是第一张")
-    @PostMapping("modelSave")
+    @ApiOperation(value = "v1.1-文物-新增&编辑", notes = "默认封面图是第一张")
+    @PostMapping("/modelSave")
     public Result modelSave(@Valid @RequestBody ModelDto param) {
         return entityService.saveModel(param);
     }

gis_cms/src/main/java/com/gis/cms/controller/ProjectController.java

@@ -17,9 +17,9 @@ import java.util.List;
 /**
  * Created by owen on 2021/10/12 0027 15:17
  */
-@Api(tags = "项目管理")
+@Api(tags = "v1.1-项目管理")
 @RestController
-@RequestMapping("cms/project")
+@RequestMapping("/cms/project")
 public class ProjectController {
 
     @Autowired
@@ -38,7 +38,7 @@ public class ProjectController {
 
 
     @WebControllerLog(description = "项目管理-新增", addDb = true)
-    @ApiOperation(value = "新增")
+    @ApiOperation(value = "v1.1-新增")
     @PostMapping("add")
     public Result add(@RequestBody ProjectAddDto param) {
         return entityService.add(param);

gis_cms/src/main/java/com/gis/cms/entity/dto/ModelDto.java

@@ -19,7 +19,6 @@ public class ModelDto {
     @ApiModelProperty(value = "名称", required = true)
     private String name;
 
-//    @NotNull(message = "文物类型id不能为空")
     @ApiModelProperty(value = "文物类型id")
     private Long goodsTypeId;
 
@@ -33,9 +32,12 @@ public class ModelDto {
     @ApiModelProperty(value = "图片id, 多个以逗号隔开")
     private String fileIds;
 
-//    @NotNull(message = "项目id不能为空")
     @ApiModelProperty(value = "项目id")
     private Long projectId;
 
+    @ApiModelProperty(value = "备注|标签")
+    private String remark;
+
+
 
 }

gis_cms/src/main/java/com/gis/cms/entity/dto/ProjectAddDto.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -37,11 +38,15 @@ public class ProjectAddDto implements Serializable {
     private String cooperation;
 
 
+//    @ApiModelProperty(value = "项目网址")
+//    private Map<String, String> websites;
+
     @ApiModelProperty(value = "项目网址")
-    private Map<String, String> websites;
+    private List<UrlDto> websites;
 
     @ApiModelProperty(value = "三维场景")
-    private Map<String, String> scenes;
+    private List<UrlDto> scenes;
+//    private Map<String, String> scenes;
 
     @ApiModelProperty(value = "资料文档ids, 多个以逗号分隔")
     private String docIds;

gis_cms/src/main/java/com/gis/cms/entity/dto/UrlDto.java

@@ -24,5 +24,8 @@ public class UrlDto {
     @ApiModelProperty(value = "项目id")
     private Long projectId;
 
+    @ApiModelProperty(value = "备注|标签")
+    private String remark;
+
 
 }

gis_cms/src/main/java/com/gis/cms/entity/po/GoodsEntity.java

@@ -41,6 +41,10 @@ public class GoodsEntity extends BaseEntity {
     @ApiModelProperty(value = "图片id, 多个以逗号隔开")
     private String fileIds;
 
+    @ApiModelProperty(value = "备注|标签")
+    private String remark;
+
+
     @Transient
     @ApiModelProperty(value = "项目名称")
     private String projectName;

gis_cms/src/main/java/com/gis/cms/entity/po/SceneEntity.java

@@ -32,6 +32,9 @@ public class SceneEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "项目id")
     private Long projectId;
 
+    @ApiModelProperty(value = "备注|标签")
+    private String remark;
+
     @Transient
     @ApiModelProperty(value = "项目名称")
     private String projectName;

gis_cms/src/main/java/com/gis/cms/mapper/provider/GoodsProvider.java

@@ -28,7 +28,10 @@ public class GoodsProvider {
         String searchKey = param.getSearchKey();
         if (!StringUtils.isAllBlank(searchKey)) {
             searchKey = StringUtils.trim(searchKey);
-            sql.append(" and ( a.name like '%").append(searchKey).append("%' )");
+            sql.append(" and (");
+            sql.append("  a.name like '%").append(searchKey).append("%' ");
+            sql.append("  or a.remark like '%").append(searchKey).append("%' ");
+            sql.append(" )");
         }
 
         Long projectTypeId = param.getProjectTypeId();

gis_cms/src/main/java/com/gis/cms/mapper/provider/SceneProvider.java

@@ -26,7 +26,10 @@ public class SceneProvider {
         String searchKey = param.getSearchKey();
         if (!StringUtils.isAllBlank(searchKey)) {
             searchKey = StringUtils.trim(searchKey);
-            sql.append(" and ( a.name like '%").append(searchKey).append("%' )");
+            sql.append(" and (");
+            sql.append("  a.name like '%").append(searchKey).append("%' ");
+            sql.append("  or a.remark like '%").append(searchKey).append("%' ");
+            sql.append(" )");
         }
 
         Long projectTypeId = param.getProjectTypeId();

gis_cms/src/main/java/com/gis/cms/service/impl/ProjectServiceImpl.java

@@ -183,15 +183,16 @@ public class ProjectServiceImpl extends IBaseServiceImpl<ProjectEntity, Long> im
      * @param id 项目id
      * @param
      */
-    private void saveSceneInfo(Long id, Map<String, String> dto, String type) {
-        if (dto != null){
+    private void saveSceneInfo(Long id, List<UrlDto> param, String type) {
+        if (param != null){
             SceneEntity entity;
-            for(Map.Entry<String, String> entry : dto.entrySet()){
+            for(UrlDto dto : param){
                 entity = new SceneEntity();
                 entity.setProjectId(id);
                 entity.setType(type);
-                entity.setName(entry.getKey());
-                entity.setUrl(entry.getValue());
+                entity.setName(dto.getName());
+                entity.setUrl(dto.getUrl());
+                entity.setRemark(dto.getRemark());
                 sceneService.save(entity);
             }
         }

gis_common/src/main/java/com/gis/common/util/PasswordUtils.java

@@ -119,7 +119,6 @@ public class PasswordUtils {
             // TODO: handle exception
             return false;
         }
-//        return new String(passDec);
     }
 
     /**

pom.xml

@@ -38,7 +38,7 @@
     <hutool.version>5.3.3</hutool.version>
     <pinyin4j.version>2.5.1</pinyin4j.version>
     <lombok.version>1.18.2</lombok.version>
-    <fastjson.version>1.2.75</fastjson.version>
+    <fastjson.version>1.2.83</fastjson.version>
     <lang3.version>3.7</lang3.version>
     <knife4j.version>2.0.2</knife4j.version>
     <mysql.version>8.0.15</mysql.version>
@@ -91,6 +91,13 @@
 
 
 
+      <!-- https://mvnrepository.com/artifact/org.springframework/spring-core -->
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-core</artifactId>
+        <version>5.2.20.RELEASE</version>
+      </dependency>
+
 
       <!-- springboot -->
       <dependency>

run.sh

@@ -0,0 +1,60 @@
+#!/bin/sh
+APP_NAME=age_storage.jar
+APP_PORT=8010
+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为空
+	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
+
+