Skip to content

C
company-platform
Commit 9552130c authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加优势

parent 820aa153
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 76 deletions
company-manager/db/add.sql
View file @ 9552130c
CREATE TABLE `mortals_xhx_article` ( CREATE TABLE `mortals_xhx_article` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '文章id', `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '文章id',
`title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '标题', `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '标题',
`cover` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '封面', `cover` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '封面',
`introduction` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '文章介绍', `introduction` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '文章介绍',
`content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '内容', `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '内容',
`content_html` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '内容html', `content_html` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '内容html',
`author` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '文章作者', `author` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '文章作者',
`create_user_id` bigint(20) DEFAULT NULL COMMENT '创建用户', `create_user_id` bigint(20) DEFAULT NULL COMMENT '创建用户',
`create_time` datetime DEFAULT NULL COMMENT '创建时间', `create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_time` datetime DEFAULT NULL COMMENT '更新时间', `update_time` datetime DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='文章'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='文章';
CREATE TABLE `mortals_xhx_company` ( CREATE TABLE `mortals_xhx_company` (
`id` int(20) NOT NULL AUTO_INCREMENT COMMENT '公司id', `id` int(20) NOT NULL AUTO_INCREMENT COMMENT '公司id',
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '名称', `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '名称',
`introduction` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '公司介绍', `introduction` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '公司介绍',
`phone` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '电话号码', `phone` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '电话号码',
`address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '地址', `address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '地址',
`qr_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '二维码', `qr_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '二维码',
`create_user_id` bigint(20) DEFAULT NULL COMMENT '创建用户', `create_user_id` bigint(20) DEFAULT NULL COMMENT '创建用户',
`create_time` datetime DEFAULT NULL COMMENT '创建时间', `create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_time` datetime DEFAULT NULL COMMENT '更新时间', `update_time` datetime DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='公司基本信息'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='公司基本信息';
CREATE TABLE `mortals_xhx_designer` ( CREATE TABLE `mortals_xhx_designer` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '设计师id', `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '设计师id',
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '名字', `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '名字',
`avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '头像', `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '头像',
`content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '内容', `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '内容',
`content_html` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '内容html', `content_html` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '内容html',
`create_user_id` bigint(20) DEFAULT NULL COMMENT '创建用户', `create_user_id` bigint(20) DEFAULT NULL COMMENT '创建用户',
`create_time` datetime DEFAULT NULL COMMENT '创建时间', `create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_time` datetime DEFAULT NULL COMMENT '更新时间', `update_time` datetime DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='员工设计师'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='员工设计师';
CREATE TABLE `mortals_xhx_example` ( CREATE TABLE `mortals_xhx_example` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '案例id', `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '案例id',
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '案例名称', `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '案例名称',
`example_type` int(11) DEFAULT NULL COMMENT '案例种类（0，1，2，3，4，5）', `example_type` int(11) DEFAULT NULL COMMENT '案例种类（0，1，2，3，4，5）',
`image1` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '案例图片(1-16张)', `image1` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '案例图片(1-16张)',
`image2` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `image2` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`image3` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `image3` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`image4` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `image4` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`image5` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `image5` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`image6` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `image6` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`image7` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `image7` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`image8` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `image8` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`image9` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `image9` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`image10` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `image10` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`image11` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `image11` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`image12` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `image12` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`image13` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `image13` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`image14` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `image14` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`image15` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `image15` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`image16` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `image16` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '内容', `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '内容',
`content_html` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '内容html', `content_html` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '内容html',
`create_user_id` bigint(20) DEFAULT NULL COMMENT '创建用户', `create_user_id` bigint(20) DEFAULT NULL COMMENT '创建用户',
`create_time` datetime DEFAULT NULL COMMENT '创建时间', `create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_time` datetime DEFAULT NULL COMMENT '更新时间', `update_time` datetime DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='案例图片'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='案例图片';
...@@ -82,27 +82,27 @@ CREATE TABLE `mortals_xhx_slideshow` ( ...@@ -82,27 +82,27 @@ CREATE TABLE `mortals_xhx_slideshow` (
CREATE TABLE `mortals_xhx_type` ( CREATE TABLE `mortals_xhx_type` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '电梯种类id', `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '电梯种类id',
`type_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '电梯种类名称', `type_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '电梯种类名称',
`create_user_id` bigint(20) DEFAULT NULL COMMENT '创建用户', `create_user_id` bigint(20) DEFAULT NULL COMMENT '创建用户',
`create_time` datetime DEFAULT NULL COMMENT '创建时间', `create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_time` datetime DEFAULT NULL COMMENT '更新时间', `update_time` datetime DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='类型'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='类型';
CREATE TABLE `mortals_xhx_type_details` ( CREATE TABLE `mortals_xhx_type_details` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '种类详情id', `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '种类详情id',
`title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '标题', `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '标题',
`image_url1` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '图片', `image_url1` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '图片',
`image_url2` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `image_url2` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`image_url3` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `image_url3` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`image_url4` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `image_url4` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`image_url5` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `image_url5` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`type_id` int(11) DEFAULT NULL COMMENT '产品类型id', `type_id` int(11) DEFAULT NULL COMMENT '产品类型id',
`introduction` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '描述内容', `introduction` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '描述内容',
`create_user_id` bigint(20) DEFAULT NULL COMMENT '创建用户', `create_user_id` bigint(20) DEFAULT NULL COMMENT '创建用户',
`create_time` datetime DEFAULT NULL COMMENT '创建时间', `create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_time` datetime DEFAULT NULL COMMENT '更新时间', `update_time` datetime DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='类型详细'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='类型详细';
\ No newline at end of file
company-manager/src/main/java/com/mortals/xhx/common/utils/BeanUtil.java
View file @ 9552130c
...@@ -145,11 +145,19 @@ public class BeanUtil { ...@@ -145,11 +145,19 @@ public class BeanUtil {
public static void main(String[] args) { public static void main(String[] args) {
String str="'"; /* String str="'";
System.out.println(BeanUtil.isConSpeChar(str)); System.out.println(BeanUtil.isConSpeChar(str));
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();*/
//Map<String, String> map = mapper.readValue(json, Map.class); //Map<String, String> map = mapper.readValue(json, Map.class);
Integer a=2500;
Integer b=2500;
System.out.println(a.equals(b));
} }
} }
company-manager/src/main/java/com/mortals/xhx/module/advantage/model/AdvantageEntity.java
View file @ 9552130c
...@@ -31,6 +31,7 @@ public class AdvantageEntity extends AdvantageVo { ...@@ -31,6 +31,7 @@ public class AdvantageEntity extends AdvantageVo {
* 图片 * 图片
*/ */
private String imagePath; private String imagePath;
/** /**
* 备注 * 备注
*/ */
......
company-manager/src/main/java/com/mortals/xhx/module/type/web/TypeController.java
View file @ 9552130c
package com.mortals.xhx.module.type.web; package com.mortals.xhx.module.type.web;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.type.model.TypeDetailsEntity;
import com.mortals.xhx.module.type.model.TypeDetailsQuery;
import com.mortals.xhx.module.type.service.TypeDetailsService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -36,6 +40,9 @@ public class TypeController extends BaseCRUDJsonBodyMappingController<TypeServic ...@@ -36,6 +40,9 @@ public class TypeController extends BaseCRUDJsonBodyMappingController<TypeServic
@Autowired @Autowired
private ParamService paramService; private ParamService paramService;
@Autowired
private TypeDetailsService typeDetailsService;
public TypeController(){ public TypeController(){
super.setModuleDesc( "类型"); super.setModuleDesc( "类型");
...@@ -47,4 +54,14 @@ public class TypeController extends BaseCRUDJsonBodyMappingController<TypeServic ...@@ -47,4 +54,14 @@ public class TypeController extends BaseCRUDJsonBodyMappingController<TypeServic
} }
@Override
protected int editAfter(Long id, Map<String, Object> model, TypeEntity entity, Context context) throws AppException {
TypeDetailsQuery typeDetailsQuery = new TypeDetailsQuery();
typeDetailsQuery.setTypeId(entity.getId());
List<TypeDetailsEntity> typeDetailsEntities = typeDetailsService.find(typeDetailsQuery, context);
entity.setTypeDetailsList(typeDetailsEntities);
return super.editAfter(id, model, entity, context);
}
} }
\ No newline at end of file
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