Browse Source

添加万物墙, 可能不用

wuweihao 3 years ago
parent
commit
13c983e02a
50 changed files with 3415 additions and 21 deletions
  1. 5 0
      gis_application/pom.xml
  2. 1 1
      gis_application/src/main/resources/application.properties
  3. 0 20
      gis_common/pom.xml
  4. 207 0
      gis_wall/src/main/java/com/gis/wall/controller/CollectionController.java
  5. 28 0
      gis_wall/src/main/java/com/gis/wall/mapper/TbCollectionMapper.java
  6. 46 0
      gis_wall/src/main/java/com/gis/wall/mapper/TbCollectionMapperCust.java
  7. 22 0
      gis_wall/src/main/java/com/gis/wall/mapper/TbCollectionTimeMapper.java
  8. 14 0
      gis_wall/src/main/java/com/gis/wall/mapper/TbCollectionTimeMapperCust.java
  9. 22 0
      gis_wall/src/main/java/com/gis/wall/mapper/TbCollectionTypeMapper.java
  10. 14 0
      gis_wall/src/main/java/com/gis/wall/mapper/TbCollectionTypeMapperCust.java
  11. 74 0
      gis_wall/src/main/java/com/gis/wall/pojo/TbCollection.java
  12. 45 0
      gis_wall/src/main/java/com/gis/wall/pojo/TbCollectionTime.java
  13. 45 0
      gis_wall/src/main/java/com/gis/wall/pojo/TbCollectionType.java
  14. 15 0
      gis_wall/src/main/java/com/gis/wall/request/RequestBase.java
  15. 60 0
      gis_wall/src/main/java/com/gis/wall/request/RequestCollection.java
  16. 71 0
      gis_wall/src/main/java/com/gis/wall/respon/ResponCollection.java
  17. 45 0
      gis_wall/src/main/java/com/gis/wall/respon/ResponExhibition.java
  18. 31 0
      gis_wall/src/main/java/com/gis/wall/respon/ResponStatistics.java
  19. 56 0
      gis_wall/src/main/java/com/gis/wall/service/ICollectionService.java
  20. 283 0
      gis_wall/src/main/java/com/gis/wall/service/impl/CollectionServiceImpl.java
  21. 43 0
      gis_wall/src/main/resources/b/SceneMapper.xml
  22. 93 0
      gis_wall/src/main/resources/b/TbAuthorityMapper.xml
  23. 106 0
      gis_wall/src/main/resources/b/TbEquipmentMapper.xml
  24. 9 0
      gis_wall/src/main/resources/b/TbEquipmentMapperCust.xml
  25. 93 0
      gis_wall/src/main/resources/b/TbExhibitionCollectionMapper.xml
  26. 19 0
      gis_wall/src/main/resources/b/TbExhibitionCollectionMapperCust.xml
  27. 145 0
      gis_wall/src/main/resources/b/TbExhibitionMapper.xml
  28. 62 0
      gis_wall/src/main/resources/b/TbExhibitionMapperCust.xml
  29. 82 0
      gis_wall/src/main/resources/b/TbExhibitionTypeMapper.xml
  30. 183 0
      gis_wall/src/main/resources/b/TbInformationMapper.xml
  31. 21 0
      gis_wall/src/main/resources/b/TbInformationMapperCust.xml
  32. 104 0
      gis_wall/src/main/resources/b/TbLogMapper.xml
  33. 18 0
      gis_wall/src/main/resources/b/TbLogMapperCust.xml
  34. 93 0
      gis_wall/src/main/resources/b/TbMenuMapper.xml
  35. 82 0
      gis_wall/src/main/resources/b/TbPositionMapper.xml
  36. 9 0
      gis_wall/src/main/resources/b/TbPositionMapperCust.xml
  37. 162 0
      gis_wall/src/main/resources/b/TbResourceMapper.xml
  38. 25 0
      gis_wall/src/main/resources/b/TbResourceMapperCust.xml
  39. 93 0
      gis_wall/src/main/resources/b/TbRoleMapper.xml
  40. 41 0
      gis_wall/src/main/resources/b/TbRoleMapperCust.xml
  41. 128 0
      gis_wall/src/main/resources/b/TbUserMapper.xml
  42. 42 0
      gis_wall/src/main/resources/b/TbUserMapperCust.xml
  43. 41 0
      gis_wall/src/main/resources/b/VideoMapper.xml
  44. 318 0
      gis_wall/src/main/resources/mapper/TbCollectionMapper.xml
  45. 128 0
      gis_wall/src/main/resources/mapper/TbCollectionMapperCust.xml
  46. 82 0
      gis_wall/src/main/resources/mapper/TbCollectionTimeMapper.xml
  47. 10 0
      gis_wall/src/main/resources/mapper/TbCollectionTimeMapperCust.xml
  48. 82 0
      gis_wall/src/main/resources/mapper/TbCollectionTypeMapper.xml
  49. 10 0
      gis_wall/src/main/resources/mapper/TbCollectionTypeMapperCust.xml
  50. 7 0
      pom.xml

+ 5 - 0
gis_application/pom.xml

@@ -23,6 +23,11 @@
             <groupId>com.gis</groupId>
             <artifactId>gis_cms</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.gis</groupId>
+            <artifactId>gis_wall</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

+ 1 - 1
gis_application/src/main/resources/application.properties

@@ -31,7 +31,7 @@ mybatis-plus.configuration.call-setters-on-nulls=true
 mybatis-plus.global-config.db-config.logic-delete-value=1
 mybatis-plus.global-config.db-config.logic-not-delete-value=0
 mybatis-plus.global-config.db-config.logic-delete-field = isDelete
-mybatis-plus.mapper-locations=classpath*:/mybatis/mappers/**.xml
+mybatis-plus.mapper-locations=classpath*:/mapper/**.xml
 
 
 #pager

+ 0 - 20
gis_common/pom.xml

@@ -90,20 +90,6 @@
             <artifactId>pinyin4j</artifactId>
         </dependency>
 
-        <!--excel 依赖工具包, hutool需要用的-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.poi</groupId>-->
-            <!--<artifactId>poi-ooxml</artifactId>-->
-        <!--</dependency>-->
-
-        <!-- 二维码 -->
-        <!--<dependency>-->
-            <!--<groupId>com.google.zxing</groupId>-->
-            <!--<artifactId>core</artifactId>-->
-        <!--</dependency>-->
-
-
-
 
         <!-- jwt -->
         <dependency>
@@ -122,12 +108,6 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
 
-        <!--&lt;!&ndash;分页插件&ndash;&gt;-->
-        <!--<dependency>-->
-            <!--<groupId>com.github.pagehelper</groupId>-->
-            <!--<artifactId>pagehelper-spring-boot-starter</artifactId>-->
-        <!--</dependency>-->
-
 
 
     </dependencies>

+ 207 - 0
gis_wall/src/main/java/com/gis/wall/controller/CollectionController.java

@@ -0,0 +1,207 @@
+package com.gis.wall.controller;
+
+import com.gis.common.base.aop.WebControllerLog;
+import com.gis.common.constant.ConfigConstant;
+import com.gis.common.util.FileUtils;
+import com.gis.common.util.Result;
+import com.gis.wall.pojo.TbCollection;
+import com.gis.wall.request.RequestCollection;
+import com.gis.wall.respon.ResponCollection;
+import com.gis.wall.service.ICollectionService;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Hb_zzZ on 2019/9/11.
+ */
+@Api(tags = "文物库模块")
+@Controller
+@RequestMapping("/cms/collection")
+@Slf4j
+public class CollectionController {
+
+    @Autowired
+    private ICollectionService service;
+
+//    @Value("${upload.collection}")
+//    private String uploadPath;
+
+    @Autowired
+    ConfigConstant configConstant;
+
+    @Autowired
+    FileUtils fileUtils;
+
+    @PostMapping("timeList")
+    @ResponseBody
+    @ApiOperation("获取年代列表")
+    public Result timeList(){
+        return Result.success(service.timeList());
+    }
+
+    @PostMapping("typeList")
+    @ResponseBody
+    @ApiOperation("获取文物类别列表")
+    public Result typeList(@RequestBody RequestCollection bo){
+        return Result.success(service.typeList(bo));
+    }
+
+    @PostMapping("addCollection")
+    @ResponseBody
+    @WebControllerLog(description = "文物库-新增文物")
+    @ApiOperation("新增文物")
+    public Result addCollection(@RequestBody RequestCollection bo){
+        if(bo == null || StringUtils.isEmpty(bo.getName())  ||
+                bo.getTimeId() == null  || bo.getTypeId() == null){
+            return Result.failure("参数不能为空");
+        }
+
+        TbCollection collection = new TbCollection();
+        BeanUtils.copyProperties(bo, collection);
+        collection.setUnityUrl("/collection/unity/" + bo.getDirCode());
+        service.insert(collection);
+        return Result.success();
+    }
+
+    @PostMapping("updateCollection")
+    @ResponseBody
+    @WebControllerLog(description = "文物库-修改文物")
+    @ApiOperation("修改文物")
+    public Result updateCollection(@RequestBody RequestCollection bo){
+        if(bo == null || StringUtils.isEmpty(bo.getName()) ||
+                bo.getTimeId() == null  || bo.getTypeId() == null ){
+            return Result.failure("参数不能为空");
+        }
+
+        TbCollection collection = new TbCollection();
+        BeanUtils.copyProperties(bo, collection);
+        service.update(collection);
+        return Result.success();
+    }
+
+
+
+    @PostMapping("/deleteCollection")
+    @ResponseBody
+    @WebControllerLog(description = "文物库-删除文物")
+    @ApiOperation("删除文物")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "文物id", dataType = "String")})
+    public Result deleteCollection(@RequestBody RequestCollection bo){
+        if(bo == null || bo.getId() == null){
+            return Result.failure("参数不能为空");
+        }
+        service.deleteById(bo.getId());
+        return Result.success();
+    }
+
+    @PostMapping("findById")
+    @ResponseBody
+    @WebControllerLog(description = "文物库-查询文物库详情")
+    @ApiOperation("查询文物库详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "文物id", dataType = "String")})
+    public Result findById(@RequestBody RequestCollection bo){
+        if(bo == null || bo.getId() == null){
+            return Result.failure("参数不能为空");
+        }
+
+        return Result.success(service.findById(bo.getId()));
+    }
+
+    @PostMapping("list")
+    @ResponseBody
+    @WebControllerLog(description = "文物库-获取文物列表")
+    @ApiOperation("获取文物列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "timeId", value = "年代id", dataType = "String"),
+            @ApiImplicitParam(name = "typeId", value = "类型id", dataType = "String"),
+            @ApiImplicitParam(name = "name", value = "文物名称", dataType = "String"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", dataType = "String"),
+            @ApiImplicitParam(name = "pageSize", value = "每页数量", dataType = "String")})
+    public Result list(@RequestBody RequestCollection bo){
+        List<ResponCollection> list = service.findList(bo);
+        PageInfo<ResponCollection> pageInfo = new PageInfo<>(list);
+        return Result.success(pageInfo);
+    }
+
+    @PostMapping("/upload")
+    @ResponseBody
+    @ApiOperation("上传文物图片")
+    public Result upload(@RequestParam(value = "filename", defaultValue = "") String name, @RequestParam("file") MultipartFile file){
+        if(file == null){
+            return Result.failure("参数不能为空");
+        }
+        String fileName = System.currentTimeMillis() + "_";
+        if(StringUtils.isNotEmpty(name)){
+            fileName = fileName + name;
+        }else {
+            fileName = fileName + file.getOriginalFilename();
+        }
+//        boolean flag = FileUtil.upload(file, uploadPath, fileName);
+
+
+        Map<String, Object> map = fileUtils.uploadMap(file, "/collection", false);
+        Object filePath = map.get("filePath");
+        log.info("图片地址:" + fileName);
+
+
+        return Result.success(filePath);
+    }
+
+
+    /**
+     * 2021-08-09
+     * @param file
+     * @param code
+     * @return
+     */
+    @PostMapping("/uploadCode")
+    @ApiOperation("上传Unity")
+    @ResponseBody
+    public Result uploadCode(MultipartFile file, String code){
+
+        return service.uploadCode(file, code);
+    }
+
+
+//    @PostMapping("/importCollection")
+//    @ResponseBody
+//    @ApiOperation("导入文物Excel")
+//    public AjaxJson importCollection(@RequestParam("file") MultipartFile file){
+//        if(file == null){
+//            return AjaxJson.failure("参数不能为空");
+//        }
+//        String fileName = System.currentTimeMillis() + "_" +  file.getOriginalFilename();
+//        log.info("导入文件保存地址:" + fileName);
+//        boolean flag = FileUtil.upload(file, uploadPath, fileName);
+//
+//        if(!flag){
+//            return AjaxJson.failure("导入文物数据失败");
+//        }
+//
+//        return service.importCollection(uploadPath + "/" + fileName);
+//    }
+
+
+
+    @GetMapping("addVisit/{id}")
+    @ResponseBody
+    @ApiOperation("保存访问量")
+    public Result addVisit(@PathVariable Long id){
+        return service.addVisit(id);
+    }
+}

+ 28 - 0
gis_wall/src/main/java/com/gis/wall/mapper/TbCollectionMapper.java

@@ -0,0 +1,28 @@
+package com.gis.wall.mapper;
+
+
+import com.gis.wall.pojo.TbCollection;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+@Mapper
+@Component
+public interface TbCollectionMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(TbCollection record);
+
+    int insertSelective(TbCollection record);
+
+    TbCollection selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(TbCollection record);
+
+//    int updateByPrimaryKeyWithBLOBs(TbCollection record);
+
+    int updateByPrimaryKey(TbCollection record);
+
+    void addVisit(Long id);
+
+    Long countVisit();
+}

+ 46 - 0
gis_wall/src/main/java/com/gis/wall/mapper/TbCollectionMapperCust.java

@@ -0,0 +1,46 @@
+package com.gis.wall.mapper;
+
+
+import com.gis.wall.pojo.TbCollection;
+import com.gis.wall.pojo.TbCollectionTime;
+import com.gis.wall.pojo.TbCollectionType;
+import com.gis.wall.request.RequestCollection;
+import com.gis.wall.respon.ResponCollection;
+import com.gis.wall.respon.ResponStatistics;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+@Component
+public interface TbCollectionMapperCust {
+
+    List<TbCollectionTime> timeList();
+
+    List<TbCollectionType> typeList(RequestCollection bo);
+
+    List<ResponCollection> findList(RequestCollection bo);
+
+    List<ResponCollection> findListByExhibitionId(Long id);
+
+    List<ResponCollection> searchListByName(RequestCollection collection);
+
+    int addLikeNumById(Long id);
+
+    TbCollection findByName(String name);
+
+    int addOpenNumById(Long id);
+
+    int addSearchNumById(Long id);
+
+    int addDownloadNumById(Long id);
+
+    ResponStatistics collectionTotal();
+
+    List<ResponCollection> findListOrderBy(Map<String, String> map);
+
+    List<Map<String, Object>> typeTotal();
+
+}

