gis配置，设施配置，设施管理，提交

smartcity-admin/src/main/java/com/zcxk/admin/config/LocalDateTimeSerializerConfig.java

@@ -0,0 +1,74 @@
+package com.zcxk.admin.config;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.converter.Converter;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+@Configuration
+public class LocalDateTimeSerializerConfig {
+    private static final String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
+    private static final String DATE_PATTERN = "yyyy-MM-dd";
+
+    /**
+     * string转localdate
+     */
+    @Bean
+    public Converter<String, LocalDate> localDateConverter() {
+        return new Converter<String, LocalDate>() {
+            @Override
+            public LocalDate convert(String source) {
+                if (source.trim().length() == 0)
+                    return null;
+                try {
+                    return LocalDate.parse(source);
+                } catch (Exception e) {
+                    return LocalDate.parse(source, DateTimeFormatter.ofPattern(DATE_PATTERN));
+                }
+            }
+        };
+    }
+
+    /**
+     * string转localdatetime
+     */
+    @Bean
+    public Converter<String, LocalDateTime> localDateTimeConverter() {
+        return new Converter<String, LocalDateTime>() {
+            @Override
+            public LocalDateTime convert(String source) {
+                if (source.trim().length() == 0)
+                    return null;
+                // 先尝试ISO格式: 2019-07-15T16:00:00
+                try {
+                    return LocalDateTime.parse(source);
+                } catch (Exception e) {
+                    return LocalDateTime.parse(source, DateTimeFormatter.ofPattern(DATE_TIME_PATTERN));
+                }
+            }
+        };
+    }
+
+    /**
+     * 统一配置
+     */
+    @Bean
+    public Jackson2ObjectMapperBuilderCustomizer jsonCustomizer() {
+        JavaTimeModule module = new JavaTimeModule();
+        LocalDateTimeDeserializer localDateTimeDeserializer = new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        module.addDeserializer(LocalDateTime.class, localDateTimeDeserializer);
+        return builder -> {
+            builder.simpleDateFormat(DATE_TIME_PATTERN);
+            builder.serializers(new LocalDateSerializer(DateTimeFormatter.ofPattern(DATE_PATTERN)));
+            builder.serializers(new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DATE_TIME_PATTERN)));
+            builder.modules(module);
+        };
+    }
+}

smartcity-admin/src/main/java/com/zcxk/admin/config/ResourceServerConfig.java

@@ -16,7 +16,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                 .requestMatchers().antMatchers("/**")
                 .and()
                 .authorizeRequests()
-                .antMatchers("/swagger-ui.html","/webjars/**", "/webjars/**", "/swagger-resources/**", "/v2/**")
+                .antMatchers("/swagger-ui.html","/webjars/**", "/webjars/**", "/swagger-resources/**", "/v2/**","/facilities/config/**","/gis/config/**")
                 .permitAll()
                 .antMatchers("/system/product/findById","/system/site/findById", "/system/channel/findById", "/system/community/findById", "/system/building/findById","/system/project/findById","/system/customer/findById","/system/area/findById","/system/productCategory/getListByIds")
                 .permitAll() //配置不需要身份认证的请求路径

smartcity-admin/src/main/java/com/zcxk/admin/controller/FacilitiesConfigManagerController.java

@@ -0,0 +1,70 @@
+package com.zcxk.admin.controller;
+
+import com.zcxk.admin.dto.FacilitiesConfigDto;
+import com.zcxk.admin.entity.FacilitiesConfig;
+import com.zcxk.admin.service.FacilitiesService;
+
+import com.zcxk.common.model.AjaxMessage;
+import com.zcxk.common.model.ResultStatus;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Controller
+@ResponseBody
+@RequestMapping("/facilities/config")
+@Api(tags = "设施配置管理")
+public class FacilitiesConfigManagerController {
+    @Autowired
+    private FacilitiesService facilitiesService;
+
+
+    @GetMapping("/queryFacilitiesConfigList")
+    @ApiOperation(value = "查询设施配置列表")
+    public AjaxMessage<List<FacilitiesConfig>> queryFacilitiesConfigList(
+            @ApiParam(value = "设施类型", required = false) @RequestParam(required = false)String type,
+            @ApiParam(value = "上级设施id", required = false) @RequestParam(required = false)Integer pid){
+        FacilitiesConfig facilitiesConfig = new FacilitiesConfig();
+        facilitiesConfig.setFacilitiesType(type);
+        facilitiesConfig.setPid(pid);
+        List<FacilitiesConfig> facilitiesConfigs = facilitiesService.queryFacilitiesConfigList(facilitiesConfig);
+        return new AjaxMessage<>(ResultStatus.OK, facilitiesConfigs);
+    }
+    @GetMapping("/queryFacilitiesConfig")
+    @ApiOperation(value = "查询设施配置")
+    public AjaxMessage<FacilitiesConfigDto> queryFacilitiesConfig(
+            @ApiParam(value = "设施id", required = true) @RequestParam(required = true)Integer id){
+        FacilitiesConfig facilitiesConfig = new FacilitiesConfig();
+        facilitiesConfig.setId(id);
+        FacilitiesConfigDto facilitiesConfigDto = facilitiesService.queryFacilitiesConfig(facilitiesConfig);
+        return new AjaxMessage<>(ResultStatus.OK, facilitiesConfigDto);
+    }
+    @PostMapping ("/addFacilitiesConfig")
+    @ApiOperation(value = "新增设施配置")
+    public AjaxMessage addFacilitiesConfig(@ApiParam(value = "设置配置", required = true) @RequestBody(required = true)
+                                                FacilitiesConfigDto facilitiesConfigDto){
+        facilitiesService.addFacilitiesConfig(facilitiesConfigDto);
+        return new AjaxMessage(ResultStatus.OK);
+    }
+    @PostMapping("/updateFacilitiesConfig")
+    @ApiOperation(value = "更新设施配置")
+    public AjaxMessage updateFacilitiesConfig(@ApiParam(value = "设置配置", required = true) @RequestBody(required = true)
+                                                   FacilitiesConfigDto facilitiesConfigDto){
+        facilitiesService.updateFacilitiesConfig(facilitiesConfigDto);
+        return new AjaxMessage(ResultStatus.OK);
+    }
+    @PostMapping("/deleteFacilitiesConfig")
+    @ApiOperation(value = "删除设施配置")
+    public AjaxMessage deleteFacilitiesConfig(
+            @ApiParam(value = "设施id", required = false) @RequestParam(required = false)Integer id){
+        FacilitiesConfig facilitiesConfig=new FacilitiesConfig();
+        facilitiesConfig.setId(id);
+        facilitiesService.deleteFacilitiesConfig(facilitiesConfig);
+        return new AjaxMessage(ResultStatus.OK);
+    }
+}

smartcity-admin/src/main/java/com/zcxk/admin/controller/GisConfigController.java

