stjdydayou 4 éve
szülő
commit
1417e83119

+ 9 - 0
src/main/java/com/zhiqiyun/open/core/mapper/bz/PassengerEquipmentMapper.java

@@ -0,0 +1,9 @@
+package com.zhiqiyun.open.core.mapper.bz;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhiqiyun.open.core.models.bz.PassengerEquipment;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface PassengerEquipmentMapper extends BaseMapper<PassengerEquipment> {
+}

+ 40 - 0
src/main/java/com/zhiqiyun/open/core/models/bz/PassengerEquipment.java

@@ -0,0 +1,40 @@
+package com.zhiqiyun.open.core.models.bz;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.zhiqiyun.open.core.enmus.BzDataType;
+import com.zhiqiyun.open.core.typeHandler.FastjsonTypeHandler;
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@TableName(value = "passenger_equipment", autoResultMap = true)
+public class PassengerEquipment {
+    @TableId(type = IdType.INPUT)
+    private Long id;
+    private BzDataType dataType;
+    private Long bzId;
+    private String brief;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<String> litpics;
+
+    @TableField(updateStrategy = FieldStrategy.NEVER)
+    private Date createdTime;
+    @TableField(updateStrategy = FieldStrategy.NEVER)
+    private Long createdBy;
+
+    private Date updatedTime;
+    private Long updatedBy;
+
+    @TableField(exist = false)
+    private String litpic;
+
+    public String getLitpic() {
+        if (StringUtils.isBlank(this.litpic) && this.litpics != null && this.litpics.size() > 0) {
+            this.litpic = this.litpics.get(0);
+        }
+        return this.litpic;
+    }
+}

+ 7 - 0
src/main/java/com/zhiqiyun/open/core/service/BaseDataInfoService.java

@@ -0,0 +1,7 @@
+package com.zhiqiyun.open.core.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhiqiyun.open.core.models.bz.BaseDataInfo;
+
+public interface BaseDataInfoService extends IService<BaseDataInfo> {
+}

+ 7 - 0
src/main/java/com/zhiqiyun/open/core/service/PassengerEquipmentService.java

@@ -0,0 +1,7 @@
+package com.zhiqiyun.open.core.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhiqiyun.open.core.models.bz.PassengerEquipment;
+
+public interface PassengerEquipmentService extends IService<PassengerEquipment> {
+}

+ 11 - 0
src/main/java/com/zhiqiyun/open/core/service/impl/BaseDataInfoServiceImpl.java

@@ -0,0 +1,11 @@
+package com.zhiqiyun.open.core.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhiqiyun.open.core.mapper.bz.BaseDataInfoMapper;
+import com.zhiqiyun.open.core.models.bz.BaseDataInfo;
+import com.zhiqiyun.open.core.service.BaseDataInfoService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class BaseDataInfoServiceImpl extends ServiceImpl<BaseDataInfoMapper, BaseDataInfo> implements BaseDataInfoService {
+}

+ 11 - 0
src/main/java/com/zhiqiyun/open/core/service/impl/PassengerEquipmentServiceImpl.java

@@ -0,0 +1,11 @@
+package com.zhiqiyun.open.core.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhiqiyun.open.core.mapper.bz.PassengerEquipmentMapper;
+import com.zhiqiyun.open.core.models.bz.PassengerEquipment;
+import com.zhiqiyun.open.core.service.PassengerEquipmentService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class PassengerEquipmentServiceImpl extends ServiceImpl<PassengerEquipmentMapper, PassengerEquipment> implements PassengerEquipmentService {
+}

+ 33 - 0
src/main/java/com/zhiqiyun/open/mvc/controller/IndexController.java

@@ -1,10 +1,14 @@
 package com.zhiqiyun.open.mvc.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dliyun.oap.framework.service.RouterService;
 import com.dliyun.oap.framework.service.ServiceMethodHandler;
+import com.zhiqiyun.open.core.models.bz.BaseDataInfo;
 import com.zhiqiyun.open.core.service.AppKeyInfoService;