+ 22 - 0
gis_wall/src/main/java/com/gis/wall/mapper/TbCollectionTimeMapper.java

@@ -0,0 +1,22 @@
+package com.gis.wall.mapper;
+
+
+import com.gis.wall.pojo.TbCollectionTime;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+@Mapper
+@Component
+public interface TbCollectionTimeMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(TbCollectionTime record);
+
+    int insertSelective(TbCollectionTime record);
+
+    TbCollectionTime selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(TbCollectionTime record);
+
+    int updateByPrimaryKey(TbCollectionTime record);
+}

+ 14 - 0
gis_wall/src/main/java/com/gis/wall/mapper/TbCollectionTimeMapperCust.java

@@ -0,0 +1,14 @@
+package com.gis.wall.mapper;
+
+
+import com.gis.wall.pojo.TbCollectionTime;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+@Mapper
+@Component
+public interface TbCollectionTimeMapperCust {
+
+    TbCollectionTime findByName(String name);
+
+}

+ 22 - 0
gis_wall/src/main/java/com/gis/wall/mapper/TbCollectionTypeMapper.java

@@ -0,0 +1,22 @@
+package com.gis.wall.mapper;
+
+
+import com.gis.wall.pojo.TbCollectionType;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+@Mapper
+@Component
+public interface TbCollectionTypeMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(TbCollectionType record);
+
+    int insertSelective(TbCollectionType record);
+
+    TbCollectionType selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(TbCollectionType record);
+
+    int updateByPrimaryKey(TbCollectionType record);
+}

+ 14 - 0
gis_wall/src/main/java/com/gis/wall/mapper/TbCollectionTypeMapperCust.java

@@ -0,0 +1,14 @@
+package com.gis.wall.mapper;
+
+
+import com.gis.wall.pojo.TbCollectionType;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+@Mapper
+@Component
+public interface TbCollectionTypeMapperCust {
+
+    TbCollectionType findByName(String name);
+
+}

+ 74 - 0
gis_wall/src/main/java/com/gis/wall/pojo/TbCollection.java

@@ -0,0 +1,74 @@
+package com.gis.wall.pojo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class TbCollection {
+    private Long id;
+
+    private String name;
+
+    private Long typeId;
+
+    private Long timeId;
+
+    private Date discoveryTime;
+
+    private Date repairTime;
+
+    private String venue;
+
+    private String unityPic;
+
+    private String unityUrl;
+
+    private String pic;
+
+    private String modelUrl;
+
+    private String contentUrl;
+
+    private Integer state;
+
+    private Date createTime;
+
+    private String description;
+
+    private String num;
+
+    private Integer likeNum;
+
+    private Integer openNum;
+
+    private Integer searchNum;
+
+    private Integer downloadNum;
+
+
+
+
+    @ApiModelProperty(value = "图片")
+    private String icon;
+
+    @ApiModelProperty(value = "目录code", notes = "上传文件使用")
+    private String dirCode;
+
+    @ApiModelProperty(value = "访问量")
+    private String visit;
+
+
+    // 2021-09-22
+    @ApiModelProperty(value = "类型: 2D 、 3D")
+    private String type;
+
+    @ApiModelProperty(value = "轮播板式", notes = "数组转字符串存储")
+    private String urlList;
+
+    @ApiModelProperty(value = "二维码")
+    private String qrCode;
+
+
+}

+ 45 - 0
gis_wall/src/main/java/com/gis/wall/pojo/TbCollectionTime.java