@@ -0,0 +1,80 @@
+package com.zcxk.admin.controller;
+
+import com.github.pagehelper.PageHelper;
+import com.zcxk.admin.dto.FacilitiesConfigDto;
+import com.zcxk.admin.entity.FacilitiesConfig;
+import com.zcxk.admin.entity.GisConfig;
+import com.zcxk.admin.service.GisConfigService;
+import com.zcxk.common.model.AjaxMessage;
+import com.zcxk.common.model.Pagination;
+import com.zcxk.common.model.ResultStatus;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Controller
+@ResponseBody
+@RequestMapping("/gis/config")
+@Api(tags = "GIS配置管理")
+public class GisConfigController {
+    @Autowired
+    private GisConfigService gisConfigService;
+    @PostMapping ("/queryGisConfigList")
+    @ApiOperation(value = "查询gis配置列表")
+    public AjaxMessage<Pagination<GisConfig>> queryFacilitiesConfigList(
+            @ApiParam(value = "设施类型", required = false) @RequestParam(required = false)String serviceType,
+            @ApiParam(value = "上级设施id", required = false) @RequestParam(required = false)String name,
+            @ApiParam(value = "页数,非必传，默认第一页", required = false, defaultValue = "1") @RequestParam(required = false, defaultValue = "1") int pageNum,
+            @ApiParam(value = "条数，非必传，默认15条", required = false, defaultValue = "15") @RequestParam(required = false, defaultValue = "15") int pageSize
+    ){
+        GisConfig gisConfig=new GisConfig();
+        gisConfig.setLanService(name);
+        gisConfig.setServiceType(serviceType);
+        PageHelper.startPage(pageNum,pageSize);
+        List<GisConfig> gisConfigs = gisConfigService.queryGisConfigs(gisConfig);
+        Pagination<GisConfig> gisConfigPagination = new Pagination<>(gisConfigs);
+        return new AjaxMessage<>(ResultStatus.OK, gisConfigPagination);
+    }
+    @GetMapping("/queryGisConfigType")
+    @ApiOperation(value = "查询gis配置类型")
+    public AjaxMessage<List<String>> queryGisConfigType(){
+
+        return new AjaxMessage(ResultStatus.OK,gisConfigService.queryGisConfigType());
+    }
+    @GetMapping("/queryGisConfig")
+    @ApiOperation(value = "查询gis配置")
+    public AjaxMessage<List<GisConfig>> queryGisConfig(
+            @ApiParam(value = "id", required = true) @RequestParam(required = true) Integer id){
+        GisConfig gisConfig = new GisConfig();
+        gisConfig.setId(id);
+        return new AjaxMessage(ResultStatus.OK,gisConfigService.queryGisConfig(gisConfig));
+    }
+    @PostMapping("/addGisConfig")
+    @ApiOperation(value = "新增gis配置")
+    public AjaxMessage addFacilitiesConfig(@ApiParam(value = "gis配置", required = true) @RequestBody(required = true)
+                                                   GisConfig gisConfig){
+        gisConfigService.addGisConfig(gisConfig);
+        return new AjaxMessage(ResultStatus.OK);
+    }
+    @PostMapping("/updateGisConfig")
+    @ApiOperation(value = "更新gis配置")
+    public AjaxMessage updateGisConfig(@ApiParam(value = "gis配置", required = true) @RequestBody(required = true)
+                                                   GisConfig gisConfig){
+        gisConfigService.updateGisConfig(gisConfig);
+        return new AjaxMessage(ResultStatus.OK);
+    }
+    @PostMapping("/deleteGisConfig")
+    @ApiOperation(value = "删除gis配置")
+    public AjaxMessage deleteGisConfig(
+            @ApiParam(value = "id", required = true) @RequestParam(required = false)Integer id){
+        GisConfig gisConfig=new GisConfig();
+        gisConfig.setId(id);
+        gisConfigService.deleteGisConfig(gisConfig);
+        return new AjaxMessage(ResultStatus.OK);
+    }
+}

smartcity-admin/src/main/java/com/zcxk/admin/dao/FacilitiesConfigAttributeMapper.java

@@ -0,0 +1,24 @@
+package com.zcxk.admin.dao;
+
+import com.zcxk.admin.entity.FacilitiesConfigAttribute;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface FacilitiesConfigAttributeMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(FacilitiesConfigAttribute record);
+
+    int insertSelective(FacilitiesConfigAttribute record);
+
+    FacilitiesConfigAttribute selectByPrimaryKey(Integer id);
+    List<FacilitiesConfigAttribute> selectByfacilitiesConfigid(Integer id);
+    int updateByPrimaryKeySelective(FacilitiesConfigAttribute record);
+
+    int updateByPrimaryKey(FacilitiesConfigAttribute record);
+
+    void deleteByfacilitiesConfigid(Integer id);
+
+}

smartcity-admin/src/main/java/com/zcxk/admin/dao/FacilitiesConfigLabelMapper.java

@@ -0,0 +1,24 @@
+package com.zcxk.admin.dao;
+
+import com.zcxk.admin.entity.FacilitiesConfigLabel;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface FacilitiesConfigLabelMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(FacilitiesConfigLabel record);
+
+    int insertSelective(FacilitiesConfigLabel record);
+
+    FacilitiesConfigLabel selectByPrimaryKey(Integer id);
+    List<FacilitiesConfigLabel> selectByfacilitiesConfigid(Integer id);
+
+    int updateByPrimaryKeySelective(FacilitiesConfigLabel record);
+
+    int updateByPrimaryKey(FacilitiesConfigLabel record);
+
+    void deleteByfacilitiesConfigid(Integer id);
+}

smartcity-admin/src/main/java/com/zcxk/admin/dao/FacilitiesConfigMapper.java

@@ -0,0 +1,23 @@
+package com.zcxk.admin.dao;
+
+import com.zcxk.admin.entity.FacilitiesConfig;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+@Mapper
+public interface FacilitiesConfigMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(FacilitiesConfig record);
+
+    int insertSelective(FacilitiesConfig record);
+
+    FacilitiesConfig selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(FacilitiesConfig record);
+
+    int updateByPrimaryKey(FacilitiesConfig record);
+
+    List<FacilitiesConfig> selectList(FacilitiesConfig facilitiesConfig);
+
+}

smartcity-admin/src/main/java/com/zcxk/admin/dao/GisConfigMapper.java

@@ -0,0 +1,24 @@
+package com.zcxk.admin.dao;
+
+import com.zcxk.admin.entity.GisConfig;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface GisConfigMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(GisConfig record);
+
+    int insertSelective(GisConfig record);
+
+    GisConfig selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(GisConfig record);
+
+    int updateByPrimaryKey(GisConfig record);
+    List<String> queryGisConfigType();
+    List<GisConfig> queryGisConfig(GisConfig gisConfig);
+
+}

smartcity-admin/src/main/java/com/zcxk/admin/dto/FacilitiesConfigDto.java

@@ -0,0 +1,14 @@
+package com.zcxk.admin.dto;
+
+import com.zcxk.admin.entity.FacilitiesConfig;
+import com.zcxk.admin.entity.FacilitiesConfigAttribute;
+import com.zcxk.admin.entity.FacilitiesConfigLabel;
+import lombok.Data;
+
+import java.util.List;
+@Data
+public class FacilitiesConfigDto {
+    private FacilitiesConfig facilitiesConfig;
+    private List<FacilitiesConfigAttribute>facilitiesConfigAttributes;
+    private List<FacilitiesConfigLabel>facilitiesConfigLabels;
+}

smartcity-admin/src/main/java/com/zcxk/admin/entity/FacilitiesConfig.java

@@ -0,0 +1,86 @@
+package com.zcxk.admin.entity;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * sc_facilities_config
+ * @author 
+ */
+@Data
+@ApiModel
+public class FacilitiesConfig implements Serializable {
+    @ApiModelProperty(value="id")
+    private Integer id;
+
+    /**
+     * 上级设施id
+     */
+    @ApiModelProperty(value="上级设施id")
+    private Integer pid;
+
+    /**
+     * 设施类型
+     */
+    @ApiModelProperty(value="设施类型")
+    private String facilitiesType;
+
+    /**
+     * 3d鸟瞰图
+     */
+    @ApiModelProperty(value="3d鸟瞰图")
+    private Integer aerialView3d;
+
+    /**
+     * 3d现场照
+     */
+    @ApiModelProperty(value="3d现场照")
+    private Integer sitePhoto3d;
+
+    /**
+     * 工艺流程图
+     */
+    @ApiModelProperty(value="工艺流程图")
+    private Integer processFlowChart;
+
+    /**
+     * 工艺现场照
+     */
+    @ApiModelProperty(value="工艺现场照")
+    private Integer processSitePhoto;
+
+    /**
+     * 图标
+     */
+    @ApiModelProperty(value="图标")
+    private String icon;
+
+    /**
+     * 站点id
+     */
+    @ApiModelProperty(value="站点id")
+    private Integer siteId;
+
+    /**
+     * 基本信息参数数量
+     */
+    @ApiModelProperty(value="基本信息参数数量")
+    private Integer baseInfoNum;
+
+    /**
+     * 标签参数数量
+     */
+    @ApiModelProperty(value="标签参数数量")
+    private Integer labelInfoNum;
+
+    /**
+     * 设施数量
+     */
+    @ApiModelProperty(value="设施数量")
+    private Integer facilitiesNum;
+
+    private static final long serialVersionUID = 1L;
+}

smartcity-admin/src/main/java/com/zcxk/admin/entity/FacilitiesConfigAttribute.java

