diff --git a/config/db/V2.7__t_ability_application_add_col.sql b/config/db/V2.7__t_ability_application_add_col.sql new file mode 100644 index 00000000..cc7b5c30 --- /dev/null +++ b/config/db/V2.7__t_ability_application_add_col.sql @@ -0,0 +1,6 @@ +alter table `t_ability_application` +ADD COLUMN `title` longtext NULL comment '能力申请标题' AFTER `cameraList`, +ADD COLUMN `application_system` varchar(255) NULL comment '应用系统' AFTER `title`, +ADD COLUMN `application_scene` varchar(255) NULL comment '应用场景' AFTER `application_system`, +ADD COLUMN `application_background` longtext NULL comment '应用背景' AFTER `application_scene`, +ADD COLUMN `effect_wish` longtext NULL comment '能力应用期望效果' AFTER `application_background`; \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java index 0c6c3a1f..a90edd1f 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java +++ b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java @@ -106,6 +106,13 @@ public class AbilityCenterControllerV2 { tAbilityApplicationDTO.setUserId(abilityBatchApplicationDTO.getUserId()); tAbilityApplicationDTO.setApproveStatus("审核中"); tAbilityApplicationDTO.setDelFlag(0); + // v2 新增字段 + tAbilityApplicationDTO.setTitle(abilityBatchApplicationDTO.getTitle()); + tAbilityApplicationDTO.setApplicationBackground(abilityBatchApplicationDTO.getApplicationBackground()); + tAbilityApplicationDTO.setApplicationScene(abilityBatchApplicationDTO.getScene()); + tAbilityApplicationDTO.setApplicationSystem(abilityBatchApplicationDTO.getApplicationSystem()); + tAbilityApplicationDTO.setEffectWish(abilityBatchApplicationDTO.getEffectWish()); + // 仿照请求接口 /processForm/tabilityapplication ValidatorUtils.validateEntity(tAbilityApplicationDTO, AddGroup.class, DefaultGroup.class); tAbilityApplicationService.save(tAbilityApplicationDTO); // 写能力申请数据 diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationDTO.java b/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationDTO.java index c800ef61..e4350413 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationDTO.java @@ -55,4 +55,19 @@ public class TAbilityApplicationDTO extends AuditingBaseDTO implements Serializa @ApiModelProperty(value = "摄像头ID数组") private String cameraList; + @ApiModelProperty(value = "能力申请标题") + private String title; + + @ApiModelProperty(value = "应用系统") + private String applicationSystem; + + @ApiModelProperty(value = "应用场景") + private String applicationScene; + + @ApiModelProperty(value = "应用背景") + private String applicationBackground; + + @ApiModelProperty(value = "能力应用期望效果") + private String effectWish; + } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityBatchApplicationDTO.java b/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityBatchApplicationDTO.java index d9552a46..c6efecd2 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityBatchApplicationDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityBatchApplicationDTO.java @@ -50,4 +50,19 @@ public class TAbilityBatchApplicationDTO extends AuditingBaseDTO implements Seri @ApiModelProperty(value = "摄像头ID数组") private String cameraList; + + @ApiModelProperty(value = "能力申请标题") + private String title; + + @ApiModelProperty(value = "应用系统") + private String applicationSystem; + + @ApiModelProperty(value = "应用场景") + private String applicationScene; + + @ApiModelProperty(value = "应用背景") + private String applicationBackground; + + @ApiModelProperty(value = "能力应用期望效果") + private String effectWish; } diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/entity/TAbilityApplicationEntity.java b/renren-admin/src/main/java/io/renren/modules/processForm/entity/TAbilityApplicationEntity.java index b4e3c7e6..9508be84 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/entity/TAbilityApplicationEntity.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/entity/TAbilityApplicationEntity.java @@ -96,4 +96,30 @@ public class TAbilityApplicationEntity implements Serializable { * 摄像头ID数组 */ private String cameraList; + + /** + * 能力申请标题 + */ + private String title; + + + /** + * 应用系统 + */ + private String applicationSystem; + + /** + * 应用场景 + */ + private String applicationScene; + + /** + * 应用背景 + */ + private String applicationBackground; + + /** + * 能力应用期望效果 + */ + private String effectWish; } \ No newline at end of file diff --git a/renren-admin/src/main/resources/assembly/bin/renren-admin.sh b/renren-admin/src/main/resources/assembly/bin/renren-admin.sh index b6b73d19..aded7de5 100644 --- a/renren-admin/src/main/resources/assembly/bin/renren-admin.sh +++ b/renren-admin/src/main/resources/assembly/bin/renren-admin.sh @@ -3,7 +3,7 @@ #description:auto_run #processname:zf #JAR根位置 -JAR_ROOT=`pwd` +JAR_ROOT=$(pwd) #JAR位置 JAR_PATH="$JAR_ROOT"/renren-admin.jar @@ -12,29 +12,30 @@ LOG_PATH=/dev/null #开始方法 start() { - cd $JAR_ROOT - nohup java -Dfile.encoding=utf-8 -server -Xms256m -Xmx2g -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./ -jar $JAR_PATH >$LOG_PATH 2>&1 & - echo "$JAR_PATH start success." + cd $JAR_ROOT + nohup java -Dfile.encoding=utf-8 -server -Xms256m -Xmx2g -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./ -jar $JAR_PATH >$LOG_PATH 2>&1 & + echo "$JAR_PATH start success." } #结束方法 stop() { - kill -9 `ps -ef|grep $JAR_PATH|grep -v grep|grep -v stop|awk '{print $2}'` - echo "$JAR_PATH stop success." + kill -9 $(ps -ef | grep $JAR_PATH | grep -v grep | grep -v stop | awk '{print $2}') + echo "$JAR_PATH stop success." } case "$1" in start) - start - ;; + start + ;; stop) - stop - ;; + stop + ;; restart) - stop - start - ;; + stop + start + ;; *) - echo "Userage: $0 {start|stop|restart}" - exit 1 + echo "Userage: $0 {start|stop|restart}" + exit 1 + ;; esac diff --git a/renren-admin/src/main/resources/db/V2.7__t_ability_application_add_col.sql b/renren-admin/src/main/resources/db/V2.7__t_ability_application_add_col.sql new file mode 100644 index 00000000..cc7b5c30 --- /dev/null +++ b/renren-admin/src/main/resources/db/V2.7__t_ability_application_add_col.sql @@ -0,0 +1,6 @@ +alter table `t_ability_application` +ADD COLUMN `title` longtext NULL comment '能力申请标题' AFTER `cameraList`, +ADD COLUMN `application_system` varchar(255) NULL comment '应用系统' AFTER `title`, +ADD COLUMN `application_scene` varchar(255) NULL comment '应用场景' AFTER `application_system`, +ADD COLUMN `application_background` longtext NULL comment '应用背景' AFTER `application_scene`, +ADD COLUMN `effect_wish` longtext NULL comment '能力应用期望效果' AFTER `application_background`; \ No newline at end of file