@@ -0,0 +1,45 @@
+package com.gis.wall.pojo;
+
+import java.util.Date;
+
+public class TbCollectionTime {
+    private Long id;
+
+    private String name;
+
+    private Integer state;
+
+    private Date createTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

+ 45 - 0
gis_wall/src/main/java/com/gis/wall/pojo/TbCollectionType.java

@@ -0,0 +1,45 @@
+package com.gis.wall.pojo;
+
+import java.util.Date;
+
+public class TbCollectionType {
+    private Long id;
+
+    private String name;
+
+    private Integer state;
+
+    private Date createTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

+ 15 - 0
gis_wall/src/main/java/com/gis/wall/request/RequestBase.java

@@ -0,0 +1,15 @@
+package com.gis.wall.request;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class RequestBase implements Serializable {
+
+    private int pageNum;
+
+    private int pageSize;
+
+    private int start;
+}

+ 60 - 0
gis_wall/src/main/java/com/gis/wall/request/RequestCollection.java

@@ -0,0 +1,60 @@
+package com.gis.wall.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Created by Hb_zzZ on 2019/9/11.
+ */
+@Data
+public class RequestCollection extends RequestBase{
+
+    private Long id;
+
+    private String name;
+
+    private Long typeId;
+
+    private Long timeId;
+
+    private Date discoveryTime;
+
+    private Date repairTime;
+
+    private String venue;
+
+    private String modelUrl;
+
+    private String contentUrl;
+
+    private Integer state;
+
+    private String description;
+
+    private String pic;
+
+    private String num;
+
+    private String unityPic;
+
+    private String unityUrl;
+
+    // 图片 2021-08-02
+    @ApiModelProperty(value = "图片")
+    private String icon;
+
+    @ApiModelProperty(value = "目录code", notes = "上传文件使用")
+    private String dirCode;
+
+    // 2021-09-22
+    @ApiModelProperty(value = "类型: 2D 、 3D")
+    private String type;
+
+    @ApiModelProperty(value = "轮播板式")
+    private String urlList;
+
+    @ApiModelProperty(value = "二维码")
+    private String qrCode;
+}

+ 71 - 0
gis_wall/src/main/java/com/gis/wall/respon/ResponCollection.java

@@ -0,0 +1,71 @@
+package com.gis.wall.respon;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by Hb_zzZ on 2019/9/11.
+ */
+@Data
+public class ResponCollection {
+
+    private Long id;
+
+    private String name;
+
+    private Long typeId;
+
+    private Long timeId;
+
+    private String discoveryTime;
+
+    private String repairTime;
+
+    private String venue;
+
+    private String modelUrl;
+
+    private String contentUrl;
+
+    private Integer state;
+
+    private String description;
+
+    private String typeName;
+
+    private String timeName;
+
+    private String pic;
+
+    private String num;
+
+    private Integer likeNum;
+
+    private Integer openNum;
+
+    private Integer searchNum;
+
+    private Integer downloadNum;
+
+    private String unityPic;
+
+    private String unityUrl;
+
+    // 图片 2021-08-02
+    @ApiModelProperty(value = "图片")
+    private String icon;
+
+    @ApiModelProperty(value = "目录code", notes = "上传文件使用")
+    private String dirCode;
+
+
+    // 2021-09-22
+    @ApiModelProperty(value = "类型: 2D 、 3D")
+    private String type;
+
+    @ApiModelProperty(value = "轮播板式")
+    private String urlList;
+
+    @ApiModelProperty(value = "二维码")
+    private String qrCode;
+}

+ 45 - 0
gis_wall/src/main/java/com/gis/wall/respon/ResponExhibition.java

@@ -0,0 +1,45 @@
+package com.gis.wall.respon;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by Hb_zzZ on 2019/9/12.
+ */
+@Data
+public class ResponExhibition {
+
+    private Long id;
+
+    private String name;
+
+    private Long typeId;
+
+    private Long equipmentId;
+
+    private Integer state;
+
+    private String description;
+
+    private Long exhibitionId;
+
+    private Long collectionId;
+
+    private String collectionName;
+
+    private String typeName;
+
+    private String timeName;
+
+    private String equipmentName;
+
+    private String createTime;
+
+    private List<ResponCollection> collectionList;
+
+    private String webUrl;
+
+    private Long openNum;
+
+}

+ 31 - 0
gis_wall/src/main/java/com/gis/wall/respon/ResponStatistics.java

@@ -0,0 +1,31 @@
+package com.gis.wall.respon;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Hb_zzZ on 2020/9/11.
+ */
+@Data
+public class ResponStatistics {
+
+    private Long total;
+
+    private Long likeTotal;
+
+    private Long downloadNum;
+
+    private Long exhibitionTotal;
+
+    private List<ResponExhibition> exhibitionList;
+
+    List<ResponCollection> collectionSearchList;
+
+    List<ResponCollection> collectionLikeList;
+
+    List<ResponCollection> collectionOpenList;
+
+    List<Map<String, Object>> collectionTypeTotal;
+}

+ 56 - 0
gis_wall/src/main/java/com/gis/wall/service/ICollectionService.java

@@ -0,0 +1,56 @@
+package com.gis.wall.service;
+
+import com.gis.common.util.Result;
+import com.gis.wall.pojo.TbCollection;
+import com.gis.wall.pojo.TbCollectionTime;
+import com.gis.wall.pojo.TbCollectionType;
+import com.gis.wall.request.RequestCollection;
+import com.gis.wall.respon.ResponCollection;
+import com.gis.wall.respon.ResponStatistics;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Hb_zzZ on 2019/9/11.
+ */
+public interface ICollectionService {
+
+    List<TbCollectionType> typeList(RequestCollection bo);
+
+    List<TbCollectionTime> timeList();
+
+    int insert(TbCollection bo);
+
+    int update(TbCollection bo);
+
+    ResponCollection findById(Long id);
+
+    List<ResponCollection> findList(RequestCollection bo);
+
+    int addLikeNumById(Long id);
+
+//    Result importCollection(String fileUrl);
+
+    List<ResponCollection> searchCollection(RequestCollection bo);
+
+    int addSearchNum(Long id);
+
+    int addDownloadNum(Long id);
+
+    ResponStatistics collectionTotal();
+
+    List<ResponCollection> findListOrderBy(Map<String, String> map);
+
+    List<Map<String, Object>> typeTotal();
+
+    int deleteById(Long id);
+
+    Result uploadCode(MultipartFile file, String code);
+
+    Result addVisit(Long id);
+
+
+    Long countVisit();
+}

+ 283 - 0
gis_wall/src/main/java/com/gis/wall/service/impl/CollectionServiceImpl.java

@@ -0,0 +1,283 @@
+package com.gis.wall.service.impl;
+
+import cn.hutool.core.io.FileUtil;
+import com.gis.common.constant.ConfigConstant;
+import com.gis.common.util.Result;
+import com.gis.wall.mapper.*;
+import com.gis.wall.pojo.TbCollection;
+import com.gis.wall.pojo.TbCollectionTime;
+import com.gis.wall.pojo.TbCollectionType;
+import com.gis.wall.request.RequestCollection;
+import com.gis.wall.respon.ResponCollection;
+import com.gis.wall.respon.ResponStatistics;
+import com.gis.wall.service.ICollectionService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.util.StringUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Hb_zzZ on 2019/9/11.
+ */
+@Slf4j
+@Service
+public class CollectionServiceImpl implements ICollectionService {
+
+    @Autowired
+    private TbCollectionMapper mapper;
+
+    @Autowired
+    private TbCollectionMapperCust mapperCust;
+
+    @Autowired
+    private TbCollectionTypeMapper typeMapper;
+
+    @Autowired
+    private TbCollectionTypeMapperCust typeMapperCust;
+
+    @Autowired
+    private TbCollectionTimeMapper timeMapper;
+
+    @Autowired
+    private TbCollectionTimeMapperCust timeMapperCust;
+
+//    @Autowired
+//    private TbExhibitionCollectionMapperCust exhibitionCollectionMapperCust;
+
+    @Autowired
+    ConfigConstant configConstant;
+
+    @Override
+    public List<TbCollectionType> typeList(RequestCollection bo) {
+        return mapperCust.typeList(bo);
+    }
+
+    @Override
+    public List<TbCollectionTime> timeList() {
+        return mapperCust.timeList();
+    }
+
+    @Override
+    public int insert(TbCollection bo) {
+        return mapper.insertSelective(bo);
+    }
+
+    @Override
+    public int update(TbCollection bo) {
+        return mapper.updateByPrimaryKeySelective(bo);
+    }
+
+    @Override
+    public ResponCollection findById(Long id) {
+        TbCollection collection = mapper.selectByPrimaryKey(id);
+        if(collection == null){
+            return null;
+        }
+        ResponCollection result = new ResponCollection();
+        BeanUtils.copyProperties(collection, result);
+//        String typeImages = collection.getTypeImages();
+//        if (StringUtils.isNotBlank(typeImages)){
+//            List<String> images = Arrays.asList(StrUtil.split(typeImages, ","));
+//            result.setTypeImages(images);
+//        }
+        TbCollectionType type = typeMapper.selectByPrimaryKey(collection.getTypeId());
+        if(type != null){
+            result.setTypeName(type.getName());
+        }
+
+        TbCollectionTime time = timeMapper.selectByPrimaryKey(collection.getTimeId());
+        if(time != null){
+            result.setTimeName(time.getName());
+        }
+
+        if(collection.getDiscoveryTime() != null){
+            result.setDiscoveryTime(String.valueOf(collection.getDiscoveryTime().getTime()));
+        }
+        if(collection.getRepairTime() != null){
+            result.setRepairTime(String.valueOf(collection.getRepairTime().getTime()));
+        }
+
+        mapperCust.addOpenNumById(id);
+
+        return result;
+    }
+
+
+
+    @Override
+    public List<ResponCollection> findList(RequestCollection bo) {
+        if(bo == null){
+            bo = new RequestCollection();
+            bo.setState(0);
+            return mapperCust.findList(bo);
+        }
+        int pageNum = bo.getPageNum() == 0? 1: bo.getPageNum();
+        int pageSize = bo.getPageSize() == 0? 10: bo.getPageSize();
+        PageHelper.startPage(pageNum, pageSize);
+
+        return mapperCust.findList(bo);
+    }
+
+    @Override
+    public int addLikeNumById(Long id) {
+        return mapperCust.addLikeNumById(id);
+    }
+
+//    @Override
+//    public Result importCollection(String fileUrl) {
+//        TbCollection collection = null;
+//        TbCollectionType collectionType = null;
+//        TbCollectionTime collectionTime = null;
+//        StringBuilder error = new StringBuilder();
+//        StringBuilder errorNum = new StringBuilder("");
+//
+//        ImportExeclUtil poi = new ImportExeclUtil();
+//        List<List<String>> list = poi.read(fileUrl);
+//        if (list != null) {
+//            for (int i = 0; i < list.size(); i++) {
+//                List<String> cellList = list.get(i);
+//                if(i == 0){
+//                    continue;
+//                }
+////                if(cellList.size() < 7){
+//                if(cellList.size() < 6){
+//                    return Result.failure("导入数据根式不正常");
+//                }
+//                if(StringUtil.isEmpty(cellList.get(0).toString().trim()) ||
+//                        StringUtil.isEmpty(cellList.get(1).toString().trim()) ||
+//                        StringUtil.isEmpty(cellList.get(2).toString().trim()) ||
+//                        StringUtil.isEmpty(cellList.get(3).toString().trim()) ||
+//                        StringUtil.isEmpty(cellList.get(4).toString().trim())){
+//                    errorNum.append(cellList.get(0).toString().trim()).append(";");
+//                    continue;
+//                }
+//
+//                collection = mapperCust.findByName(cellList.get(1).toString().trim());
+//                collectionType = typeMapperCust.findByName(cellList.get(2).toString().trim());
+//                collectionTime = timeMapperCust.findByName(cellList.get(3).toString().trim());
+//                if(collectionType == null || collectionTime == null){
+//                    errorNum.append(cellList.get(0).toString().trim()).append(";");
+//                    continue;
+//                }
+//                if(collection == null){
+//                    collection = new TbCollection();
+//                    collection.setName(cellList.get(1).toString().trim());
+//                    collection.setTypeId(collectionType.getId());
+//                    collection.setTimeId(collectionTime.getId());
+//                    collection.setNum(cellList.get(4).toString().trim());
+//                    collection.setDescription(cellList.get(5).toString().trim());
+//                    collection.setCreateTime(new Date());
+//                    mapper.insertSelective(collection);
+//                    continue;
+//                }
+//                collection.setName(cellList.get(1).toString().trim());
+//                collection.setTypeId(collectionType.getId());
+//                collection.setTimeId(collectionTime.getId());
+//                collection.setNum(cellList.get(4).toString().trim());
+//                collection.setDescription(cellList.get(5).toString().trim());
+//                mapper.updateByPrimaryKeySelective(collection);
+//            }
+//
+//        }
+//        if(StringUtil.isNotEmpty(errorNum.toString())){
+//            error.append("序号").append(errorNum.toString()).append("内容导入失败");
+//            return Result.failure(error.toString());
+//        }
+//        return Result.success();
+//    }
+
+    @Override
+    public List<ResponCollection> searchCollection(RequestCollection bo) {
+        return mapperCust.searchListByName(bo);
+    }
+
+    @Override
+    public int addSearchNum(Long id) {
+        return mapperCust.addSearchNumById(id);
+    }
+
+    @Override
+    public int addDownloadNum(Long id) {
+        return mapperCust.addDownloadNumById(id);
+    }
+
+    @Override
+    public ResponStatistics collectionTotal() {
+        return mapperCust.collectionTotal();
+    }
+
+    @Override
+    public List<ResponCollection> findListOrderBy(Map<String, String> map) {
+        return mapperCust.findListOrderBy(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> typeTotal() {
+        return mapperCust.typeTotal();
+    }
+
+//    @Override
+//    public int deleteById(Long id) {
+//        exhibitionCollectionMapperCust.deleteByCollectionId(id);
+//        return mapper.deleteByPrimaryKey(id);
+//    }
+
+        @Override
+    public int deleteById(Long id) {
+        return mapper.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public Result uploadCode(MultipartFile file, String code) {
+
+        if(file == null){
+            return Result.failure("参数不能为空");
+        }
+
+        // 拦截非法文件
+        List<String> legalSuffix = Arrays.asList("obj","png","ab");
+        String originalFilename = file.getOriginalFilename();
+        String suffix = StringUtils.substringAfterLast(originalFilename, ".");
+        suffix = StringUtils.lowerCase(suffix);
+
+        if (!legalSuffix.contains(suffix)){
+            return Result.failure(3001, "非法文件");
+        }
+
+        String filePath = "/collection/unity/" + code +"/" +  originalFilename;
+        String savePath = configConstant.serverBasePath + filePath;
+        try {
+            FileUtil.writeFromStream(file.getInputStream(), savePath);
+            log.info("图片地址:" + savePath);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return Result.success((Object)filePath);
+    }
+
+    @Override
+    public Result addVisit(Long id) {
+        mapper.addVisit(id);
+        return Result.success();
+    }
+
+    @Override
+    public Long countVisit() {
+        return mapper.countVisit();
+    }
+
+    public static void main(String[] args) {
+        CollectionServiceImpl service = new CollectionServiceImpl();
+
+//        service.importCollection("F:\\文档\\下载\\高淳文物导入模板.xlsx");
+    }
+}

+ 43 - 0
gis_wall/src/main/resources/b/SceneMapper.xml

@@ -0,0 +1,43 @@
+<!--<?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.fdage.dao.base.SceneMapper">-->
+  <!--<resultMap id="BaseResultMap" type="com.fdage.entity.SceneEntity">-->
+    <!--&lt;!&ndash;<id column="id" jdbcType="BIGINT" property="id" />&ndash;&gt;-->
+    <!--&lt;!&ndash;<result column="name" jdbcType="VARCHAR" property="name" />&ndash;&gt;-->
+  <!--</resultMap>-->
+
+  <!--<select id="findAll" parameterType="java.lang.Long" resultMap="BaseResultMap">-->
+   <!--select * from tb_scene where is_delete=0 order by create_time desc;-->
+  <!--</select>-->
+
+  <!--<select id="findById" parameterType="java.lang.Long" resultMap="BaseResultMap">-->
+   <!--select * from tb_scene where is_delete=0 and id=#{id};-->
+  <!--</select>-->
+
+
+    <!--<insert id="insert" parameterType="com.fdage.entity.SceneEntity">-->
+    <!--insert into tb_scene (-->
+    <!--name, url_scene, thumb, file_name-->
+    <!--)-->
+    <!--values (-->
+    <!--#{name} ,#{urlScene} ,#{thumb} ,#{fileName}-->
+    <!--)-->
+  <!--</insert>-->
+
+
+    <!--<update id="update" parameterType="com.fdage.entity.SceneEntity">-->
+    <!--update tb_scene set-->
+    <!--name=#{name},-->
+    <!--url_scene=#{urlScene},-->
+    <!--thumb=#{thumb},-->
+    <!--file_name=#{fileName},-->
+    <!--update_time=#{updateTime}-->
+   <!--where id=#{id} and is_delete=0;-->
+  <!--</update>-->
+
+
+    <!--<update id="remove" parameterType="com.fdage.entity.SceneEntity">-->
+      <!--update tb_scene set is_delete=1, update_time=NOW() where id=#{id} and is_delete=0;-->
+  <!--</update>-->
+
+<!--</mapper>-->

+ 93 - 0
gis_wall/src/main/resources/b/TbAuthorityMapper.xml

@@ -0,0 +1,93 @@
+<!--<?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.fdage.dao.base.TbAuthorityMapper">-->
+  <!--<resultMap id="BaseResultMap" type="com.fdage.pojo.TbAuthority">-->
+    <!--<id column="id" jdbcType="BIGINT" property="id" />-->
+    <!--<result column="role_id" jdbcType="BIGINT" property="roleId" />-->
+    <!--<result column="menu_id" jdbcType="BIGINT" property="menuId" />-->
+    <!--<result column="state" jdbcType="INTEGER" property="state" />-->
+    <!--<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />-->
+  <!--</resultMap>-->
+  <!--<sql id="Base_Column_List">-->
+    <!--id, role_id, menu_id, state, create_time-->
+  <!--</sql>-->
+  <!--<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">-->
+    <!--select -->
+    <!--<include refid="Base_Column_List" />-->
+    <!--from tb_authority-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</select>-->
+  <!--<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">-->
+    <!--delete from tb_authority-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</delete>-->
+  <!--<insert id="insert" parameterType="com.fdage.pojo.TbAuthority">-->
+    <!--insert into tb_authority (id, role_id, menu_id, -->
+      <!--state, create_time)-->
+    <!--values (#{id,jdbcType=BIGINT}, #{roleId,jdbcType=BIGINT}, #{menuId,jdbcType=BIGINT}, -->
+      <!--#{state,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP})-->
+  <!--</insert>-->
+  <!--<insert id="insertSelective" parameterType="com.fdage.pojo.TbAuthority">-->
+    <!--insert into tb_authority-->
+    <!--<trim prefix="(" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--id,-->
+      <!--</if>-->
+      <!--<if test="roleId != null">-->
+        <!--role_id,-->
+      <!--</if>-->
+      <!--<if test="menuId != null">-->
+        <!--menu_id,-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--state,-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time,-->
+      <!--</if>-->
+    <!--</trim>-->
+    <!--<trim prefix="values (" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--#{id,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="roleId != null">-->
+        <!--#{roleId,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="menuId != null">-->
+        <!--#{menuId,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--#{state,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--#{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+    <!--</trim>-->
+  <!--</insert>-->
+  <!--<update id="updateByPrimaryKeySelective" parameterType="com.fdage.pojo.TbAuthority">-->
+    <!--update tb_authority-->
+    <!--<set>-->
+      <!--<if test="roleId != null">-->
+        <!--role_id = #{roleId,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="menuId != null">-->
+        <!--menu_id = #{menuId,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--state = #{state,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time = #{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+    <!--</set>-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+  <!--<update id="updateByPrimaryKey" parameterType="com.fdage.pojo.TbAuthority">-->
+    <!--update tb_authority-->
+    <!--set role_id = #{roleId,jdbcType=BIGINT},-->
+      <!--menu_id = #{menuId,jdbcType=BIGINT},-->
+      <!--state = #{state,jdbcType=INTEGER},-->
+      <!--create_time = #{createTime,jdbcType=TIMESTAMP}-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+<!--</mapper>-->

+ 106 - 0
gis_wall/src/main/resources/b/TbEquipmentMapper.xml

@@ -0,0 +1,106 @@
+<!--<?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.fdage.dao.base.TbEquipmentMapper">-->
+  <!--<resultMap id="BaseResultMap" type="com.fdage.pojo.TbEquipment">-->
+    <!--<id column="id" jdbcType="BIGINT" property="id" />-->
+    <!--<result column="name" jdbcType="VARCHAR" property="name" />-->
+    <!--<result column="uuid" jdbcType="VARCHAR" property="uuid" />-->
+    <!--<result column="position_id" jdbcType="BIGINT" property="positionId" />-->
+    <!--<result column="state" jdbcType="INTEGER" property="state" />-->
+    <!--<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />-->
+  <!--</resultMap>-->
+  <!--<sql id="Base_Column_List">-->
+    <!--id, name, uuid, position_id, state, create_time-->
+  <!--</sql>-->
+  <!--<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">-->
+    <!--select -->
+    <!--<include refid="Base_Column_List" />-->
+    <!--from tb_equipment-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</select>-->
+  <!--<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">-->
+    <!--delete from tb_equipment-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</delete>-->
+  <!--<insert id="insert" parameterType="com.fdage.pojo.TbEquipment">-->
+    <!--insert into tb_equipment (id, name, uuid, -->
+      <!--position_id, state, create_time-->
+      <!--)-->
+    <!--values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{uuid,jdbcType=VARCHAR}, -->
+      <!--#{positionId,jdbcType=BIGINT}, #{state,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}-->
+      <!--)-->
+  <!--</insert>-->
+  <!--<insert id="insertSelective" parameterType="com.fdage.pojo.TbEquipment">-->
+    <!--insert into tb_equipment-->
+    <!--<trim prefix="(" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--id,-->
+      <!--</if>-->
+      <!--<if test="name != null">-->
+        <!--name,-->
+      <!--</if>-->
+      <!--<if test="uuid != null">-->
+        <!--uuid,-->
+      <!--</if>-->
+      <!--<if test="positionId != null">-->
+        <!--position_id,-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--state,-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time,-->
+      <!--</if>-->
+    <!--</trim>-->
+    <!--<trim prefix="values (" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--#{id,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="name != null">-->
+        <!--#{name,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="uuid != null">-->
+        <!--#{uuid,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="positionId != null">-->
+        <!--#{positionId,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--#{state,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--#{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+    <!--</trim>-->
+  <!--</insert>-->
+  <!--<update id="updateByPrimaryKeySelective" parameterType="com.fdage.pojo.TbEquipment">-->
+    <!--update tb_equipment-->
+    <!--<set>-->
+      <!--<if test="name != null">-->
+        <!--name = #{name,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="uuid != null">-->
+        <!--uuid = #{uuid,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="positionId != null">-->
+        <!--position_id = #{positionId,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--state = #{state,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time = #{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+    <!--</set>-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+  <!--<update id="updateByPrimaryKey" parameterType="com.fdage.pojo.TbEquipment">-->
+    <!--update tb_equipment-->
+    <!--set name = #{name,jdbcType=VARCHAR},-->
+      <!--uuid = #{uuid,jdbcType=VARCHAR},-->
+      <!--position_id = #{positionId,jdbcType=BIGINT},-->
+      <!--state = #{state,jdbcType=INTEGER},-->
+      <!--create_time = #{createTime,jdbcType=TIMESTAMP}-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+<!--</mapper>-->

+ 9 - 0
gis_wall/src/main/resources/b/TbEquipmentMapperCust.xml

@@ -0,0 +1,9 @@
+<!--<?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.fdage.dao.cust.TbEquipmentMapperCust">-->
+  <!--<select id="findList" resultType="com.fdage.respon.ResponEquipment">-->
+    <!--select -->
+      <!--a.id, a.name, a.uuid, a.position_id as positionId, a.state, a.create_time as createTime, b.name as positionName-->
+    <!--from tb_equipment a left join tb_position b on a.position_id = b.id-->
+  <!--</select>-->
+<!--</mapper>-->

+ 93 - 0
gis_wall/src/main/resources/b/TbExhibitionCollectionMapper.xml

@@ -0,0 +1,93 @@
+<!--<?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.fdage.dao.base.TbExhibitionCollectionMapper">-->
+  <!--<resultMap id="BaseResultMap" type="com.fdage.pojo.TbExhibitionCollection">-->
+    <!--<id column="id" jdbcType="BIGINT" property="id" />-->
+    <!--<result column="exhibition_id" jdbcType="BIGINT" property="exhibitionId" />-->
+    <!--<result column="collection_id" jdbcType="BIGINT" property="collectionId" />-->
+    <!--<result column="state" jdbcType="INTEGER" property="state" />-->
+    <!--<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />-->
+  <!--</resultMap>-->
+  <!--<sql id="Base_Column_List">-->
+    <!--id, exhibition_id, collection_id, state, create_time-->
+  <!--</sql>-->
+  <!--<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">-->
+    <!--select -->
+    <!--<include refid="Base_Column_List" />-->
+    <!--from tb_exhibition_collection-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</select>-->
+  <!--<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">-->
+    <!--delete from tb_exhibition_collection-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</delete>-->
+  <!--<insert id="insert" parameterType="com.fdage.pojo.TbExhibitionCollection">-->
+    <!--insert into tb_exhibition_collection (id, exhibition_id, collection_id, -->
+      <!--state, create_time)-->
+    <!--values (#{id,jdbcType=BIGINT}, #{exhibitionId,jdbcType=BIGINT}, #{collectionId,jdbcType=BIGINT}, -->
+      <!--#{state,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP})-->
+  <!--</insert>-->
+  <!--<insert id="insertSelective" parameterType="com.fdage.pojo.TbExhibitionCollection">-->
+    <!--insert into tb_exhibition_collection-->
+    <!--<trim prefix="(" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--id,-->
+      <!--</if>-->
+      <!--<if test="exhibitionId != null">-->
+        <!--exhibition_id,-->
+      <!--</if>-->
+      <!--<if test="collectionId != null">-->
+        <!--collection_id,-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--state,-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time,-->
+      <!--</if>-->
+    <!--</trim>-->
+    <!--<trim prefix="values (" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--#{id,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="exhibitionId != null">-->
+        <!--#{exhibitionId,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="collectionId != null">-->
+        <!--#{collectionId,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--#{state,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--#{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+    <!--</trim>-->
+  <!--</insert>-->
+  <!--<update id="updateByPrimaryKeySelective" parameterType="com.fdage.pojo.TbExhibitionCollection">-->
+    <!--update tb_exhibition_collection-->
+    <!--<set>-->
+      <!--<if test="exhibitionId != null">-->
+        <!--exhibition_id = #{exhibitionId,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="collectionId != null">-->
+        <!--collection_id = #{collectionId,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--state = #{state,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time = #{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+    <!--</set>-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+  <!--<update id="updateByPrimaryKey" parameterType="com.fdage.pojo.TbExhibitionCollection">-->
+    <!--update tb_exhibition_collection-->
+    <!--set exhibition_id = #{exhibitionId,jdbcType=BIGINT},-->
+      <!--collection_id = #{collectionId,jdbcType=BIGINT},-->
+      <!--state = #{state,jdbcType=INTEGER},-->
+      <!--create_time = #{createTime,jdbcType=TIMESTAMP}-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+<!--</mapper>-->

+ 19 - 0
gis_wall/src/main/resources/b/TbExhibitionCollectionMapperCust.xml

@@ -0,0 +1,19 @@
+<!--<?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.fdage.dao.cust.TbExhibitionCollectionMapperCust">-->
+  <!--<delete id="deleteByExhibitionId" parameterType="java.lang.Long">-->
+    <!--delete from tb_exhibition_collection-->
+    <!--where exhibition_id = #{exhibitionId,jdbcType=BIGINT}-->
+  <!--</delete>-->
+
+  <!--<select id="findExhibitionCollection" parameterType="java.lang.Long" resultType="com.fdage.respon.ResponExhibition">-->
+    <!--select exhibition_id as exhibitionId, collection_id as collectionId-->
+    <!--FROM tb_exhibition_collection-->
+    <!--where exhibition_id = #{exhibitionId}-->
+  <!--</select>-->
+
+  <!--<delete id="deleteByCollectionId" parameterType="java.lang.Long">-->
+    <!--delete from tb_exhibition_collection-->
+    <!--where collection_id = #{collectionId,jdbcType=BIGINT}-->
+  <!--</delete>-->
+<!--</mapper>-->

+ 145 - 0
gis_wall/src/main/resources/b/TbExhibitionMapper.xml

@@ -0,0 +1,145 @@
+<!--<?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.fdage.dao.base.TbExhibitionMapper">-->
+  <!--<resultMap id="BaseResultMap" type="com.fdage.pojo.TbExhibition">-->
+    <!--<id column="id" jdbcType="BIGINT" property="id" />-->
+    <!--<result column="name" jdbcType="VARCHAR" property="name" />-->
+    <!--<result column="web_url" jdbcType="VARCHAR" property="webUrl" />-->
+    <!--<result column="type_id" jdbcType="BIGINT" property="typeId" />-->
+    <!--<result column="equipment_id" jdbcType="BIGINT" property="equipmentId" />-->
+    <!--<result column="state" jdbcType="INTEGER" property="state" />-->
+    <!--<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />-->
+  <!--</resultMap>-->
+  <!--<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.fdage.pojo.TbExhibition">-->
+    <!--<result column="description" jdbcType="LONGVARCHAR" property="description" />-->
+  <!--</resultMap>-->
+  <!--<sql id="Base_Column_List">-->
+    <!--id, name,web_url, type_id, equipment_id, state, create_time-->
+  <!--</sql>-->
+  <!--<sql id="Blob_Column_List">-->
+    <!--description-->
+  <!--</sql>-->
+  <!--<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">-->
+    <!--select -->
+    <!--<include refid="Base_Column_List" />-->
+    <!--,-->
+    <!--<include refid="Blob_Column_List" />-->
+    <!--from tb_exhibition-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</select>-->
+  <!--<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">-->
+    <!--delete from tb_exhibition-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</delete>-->
+  <!--<insert id="insert" parameterType="com.fdage.pojo.TbExhibition" useGeneratedKeys="true" keyProperty="id">-->
+    <!--insert into tb_exhibition (id, name, type_id, web_url,-->
+      <!--equipment_id, state, create_time, -->
+      <!--description)-->
+    <!--values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{typeId,jdbcType=BIGINT}, #{webUrl,jdbcType=VARCHAR},-->
+      <!--#{equipmentId,jdbcType=BIGINT}, #{state,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, -->
+      <!--#{description,jdbcType=LONGVARCHAR})-->
+  <!--</insert>-->
+  <!--<insert id="insertSelective" parameterType="com.fdage.pojo.TbExhibition" useGeneratedKeys="true" keyProperty="id">-->
+    <!--insert into tb_exhibition-->
+    <!--<trim prefix="(" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--id,-->
+      <!--</if>-->
+      <!--<if test="name != null">-->
+        <!--name,-->
+      <!--</if>-->
+      <!--<if test="typeId != null">-->
+        <!--type_id,-->
+      <!--</if>-->
+      <!--<if test="webUrl != null">-->
+        <!--web_url,-->
+      <!--</if>-->
+      <!--<if test="equipmentId != null">-->
+        <!--equipment_id,-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--state,-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time,-->
+      <!--</if>-->
+      <!--<if test="description != null">-->
+        <!--description,-->
+      <!--</if>-->
+    <!--</trim>-->
+    <!--<trim prefix="values (" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--#{id,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="name != null">-->
+        <!--#{name,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="typeId != null">-->
+        <!--#{typeId,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="webUrl != null">-->
+        <!--#{webUrl,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="equipmentId != null">-->
+        <!--#{equipmentId,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--#{state,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--#{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+      <!--<if test="description != null">-->
+        <!--#{description,jdbcType=LONGVARCHAR},-->
+      <!--</if>-->
+    <!--</trim>-->
+  <!--</insert>-->
+  <!--<update id="updateByPrimaryKeySelective" parameterType="com.fdage.pojo.TbExhibition">-->
+    <!--update tb_exhibition-->
+    <!--<set>-->
+      <!--<if test="name != null">-->
+        <!--name = #{name,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="typeId != null">-->
+        <!--type_id = #{typeId,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="webUrl != null">-->
+        <!--web_url = #{webUrl,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="equipmentId != null">-->
+        <!--equipment_id = #{equipmentId,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--state = #{state,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time = #{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+      <!--<if test="description != null">-->
+        <!--description = #{description,jdbcType=LONGVARCHAR},-->
+      <!--</if>-->
+    <!--</set>-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+  <!--<update id="updateByPrimaryKeyWithBLOBs" parameterType="com.fdage.pojo.TbExhibition">-->
+    <!--update tb_exhibition-->
+    <!--set name = #{name,jdbcType=VARCHAR},-->
+      <!--type_id = #{typeId,jdbcType=BIGINT},-->
+      <!--web_url = #{webUrl,jdbcType=VARCHAR},-->
+      <!--equipment_id = #{equipmentId,jdbcType=BIGINT},-->
+      <!--state = #{state,jdbcType=INTEGER},-->
+      <!--create_time = #{createTime,jdbcType=TIMESTAMP},-->
+      <!--description = #{description,jdbcType=LONGVARCHAR}-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+  <!--<update id="updateByPrimaryKey" parameterType="com.fdage.pojo.TbExhibition">-->
+    <!--update tb_exhibition-->
+    <!--set name = #{name,jdbcType=VARCHAR},-->
+      <!--type_id = #{typeId,jdbcType=BIGINT},-->
+      <!--web_url = #{webUrl,jdbcType=VARCHAR},-->
+      <!--equipment_id = #{equipmentId,jdbcType=BIGINT},-->
+      <!--state = #{state,jdbcType=INTEGER},-->
+      <!--create_time = #{createTime,jdbcType=TIMESTAMP}-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+<!--</mapper>-->

+ 62 - 0
gis_wall/src/main/resources/b/TbExhibitionMapperCust.xml

@@ -0,0 +1,62 @@
+<!--<?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.fdage.dao.cust.TbExhibitionMapperCust">-->
+    <!--<select id="findCollectionByExhibition" parameterType="java.lang.Long" resultType="com.fdage.respon.ResponExhibition">-->
+        <!--select b.name, c.name as timeName, d.name as typeName, b.id-->
+        <!--FROM tb_exhibition_collection a LEFT JOIN tb_collection b ON a.collection_id = b.id-->
+        <!--LEFT JOIN tb_collection_time c ON b.time_id = c.id-->
+        <!--LEFT JOIN tb_exhibition_type d on b.type_id = d.id-->
+        <!--where a.exhibition_id = #{id}-->
+    <!--</select>-->
+
+    <!--<select id="findList" parameterType="com.fdage.request.RequestExhibition" resultType="com.fdage.respon.ResponExhibition">-->
+        <!--select a.id, a.name , b.name as equipmentName, c.name as typeName, a.create_time as createTime, a.state,-->
+          <!--b.id as equipmentId, c.id as typeId, a.description, a.web_url as webUrl-->
+        <!--FROM tb_exhibition a LEFT JOIN tb_equipment b ON a.equipment_id = b.id-->
+        <!--LEFT JOIN tb_exhibition_type c on a.type_id = c.id-->
+        <!--where 1 = 1-->
+        <!--<if test="name != null and name != ''">-->
+            <!--and a.name LIKE CONCAT('%', #{name}, '%')-->
+        <!--</if>-->
+        <!--<if test="state != null">-->
+            <!--and a.state = #{state}-->
+        <!--</if>-->
+    <!--</select>-->
+
+    <!--<select id="getExhibitionByEquipmentId" parameterType="java.lang.Long" resultType="com.fdage.respon.ResponExhibition">-->
+        <!--select a.id, a.name , b.name as equipmentName, c.name as typeName, a.create_time as createTime, a.state, a.web_url as webUrl-->
+        <!--FROM tb_exhibition a LEFT JOIN tb_equipment b ON a.equipment_id = b.id-->
+        <!--LEFT JOIN tb_exhibition_type c on a.type_id = c.id-->
+        <!--where a.state = 0 and a.equipment_id = #{id}-->
+    <!--</select>-->
+
+    <!--<update id="updateStateByEquipmentId" parameterType="java.lang.Long">-->
+        <!--update tb_exhibition-->
+        <!--set state = 1-->
+        <!--where equipment_id = #{id,jdbcType=BIGINT}-->
+    <!--</update>-->
+
+    <!--<select id="typeList" resultType="com.fdage.pojo.TbExhibitionType">-->
+        <!--select id, name-->
+        <!--from tb_exhibition_type-->
+    <!--</select>-->
+
+    <!--<update id="addOpenNum" parameterType="java.lang.Long">-->
+        <!--update tb_exhibition-->
+        <!--set open_num = open_num + 1-->
+        <!--where id = #{id,jdbcType=BIGINT}-->
+    <!--</update>-->
+
+    <!--<select id="exhibitionTotal" resultType="java.lang.Long">-->
+        <!--SELECT COUNT(DISTINCT(collection_id))-->
+        <!--FROM `tb_exhibition_collection`-->
+    <!--</select>-->
+
+    <!--<select id="findListOrderBy" resultType="com.fdage.respon.ResponExhibition">-->
+        <!--select a.id, a.name , b.name as equipmentName, c.name as typeName, a.create_time as createTime, a.state,-->
+        <!--b.id as equipmentId, c.id as typeId, a.description, a.web_url as webUrl, a.open_num as openNum-->
+        <!--FROM tb_exhibition a LEFT JOIN tb_equipment b ON a.equipment_id = b.id-->
+        <!--LEFT JOIN tb_exhibition_type c on a.type_id = c.id-->
+        <!--ORDER BY a.open_num desc-->
+    <!--</select>-->
+<!--</mapper>-->

+ 82 - 0
gis_wall/src/main/resources/b/TbExhibitionTypeMapper.xml

@@ -0,0 +1,82 @@
+<!--<?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.fdage.dao.base.TbExhibitionTypeMapper">-->
+  <!--<resultMap id="BaseResultMap" type="com.fdage.pojo.TbExhibitionType">-->
+    <!--<id column="id" jdbcType="BIGINT" property="id" />-->
+    <!--<result column="name" jdbcType="VARCHAR" property="name" />-->
+    <!--<result column="state" jdbcType="INTEGER" property="state" />-->
+    <!--<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />-->
+  <!--</resultMap>-->
+  <!--<sql id="Base_Column_List">-->
+    <!--id, name, state, create_time-->
+  <!--</sql>-->
+  <!--<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">-->
+    <!--select -->
+    <!--<include refid="Base_Column_List" />-->
+    <!--from tb_exhibition_type-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</select>-->
+  <!--<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">-->
+    <!--delete from tb_exhibition_type-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</delete>-->
+  <!--<insert id="insert" parameterType="com.fdage.pojo.TbExhibitionType">-->
+    <!--insert into tb_exhibition_type (id, name, state, -->
+      <!--create_time)-->
+    <!--values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, -->
+      <!--#{createTime,jdbcType=TIMESTAMP})-->
+  <!--</insert>-->
+  <!--<insert id="insertSelective" parameterType="com.fdage.pojo.TbExhibitionType">-->
+    <!--insert into tb_exhibition_type-->
+    <!--<trim prefix="(" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--id,-->
+      <!--</if>-->
+      <!--<if test="name != null">-->
+        <!--name,-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--state,-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time,-->
+      <!--</if>-->
+    <!--</trim>-->
+    <!--<trim prefix="values (" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--#{id,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="name != null">-->
+        <!--#{name,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--#{state,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--#{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+    <!--</trim>-->
+  <!--</insert>-->
+  <!--<update id="updateByPrimaryKeySelective" parameterType="com.fdage.pojo.TbExhibitionType">-->
+    <!--update tb_exhibition_type-->
+    <!--<set>-->
+      <!--<if test="name != null">-->
+        <!--name = #{name,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--state = #{state,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time = #{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+    <!--</set>-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+  <!--<update id="updateByPrimaryKey" parameterType="com.fdage.pojo.TbExhibitionType">-->
+    <!--update tb_exhibition_type-->
+    <!--set name = #{name,jdbcType=VARCHAR},-->
+      <!--state = #{state,jdbcType=INTEGER},-->
+      <!--create_time = #{createTime,jdbcType=TIMESTAMP}-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+<!--</mapper>-->

+ 183 - 0
gis_wall/src/main/resources/b/TbInformationMapper.xml

@@ -0,0 +1,183 @@
+<!--<?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.fdage.dao.base.TbInformationMapper">-->
+  <!--<resultMap id="BaseResultMap" type="com.fdage.pojo.TbInformation">-->
+    <!--<id column="id" jdbcType="BIGINT" property="id" />-->
+    <!--<result column="name" jdbcType="VARCHAR" property="name" />-->
+    <!--<result column="type" jdbcType="INTEGER" property="type" />-->
+    <!--<result column="content_url" jdbcType="VARCHAR" property="contentUrl" />-->
+    <!--<result column="content_num" jdbcType="INTEGER" property="contentNum" />-->
+    <!--<result column="order_num" jdbcType="INTEGER" property="orderNum" />-->
+    <!--<result column="state" jdbcType="INTEGER" property="state" />-->
+    <!--<result column="start_time" jdbcType="TIMESTAMP" property="startTime" />-->
+    <!--<result column="end_time" jdbcType="TIMESTAMP" property="endTime" />-->
+    <!--<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />-->
+  <!--</resultMap>-->
+  <!--<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.fdage.pojo.TbInformation">-->
+    <!--<result column="description" jdbcType="LONGVARCHAR" property="description" />-->
+  <!--</resultMap>-->
+  <!--<sql id="Base_Column_List">-->
+    <!--id, name, type, content_url, content_num, order_num, state, start_time, end_time, create_time-->
+  <!--</sql>-->
+  <!--<sql id="Blob_Column_List">-->
+    <!--description-->
+  <!--</sql>-->
+  <!--<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">-->
+    <!--select -->
+    <!--<include refid="Base_Column_List" />-->
+    <!--,-->
+    <!--<include refid="Blob_Column_List" />-->
+    <!--from tb_information-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</select>-->
+  <!--<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">-->
+    <!--delete from tb_information-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</delete>-->
+  <!--<insert id="insert" parameterType="com.fdage.pojo.TbInformation">-->
+    <!--insert into tb_information (id, name, type, -->
+      <!--content_url, content_num, order_num, state,-->
+      <!--start_time, end_time, create_time, -->
+      <!--description)-->
+    <!--values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, -->
+      <!--#{contentUrl,jdbcType=VARCHAR}, #{contentNum,jdbcType=INTEGER}, #{orderNum,jdbcType=INTEGER}, #{state,jdbcType=INTEGER},-->
+      <!--#{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, -->
+      <!--#{description,jdbcType=LONGVARCHAR})-->
+  <!--</insert>-->
+  <!--<insert id="insertSelective" parameterType="com.fdage.pojo.TbInformation">-->
+    <!--insert into tb_information-->
+    <!--<trim prefix="(" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--id,-->
+      <!--</if>-->
+      <!--<if test="name != null">-->
+        <!--name,-->
+      <!--</if>-->
+      <!--<if test="type != null">-->
+        <!--type,-->
+      <!--</if>-->
+      <!--<if test="contentUrl != null">-->
+        <!--content_url,-->
+      <!--</if>-->
+      <!--<if test="contentNum != null">-->
+        <!--content_num,-->
+      <!--</if>-->
+      <!--<if test="orderNum != null">-->
+        <!--order_num,-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--state,-->
+      <!--</if>-->
+      <!--<if test="startTime != null">-->
+        <!--start_time,-->
+      <!--</if>-->
+      <!--<if test="endTime != null">-->
+        <!--end_time,-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time,-->
+      <!--</if>-->
+      <!--<if test="description != null">-->
+        <!--description,-->
+      <!--</if>-->
+    <!--</trim>-->
+    <!--<trim prefix="values (" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--#{id,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="name != null">-->
+        <!--#{name,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="type != null">-->
+        <!--#{type,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="contentUrl != null">-->
+        <!--#{contentUrl,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="contentNum != null">-->
+        <!--#{contentNum,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="orderNum != null">-->
+        <!--#{orderNum,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--#{state,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="startTime != null">-->
+        <!--#{startTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+      <!--<if test="endTime != null">-->
+        <!--#{endTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--#{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+      <!--<if test="description != null">-->
+        <!--#{description,jdbcType=LONGVARCHAR},-->
+      <!--</if>-->
+    <!--</trim>-->
+  <!--</insert>-->
+  <!--<update id="updateByPrimaryKeySelective" parameterType="com.fdage.pojo.TbInformation">-->
+    <!--update tb_information-->
+    <!--<set>-->
+      <!--<if test="name != null">-->
+        <!--name = #{name,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="type != null">-->
+        <!--type = #{type,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="contentUrl != null">-->
+        <!--content_url = #{contentUrl,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="contentNum != null">-->
+        <!--content_num = #{contentNum,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="orderNum != null">-->
+        <!--order_num = #{orderNum,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--state = #{state,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="startTime != null">-->
+        <!--start_time = #{startTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+      <!--<if test="endTime != null">-->
+        <!--end_time = #{endTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time = #{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+      <!--<if test="description != null">-->
+        <!--description = #{description,jdbcType=LONGVARCHAR},-->
+      <!--</if>-->
+    <!--</set>-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+  <!--<update id="updateByPrimaryKeyWithBLOBs" parameterType="com.fdage.pojo.TbInformation">-->
+    <!--update tb_information-->
+    <!--set name = #{name,jdbcType=VARCHAR},-->
+      <!--type = #{type,jdbcType=INTEGER},-->
+      <!--content_url = #{contentUrl,jdbcType=VARCHAR},-->
+      <!--content_num = #{contentNum,jdbcType=INTEGER},-->
+      <!--order_num = #{orderNum,jdbcType=INTEGER},-->
+      <!--state = #{state,jdbcType=INTEGER},-->
+      <!--start_time = #{startTime,jdbcType=TIMESTAMP},-->
+      <!--end_time = #{endTime,jdbcType=TIMESTAMP},-->
+      <!--create_time = #{createTime,jdbcType=TIMESTAMP},-->
+      <!--description = #{description,jdbcType=LONGVARCHAR}-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+  <!--<update id="updateByPrimaryKey" parameterType="com.fdage.pojo.TbInformation">-->
+    <!--update tb_information-->
+    <!--set name = #{name,jdbcType=VARCHAR},-->
+      <!--type = #{type,jdbcType=INTEGER},-->
+      <!--content_url = #{contentUrl,jdbcType=VARCHAR},-->
+      <!--content_num = #{contentNum,jdbcType=INTEGER},-->
+      <!--order_num = #{orderNum,jdbcType=INTEGER},-->
+      <!--state = #{state,jdbcType=INTEGER},-->
+      <!--start_time = #{startTime,jdbcType=TIMESTAMP},-->
+      <!--end_time = #{endTime,jdbcType=TIMESTAMP},-->
+      <!--create_time = #{createTime,jdbcType=TIMESTAMP}-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+<!--</mapper>-->

+ 21 - 0
gis_wall/src/main/resources/b/TbInformationMapperCust.xml

@@ -0,0 +1,21 @@
+<!--<?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.fdage.dao.cust.TbInformationMapperCust">-->
+  <!--<select id="findList" parameterType="com.fdage.request.RequestInformation" resultType="com.fdage.respon.ResponInformation">-->
+    <!--select-->
+      <!--id, name, type, content_url as contentUrl, content_num as contentNum, order_num as orderNum, state, start_time as startTime,-->
+      <!--end_time as endTime, create_time as createTime, description-->
+    <!--from tb_information-->
+    <!--where 1 = 1-->
+    <!--<if test="type != null">-->
+      <!--and type = #{type}-->
+    <!--</if>-->
+    <!--<if test="name != null and name != ''">-->
+      <!--and name like CONCAT('%', #{name}, '%')-->
+    <!--</if>-->
+    <!--<if test="state != null">-->
+      <!--and state = #{state}-->
+    <!--</if>-->
+    <!--ORDER BY order_num, create_time DESC-->
+  <!--</select>-->
+<!--</mapper>-->

+ 104 - 0
gis_wall/src/main/resources/b/TbLogMapper.xml

@@ -0,0 +1,104 @@
+<!--<?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.fdage.dao.base.TbLogMapper">-->
+  <!--<resultMap id="BaseResultMap" type="com.fdage.pojo.TbLog">-->
+    <!--<id column="id" jdbcType="BIGINT" property="id" />-->
+    <!--<result column="user_id" jdbcType="BIGINT" property="userId" />-->
+    <!--<result column="type" jdbcType="VARCHAR" property="type" />-->
+    <!--<result column="description" jdbcType="VARCHAR" property="description" />-->
+    <!--<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />-->
+    <!--<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />-->
+  <!--</resultMap>-->
+  <!--<sql id="Base_Column_List">-->
+    <!--id, user_id, type, description, update_time, create_time-->
+  <!--</sql>-->
+  <!--<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">-->
+    <!--select -->
+    <!--<include refid="Base_Column_List" />-->
+    <!--from tb_log-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</select>-->
+  <!--<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">-->
+    <!--delete from tb_log-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</delete>-->
+  <!--<insert id="insert" parameterType="com.fdage.pojo.TbUser">-->
+    <!--insert into tb_log (id, user_id, type, description, update_time, create_time)-->
+    <!--values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR},-->
+      <!--#{description,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP})-->
+  <!--</insert>-->
+  <!--<insert id="insertSelective" parameterType="com.fdage.pojo.TbUser">-->
+    <!--insert into tb_log-->
+    <!--<trim prefix="(" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--id,-->
+      <!--</if>-->
+      <!--<if test="userId != null">-->
+        <!--user_id,-->
+      <!--</if>-->
+      <!--<if test="description != null">-->
+        <!--description,-->
+      <!--</if>-->
+      <!--<if test="type != null">-->
+        <!--type,-->
+      <!--</if>-->
+      <!--<if test="updateTime != null">-->
+        <!--update_time,-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time,-->
+      <!--</if>-->
+    <!--</trim>-->
+    <!--<trim prefix="values (" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--#{id,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="userId != null">-->
+        <!--#{userId,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="description != null">-->
+        <!--#{description,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="type != null">-->
+        <!--#{type,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="updateTime != null">-->
+        <!--#{updateTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--#{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+    <!--</trim>-->
+  <!--</insert>-->
+  <!--<update id="updateByPrimaryKeySelective" parameterType="com.fdage.pojo.TbUser">-->
+    <!--update tb_log-->
+    <!--<set>-->
+      <!--<if test="userId != null">-->
+        <!--user_id = #{userId,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="description != null">-->
+        <!--description = #{password,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="type != null">-->
+        <!--type = #{type,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="updateTime != null">-->
+        <!--update_time = #{updateTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time = #{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+    <!--</set>-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+  <!--<update id="updateByPrimaryKey" parameterType="com.fdage.pojo.TbUser">-->
+    <!--update tb_log-->
+    <!--set-->
+      <!--user_id = #{userId,jdbcType=BIGINT},-->
+      <!--description = #{description,jdbcType=VARCHAR},-->
+      <!--type = #{type,jdbcType=VARCHAR},-->
+      <!--update_time = #{updateTime,jdbcType=TIMESTAMP},-->
+      <!--create_time = #{createTime,jdbcType=TIMESTAMP}-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+<!--</mapper>-->

+ 18 - 0
gis_wall/src/main/resources/b/TbLogMapperCust.xml

@@ -0,0 +1,18 @@
+<!--<?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.fdage.dao.cust.TbLogMapperCust">-->
+  <!--<select id="findList" parameterType="com.fdage.request.RequestLog" resultType="com.fdage.pojo.TbLog">-->
+    <!--select-->
+    <!--a.id, a.user_id as userId, a.type, a.description, a.update_time AS updateTime,-->
+    <!--a.create_time as createTime, b.user_name as userName-->
+    <!--from tb_log a left join tb_user b on a.user_id = b.id-->
+    <!--where 1 = 1-->
+    <!--<if test="type != null">-->
+      <!--and type like CONCAT('%', #{type}, '%')-->
+    <!--</if>-->
+    <!--<if test="description != null">-->
+      <!--and description like CONCAT('%', #{description}, '%')-->
+    <!--</if>-->
+    <!--ORDER BY id desc-->
+  <!--</select>-->
+<!--</mapper>-->

+ 93 - 0
gis_wall/src/main/resources/b/TbMenuMapper.xml

@@ -0,0 +1,93 @@
+<!--<?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.fdage.dao.base.TbMenuMapper">-->
+  <!--<resultMap id="BaseResultMap" type="com.fdage.pojo.TbMenu">-->
+    <!--<id column="id" jdbcType="BIGINT" property="id" />-->
+    <!--<result column="menu_name" jdbcType="VARCHAR" property="menuName" />-->
+    <!--<result column="parent_id" jdbcType="BIGINT" property="parentId" />-->
+    <!--<result column="type" jdbcType="INTEGER" property="type" />-->
+    <!--<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />-->
+  <!--</resultMap>-->
+  <!--<sql id="Base_Column_List">-->
+    <!--id, menu_name, parent_id, type, create_time-->
+  <!--</sql>-->
+  <!--<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">-->
+    <!--select -->
+    <!--<include refid="Base_Column_List" />-->
+    <!--from tb_menu-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</select>-->
+  <!--<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">-->
+    <!--delete from tb_menu-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</delete>-->
+  <!--<insert id="insert" parameterType="com.fdage.pojo.TbMenu" useGeneratedKeys="true" keyProperty="id">-->
+    <!--insert into tb_menu (id, menu_name, parent_id, -->
+      <!--type, create_time)-->
+    <!--values (#{id,jdbcType=BIGINT}, #{menuName,jdbcType=VARCHAR}, #{parentId,jdbcType=BIGINT}, -->
+      <!--#{type,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP})-->
+  <!--</insert>-->
+  <!--<insert id="insertSelective" parameterType="com.fdage.pojo.TbMenu"  useGeneratedKeys="true" keyProperty="id">-->
+    <!--insert into tb_menu-->
+    <!--<trim prefix="(" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--id,-->
+      <!--</if>-->
+      <!--<if test="menuName != null">-->
+        <!--menu_name,-->
+      <!--</if>-->
+      <!--<if test="parentId != null">-->
+        <!--parent_id,-->
+      <!--</if>-->
+      <!--<if test="type != null">-->
+        <!--type,-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time,-->
+      <!--</if>-->
+    <!--</trim>-->
+    <!--<trim prefix="values (" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--#{id,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="menuName != null">-->
+        <!--#{menuName,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="parentId != null">-->
+        <!--#{parentId,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="type != null">-->
+        <!--#{type,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--#{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+    <!--</trim>-->
+  <!--</insert>-->
+  <!--<update id="updateByPrimaryKeySelective" parameterType="com.fdage.pojo.TbMenu">-->
+    <!--update tb_menu-->
+    <!--<set>-->
+      <!--<if test="menuName != null">-->
+        <!--menu_name = #{menuName,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="parentId != null">-->
+        <!--parent_id = #{parentId,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="type != null">-->
+        <!--type = #{type,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time = #{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+    <!--</set>-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+  <!--<update id="updateByPrimaryKey" parameterType="com.fdage.pojo.TbMenu">-->
+    <!--update tb_menu-->
+    <!--set menu_name = #{menuName,jdbcType=VARCHAR},-->
+      <!--parent_id = #{parentId,jdbcType=BIGINT},-->
+      <!--type = #{type,jdbcType=INTEGER},-->
+      <!--create_time = #{createTime,jdbcType=TIMESTAMP}-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+<!--</mapper>-->

+ 82 - 0
gis_wall/src/main/resources/b/TbPositionMapper.xml

@@ -0,0 +1,82 @@
+<!--<?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.fdage.dao.base.TbPositionMapper">-->
+  <!--<resultMap id="BaseResultMap" type="com.fdage.pojo.TbPosition">-->
+    <!--<id column="id" jdbcType="BIGINT" property="id" />-->
+    <!--<result column="name" jdbcType="VARCHAR" property="name" />-->
+    <!--<result column="state" jdbcType="INTEGER" property="state" />-->
+    <!--<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />-->
+  <!--</resultMap>-->
+  <!--<sql id="Base_Column_List">-->
+    <!--id, name, state, create_time-->
+  <!--</sql>-->
+  <!--<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">-->
+    <!--select -->
+    <!--<include refid="Base_Column_List" />-->
+    <!--from tb_position-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</select>-->
+  <!--<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">-->
+    <!--delete from tb_position-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</delete>-->
+  <!--<insert id="insert" parameterType="com.fdage.pojo.TbPosition">-->
+    <!--insert into tb_position (id, name, state, -->
+      <!--create_time)-->
+    <!--values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, -->
+      <!--#{createTime,jdbcType=TIMESTAMP})-->
+  <!--</insert>-->
+  <!--<insert id="insertSelective" parameterType="com.fdage.pojo.TbPosition">-->
+    <!--insert into tb_position-->
+    <!--<trim prefix="(" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--id,-->
+      <!--</if>-->
+      <!--<if test="name != null">-->
+        <!--name,-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--state,-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time,-->
+      <!--</if>-->
+    <!--</trim>-->
+    <!--<trim prefix="values (" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--#{id,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="name != null">-->
+        <!--#{name,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--#{state,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--#{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+    <!--</trim>-->
+  <!--</insert>-->
+  <!--<update id="updateByPrimaryKeySelective" parameterType="com.fdage.pojo.TbPosition">-->
+    <!--update tb_position-->
+    <!--<set>-->
+      <!--<if test="name != null">-->
+        <!--name = #{name,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--state = #{state,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time = #{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+    <!--</set>-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+  <!--<update id="updateByPrimaryKey" parameterType="com.fdage.pojo.TbPosition">-->
+    <!--update tb_position-->
+    <!--set name = #{name,jdbcType=VARCHAR},-->
+      <!--state = #{state,jdbcType=INTEGER},-->
+      <!--create_time = #{createTime,jdbcType=TIMESTAMP}-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+<!--</mapper>-->

+ 9 - 0
gis_wall/src/main/resources/b/TbPositionMapperCust.xml

@@ -0,0 +1,9 @@
+<!--<?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.fdage.dao.cust.TbPositionMapperCust">-->
+  <!--<select id="list" resultMap="com.fdage.dao.base.TbPositionMapper.BaseResultMap">-->
+    <!--select -->
+    <!--<include refid="com.fdage.dao.base.TbPositionMapper.Base_Column_List" />-->
+    <!--from tb_position-->
+  <!--</select>-->
+<!--</mapper>-->

+ 162 - 0
gis_wall/src/main/resources/b/TbResourceMapper.xml

@@ -0,0 +1,162 @@
+<!--<?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.fdage.dao.base.TbResourceMapper">-->
+  <!--<resultMap id="BaseResultMap" type="com.fdage.pojo.TbResource">-->
+    <!--<id column="id" jdbcType="BIGINT" property="id" />-->
+    <!--<result column="name" jdbcType="VARCHAR" property="name" />-->
+    <!--<result column="url" jdbcType="VARCHAR" property="url" />-->
+    <!--<result column="description" jdbcType="VARCHAR" property="description" />-->
+    <!--<result column="resource_type" jdbcType="VARCHAR" property="resourceType" />-->
+    <!--<result column="resource_key" jdbcType="VARCHAR" property="resourceKey" />-->
+    <!--<result column="parent_id" jdbcType="INTEGER" property="parentId" />-->
+    <!--<result column="sort" jdbcType="INTEGER" property="sort" />-->
+    <!--<result column="rec_status" jdbcType="VARCHAR" property="recStatus" />-->
+    <!--<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />-->
+    <!--<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />-->
+  <!--</resultMap>-->
+  <!--<sql id="Base_Column_List">-->
+    <!--id, name, url, resource_type, resource_key, description, parent_id, sort, rec_status, create_time, update_time-->
+  <!--</sql>-->
+  <!--<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">-->
+    <!--select -->
+    <!--<include refid="Base_Column_List" />-->
+    <!--from tb_resource-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</select>-->
+  <!--<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">-->
+    <!--delete from tb_resource-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</delete>-->
+  <!--<insert id="insert" parameterType="com.fdage.pojo.TbResource" useGeneratedKeys="true" keyProperty="id">-->
+    <!--insert into tb_resource (id, name, url, resource_type, resource_key, description, parent_id,-->
+     <!--sort, rec_status, create_time, update_time)-->
+    <!--values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, -->
+      <!--#{resourceType,jdbcType=VARCHAR}, #{resourceKey,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, -->
+      <!--#{sort,jdbcType=INTEGER}, #{recStatus,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER}, -->
+      <!--#{createTime,jdbcType=TIMESTAMP}), #{updateTime,jdbcType=TIMESTAMP})-->
+  <!--</insert>-->
+  <!--<insert id="insertSelective" parameterType="com.fdage.pojo.TbResource" useGeneratedKeys="true" keyProperty="id">-->
+    <!--insert into tb_resource-->
+    <!--<trim prefix="(" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--id,-->
+      <!--</if>-->
+      <!--<if test="name != null">-->
+        <!--name,-->
+      <!--</if>-->
+      <!--<if test="url != null">-->
+        <!--url,-->
+      <!--</if>-->
+      <!--<if test="resourceType != null">-->
+        <!--resource_type,-->
+      <!--</if>-->
+      <!--<if test="resourceKey != null">-->
+        <!--resource_key,-->
+      <!--</if>-->
+      <!--<if test="description != null">-->
+        <!--description,-->
+      <!--</if>-->
+      <!--<if test="parentId != null">-->
+        <!--parent_id,-->
+      <!--</if>-->
+      <!--<if test="sort != null">-->
+        <!--sort,-->
+      <!--</if>-->
+      <!--<if test="recStatus != null">-->
+        <!--rec_status,-->
+      <!--</if>-->
+      <!--<if test="updateTime != null">-->
+        <!--update_time,-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time,-->
+      <!--</if>-->
+    <!--</trim>-->
+    <!--<trim prefix="values (" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--#{id,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="name != null">-->
+        <!--#{name,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="url != null">-->
+        <!--#{url,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="resourceType != null">-->
+        <!--#{resourceType,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="resourceKey != null">-->
+        <!--#{resourceKey,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+      <!--<if test="description != null">-->
+        <!--#{description,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="parentId != null">-->
+        <!--#{parentId,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="sort != null">-->
+        <!--#{sort,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="recStatus != null">-->
+        <!--#{recStatus,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="updateTime != null">-->
+        <!--#{updateTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--#{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+    <!--</trim>-->
+  <!--</insert>-->
+  <!--<update id="updateByPrimaryKeySelective" parameterType="com.fdage.pojo.TbResource">-->
+    <!--update tb_resource-->
+    <!--<set>-->
+      <!--<if test="name != null">-->
+        <!--name = #{name,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="url != null">-->
+        <!--url = #{url,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="resourceType != null">-->
+        <!--resource_type = #{resourceType,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="resourceKey != null">-->
+        <!--resource_key = #{resourceKey,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+      <!--<if test="description != null">-->
+        <!--description = #{description,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="parentId != null">-->
+        <!--parent_id = #{parentId,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="sort != null">-->
+        <!--sort = #{sort,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="recStatus != null">-->
+        <!--rec_status = #{recStatus,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="updateTime != null">-->
+        <!--update_time = #{updateTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time = #{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+    <!--</set>-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+  <!--<update id="updateByPrimaryKey" parameterType="com.fdage.pojo.TbResource">-->
+    <!--update tb_resource-->
+    <!--set -->
+      <!--name = #{name,jdbcType=VARCHAR},-->
+      <!--url = #{url,jdbcType=VARCHAR},-->
+      <!--resource_type = #{resourceType,jdbcType=INTEGER},-->
+      <!--resource_key = #{resourceKey,jdbcType=TIMESTAMP},-->
+      <!--description = #{description,jdbcType=VARCHAR},-->
+      <!--parent_id = #{parentId,jdbcType=INTEGER},-->
+      <!--sort = #{sort,jdbcType=INTEGER},-->
+      <!--rec_status = #{recStatus,jdbcType=VARCHAR},-->
+      <!--update_time = #{updateTime,jdbcType=TIMESTAMP},-->
+      <!--create_time = #{createTime,jdbcType=TIMESTAMP},-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+<!--</mapper>-->

+ 25 - 0
gis_wall/src/main/resources/b/TbResourceMapperCust.xml

@@ -0,0 +1,25 @@
+<!--<?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.fdage.dao.cust.TbResourceMapperCust">-->
+
+  <!--<select id="findAll" parameterType="java.lang.Long" resultMap="com.fdage.dao.base.TbResourceMapper.BaseResultMap">-->
+    <!--select -->
+    <!--<include refid="com.fdage.dao.base.TbResourceMapper.Base_Column_List" />-->
+    <!--from tb_resource WHERE rec_status = 'A'-->
+  <!--</select>-->
+
+  <!--<select id="findResourceByUserId" parameterType="java.lang.Long" resultMap="com.fdage.dao.base.TbResourceMapper.BaseResultMap">-->
+    <!--select b.id, b.name, b.parent_id, b.resource_type, b.resource_key from-->
+      <!--((tb_user u left join tb_user_role ur on u.id = ur.user_id)-->
+      <!--join tb_role r on r.id = ur.role_id)-->
+      <!--join tb_role_resource a on r.id = a.role_id-->
+      <!--join tb_resource b on b.id = a.resource_id WHERE u.id = #{userId}-->
+  <!--</select>-->
+
+  <!--<select id="findResourceByRoleId" parameterType="java.lang.Long" resultMap="com.fdage.dao.base.TbResourceMapper.BaseResultMap">-->
+    <!--SELECT b.id, b.name, b.parent_id, b.resource_type, b.resource_key FROM-->
+        <!--tb_role_resource a-->
+        <!--JOIN tb_resource b ON b.id = a.resource_id WHERE a.role_id = #{roleId}-->
+  <!--</select>-->
+
+<!--</mapper>-->

+ 93 - 0
gis_wall/src/main/resources/b/TbRoleMapper.xml

@@ -0,0 +1,93 @@
+<!--<?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.fdage.dao.base.TbRoleMapper">-->
+  <!--<resultMap id="BaseResultMap" type="com.fdage.pojo.TbRole">-->
+    <!--<id column="id" jdbcType="BIGINT" property="id" />-->
+    <!--<result column="role_name" jdbcType="VARCHAR" property="roleName" />-->
+    <!--<result column="description" jdbcType="VARCHAR" property="description" />-->
+    <!--<result column="state" jdbcType="INTEGER" property="state" />-->
+    <!--<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />-->
+  <!--</resultMap>-->
+  <!--<sql id="Base_Column_List">-->
+    <!--id, role_name, description, state, create_time-->
+  <!--</sql>-->
+  <!--<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">-->
+    <!--select -->
+    <!--<include refid="Base_Column_List" />-->
+    <!--from tb_role-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</select>-->
+  <!--<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">-->
+    <!--delete from tb_role-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</delete>-->
+  <!--<insert id="insert" parameterType="com.fdage.pojo.TbRole" useGeneratedKeys="true" keyProperty="id">-->
+    <!--insert into tb_role (id, role_name, description, -->
+      <!--state, create_time)-->
+    <!--values (#{id,jdbcType=BIGINT}, #{roleName,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, -->
+      <!--#{state,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP})-->
+  <!--</insert>-->
+  <!--<insert id="insertSelective" parameterType="com.fdage.pojo.TbRole" useGeneratedKeys="true" keyProperty="id">-->
+    <!--insert into tb_role-->
+    <!--<trim prefix="(" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--id,-->
+      <!--</if>-->
+      <!--<if test="roleName != null">-->
+        <!--role_name,-->
+      <!--</if>-->
+      <!--<if test="description != null">-->
+        <!--description,-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--state,-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time,-->
+      <!--</if>-->
+    <!--</trim>-->
+    <!--<trim prefix="values (" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--#{id,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="roleName != null">-->
+        <!--#{roleName,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="description != null">-->
+        <!--#{description,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--#{state,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--#{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+    <!--</trim>-->
+  <!--</insert>-->
+  <!--<update id="updateByPrimaryKeySelective" parameterType="com.fdage.pojo.TbRole">-->
+    <!--update tb_role-->
+    <!--<set>-->
+      <!--<if test="roleName != null">-->
+        <!--role_name = #{roleName,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="description != null">-->
+        <!--description = #{description,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--state = #{state,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time = #{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+    <!--</set>-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+  <!--<update id="updateByPrimaryKey" parameterType="com.fdage.pojo.TbRole">-->
+    <!--update tb_role-->
+    <!--set role_name = #{roleName,jdbcType=VARCHAR},-->
+      <!--description = #{description,jdbcType=VARCHAR},-->
+      <!--state = #{state,jdbcType=INTEGER},-->
+      <!--create_time = #{createTime,jdbcType=TIMESTAMP}-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+<!--</mapper>-->

+ 41 - 0
gis_wall/src/main/resources/b/TbRoleMapperCust.xml

@@ -0,0 +1,41 @@
+<!--<?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.fdage.dao.cust.TbRoleMapperCust">-->
+
+  <!--<select id="findRoleResourceByRoleId" resultType="java.lang.String">-->
+    <!--select resource_id from tb_role_resource where role_id= #{userId}-->
+  <!--</select>-->
+
+  <!--<delete id="deleteRoleResource" parameterType="java.lang.Long">-->
+    <!--delete from tb_role_resource where role_id=#{roleId}-->
+  <!--</delete>-->
+
+  <!--<insert id="saveRoleResource" parameterType="Map">-->
+    <!--insert into tb_role_resource (role_id, resource_id) values (#{roleId}, #{resourceId});-->
+  <!--</insert>-->
+
+  <!--<insert id="saveRoleUser" parameterType="Map">-->
+    <!--insert into tb_user_role (role_id, user_id) values (#{roleId}, #{userId});-->
+  <!--</insert>-->
+
+  <!--<delete id="deleteRoleUser" parameterType="java.lang.Long">-->
+    <!--delete from tb_user_role where user_id = #{userId}-->
+  <!--</delete>-->
+
+  <!--<select id="findRoleList" resultType="com.fdage.respon.ResponRole">-->
+    <!--select id, role_name as roleName, description, state, create_time as createTime, role_key as roleKey from tb_role-->
+  <!--</select>-->
+
+  <!--<select id="findUserNameByRoleId" parameterType="java.lang.Long" resultType="java.lang.String">-->
+    <!--SELECT a.user_name AS userName FROM `tb_user` a LEFT JOIN `tb_user_role` b ON a.id = b.user_id-->
+	<!--LEFT JOIN `tb_role` c ON b.role_id = c.id WHERE c.id = #{roleId}-->
+  <!--</select>-->
+
+  <!--<select id="findUserByRoleId" parameterType="java.lang.Long" resultType="com.fdage.respon.ResponUser">-->
+    <!--SELECT a.id, a.user_name as userName, a.password, a.role_id as roleId, a.phone, a.head, a.state,-->
+      <!--a.create_time AS createTime-->
+    <!--FROM `tb_user` a LEFT JOIN `tb_user_role` b ON a.id = b.user_id-->
+    <!--LEFT JOIN `tb_role` c ON b.role_id = c.id WHERE c.id = #{roleId}-->
+  <!--</select>-->
+
+<!--</mapper>-->

+ 128 - 0
gis_wall/src/main/resources/b/TbUserMapper.xml

@@ -0,0 +1,128 @@
+<!--<?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.fdage.dao.base.TbUserMapper">-->
+  <!--<resultMap id="BaseResultMap" type="com.fdage.pojo.TbUser">-->
+    <!--<id column="id" jdbcType="BIGINT" property="id" />-->
+    <!--<result column="user_name" jdbcType="VARCHAR" property="userName" />-->
+    <!--<result column="password" jdbcType="VARCHAR" property="password" />-->
+    <!--<result column="role_id" jdbcType="BIGINT" property="roleId" />-->
+    <!--<result column="phone" jdbcType="VARCHAR" property="phone" />-->
+    <!--<result column="head" jdbcType="VARCHAR" property="head" />-->
+    <!--<result column="state" jdbcType="INTEGER" property="state" />-->
+    <!--<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />-->
+  <!--</resultMap>-->
+  <!--<sql id="Base_Column_List">-->
+    <!--id, user_name, password, role_id, phone, head, state, create_time-->
+  <!--</sql>-->
+  <!--<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">-->
+    <!--select -->
+    <!--<include refid="Base_Column_List" />-->
+    <!--from tb_user-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</select>-->
+  <!--<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">-->
+    <!--delete from tb_user-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</delete>-->
+  <!--<insert id="insert" parameterType="com.fdage.pojo.TbUser" useGeneratedKeys="true" keyProperty="id">-->
+    <!--insert into tb_user (id, user_name, password, -->
+      <!--role_id, phone, head, -->
+      <!--state, create_time)-->
+    <!--values (#{id,jdbcType=BIGINT}, #{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, -->
+      <!--#{roleId,jdbcType=BIGINT}, #{phone,jdbcType=VARCHAR}, #{head,jdbcType=VARCHAR}, -->
+      <!--#{state,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP})-->
+  <!--</insert>-->
+  <!--<insert id="insertSelective" parameterType="com.fdage.pojo.TbUser" useGeneratedKeys="true" keyProperty="id">-->
+    <!--insert into tb_user-->
+    <!--<trim prefix="(" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--id,-->
+      <!--</if>-->
+      <!--<if test="userName != null">-->
+        <!--user_name,-->
+      <!--</if>-->
+      <!--<if test="password != null">-->
+        <!--password,-->
+      <!--</if>-->
+      <!--<if test="roleId != null">-->
+        <!--role_id,-->
+      <!--</if>-->
+      <!--<if test="phone != null">-->
+        <!--phone,-->
+      <!--</if>-->
+      <!--<if test="head != null">-->
+        <!--head,-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--state,-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time,-->
+      <!--</if>-->
+    <!--</trim>-->
+    <!--<trim prefix="values (" suffix=")" suffixOverrides=",">-->
+      <!--<if test="id != null">-->
+        <!--#{id,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="userName != null">-->
+        <!--#{userName,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="password != null">-->
+        <!--#{password,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="roleId != null">-->
+        <!--#{roleId,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="phone != null">-->
+        <!--#{phone,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="head != null">-->
+        <!--#{head,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--#{state,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--#{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+    <!--</trim>-->
+  <!--</insert>-->
+  <!--<update id="updateByPrimaryKeySelective" parameterType="com.fdage.pojo.TbUser">-->
+    <!--update tb_user-->
+    <!--<set>-->
+      <!--<if test="userName != null">-->
+        <!--user_name = #{userName,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="password != null">-->
+        <!--password = #{password,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="roleId != null">-->
+        <!--role_id = #{roleId,jdbcType=BIGINT},-->
+      <!--</if>-->
+      <!--<if test="phone != null">-->
+        <!--phone = #{phone,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="head != null">-->
+        <!--head = #{head,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="state != null">-->
+        <!--state = #{state,jdbcType=INTEGER},-->
+      <!--</if>-->
+      <!--<if test="createTime != null">-->
+        <!--create_time = #{createTime,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+    <!--</set>-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+  <!--<update id="updateByPrimaryKey" parameterType="com.fdage.pojo.TbUser">-->
+    <!--update tb_user-->
+    <!--set user_name = #{userName,jdbcType=VARCHAR},-->
+      <!--password = #{password,jdbcType=VARCHAR},-->
+      <!--role_id = #{roleId,jdbcType=BIGINT},-->
+      <!--phone = #{phone,jdbcType=VARCHAR},-->
+      <!--head = #{head,jdbcType=VARCHAR},-->
+      <!--state = #{state,jdbcType=INTEGER},-->
+      <!--create_time = #{createTime,jdbcType=TIMESTAMP}-->
+    <!--where id = #{id,jdbcType=BIGINT}-->
+  <!--</update>-->
+<!--</mapper>-->

+ 42 - 0
gis_wall/src/main/resources/b/TbUserMapperCust.xml

@@ -0,0 +1,42 @@
+<!--<?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.fdage.dao.cust.TbUserMapperCust">-->
+  <!--<select id="findByUserName" parameterType="java.lang.String" resultMap="com.fdage.dao.base.TbUserMapper.BaseResultMap">-->
+    <!--select -->
+    <!--<include refid="com.fdage.dao.base.TbUserMapper.Base_Column_List" />-->
+    <!--from tb_user-->
+    <!--where user_name = #{userName}-->
+  <!--</select>-->
+
+  <!--<select id="findUserList" parameterType="com.fdage.pojo.TbUser" resultType="com.fdage.respon.ResponUser">-->
+    <!--select-->
+      <!--a.id, a.user_name as userName, a.password, a.role_id as roleId, a.phone, a.head, a.state,-->
+      <!--a.create_time AS createTime, c.id as roleId, c.role_name as roleName-->
+    <!--from tb_user a left join tb_user_role b on a.id = b.user_id-->
+    <!--left join tb_role c on b.role_id = c.id-->
+    <!--where 1 = 1-->
+    <!--<if test="state != null">-->
+      <!--and a.state = #{state}-->
+    <!--</if>-->
+    <!--<if test="userName != null">-->
+      <!--and a.user_name like CONCAT('%', #{userName}, '%')-->
+    <!--</if>-->
+
+    <!--ORDER by a.create_time DESC-->
+  <!--</select>-->
+
+  <!--<select id="roleList" resultType="com.fdage.pojo.TbRole">-->
+  <!--select id, role_name as roleName, description, state-->
+  <!--from tb_role where state = 0-->
+<!--</select>-->
+
+  <!--<select id="findUserRoleByUserId" resultType="java.lang.Integer">-->
+    <!--select role_id from tb_user_role where user_id= #{userId}-->
+  <!--</select>-->
+
+  <!--<select id="findRoleByUserId" parameterType="java.lang.Long" resultType="java.lang.String">-->
+    <!--select r.role_key from-->
+    <!--(tb_user u left join tb_user_role ur on u.id = ur.user_id) left join tb_role r on r.id = ur.role_id-->
+    <!--WHERE u.id = #{id}-->
+  <!--</select>-->
+<!--</mapper>-->

+ 41 - 0
gis_wall/src/main/resources/b/VideoMapper.xml

@@ -0,0 +1,41 @@
+<!--<?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.fdage.dao.base.VideoMapper">-->
+  <!--<resultMap id="BaseResultMap" type="com.fdage.entity.VideoEntity">-->
+  <!--</resultMap>-->
+
+  <!--<select id="findAll" parameterType="java.lang.Long" resultMap="BaseResultMap">-->
+   <!--select * from tb_video where is_delete=0 order by create_time desc;-->
+  <!--</select>-->
+
+  <!--<select id="findById" parameterType="java.lang.Long" resultMap="BaseResultMap">-->
+   <!--select * from tb_video where is_delete=0 and id=#{id};-->
+  <!--</select>-->
+
+
+    <!--<insert id="insert" parameterType="com.fdage.entity.VideoEntity">-->
+    <!--insert into tb_video (-->
+    <!--name, url_video, thumb, file_name-->
+    <!--)-->
+    <!--values (-->
+    <!--#{name} ,#{urlVideo} ,#{thumb} ,#{fileName}-->
+    <!--)-->
+  <!--</insert>-->
+
+
+    <!--<update id="update" parameterType="com.fdage.entity.VideoEntity">-->
+    <!--update tb_video set-->
+    <!--name=#{name},-->
+    <!--url_video=#{urlVideo},-->
+    <!--thumb=#{thumb},-->
+    <!--file_name=#{fileName},-->
+    <!--update_time=#{updateTime}-->
+   <!--where id=#{id} and is_delete=0;-->
+  <!--</update>-->
+
+
+    <!--<update id="remove" parameterType="com.fdage.entity.VideoEntity">-->
+      <!--update tb_video set is_delete=1, update_time=NOW() where id=#{id} and is_delete=0;-->
+  <!--</update>-->
+
+<!--</mapper>-->

+ 318 - 0
gis_wall/src/main/resources/mapper/TbCollectionMapper.xml

@@ -0,0 +1,318 @@
+<?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.gis.wall.mapper.TbCollectionMapper">
+  <resultMap id="BaseResultMap" type="com.gis.wall.pojo.TbCollection">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="type_id" jdbcType="BIGINT" property="typeId" />
+    <result column="time_id" jdbcType="BIGINT" property="timeId" />
+    <result column="num" jdbcType="VARCHAR" property="num" />
+    <result column="discovery_time" jdbcType="TIMESTAMP" property="discoveryTime" />
+    <result column="repair_time" jdbcType="TIMESTAMP" property="repairTime" />
+    <result column="venue" jdbcType="VARCHAR" property="venue" />
+    <result column="unity_pic" jdbcType="VARCHAR" property="unityPic" />
+    <result column="unity_url" jdbcType="VARCHAR" property="unityUrl" />
+    <result column="pic" jdbcType="VARCHAR" property="pic" />
+    <result column="model_url" jdbcType="VARCHAR" property="modelUrl" />
+    <result column="content_url" jdbcType="VARCHAR" property="contentUrl" />
+    <result column="state" jdbcType="INTEGER" property="state" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="like_num" jdbcType="BIGINT" property="likeNum" />
+    <result column="open_num" jdbcType="BIGINT" property="openNum" />
+    <result column="search_num" jdbcType="BIGINT" property="searchNum" />
+    <result column="download_num" jdbcType="BIGINT" property="downloadNum" />
+    <result column="icon" jdbcType="VARCHAR" property="icon" />
+    <result column="dir_code" jdbcType="VARCHAR" property="dirCode" />
+    <result column="visit" jdbcType="BIGINT" property="visit" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.gis.wall.pojo.TbCollection">
+    <result column="description" jdbcType="LONGVARCHAR" property="description" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, name, type_id, time_id, num, dir_code, icon, discovery_time, repair_time, venue, pic, unity_pic, unity_url, model_url, content_url,
+    state, create_time, like_num, open_num, search_num, download_num, type, url_list, qr_code
+  </sql>
+  <sql id="Blob_Column_List">
+    description
+  </sql>
+
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from tb_collection
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from tb_collection
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+
+  <select id="countVisit" resultType="java.lang.Long">
+    SELECT SUM(visit) from tb_collection;
+  </select>
+
+
+  <update id="addVisit" parameterType="java.lang.Long">
+    update tb_collection set visit = visit + 1  where id = #{id,jdbcType=BIGINT}
+  </update>
+
+
+  <insert id="insert" parameterType="com.gis.wall.pojo.TbCollection">
+    insert into tb_collection (id, name, type_id, 
+      time_id, num, discovery_time, repair_time,
+      venue, pic, model_url, unity_pic, unity_url,
+      content_url, state, create_time, icon, dir_code,
+      description)
+    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{typeId,jdbcType=BIGINT},
+      #{timeId,jdbcType=BIGINT}, #{num,jdbcType=VARCHAR}, #{discoveryTime,jdbcType=TIMESTAMP}, #{repairTime,jdbcType=TIMESTAMP},
+      #{venue,jdbcType=VARCHAR}, #{pic,jdbcType=VARCHAR}, #{modelUrl,jdbcType=VARCHAR},
+      #{unityPic,jdbcType=VARCHAR}, #{unityUrl,jdbcType=VARCHAR},
+      #{contentUrl,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{icon,jdbcType=VARCHAR}, #{dirCode,jdbcType=VARCHAR},
+      #{description,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gis.wall.pojo.TbCollection">
+    insert into tb_collection
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="typeId != null">
+        type_id,
+      </if>
+      <if test="timeId != null">
+        time_id,
+      </if>
+      <if test="num != null">
+        num,
+      </if>
+      <if test="discoveryTime != null">
+        discovery_time,
+      </if>
+      <if test="repairTime != null">
+        repair_time,
+      </if>
+      <if test="venue != null">
+        venue,
+      </if>
+      <if test="unityPic != null">
+        unity_pic,
+      </if>
+      <if test="unityUrl != null">
+        unity_url,
+      </if>
+      <if test="pic != null">
+        pic,
+      </if>
+      <if test="modelUrl != null">
+        model_url,
+      </if>
+      <if test="contentUrl != null">
+        content_url,
+      </if>
+      <if test="state != null">
+        state,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="description != null">
+        description,
+      </if>
+      <if test="icon != null">
+        icon,
+      </if>
+      <if test="dirCode != null">
+        dir_code,
+      </if>
+      <if test="urlList != null">
+        url_list ,
+      </if>
+      <if test="type != null">
+        type ,
+      </if>
+      <if test="qrCode != null">
+        qr_code ,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="typeId != null">
+        #{typeId,jdbcType=BIGINT},
+      </if>
+      <if test="timeId != null">
+        #{timeId,jdbcType=BIGINT},
+      </if>
+      <if test="num != null">
+        #{num,jdbcType=VARCHAR},
+      </if>
+      <if test="discoveryTime != null">
+        #{discoveryTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="repairTime != null">
+        #{repairTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="venue != null">
+        #{venue,jdbcType=VARCHAR},
+      </if>
+      <if test="unityPic != null">
+        #{unityPic,jdbcType=VARCHAR},
+      </if>
+      <if test="unityUrl != null">
+        #{unityUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="pic != null">
+        #{pic,jdbcType=VARCHAR},
+      </if>
+      <if test="modelUrl != null">
+        #{modelUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="contentUrl != null">
+        #{contentUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="description != null">
+        #{description,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="icon != null">
+        #{icon,jdbcType=VARCHAR},
+      </if>
+      <if test="dirCode != null">
+        #{dirCode,jdbcType=VARCHAR},
+      </if>
+
+      <if test="urlList != null">
+        #{urlList,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="qrCode != null">
+        #{qrCode,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gis.wall.pojo.TbCollection">
+    update tb_collection
+    <set>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="typeId != null">
+        type_id = #{typeId,jdbcType=BIGINT},
+      </if>
+      <if test="timeId != null">
+        time_id = #{timeId,jdbcType=BIGINT},
+      </if>
+      <if test="num != null">
+        num = #{num,jdbcType=VARCHAR},
+      </if>
+      <if test="discoveryTime != null">
+        discovery_time = #{discoveryTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="repairTime != null">
+        repair_time = #{repairTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="venue != null">
+        venue = #{venue,jdbcType=VARCHAR},
+      </if>
+      <if test="unityPic != null">
+        unity_pic = #{unityPic,jdbcType=VARCHAR},
+      </if>
+      <if test="unityUrl != null">
+        unity_url = #{unityUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="pic != null">
+        pic = #{pic,jdbcType=VARCHAR},
+      </if>
+      <if test="modelUrl != null">
+        model_url = #{modelUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="contentUrl != null">
+        content_url = #{contentUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        state = #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="description != null">
+        description = #{description,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="icon != null">
+        icon = #{icon,jdbcType=VARCHAR},
+      </if>
+      <if test="dirCode != null">
+        dir_code = #{dirCode,jdbcType=VARCHAR},
+      </if>
+      <if test="urlList != null">
+        url_list = #{urlList,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="qrCode != null">
+        qr_code = #{qrCode,jdbcType=VARCHAR},
+      </if>
+
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.gis.wall.pojo.TbCollection">
+    update tb_collection
+    set name = #{name,jdbcType=VARCHAR},
+      type_id = #{typeId,jdbcType=BIGINT},
+      time_id = #{timeId,jdbcType=BIGINT},
+      num = #{num,jdbcType=VARCHAR},
+      discovery_time = #{discoveryTime,jdbcType=TIMESTAMP},
+      repair_time = #{repairTime,jdbcType=TIMESTAMP},
+      venue = #{venue,jdbcType=VARCHAR},
+      unity_pic = #{unityPic,jdbcType=VARCHAR},
+      unity_url = #{unityUrl,jdbcType=VARCHAR},
+      pic = #{pic,jdbcType=VARCHAR},
+      model_url = #{modelUrl,jdbcType=VARCHAR},
+      content_url = #{contentUrl,jdbcType=VARCHAR},
+      state = #{state,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      icon = #{icon,jdbcType=VARCHAR},
+      dir_code = #{dirCode,jdbcType=VARCHAR},
+      description = #{description,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gis.wall.pojo.TbCollection">
+    update tb_collection
+    set name = #{name,jdbcType=VARCHAR},
+      type_id = #{typeId,jdbcType=BIGINT},
+      time_id = #{timeId,jdbcType=BIGINT},
+      num = #{num,jdbcType=VARCHAR},
+      discovery_time = #{discoveryTime,jdbcType=TIMESTAMP},
+      repair_time = #{repairTime,jdbcType=TIMESTAMP},
+      venue = #{venue,jdbcType=VARCHAR},
+      unity_pic = #{unityPic,jdbcType=VARCHAR},
+      unity_url = #{unityUrl,jdbcType=VARCHAR},
+      pic = #{pic,jdbcType=VARCHAR},
+      model_url = #{modelUrl,jdbcType=VARCHAR},
+      content_url = #{contentUrl,jdbcType=VARCHAR},
+      state = #{state,jdbcType=INTEGER},
+       icon = #{icon,jdbcType=VARCHAR},
+      dir_code = #{dirCode,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

+ 128 - 0
gis_wall/src/main/resources/mapper/TbCollectionMapperCust.xml

@@ -0,0 +1,128 @@
+<?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.gis.wall.mapper.TbCollectionMapperCust">
+  <select id="timeList" resultType="com.gis.wall.pojo.TbCollectionTime">
+    select id, name
+    from tb_collection_time
+    order by order_num
+  </select>
+
+  <select id="typeList" resultType="com.gis.wall.pojo.TbCollectionType">
+    select id, name
+    from tb_collection_type
+    WHERE 1 = 1
+    <if test="state != null">
+      and state = #{state}
+    </if>
+  </select>
+
+  <select id="findList" parameterType="com.gis.wall.request.RequestCollection" resultType="com.gis.wall.respon.ResponCollection">
+    select a.id, a.name, a.type_id as typeId, a.time_id as timeId, a.discovery_time as discoveryTime,
+    a.repair_time as repairTime, a.venue, a.model_url as modelUrl, a.content_url as contentUrl, a.state,
+    a.create_time as createTime, a.description, b.name as timeName, c.name as typeName, a.pic, a.num,
+    a.like_num as likeNum, a.open_num as openNum, a.search_num as searchNum, download_num as downloadNum,
+    a.unity_pic as unityPic, a.unity_url as unityUrl, a.icon, a.dir_code as dirCode, a.type, a.url_list, a.qr_code
+    from tb_collection a LEFT JOIN tb_collection_time b on a.time_id = b.id
+    LEFT JOIN tb_collection_type c ON a.type_id = c.id
+    WHERE 1 = 1
+    <if test="typeId != null">
+      and a.type_id = #{typeId}
+    </if>
+    <if test="timeId != null">
+      and a.time_id = #{timeId}
+    </if>
+    <if test="name != null and name != ''">
+      and a.name LIKE CONCAT('%', #{name}, '%')
+    </if>
+    <if test="state != null">
+      and a.state = #{state}
+    </if>
+  </select>
+
+  <select id="findListByExhibitionId" parameterType="java.lang.Long" resultType="com.gis.wall.respon.ResponCollection">
+    select a.id, a.name, a.type_id as typeId, a.time_id as timeId, a.discovery_time as discoveryTime,
+    a.repair_time as repairTime, a.venue, a.model_url as modelUrl, a.content_url as contentUrl, a.state,
+    a.create_time as createTime, a.description, b.name as timeName, c.name as typeName, a.pic, a.num,
+    a.like_num as likeNum, a.open_num as openNum, a.search_num as searchNum, download_num as downloadNum,
+     a.unity_pic as unityPic, a.unity_url as unityUrl, a.type, a.url_list, a.qr_code
+    from tb_collection a LEFT JOIN tb_collection_time b on a.time_id = b.id
+    LEFT JOIN tb_collection_type c ON a.type_id = c.id
+    LEFT JOIN tb_exhibition_collection d ON a.id = d.collection_id
+    WHERE d.exhibition_id = #{id}
+  </select>
+
+  <select id="searchListByName" parameterType="com.gis.wall.request.RequestCollection" resultType="com.gis.wall.respon.ResponCollection">
+    select a.id, a.name, a.type_id as typeId, a.time_id as timeId, a.discovery_time as discoveryTime,
+    a.repair_time as repairTime, a.venue, a.model_url as modelUrl, a.content_url as contentUrl, a.state,
+    a.create_time as createTime, a.description, b.name as timeName, c.name as typeName, a.pic, a.num,
+    a.like_num as likeNum, a.open_num as openNum, a.search_num as searchNum, download_num as downloadNum,
+    a.unity_pic as unityPic, a.unity_url as unityUrl, a.type, a.url_list, a.qr_code
+    from tb_collection a LEFT JOIN tb_collection_time b on a.time_id = b.id
+    LEFT JOIN tb_collection_type c ON a.type_id = c.id
+    WHERE 1 = 1
+    <if test="name != null and name != ''">
+      and a.name LIKE CONCAT('%', #{name}, '%')
+    </if>
+
+    <if test="typeId != null and typeId != ''">
+      and a.type_id = #{typeId}
+    </if>
+
+  </select>
+
+  <update id="addLikeNumById" parameterType="java.lang.Long">
+    UPDATE tb_collection SET like_num = like_num + 1 WHERE id = #{id}
+  </update>
+
+  <update id="addOpenNumById" parameterType="java.lang.Long">
+    UPDATE tb_collection SET open_num = open_num + 1 WHERE id = #{id}
+  </update>
+
+  <update id="addSearchNumById" parameterType="java.lang.Long">
+    UPDATE tb_collection SET search_num = search_num + 1 WHERE id = #{id}
+  </update>
+
+  <update id="addDownloadNumById" parameterType="java.lang.Long">
+    UPDATE tb_collection SET download_num = download_num + 1 WHERE id = #{id}
+  </update>
+
+  <select id="findByName" parameterType="java.lang.String" resultMap="com.gis.wall.mapper.TbCollectionMapper.BaseResultMap">
+    select
+    <include refid="com.gis.wall.mapper.TbCollectionMapper.Base_Column_List" />
+    ,
+    <include refid="com.gis.wall.mapper.TbCollectionMapper.Blob_Column_List" />
+    from tb_collection
+    where name = #{name}
+  </select>
+
+  <select id="collectionTotal" resultType="com.gis.wall.respon.ResponStatistics">
+    SELECT COUNT(*) AS total, SUM(like_num) AS likeTotal, SUM(download_num) AS downloadNum
+    FROM `tb_collection`
+  </select>
+
+  <select id="findListOrderBy" parameterType="List" resultType="com.gis.wall.respon.ResponCollection">
+    select a.id, a.name, a.type_id as typeId, a.time_id as timeId, a.discovery_time as discoveryTime,
+    a.repair_time as repairTime, a.venue, a.model_url as modelUrl, a.content_url as contentUrl, a.state,
+    a.create_time as createTime, a.description, b.name as timeName, c.name as typeName, a.pic, a.num,
+    a.like_num as likeNum, a.open_num as openNum, a.search_num as searchNum, download_num as downloadNum,
+    a.unity_pic as unityPic, a.unity_url as unityUrl, a.type, a.url_list, a.qr_code
+    from tb_collection a LEFT JOIN tb_collection_time b on a.time_id = b.id
+    LEFT JOIN tb_collection_type c ON a.type_id = c.id
+    WHERE 1 = 1
+    <choose>
+      <when test="sidx != null and sidx.trim() != ''">
+        order by ${sidx} ${order}
+      </when>
+      <otherwise>
+        order by a.id desc
+      </otherwise>
+    </choose>
+
+  </select>
+
+  <select id="typeTotal" resultType="Map">
+    SELECT SUM(a.type_id) AS typeNum, b.name AS typeName
+    FROM `tb_collection` a LEFT JOIN `tb_collection_type` b ON a.type_id = b.id
+    GROUP BY a.type_id
+  </select>
+</mapper>

+ 82 - 0
gis_wall/src/main/resources/mapper/TbCollectionTimeMapper.xml

@@ -0,0 +1,82 @@
+<?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.gis.wall.mapper.TbCollectionTimeMapper">
+  <resultMap id="BaseResultMap" type="com.gis.wall.pojo.TbCollectionTime">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="state" jdbcType="INTEGER" property="state" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, name, state, create_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from tb_collection_time
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from tb_collection_time
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" parameterType="com.gis.wall.pojo.TbCollectionTime">
+    insert into tb_collection_time (id, name, state, 
+      create_time)
+    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, 
+      #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gis.wall.pojo.TbCollectionTime">
+    insert into tb_collection_time
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="state != null">
+        state,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gis.wall.pojo.TbCollectionTime">
+    update tb_collection_time
+    <set>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        state = #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gis.wall.pojo.TbCollectionTime">
+    update tb_collection_time
+    set name = #{name,jdbcType=VARCHAR},
+      state = #{state,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

+ 10 - 0
gis_wall/src/main/resources/mapper/TbCollectionTimeMapperCust.xml

@@ -0,0 +1,10 @@
+<?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.gis.wall.mapper.TbCollectionTimeMapperCust">
+  <select id="findByName" parameterType="java.lang.String" resultMap="com.gis.wall.mapper.TbCollectionTimeMapper.BaseResultMap">
+    select 
+    <include refid="com.gis.wall.mapper.TbCollectionTimeMapper.Base_Column_List" />
+    from tb_collection_time
+    where name = #{name}
+  </select>
+</mapper>

+ 82 - 0
gis_wall/src/main/resources/mapper/TbCollectionTypeMapper.xml

@@ -0,0 +1,82 @@
+<?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.gis.wall.mapper.TbCollectionTypeMapper">
+  <resultMap id="BaseResultMap" type="com.gis.wall.pojo.TbCollectionType">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="state" jdbcType="INTEGER" property="state" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, name, state, create_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from tb_collection_type
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from tb_collection_type
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" parameterType="com.gis.wall.pojo.TbCollectionType">
+    insert into tb_collection_type (id, name, state, 
+      create_time)
+    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, 
+      #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gis.wall.pojo.TbCollectionType">
+    insert into tb_collection_type
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="state != null">
+        state,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gis.wall.pojo.TbCollectionType">
+    update tb_collection_type
+    <set>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        state = #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gis.wall.pojo.TbCollectionType">
+    update tb_collection_type
+    set name = #{name,jdbcType=VARCHAR},
+      state = #{state,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

+ 10 - 0
gis_wall/src/main/resources/mapper/TbCollectionTypeMapperCust.xml

@@ -0,0 +1,10 @@
+<?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.gis.wall.mapper.TbCollectionTypeMapperCust">
+  <select id="findByName" parameterType="java.lang.String" resultMap="com.gis.wall.mapper.TbCollectionTypeMapper.BaseResultMap">
+    select 
+    <include refid="com.gis.wall.mapper.TbCollectionTypeMapper.Base_Column_List" />
+    from tb_collection_type
+    where name = #{name}
+  </select>
+</mapper>

+ 7 - 0
pom.xml

@@ -21,6 +21,7 @@
     <module>gis_admin</module>
     <module>gis_application</module>
     <module>gis_cms</module>
+    <module>gis_wall</module>
   </modules>
 
 
@@ -79,6 +80,12 @@
         <version>${gis.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>com.gis</groupId>
+        <artifactId>gis_wall</artifactId>
+        <version>${gis.version}</version>
+      </dependency>
+
 
       <!-- https://mvnrepository.com/artifact/org.springframework/spring-core -->
       <dependency>