@@ -0,0 +1,40 @@
+package com.zcxk.admin.entity;
+
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * sc_facilities_config_attribute
+ * @author 
+ */
+@Data
+public class FacilitiesConfigAttribute implements Serializable {
+    private Integer id;
+
+    /**
+     * 参数字段
+     */
+    private String cloumnName;
+
+    /**
+     * 参数类型
+     */
+    private String cloumnType;
+
+    /**
+     * 取值
+     */
+    private String cloumnExamples;
+
+    /**
+     * 取值描述
+     */
+    private String describe;
+
+    /**
+     * 设施配置表主键id
+     */
+    private Integer facilitiesConfigId;
+
+    private static final long serialVersionUID = 1L;
+}

smartcity-admin/src/main/java/com/zcxk/admin/entity/FacilitiesConfigLabel.java

@@ -0,0 +1,24 @@
+package com.zcxk.admin.entity;
+
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * sc_facilities_config_label
+ * @author 
+ */
+@Data
+public class FacilitiesConfigLabel implements Serializable {
+    private Integer id;
+
+    private String cloumnName;
+
+    private String cloumnCode;
+
+    /**
+     * 设施配置表主键id
+     */
+    private Integer facilitiesConfigId;
+
+    private static final long serialVersionUID = 1L;
+}

smartcity-admin/src/main/java/com/zcxk/admin/entity/GisConfig.java

@@ -0,0 +1,49 @@
+package com.zcxk.admin.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * (GisConfig)实体类
+ *
+ * @author makejava
+ * @since 2020-10-10 17:18:47
+ */
+@Data
+@ApiModel
+public class GisConfig implements Serializable {
+    private static final long serialVersionUID = 380628675162989961L;
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    /**
+     * 服务类型
+     */
+    @ApiModelProperty(value = "服务类型")
+    private String serviceType;
+    /**
+     * 内外服务
+     */
+    @ApiModelProperty(value = "内外服务")
+    private String lanService;
+    /**
+     * 外网服务
+     */
+    @ApiModelProperty(value = "外网服务")
+    private String outerNetService;
+    /**
+     * 中心点坐标
+     */
+    @ApiModelProperty(value = "中心点坐标")
+    private String centerCoordinate;
+    /**
+     * 站点id
+     */
+    @ApiModelProperty(value = "站点id")
+    private Integer siteId;
+    @ApiModelProperty(value = "")
+    private Date createTime;
+}

smartcity-admin/src/main/java/com/zcxk/admin/service/FacilitiesService.java

@@ -0,0 +1,14 @@
+package com.zcxk.admin.service;
+
+import com.zcxk.admin.dto.FacilitiesConfigDto;
+import com.zcxk.admin.entity.FacilitiesConfig;
+
+import java.util.List;
+
+public interface FacilitiesService {
+     List<FacilitiesConfig>queryFacilitiesConfigList(FacilitiesConfig facilitiesConfig);
+     void updateFacilitiesConfig(FacilitiesConfigDto facilitiesConfigDto);
+     void addFacilitiesConfig(FacilitiesConfigDto facilitiesConfigDto);
+     void deleteFacilitiesConfig(FacilitiesConfig facilitiesConfig);
+     FacilitiesConfigDto queryFacilitiesConfig(FacilitiesConfig facilitiesConfig);
+}

smartcity-admin/src/main/java/com/zcxk/admin/service/GisConfigService.java

@@ -0,0 +1,14 @@
+package com.zcxk.admin.service;
+
+import com.zcxk.admin.entity.GisConfig;
+
+import java.util.List;
+
+public interface GisConfigService {
+    List<GisConfig> queryGisConfigs(GisConfig gisConfig);
+    void addGisConfig(GisConfig gisConfig);
+    void updateGisConfig(GisConfig gisConfig);
+    void deleteGisConfig(GisConfig gisConfig);
+    GisConfig queryGisConfig(GisConfig gisConfig);
+    List<String>queryGisConfigType();
+}

smartcity-admin/src/main/java/com/zcxk/admin/service/impl/FacilitiesServiceImpl.java

@@ -0,0 +1,85 @@
+package com.zcxk.admin.service.impl;
+
+import com.zcxk.admin.dao.FacilitiesConfigAttributeMapper;
+import com.zcxk.admin.dao.FacilitiesConfigLabelMapper;
+import com.zcxk.admin.dao.FacilitiesConfigMapper;
+import com.zcxk.admin.dto.FacilitiesConfigDto;
+import com.zcxk.admin.entity.FacilitiesConfig;
+import com.zcxk.admin.entity.FacilitiesConfigAttribute;
+import com.zcxk.admin.entity.FacilitiesConfigLabel;
+import com.zcxk.admin.service.FacilitiesService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+@Service
+public class FacilitiesServiceImpl implements FacilitiesService {
+    @Autowired
+    private FacilitiesConfigMapper facilitiesConfigMapper;
+    @Autowired
+    private FacilitiesConfigLabelMapper facilitiesConfigLabelMapper;
+    @Autowired
+    private FacilitiesConfigAttributeMapper facilitiesConfigAttributeMapper;
+
+    @Override
+    public List<FacilitiesConfig> queryFacilitiesConfigList(FacilitiesConfig facilitiesConfig) {
+
+        return facilitiesConfigMapper.selectList(facilitiesConfig);
+    }
+    @Transactional
+    @Override
+    public void updateFacilitiesConfig(FacilitiesConfigDto facilitiesConfigDto) {
+        FacilitiesConfig facilitiesConfig = facilitiesConfigDto.getFacilitiesConfig();
+        facilitiesConfig.setBaseInfoNum(facilitiesConfigDto.getFacilitiesConfigAttributes().size());
+        facilitiesConfig.setLabelInfoNum(facilitiesConfigDto.getFacilitiesConfigLabels().size());
+
+        facilitiesConfigLabelMapper.deleteByfacilitiesConfigid(facilitiesConfig.getId());
+        facilitiesConfigAttributeMapper.deleteByfacilitiesConfigid(facilitiesConfig.getId());
+        facilitiesConfigMapper.updateByPrimaryKey(facilitiesConfig);
+        addLabelAndAttribute(facilitiesConfigDto);
+    }
+    private void addLabelAndAttribute(FacilitiesConfigDto facilitiesConfigDto){
+        facilitiesConfigDto.getFacilitiesConfigAttributes().forEach(facilitiesConfigAttribute ->{
+                    facilitiesConfigAttribute.setFacilitiesConfigId(facilitiesConfigDto.getFacilitiesConfig().getId());
+                    facilitiesConfigAttributeMapper.insertSelective(facilitiesConfigAttribute);
+                });
+
+        facilitiesConfigDto.getFacilitiesConfigLabels().forEach(facilitiesConfigLabel ->
+        {
+            facilitiesConfigLabel.setFacilitiesConfigId(facilitiesConfigDto.getFacilitiesConfig().getId());
+            facilitiesConfigLabelMapper.insertSelective(facilitiesConfigLabel);
+
+      });
+    }
+    @Transactional
+    @Override
+    public void addFacilitiesConfig(FacilitiesConfigDto facilitiesConfigDto) {
+        FacilitiesConfig facilitiesConfig = facilitiesConfigDto.getFacilitiesConfig();
+        facilitiesConfig.setBaseInfoNum(facilitiesConfigDto.getFacilitiesConfigAttributes().size());
+        facilitiesConfig.setLabelInfoNum(facilitiesConfigDto.getFacilitiesConfigLabels().size());
+        facilitiesConfigMapper.insertSelective(facilitiesConfig);
+        addLabelAndAttribute(facilitiesConfigDto);
+    }
+
+    @Override
+    public void deleteFacilitiesConfig(FacilitiesConfig facilitiesConfig) {
+
+        facilitiesConfigMapper.deleteByPrimaryKey(facilitiesConfig.getId());
+        facilitiesConfigLabelMapper.deleteByfacilitiesConfigid(facilitiesConfig.getId());
+        facilitiesConfigAttributeMapper.deleteByfacilitiesConfigid(facilitiesConfig.getId());
+    }
+
+    @Override
+    public FacilitiesConfigDto queryFacilitiesConfig(FacilitiesConfig facilitiesConfig) {
+         facilitiesConfig = facilitiesConfigMapper.selectByPrimaryKey(facilitiesConfig.getId());
+        List<FacilitiesConfigLabel> facilitiesConfigLabels = facilitiesConfigLabelMapper.selectByfacilitiesConfigid(facilitiesConfig.getId());
+        List<FacilitiesConfigAttribute> facilitiesConfigAttributes = facilitiesConfigAttributeMapper.selectByfacilitiesConfigid(facilitiesConfig.getId());
+        FacilitiesConfigDto facilitiesConfigDto = new FacilitiesConfigDto();
+        facilitiesConfigDto.setFacilitiesConfig(facilitiesConfig);
+        facilitiesConfigDto.setFacilitiesConfigAttributes(facilitiesConfigAttributes);
+        facilitiesConfigDto.setFacilitiesConfigLabels(facilitiesConfigLabels);
+
+        return facilitiesConfigDto;
+    }
+}