+import com.zhiqiyun.open.core.service.BaseDataInfoService;
 import com.zhiqiyun.open.mvc.Result;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,6 +18,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -25,6 +30,34 @@ public class IndexController {
     @Autowired
     private AppKeyInfoService appKeyInfoService;
 
+    @Autowired
+    private BaseDataInfoService baseDataInfoService;
+
+    @ResponseBody
+    @PostMapping("/bz/base/findSelectByKeyword")
+    public Result findSelectBaseInfoByKeyword(String keyword) throws IOException {
+        QueryWrapper<BaseDataInfo> queryWrapper = new QueryWrapper<>();
+
+        if (StringUtils.isNotBlank(keyword)) {
+            queryWrapper.like("id", keyword);
+            queryWrapper.or();
+            queryWrapper.like("name", keyword);
+            queryWrapper.or();
+            queryWrapper.like("brief", keyword);
+            queryWrapper.or();
+            queryWrapper.like("address", keyword);
+            queryWrapper.or();
+            queryWrapper.like("contacts", keyword);
+            queryWrapper.or();
+            queryWrapper.like("contact_number", keyword);
+        }
+        queryWrapper.last("limit 10");
+        queryWrapper.orderByDesc("id");
+
+        List<BaseDataInfo> listData = this.baseDataInfoService.list(queryWrapper);
+        return Result.instance(Result.Code.SUCCESS).setData(listData);
+    }
+
     @GetMapping("/")
     public void index(HttpServletResponse response) throws IOException {
         response.sendRedirect("/index.html");

+ 98 - 0
src/main/java/com/zhiqiyun/open/mvc/controller/PassengerEquipmentController.java

@@ -0,0 +1,98 @@
+package com.zhiqiyun.open.mvc.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhiqiyun.open.annotation.Permission;
+import com.zhiqiyun.open.core.models.bz.PassengerEquipment;
+import com.zhiqiyun.open.core.models.user.OauthInfo;
+import com.zhiqiyun.open.core.service.OauthService;
+import com.zhiqiyun.open.core.service.PassengerEquipmentService;
+import com.zhiqiyun.open.core.service.SequenceService;
+import com.zhiqiyun.open.mvc.Result;
+import com.zhiqiyun.open.mvc.params.bz.QueryHotelInfoParams;
+import com.zhiqiyun.open.mvc.params.bz.QueryPassengerEquipmentParams;
+import com.zhiqiyun.open.mvc.params.bz.SaveHotelInfoParams;
+import com.zhiqiyun.open.mvc.params.bz.SavePassengerEquipmentParams;
+import com.zhiqiyun.open.utils.DateUtil;
+import com.zhiqiyun.open.utils.ServletContext;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+@RequestMapping("/bz/passenger/equipment")
+public class PassengerEquipmentController {
+
+    @Autowired
+    private PassengerEquipmentService passengerEquipmentService;
+
+    @Autowired
+    private SequenceService sequenceService;
+
+    @Autowired
+    private OauthService oauthService;
+
+    @Permission(value = "bz.base.hotel.find", tags = "查询酒店")
+    @PostMapping("/findPage")
+    public Result findPage(@RequestBody QueryPassengerEquipmentParams params) {
+
+        QueryWrapper<PassengerEquipment> queryWrapper = new QueryWrapper<>();
+
+        Page<PassengerEquipment> page = params.getPage();
+        page.addOrder(OrderItem.desc("id"));
+
+        Page<PassengerEquipment> resultData = this.passengerEquipmentService.page(page, queryWrapper);
+
+        return Result.instance(Result.Code.SUCCESS).setData(resultData);
+    }
+
+    @Permission(value = "bz.base.hotel.add", tags = "保存酒店")
+    @PostMapping("/save")
+    public Result save(@Valid @RequestBody SavePassengerEquipmentParams params) {
+
+        this.passengerEquipmentService.save(this.buildEntity(this.sequenceService.nextId(), params));
+
+        return Result.instance(Result.Code.MESSAGE_SUCCESS);
+    }
+
+    @Permission(value = "bz.base.hotel.edit", tags = "编辑酒店")
+    @PostMapping("/updateById")
+    public Result updateById(Long id, @Valid @RequestBody SavePassengerEquipmentParams params) {
+
+        this.passengerEquipmentService.updateById(this.buildEntity(id, params));
+
+        return Result.instance(Result.Code.MESSAGE_SUCCESS);
+    }
+
+
+    private PassengerEquipment buildEntity(Long id, @Valid SavePassengerEquipmentParams params) {
+
+        PassengerEquipment entity = new PassengerEquipment();
+
+        BeanUtils.copyProperties(params, entity);
+
+        OauthInfo oauthInfo = this.oauthService.getAuth(ServletContext.getAccessToken());
+
+        entity.setCreatedTime(DateUtil.current());
+        entity.setUpdatedTime(DateUtil.current());
+        entity.setCreatedBy(oauthInfo.getId());
+        entity.setUpdatedBy(oauthInfo.getId());
+
+        entity.setId(id);
+        return entity;
+    }
+
+    @Permission(value = "bz.base.hotel.delete", tags = "删除酒店")
+    @PostMapping("/deleteByIds")
+    public Result deleteByIds(@RequestBody List<Long> ids) {
+        this.passengerEquipmentService.removeByIds(ids);
+        return Result.instance(Result.Code.MESSAGE_SUCCESS);
+    }
+}

+ 11 - 0
src/main/java/com/zhiqiyun/open/mvc/params/bz/QueryPassengerEquipmentParams.java

@@ -0,0 +1,11 @@
+package com.zhiqiyun.open.mvc.params.bz;
+
+import com.zhiqiyun.open.mvc.params.QueryPageParams;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class QueryPassengerEquipmentParams extends QueryPageParams {
+
+}

+ 16 - 0
src/main/java/com/zhiqiyun/open/mvc/params/bz/SavePassengerEquipmentParams.java

@@ -0,0 +1,16 @@
+package com.zhiqiyun.open.mvc.params.bz;
+
+import com.zhiqiyun.open.core.enmus.BzDataType;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SavePassengerEquipmentParams {
+
+    private BzDataType dataType;
+    private Long bzId;
+    private String brief;
+    private List<String> litpics;
+
+}

+ 22 - 0
src/main/resources/db/migration/V1.0.4__passenger_equipment.sql

@@ -0,0 +1,22 @@
+DROP TABLE IF EXISTS `passenger_equipment`;
+CREATE TABLE `passenger_equipment`
+(
+    `id`           BIGINT(20) NOT NULL COMMENT 'ID',
+    `data_type`    INT(11) NULL DEFAULT NULL COMMENT '点位类型',
+    `bz_id`        BIGINT(20) NULL DEFAULT NULL COMMENT '点位分布',
+    `brief`        INT(11) NULL DEFAULT NULL COMMENT '说明',
+    `litpics`      VARCHAR(500) NULL DEFAULT NULL COMMENT '图片',
+    `created_time` DATETIME NULL DEFAULT NULL COMMENT '创建时间',
+    `created_by`   BIGINT(20) NULL DEFAULT NULL COMMENT '创建人',
+    `updated_time` DATETIME NULL DEFAULT NULL COMMENT '修改时间',
+    `updated_by`   BIGINT(20) NULL DEFAULT NULL COMMENT '修改人',
+    PRIMARY KEY (`id`)
+) COMMENT ='文旅场所基础信息' ENGINE = InnoDB;
+
+REPLACE
+INTO `authority_info` (`id`, `parent_id`, `name`, `remark`)
+VALUES (2000, 0, 'bz.passenger.equipment.tourist', '客户监控设备管理'),
+       (2001, 2000, 'bz.passenger.equipment.find', '查询'),
+       (2002, 2000, 'bz.passenger.equipment.add', '添加'),
+       (2003, 2000, 'bz.passenger.equipment.edit', '修改'),
+       (2004, 2000, 'bz.passenger.equipment.delete', '删除');