smartcity-admin/src/main/java/com/zcxk/admin/service/impl/GisConfigServiceImpl.java

@@ -0,0 +1,43 @@
+package com.zcxk.admin.service.impl;
+
+import com.zcxk.admin.dao.GisConfigMapper;
+import com.zcxk.admin.entity.GisConfig;
+import com.zcxk.admin.service.GisConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+@Service
+public class GisConfigServiceImpl implements GisConfigService {
+    @Autowired
+    private GisConfigMapper gisConfigMapper;
+    @Override
+    public List<GisConfig> queryGisConfigs(GisConfig gisConfig) {
+        return gisConfigMapper.queryGisConfig(gisConfig);
+    }
+
+    @Override
+    public void addGisConfig(GisConfig gisConfig) {
+        gisConfigMapper.insertSelective(gisConfig);
+    }
+
+    @Override
+    public void updateGisConfig(GisConfig gisConfig) {
+        gisConfigMapper.updateByPrimaryKeySelective(gisConfig);
+    }
+
+    @Override
+    public void deleteGisConfig(GisConfig gisConfig) {
+        gisConfigMapper.deleteByPrimaryKey(gisConfig.getId());
+    }
+
+    @Override
+    public GisConfig queryGisConfig(GisConfig gisConfig) {
+        return gisConfigMapper.selectByPrimaryKey(gisConfig.getId());
+    }
+
+    @Override
+    public List<String> queryGisConfigType() {
+        return gisConfigMapper.queryGisConfigType();
+    }
+}

smartcity-admin/src/main/resources/application-dev.properties

@@ -3,7 +3,7 @@ spring.application.name=smart-city-v2-admin
 logging.level.root=info
 logging.path=D:/logs/smart-city-v2-admin
 #\u6570\u636E\u5E93\u914D\u7F6E
-spring.datasource.url=jdbc:mysql://114.135.61.188:23305/smart_city_v2?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://10.0.0.161:3306/smart_city_v2?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=root
 spring.datasource.password=100Zone@123
 spring.datasource.druid.driver-class-name=com.mysql.jdbc.Driver

smartcity-admin/src/main/resources/mapper/FacilitiesConfigAttributeMapper.xml

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zcxk.admin.dao.FacilitiesConfigAttributeMapper">
+  <resultMap id="BaseResultMap" type="com.zcxk.admin.entity.FacilitiesConfigAttribute">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="cloumn_name" jdbcType="VARCHAR" property="cloumnName" />
+    <result column="cloumn_type" jdbcType="VARCHAR" property="cloumnType" />
+    <result column="cloumn_examples" jdbcType="VARCHAR" property="cloumnExamples" />
+    <result column="describe" jdbcType="VARCHAR" property="describe" />
+    <result column="facilities_config_id" jdbcType="INTEGER" property="facilitiesConfigId" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, cloumn_name, cloumn_type, cloumn_examples, `describe`, facilities_config_id
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from sc_facilities_config_attribute
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <select id="selectByfacilitiesConfigid" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from sc_facilities_config_attribute
+    where facilities_config_id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from sc_facilities_config_attribute
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByfacilitiesConfigid">
+     delete from sc_facilities_config_attribute
+    where facilities_config_id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.zcxk.admin.entity.FacilitiesConfigAttribute" useGeneratedKeys="true">
+    insert into sc_facilities_config_attribute (cloumn_name, cloumn_type, cloumn_examples, 
+      `describe`, facilities_config_id)
+    values (#{cloumnName,jdbcType=VARCHAR}, #{cloumnType,jdbcType=VARCHAR}, #{cloumnExamples,jdbcType=VARCHAR}, 
+      #{describe,jdbcType=VARCHAR}, #{facilitiesConfigId,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.zcxk.admin.entity.FacilitiesConfigAttribute" useGeneratedKeys="true">
+    insert into sc_facilities_config_attribute
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="cloumnName != null">
+        cloumn_name,
+      </if>
+      <if test="cloumnType != null">
+        cloumn_type,
+      </if>
+      <if test="cloumnExamples != null">
+        cloumn_examples,
+      </if>
+      <if test="describe != null">
+        `describe`,
+      </if>
+      <if test="facilitiesConfigId != null">
+        facilities_config_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="cloumnName != null">
+        #{cloumnName,jdbcType=VARCHAR},
+      </if>
+      <if test="cloumnType != null">
+        #{cloumnType,jdbcType=VARCHAR},
+      </if>
+      <if test="cloumnExamples != null">
+        #{cloumnExamples,jdbcType=VARCHAR},
+      </if>
+      <if test="describe != null">
+        #{describe,jdbcType=VARCHAR},
+      </if>
+      <if test="facilitiesConfigId != null">
+        #{facilitiesConfigId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.zcxk.admin.entity.FacilitiesConfigAttribute">
+    update sc_facilities_config_attribute
+    <set>
+      <if test="cloumnName != null">
+        cloumn_name = #{cloumnName,jdbcType=VARCHAR},
+      </if>
+      <if test="cloumnType != null">
+        cloumn_type = #{cloumnType,jdbcType=VARCHAR},
+      </if>
+      <if test="cloumnExamples != null">
+        cloumn_examples = #{cloumnExamples,jdbcType=VARCHAR},
+      </if>
+      <if test="describe != null">
+        `describe` = #{describe,jdbcType=VARCHAR},
+      </if>
+      <if test="facilitiesConfigId != null">
+        facilities_config_id = #{facilitiesConfigId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.zcxk.admin.entity.FacilitiesConfigAttribute">
+    update sc_facilities_config_attribute
+    set cloumn_name = #{cloumnName,jdbcType=VARCHAR},
+      cloumn_type = #{cloumnType,jdbcType=VARCHAR},
+      cloumn_examples = #{cloumnExamples,jdbcType=VARCHAR},
+      `describe` = #{describe,jdbcType=VARCHAR},
+      facilities_config_id = #{facilitiesConfigId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

smartcity-admin/src/main/resources/mapper/FacilitiesConfigLabelMapper.xml

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zcxk.admin.dao.FacilitiesConfigLabelMapper">
+  <resultMap id="BaseResultMap" type="com.zcxk.admin.entity.FacilitiesConfigLabel">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="cloumn_name" jdbcType="VARCHAR" property="cloumnName" />
+    <result column="cloumn_code" jdbcType="VARCHAR" property="cloumnCode" />
+    <result column="facilities_config_id" jdbcType="INTEGER" property="facilitiesConfigId" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, cloumn_name, cloumn_code, facilities_config_id
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from sc_facilities_config_label
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+    <select id="selectByfacilitiesConfigid" resultMap="BaseResultMap">
+      select
+      <include refid="Base_Column_List" />
+      from sc_facilities_config_label
+      where facilities_config_id = #{id,jdbcType=INTEGER}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from sc_facilities_config_label
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+    <delete id="deleteByfacilitiesConfigid">
+      delete from sc_facilities_config_label
+       where facilities_config_id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.zcxk.admin.entity.FacilitiesConfigLabel" useGeneratedKeys="true">
+    insert into sc_facilities_config_label (cloumn_name, cloumn_code, facilities_config_id
+      )
+    values (#{cloumnName,jdbcType=VARCHAR}, #{cloumnCode,jdbcType=VARCHAR}, #{facilitiesConfigId,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.zcxk.admin.entity.FacilitiesConfigLabel" useGeneratedKeys="true">
+    insert into sc_facilities_config_label
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="cloumnName != null">
+        cloumn_name,
+      </if>
+      <if test="cloumnCode != null">
+        cloumn_code,
+      </if>
+      <if test="facilitiesConfigId != null">
+        facilities_config_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="cloumnName != null">
+        #{cloumnName,jdbcType=VARCHAR},
+      </if>
+      <if test="cloumnCode != null">
+        #{cloumnCode,jdbcType=VARCHAR},
+      </if>
+      <if test="facilitiesConfigId != null">
+        #{facilitiesConfigId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.zcxk.admin.entity.FacilitiesConfigLabel">
+    update sc_facilities_config_label
+    <set>
+      <if test="cloumnName != null">
+        cloumn_name = #{cloumnName,jdbcType=VARCHAR},
+      </if>
+      <if test="cloumnCode != null">
+        cloumn_code = #{cloumnCode,jdbcType=VARCHAR},
+      </if>
+      <if test="facilitiesConfigId != null">
+        facilities_config_id = #{facilitiesConfigId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.zcxk.admin.entity.FacilitiesConfigLabel">
+    update sc_facilities_config_label
+    set cloumn_name = #{cloumnName,jdbcType=VARCHAR},
+      cloumn_code = #{cloumnCode,jdbcType=VARCHAR},
+      facilities_config_id = #{facilitiesConfigId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

smartcity-admin/src/main/resources/mapper/FacilitiesConfigMapper.xml

@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zcxk.admin.dao.FacilitiesConfigMapper">
+  <resultMap id="BaseResultMap" type="com.zcxk.admin.entity.FacilitiesConfig">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="pid" jdbcType="INTEGER" property="pid" />
+    <result column="facilities_type" jdbcType="VARCHAR" property="facilitiesType" />
+    <result column="aerial_view_3d" jdbcType="INTEGER" property="aerialView3d" />
+    <result column="site_photo_3d" jdbcType="INTEGER" property="sitePhoto3d" />
+    <result column="process_flow_chart" jdbcType="INTEGER" property="processFlowChart" />
+    <result column="process_site_photo" jdbcType="INTEGER" property="processSitePhoto" />
+    <result column="icon" jdbcType="VARCHAR" property="icon" />
+    <result column="site_id" jdbcType="INTEGER" property="siteId" />
+    <result column="base_info_num" jdbcType="INTEGER" property="baseInfoNum" />
+    <result column="label_info_num" jdbcType="INTEGER" property="labelInfoNum" />
+    <result column="facilities_num" jdbcType="INTEGER" property="facilitiesNum" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, pid, facilities_type, aerial_view_3d, site_photo_3d, process_flow_chart, process_site_photo, 
+    icon, site_id, base_info_num, label_info_num
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from sc_facilities_config
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <select id="selectList" resultType="com.zcxk.admin.entity.FacilitiesConfig">
+    select
+    <include refid="Base_Column_List" />,b.facilities_num
+    from sc_facilities_config a left join  (select count(1)facilities_num  ,facilities_config_id from sc_facilities_entity
+    group by facilities_config_id ) b on a.id=b.facilities_config_id
+
+    <where>
+      <if test="facilitiesType != null">
+       and facilities_type = #{facilitiesType,jdbcType=VARCHAR}
+      </if>
+      <if test="pid != null">
+        and pid = #{pid,jdbcType=INTEGER}
+      </if>
+    </where>
+
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from sc_facilities_config
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.zcxk.admin.entity.FacilitiesConfig" useGeneratedKeys="true">
+    insert into sc_facilities_config (pid, facilities_type, aerial_view_3d, 
+      site_photo_3d, process_flow_chart, process_site_photo, 
+      icon, site_id, base_info_num, 
+      label_info_num, facilities_num)
+    values (#{pid,jdbcType=INTEGER}, #{facilitiesType,jdbcType=VARCHAR}, #{aerialView3d,jdbcType=INTEGER}, 
+      #{sitePhoto3d,jdbcType=INTEGER}, #{processFlowChart,jdbcType=INTEGER}, #{processSitePhoto,jdbcType=INTEGER}, 
+      #{icon,jdbcType=VARCHAR}, #{siteId,jdbcType=INTEGER}, #{baseInfoNum,jdbcType=INTEGER}, 
+      #{labelInfoNum,jdbcType=INTEGER}, #{facilitiesNum,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.zcxk.admin.entity.FacilitiesConfig" useGeneratedKeys="true">
+    insert into sc_facilities_config
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="pid != null">
+        pid,
+      </if>
+      <if test="facilitiesType != null">
+        facilities_type,
+      </if>
+      <if test="aerialView3d != null">
+        aerial_view_3d,
+      </if>
+      <if test="sitePhoto3d != null">
+        site_photo_3d,
+      </if>
+      <if test="processFlowChart != null">
+        process_flow_chart,
+      </if>
+      <if test="processSitePhoto != null">
+        process_site_photo,
+      </if>
+      <if test="icon != null">
+        icon,
+      </if>
+      <if test="siteId != null">
+        site_id,
+      </if>
+      <if test="baseInfoNum != null">
+        base_info_num,
+      </if>
+      <if test="labelInfoNum != null">
+        label_info_num,
+      </if>
+      <if test="facilitiesNum != null">
+        facilities_num,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="pid != null">
+        #{pid,jdbcType=INTEGER},
+      </if>
+      <if test="facilitiesType != null">
+        #{facilitiesType,jdbcType=VARCHAR},
+      </if>
+      <if test="aerialView3d != null">
+        #{aerialView3d,jdbcType=INTEGER},
+      </if>
+      <if test="sitePhoto3d != null">
+        #{sitePhoto3d,jdbcType=INTEGER},
+      </if>
+      <if test="processFlowChart != null">
+        #{processFlowChart,jdbcType=INTEGER},
+      </if>
+      <if test="processSitePhoto != null">
+        #{processSitePhoto,jdbcType=INTEGER},
+      </if>
+      <if test="icon != null">
+        #{icon,jdbcType=VARCHAR},
+      </if>
+      <if test="siteId != null">
+        #{siteId,jdbcType=INTEGER},
+      </if>
+      <if test="baseInfoNum != null">
+        #{baseInfoNum,jdbcType=INTEGER},
+      </if>
+      <if test="labelInfoNum != null">
+        #{labelInfoNum,jdbcType=INTEGER},
+      </if>
+      <if test="facilitiesNum != null">
+        #{facilitiesNum,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.zcxk.admin.entity.FacilitiesConfig">
+    update sc_facilities_config
+    <set>
+      <if test="pid != null">
+        pid = #{pid,jdbcType=INTEGER},
+      </if>
+      <if test="facilitiesType != null">
+        facilities_type = #{facilitiesType,jdbcType=VARCHAR},
+      </if>
+      <if test="aerialView3d != null">
+        aerial_view_3d = #{aerialView3d,jdbcType=INTEGER},
+      </if>
+      <if test="sitePhoto3d != null">
+        site_photo_3d = #{sitePhoto3d,jdbcType=INTEGER},
+      </if>
+      <if test="processFlowChart != null">
+        process_flow_chart = #{processFlowChart,jdbcType=INTEGER},
+      </if>
+      <if test="processSitePhoto != null">
+        process_site_photo = #{processSitePhoto,jdbcType=INTEGER},
+      </if>
+      <if test="icon != null">
+        icon = #{icon,jdbcType=VARCHAR},
+      </if>
+      <if test="siteId != null">
+        site_id = #{siteId,jdbcType=INTEGER},
+      </if>
+      <if test="baseInfoNum != null">
+        base_info_num = #{baseInfoNum,jdbcType=INTEGER},
+      </if>
+      <if test="labelInfoNum != null">
+        label_info_num = #{labelInfoNum,jdbcType=INTEGER},
+      </if>
+      <if test="facilitiesNum != null">
+        facilities_num = #{facilitiesNum,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.zcxk.admin.entity.FacilitiesConfig">
+    update sc_facilities_config
+    set pid = #{pid,jdbcType=INTEGER},
+      facilities_type = #{facilitiesType,jdbcType=VARCHAR},
+      aerial_view_3d = #{aerialView3d,jdbcType=INTEGER},
+      site_photo_3d = #{sitePhoto3d,jdbcType=INTEGER},
+      process_flow_chart = #{processFlowChart,jdbcType=INTEGER},
+      process_site_photo = #{processSitePhoto,jdbcType=INTEGER},
+      icon = #{icon,jdbcType=VARCHAR},
+      site_id = #{siteId,jdbcType=INTEGER},
+      base_info_num = #{baseInfoNum,jdbcType=INTEGER},
+      label_info_num = #{labelInfoNum,jdbcType=INTEGER},
+      facilities_num = #{facilitiesNum,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

smartcity-admin/src/main/resources/mapper/GisConfigMapper.xml

@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zcxk.admin.dao.GisConfigMapper">
+  <resultMap id="BaseResultMap" type="com.zcxk.admin.entity.GisConfig">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="service_type" jdbcType="VARCHAR" property="serviceType" />
+    <result column="lan_service" jdbcType="VARCHAR" property="lanService" />
+    <result column="outer_net_service" jdbcType="VARCHAR" property="outerNetService" />
+    <result column="center_coordinate" jdbcType="VARCHAR" property="centerCoordinate" />
+    <result column="site_id" jdbcType="INTEGER" property="siteId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, service_type, lan_service, outer_net_service, center_coordinate, site_id, create_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from sc_gis_config
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+    <select id="queryGisConfigType" resultType="java.lang.String">
+      select distinct  service_type from sc_gis_config
+    </select>
+  <select id="queryGisConfig" resultType="com.zcxk.admin.entity.GisConfig">
+    select
+    <include refid="Base_Column_List" />
+    from sc_gis_config
+    <where>
+      <if test="serviceType != null">
+        and service_type = #{serviceType,jdbcType=VARCHAR}
+      </if>
+      <if test="lanService != null">
+        and (lan_service like concat("%",#{lanService,jdbcType=VARCHAR},"%")
+         or outer_net_service like concat("%",#{outerNetService,jdbcType=VARCHAR},"%") )
+      </if>
+    </where>
+
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from sc_gis_config
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.zcxk.admin.entity.GisConfig" useGeneratedKeys="true">
+    insert into sc_gis_config (service_type, lan_service, outer_net_service, 
+      center_coordinate, site_id, create_time
+      )
+    values (#{serviceType,jdbcType=VARCHAR}, #{lanService,jdbcType=VARCHAR}, #{outerNetService,jdbcType=VARCHAR}, 
+      #{centerCoordinate,jdbcType=VARCHAR}, #{siteId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.zcxk.admin.entity.GisConfig" useGeneratedKeys="true">
+    insert into sc_gis_config
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="serviceType != null">
+        service_type,
+      </if>
+      <if test="lanService != null">
+        lan_service,
+      </if>
+      <if test="outerNetService != null">
+        outer_net_service,
+      </if>
+      <if test="centerCoordinate != null">
+        center_coordinate,
+      </if>
+      <if test="siteId != null">
+        site_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="serviceType != null">
+        #{serviceType,jdbcType=VARCHAR},
+      </if>
+      <if test="lanService != null">
+        #{lanService,jdbcType=VARCHAR},
+      </if>
+      <if test="outerNetService != null">
+        #{outerNetService,jdbcType=VARCHAR},
+      </if>
+      <if test="centerCoordinate != null">
+        #{centerCoordinate,jdbcType=VARCHAR},
+      </if>
+      <if test="siteId != null">
+        #{siteId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.zcxk.admin.entity.GisConfig">
+    update sc_gis_config
+    <set>
+      <if test="serviceType != null">
+        service_type = #{serviceType,jdbcType=VARCHAR},
+      </if>
+      <if test="lanService != null">
+        lan_service = #{lanService,jdbcType=VARCHAR},
+      </if>
+      <if test="outerNetService != null">
+        outer_net_service = #{outerNetService,jdbcType=VARCHAR},
+      </if>
+      <if test="centerCoordinate != null">
+        center_coordinate = #{centerCoordinate,jdbcType=VARCHAR},
+      </if>
+      <if test="siteId != null">
+        site_id = #{siteId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.zcxk.admin.entity.GisConfig">
+    update sc_gis_config
+    set service_type = #{serviceType,jdbcType=VARCHAR},
+      lan_service = #{lanService,jdbcType=VARCHAR},
+      outer_net_service = #{outerNetService,jdbcType=VARCHAR},
+      center_coordinate = #{centerCoordinate,jdbcType=VARCHAR},
+      site_id = #{siteId,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

smartcity-facilities/src/main/java/com/zcxk/facilities/config/ResourceServerConfig.java

@@ -0,0 +1,25 @@
+package com.zcxk.facilities.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
+import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter;
+
+@Configuration
+@EnableResourceServer
+public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
+
+    @Override
+    public void configure(HttpSecurity http) throws Exception {
+        http
+                .csrf().disable()
+                .requestMatchers().antMatchers("/**")
+                .and()
+                .authorizeRequests()
+                .antMatchers("/swagger-ui.html","/webjars/**", "/webjars/**", "/swagger-resources/**", "/v2/**","/facilities/entity/**")
+                .permitAll() //配置不需要身份认证的请求路径
+                .anyRequest().authenticated() //其他所有访问路径都需要身份认证
+                .and()
+                .httpBasic();
+    }
+}

smartcity-facilities/src/main/java/com/zcxk/facilities/config/SwaggerConfig.java

@@ -0,0 +1,72 @@
+package com.zcxk.facilities.config;
+
+import org.springframework.boot.autoconfigure.web.servlet.error.BasicErrorController;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.ApiKey;
+import springfox.documentation.service.AuthorizationScope;
+import springfox.documentation.service.SecurityReference;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spi.service.contexts.SecurityContext;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.util.List;
+
+import static com.google.common.collect.Lists.newArrayList;
+
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+    @Bean
+    public Docket api() {
+
+
+        return new Docket(DocumentationType.SWAGGER_2)
+                .ignoredParameterTypes(BasicErrorController.class)
+                .groupName("api")
+                .select()
+                .apis(RequestHandlerSelectors.any())
+                .paths(PathSelectors.any())
+                .build()
+                .apiInfo(apiInfo())
+                .securitySchemes(securitySchemes())
+                .securityContexts(securityContexts());
+    }
+
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("物联网云平台Api")
+                .description("物联网云平台")
+                .version("1.0")
+                .build();
+    }
+
+    private List<ApiKey> securitySchemes() {
+        return newArrayList(
+                new ApiKey("Authorization", "Authorization", "header"));
+    }
+
+    private List<SecurityContext> securityContexts() {
+        return newArrayList(
+                SecurityContext.builder()
+                        .securityReferences(defaultAuth())
+                        .forPaths(PathSelectors.regex("^(?!auth).*$"))
+                        .build()
+        );
+    }
+
+    List<SecurityReference> defaultAuth() {
+        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
+        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
+        authorizationScopes[0] = authorizationScope;
+        return newArrayList(
+                new SecurityReference("Authorization", authorizationScopes));
+    }
+
+}

smartcity-facilities/src/main/java/com/zcxk/facilities/controller/FacilitiesEntityController.java

@@ -0,0 +1,113 @@
+package com.zcxk.facilities.controller;
+
+import com.github.pagehelper.PageHelper;
+import com.zcxk.common.model.AjaxMessage;
+import com.zcxk.common.model.Pagination;
+import com.zcxk.common.model.ResultStatus;
+import com.zcxk.facilities.entity.FacilitiesEntity;
+import com.zcxk.facilities.service.FacilitiesEntityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * (FacilitiesEntity)控制层
+ *
+ * @author makejava
+ * @since 2020-09-30 17:59:15
+ */
+@RestController
+@RequestMapping("/facilities/entity")
+@Api(tags = "")
+public class FacilitiesEntityController {
+    /**
+     * 服务对象
+     */
+    @Autowired
+    private FacilitiesEntityService facilitiesEntityService;
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param facilitiesEntity 参数对象
+     * @return 单条数据
+     */
+    @RequestMapping(value = "get", method = RequestMethod.POST)
+    @ApiOperation(value = "查询设施")
+    public AjaxMessage<FacilitiesEntity> selectOne(
+            @ApiParam(value = "设置配置", required = true) @RequestBody FacilitiesEntity facilitiesEntity) {
+        FacilitiesEntity result = facilitiesEntityService.selectById(facilitiesEntity.getId());
+
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
+
+    /**
+     * 新增一条数据
+     *
+     * @param facilitiesEntity 实体类
+     * @return Response对象
+     */
+    @RequestMapping(value = "insert", method = RequestMethod.POST)
+    @ApiOperation(value = "插入设施配")
+    public AjaxMessage<Integer> insert(@ApiParam(value = "设置配置", required = true) @RequestBody FacilitiesEntity facilitiesEntity) {
+        int result = facilitiesEntityService.insert(facilitiesEntity);
+
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
+
+    /**
+     * 修改一条数据
+     *
+     * @param facilitiesEntity 实体类
+     * @return Response对象
+     */
+    @RequestMapping(value = "update", method = RequestMethod.POST)
+    @ApiOperation(value = "更新设施")
+    public AjaxMessage<Integer> update(@ApiParam(value = "设置配置", required = true) @RequestBody FacilitiesEntity facilitiesEntity) {
+        int result = facilitiesEntityService.update(facilitiesEntity);
+        return new AjaxMessage<>(ResultStatus.OK, result);
+
+    }
+
+    /**
+     * 删除一条数据
+     *
+     * @param facilitiesEntity 参数对象
+     * @return Response对象
+     */
+    @RequestMapping(value = "delete", method = RequestMethod.POST)
+    @ApiOperation(value = "删除设施")
+    public AjaxMessage<Integer> delete(@ApiParam(value = "设置配置", required = true) @RequestBody FacilitiesEntity facilitiesEntity) {
+        int result = facilitiesEntityService.deleteById(facilitiesEntity.getId());
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
+
+
+    /**
+     * 分页查询
+     *
+     * @param pageNum  偏移
+     * @param pageSize 条数
+     * @return Response对象
+     */
+    @RequestMapping(value = "selectPage", method = RequestMethod.POST)
+    @ApiOperation(value = "查询设施列表分页")
+    public AjaxMessage<Pagination<FacilitiesEntity>> selectPage(@ApiParam(value = "页数", required = true)Integer pageNum,
+                                                                @ApiParam(value = "每页行数", required = true)Integer pageSize,
+                                                                @ApiParam(value = "设施类型id", required = true)Integer facilitiesConfigId) {
+        FacilitiesEntity facilitiesEntity = new FacilitiesEntity();
+        facilitiesEntity.setFacilitiesConfigId(facilitiesConfigId);
+        PageHelper.startPage(pageNum, pageSize);
+        List<FacilitiesEntity> facilitiesEntitys = facilitiesEntityService.selectList(facilitiesEntity);
+        Pagination<FacilitiesEntity> pages = new Pagination<>(facilitiesEntitys);
+        return new AjaxMessage<>(ResultStatus.OK, pages);
+    }
+
+}

smartcity-facilities/src/main/java/com/zcxk/facilities/dao/FacilitiesEntityMapper.java

@@ -0,0 +1,88 @@
+package com.zcxk.facilities.dao;
+
+import com.zcxk.facilities.entity.FacilitiesEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * (FacilitiesEntity)表数据库访问层
+ *
+ * @author makejava
+ * @since 2020-10-09 11:03:00
+ */
+@Mapper
+public interface FacilitiesEntityMapper {
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    FacilitiesEntity selectById(Integer id);
+
+    /**
+     * 分页查询
+     *
+     * @param start 查询起始位置
+     * @param limit 查询条数
+     * @return 对象列表
+     */
+    List<FacilitiesEntity> selectPage(@Param("start") int start, @Param("limit") int limit);
+
+    /**
+     * 查询全部
+     *
+     * @return 对象列表
+     */
+    List<FacilitiesEntity> selectAll();
+
+    /**
+     * 通过实体作为筛选条件查询
+     *
+     * @param facilitiesEntity 实例对象
+     * @return 对象列表
+     */
+    List<FacilitiesEntity> selectList(FacilitiesEntity facilitiesEntity);
+
+    /**
+     * 新增数据
+     *
+     * @param facilitiesEntity 实例对象
+     * @return 影响行数
+     */
+    int insert(FacilitiesEntity facilitiesEntity);
+
+    /**
+     * 批量新增
+     *
+     * @param facilitiesEntitys 实例对象的集合
+     * @return 影响行数
+     */
+    int batchInsert(List<FacilitiesEntity> facilitiesEntitys);
+
+    /**
+     * 修改数据
+     *
+     * @param facilitiesEntity 实例对象
+     * @return 影响行数
+     */
+    int update(FacilitiesEntity facilitiesEntity);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 影响行数
+     */
+    int deleteById(Integer id);
+
+    /**
+     * 查询总数据数
+     *
+     * @return 数据总数
+     */
+    int count();
+}

smartcity-facilities/src/main/java/com/zcxk/facilities/entity/FacilitiesEntity.java

@@ -0,0 +1,40 @@
+package com.zcxk.facilities.entity;
+
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * (FacilitiesEntity)实体类
+ *
+ * @author makejava
+ * @since 2020-10-09 17:16:26
+ */
+@Data
+@ApiModel
+public class FacilitiesEntity implements Serializable {
+    private static final long serialVersionUID = 360823573704808281L;
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(value = "主键id")
+    private Integer id;
+    /**
+     * 站点id
+     */
+    @ApiModelProperty(value = "站点id")
+    private Integer siteId;
+    /**
+     * 根据配置加载的字段与值
+     */
+    @ApiModelProperty(value = "根据配置加载的字段与值")
+    private JSONObject cloumnValues;
+    /**
+     * 配置表id
+     */
+    @ApiModelProperty(value = "配置表id")
+    private Integer facilitiesConfigId;
+}

smartcity-facilities/src/main/java/com/zcxk/facilities/handle/JsonTypeHandle.java

@@ -0,0 +1,62 @@
+package com.zcxk.facilities.handle;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+
+
+import java.sql.*;
+public class JsonTypeHandle extends BaseTypeHandler<JSONObject>{
+    /**
+     * 设置非空参数
+     * @param ps
+     * @param i
+     * @param parameter
+     * @param jdbcType
+     * @throws SQLException
+     */
+    @Override
+    public void setNonNullParameter(PreparedStatement ps, int i, JSONObject parameter, JdbcType jdbcType) throws SQLException {
+        ps.setString(i, String.valueOf(parameter.toJSONString()));
+    }
+
+    /**
+     * 根据列名，获取可以为空的结果
+     * @param rs
+     * @param columnName
+     * @return
+     * @throws SQLException
+     */
+    @Override
+    public JSONObject getNullableResult(ResultSet rs, String columnName) throws SQLException {
+        String sqlJson = rs.getString(columnName);
+        if (null != sqlJson){
+            return JSONObject.parseObject(sqlJson);
+        }
+        return null;
+    }
+
+    /**
+     * 根据列索引，获取可以为空的结果
+     * @param rs
+     * @param columnIndex
+     * @return
+     * @throws SQLException
+     */
+    @Override
+    public JSONObject getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+        String sqlJson = rs.getString(columnIndex);
+        if (null != sqlJson){
+            return JSONObject.parseObject(sqlJson);
+        }
+        return null;
+    }
+
+    @Override
+    public JSONObject getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
+        String sqlJson = cs.getString(columnIndex);
+        if (null != sqlJson){
+            return JSONObject.parseObject(sqlJson);
+        }
+        return null;
+    }
+}

smartcity-facilities/src/main/java/com/zcxk/facilities/service/FacilitiesEntityService.java

@@ -0,0 +1,85 @@
+package com.zcxk.facilities.service;
+
+import com.zcxk.facilities.entity.FacilitiesEntity;
+
+import java.util.List;
+
+/**
+ * (FacilitiesEntity)表服务接口
+ *
+ * @author makejava
+ * @since 2020-09-30 14:16:47
+ */
+public interface FacilitiesEntityService {
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    FacilitiesEntity selectById(Integer id);
+
+    /**
+     * 分页查询
+     *
+     * @param start 查询起始位置
+     * @param limit 查询条数
+     * @return 对象列表
+     */
+    List<FacilitiesEntity> selectPage(int start, int limit);
+
+    /**
+     * 查询全部
+     *
+     * @return 对象列表
+     */
+    List<FacilitiesEntity> selectAll();
+
+    /**
+     * 通过实体作为筛选条件查询
+     *
+     * @param facilitiesEntity 实例对象
+     * @return 对象列表
+     */
+    List<FacilitiesEntity> selectList(FacilitiesEntity facilitiesEntity);
+
+    /**
+     * 新增数据
+     *
+     * @param facilitiesEntity 实例对象
+     * @return 影响行数
+     */
+    int insert(FacilitiesEntity facilitiesEntity);
+
+    /**
+     * 批量新增
+     *
+     * @param facilitiesEntitys 实例对象的集合
+     * @return 影响行数
+     */
+    int batchInsert(List<FacilitiesEntity> facilitiesEntitys);
+
+    /**
+     * 修改数据
+     *
+     * @param facilitiesEntity 实例对象
+     * @return 修改
+     */
+    int update(FacilitiesEntity facilitiesEntity);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 影响行数
+     */
+    int deleteById(Integer id);
+
+    /**
+     * 查询总数据数
+     *
+     * @return 数据总数
+     */
+    int count();
+}

smartcity-facilities/src/main/java/com/zcxk/facilities/service/impl/FacilitiesEntityServiceImpl.java

@@ -0,0 +1,119 @@
+package com.zcxk.facilities.service.impl;
+
+import com.zcxk.facilities.dao.FacilitiesEntityMapper;
+import com.zcxk.facilities.entity.FacilitiesEntity;
+import com.zcxk.facilities.service.FacilitiesEntityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * (FacilitiesEntity表)服务实现类
+ *
+ * @author makejava
+ * @since 2020-09-30 14:16:49
+ */
+@Service("facilitiesEntityService")
+public class FacilitiesEntityServiceImpl implements FacilitiesEntityService {
+    @Autowired
+    private FacilitiesEntityMapper facilitiesEntityMapper;
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @Override
+    public FacilitiesEntity selectById(Integer id) {
+        return this.facilitiesEntityMapper.selectById(id);
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param start 查询起始位置
+     * @param limit 查询条数
+     * @return 对象列表
+     */
+    @Override
+    public List<FacilitiesEntity> selectPage(int start, int limit) {
+        return this.facilitiesEntityMapper.selectPage(start, limit);
+    }
+
+    /**
+     * 查询所有
+     *
+     * @return 实例对象的集合
+     */
+    @Override
+    public List<FacilitiesEntity> selectAll() {
+        return this.facilitiesEntityMapper.selectAll();
+    }
+
+    /**
+     * 根据条件查询
+     *
+     * @return 实例对象的集合
+     */
+    @Override
+    public List<FacilitiesEntity> selectList(FacilitiesEntity facilitiesEntity) {
+        return this.facilitiesEntityMapper.selectList(facilitiesEntity);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param facilitiesEntity 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public int insert(FacilitiesEntity facilitiesEntity) {
+        return this.facilitiesEntityMapper.insert(facilitiesEntity);
+    }
+
+    /**
+     * 批量新增
+     *
+     * @param facilitiesEntitys 实例对象的集合
+     * @return 生效的条数
+     */
+    @Override
+    public int batchInsert(List<FacilitiesEntity> facilitiesEntitys) {
+        return this.facilitiesEntityMapper.batchInsert(facilitiesEntitys);
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param facilitiesEntity 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public int update(FacilitiesEntity facilitiesEntity) {
+
+        return this.facilitiesEntityMapper.update(facilitiesEntity);
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @Override
+    public int deleteById(Integer id) {
+        return this.facilitiesEntityMapper.deleteById(id);
+    }
+
+    /**
+     * 查询总数据数
+     *
+     * @return 数据总数
+     */
+    @Override
+    public int count() {
+        return this.facilitiesEntityMapper.count();
+    }
+}

smartcity-facilities/src/main/resources/application-dev.properties

@@ -1,11 +1,11 @@
-server.port=8326
+server.port=8330
 spring.application.name=smart-city-v2-facilities
 #log
 logging.level.root=info
 logging.path=C:/logs/smartcity-facilities-service
 
 #\u6570\u636E\u5E93\u914D\u7F6E
-spring.datasource.url=jdbc:mysql://114.135.61.188:3306/smart_city_v2?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://114.135.61.188:33306/smart_city_v2?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=root
 spring.datasource.password=100Zone@123
 spring.datasource.druid.driver-class-name=com.mysql.jdbc.Driver
@@ -28,6 +28,7 @@ mybatis.type-aliases-package=com.zcxk.facilities.entity,com.zcxk.common.entity
 mybatis.configuration.map-underscore-to-camel-case=true
 mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 mybatis.configuration.use-column-label=true
+mybatis.type-handlers-package=com.zcxk.facilities.handle
 
 spring.jackson.time-zone=GMT+8
 #spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

smartcity-facilities/src/main/resources/mapper/FacilitiesEntityMapper.xml

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zcxk.facilities.dao.FacilitiesEntityMapper">
+    <!-- 结果集 -->
+    <resultMap type="com.zcxk.facilities.entity.FacilitiesEntity" id="FacilitiesEntityMap">
+        <result property="id" column="id" jdbcType="INTEGER"/>
+        <result property="siteId" column="site_id" jdbcType="INTEGER"/>
+        <result property="cloumnValues" column="cloumn_values" jdbcType="OTHER"  typeHandler="com.zcxk.facilities.handle.JsonTypeHandle"/>
+        <result property="facilitiesConfigId" column="facilities_config_id" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <!-- 基本字段 -->
+    <sql id="Base_Column_List">
+        id, site_id, cloumn_values, facilities_config_id    </sql>
+
+    <!-- 查询单个 -->
+    <select id="selectById" resultMap="FacilitiesEntityMap">
+        select
+        <include refid="Base_Column_List"/>
+        from sc_facilities_entity
+        where id = #{id}
+    </select>
+
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="FacilitiesEntityMap">
+        select
+        <include refid="Base_Column_List"/>
+        from sc_facilities_entity
+        limit #{start},#{limit}
+    </select>
+
+    <!-- 查询全部 -->
+    <select id="selectAll" resultMap="FacilitiesEntityMap">
+        select
+        <include refid="Base_Column_List"/>
+        from sc_facilities_entity
+    </select>
+
+    <!--通过实体作为筛选条件查询-->
+    <select id="selectList" resultMap="FacilitiesEntityMap">
+        select
+        <include refid="Base_Column_List"/>
+        from sc_facilities_entity
+        <where>
+            <if test="id != null">
+                and id = #{id}
+            </if>
+            <if test="siteId != null">
+                and site_id = #{siteId}
+            </if>
+            <if test="cloumnValues != null">
+                and cloumn_values = #{cloumnValues}
+            </if>
+            <if test="facilitiesConfigId != null">
+                and facilities_config_id = #{facilitiesConfigId}
+            </if>
+        </where>
+    </select>
+
+    <!-- 新增所有列 -->
+    <insert id="insert" keyProperty="id" useGeneratedKeys="true">
+        insert into sc_facilities_entity(id, site_id, cloumn_values, facilities_config_id)
+        values ( #{id}, #{siteId}, #{cloumnValues,jdbcType=OTHER,typeHandler=com.zcxk.facilities.handle.JsonTypeHandle}, #{facilitiesConfigId})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="batchInsert">
+        insert into sc_facilities_entity(id, site_id, cloumn_values, facilities_config_id)
+        values
+        <foreach collection="facilitiesEntitys" item="item" index="index" separator=",">
+            (
+            #{item.id}, #{item.siteId}, #{item.cloumnValues}, #{item.facilitiesConfigId} )
+        </foreach>
+    </insert>
+
+    <!-- 通过主键修改数据 -->
+    <update id="update">
+        update smart_city_v2.sc_facilities_entity
+        <set>
+            <if test="siteId != null">
+                site_id = #{siteId},
+            </if>
+            <if test="cloumnValues != null">
+                cloumn_values = #{cloumnValues,jdbcType=OTHER,typeHandler=com.zcxk.facilities.handle.JsonTypeHandle},
+            </if>
+            <if test="facilitiesConfigId != null">
+                facilities_config_id = #{facilitiesConfigId},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <!--通过主键删除-->
+    <delete id="deleteById">
+        delete from sc_facilities_entity where id = #{id}
+    </delete>
+
+    <!-- 总数 -->
+    <select id="count" resultType="int">
+        select count(*) from sc_facilities_entity
+    </select>
+</mapper>