活动底图

tangzy

2022-07-21 83ccf770de4f2a7ea0debde1d411bf2085877104

活动底图

 src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java

@@ -115,8 +115,8 @@
        architecture.setHeading("0");
        architecture.setRoll("0");
        architecture.setGd("0");
        String url = "http://192.168.0.115:8080/#/mobileLayout/default";
        //String url = "http://171.34.197.243:786/#/mobileLayout/default";
        //String url = "http://192.168.0.115:8080/#/mobileLayout/default";
        String url = "http://171.34.197.243:786/#/mobileLayout/default";
        String gotos = URLEncoder.encode("arc", "UTF-8");
        String addressName = URLEncoder.encode(architecture.getAddressName(), "UTF-8");
        String mechanismname = URLEncoder.encode(architecture.getMechanismname(), "UTF-8");

 src/main/java/org/springblade/modules/architecture/entity/Architecture.java

@@ -136,6 +136,13 @@
     */
    @ApiModelProperty(value = "选点逆解析返回的地址名字")
    private String addressName;

    /**
     * x轴
     */
    private String x;
    /**
     * y轴
     */
    private String y;

}

 src/main/java/org/springblade/modules/architecture/mapper/ArchitectureMapper.xml

@@ -21,7 +21,7 @@
        <result column="pitch" property="pitch"/>
        <result column="roll" property="roll"/>
        <result column="panoramaurl" property="panoramaurl"/>
        <result column="addressName" property="addressName"/>
        <result column="address_name" property="addressName"/>
    </resultMap>


@@ -68,7 +68,8 @@
               pitch,
               roll,
               panoramaurl,
               addressName
               address_name,
               x
        FROM `sys_architecture`
        WHERE id = #{id}
          and is_deleted = 0
@@ -82,7 +83,7 @@
          AND panoramaurl!='' and is_deleted = 0
    </select>
    <select id="selectArchALL" resultType="java.util.HashMap">
        SELECT jd, wd, mechanismName AS mechanismname, tpUrl AS tpurl, codeUrl AS codeurl, introduce, panoramaurl
        SELECT jd, wd, mechanismName AS mechanismname, tpUrl AS tpurl, codeUrl AS codeurl, introduce, panoramaurl,x
        FROM sys_architecture
        WHERE is_deleted = 0
        --         UNION

 src/main/java/org/springblade/modules/hd/controller/HdController.java

@@ -56,6 +56,12 @@
    @ApiOperation(value = "详情", notes = "传入hd")
    public R<Hd> detail(Hd hd) {
        Hd detail = hdService.getOne(Condition.getQueryWrapper(hd));
        Long id = detail.getId();
        String d=String.valueOf(id);
        String s = hdService.selectInfo(d);
        String name = hdService.selectInfos(d);
        detail.setUrl(s);
        detail.setMapname(name);
        return R.data(detail);
    }


 src/main/java/org/springblade/modules/hd/entity/Hd.java

@@ -92,6 +92,7 @@
     */
    private String panoramaurl;
    private String url;
    private String mapname;


}

 src/main/java/org/springblade/modules/hd/mapper/HdMapper.java

@@ -22,6 +22,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.List;
import java.util.Map;

/**
 * Mapper 接口
@@ -41,4 +42,6 @@
    List<HdVO> selectHdPage(IPage page, HdVO hd);

    List selectInList();
    String selectInfo(String id);
    String selectInfos(String id);
}

 src/main/java/org/springblade/modules/hd/mapper/HdMapper.xml

@@ -15,11 +15,26 @@


    <select id="selectHdPage" resultMap="hdResultMap">
        select * from sys_hd where is_deleted = 0
        select *
        from sys_hd
    </select>

    <select id="selectInList" resultType="java.util.HashMap">
        select id,hdname from sys_hd
        select id, hdname
        from sys_hd
    </select>

    <select id="selectInfo" resultType="java.lang.String">
        SELECT mapUrl,mapname FROM sys_hdmap where hdid=#{id}
    </select>
    <select id="selectInfos" resultType="java.lang.String">
        SELECT mapname FROM sys_hdmap where hdid=#{id}
    </select>

<!--    <select id="selectInfo" resultType="java.util.HashMap">-->
<!--        SELECT h.*,hd.mapUrl as mapurl-->
<!--        FROM sys_hd h-->
<!--                 LEFT JOIN sys_hdmap hd ON h.id = hd.hdid where h.id=#{id}-->
<!--    </select>-->

</mapper>

 src/main/java/org/springblade/modules/hd/service/IHdService.java

@@ -22,6 +22,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.List;
import java.util.Map;

/**
 *  服务类
@@ -40,4 +41,6 @@
     */
    IPage<HdVO> selectHdPage(IPage<HdVO> page, HdVO hd);
    List selectInList();
    String selectInfo(String id);
    String selectInfos(String id);
}

 src/main/java/org/springblade/modules/hd/service/impl/HdServiceImpl.java

@@ -45,4 +45,14 @@
        return baseMapper.selectInList();
    }

    @Override
    public String selectInfo(String id) {
        return baseMapper.selectInfo(id);
    }

    @Override
    public String selectInfos(String id) {
        return baseMapper.selectInfos(id);
    }

}

 src/main/java/org/springblade/modules/hdmap/controller/HdmapController.java

@@ -95,6 +95,7 @@
        String mapurl = hdmap.getMapurl();
        hdmap.setMapurl(mapurl.replaceAll("amp;", ""));
        hdmap.setCreatetime(new Date());
        hdmap.setUpdatetime(new Date());
        return R.status(hdmapService.save(hdmap));
    }


 src/main/java/org/springblade/modules/life/entity/Life.java

@@ -178,5 +178,12 @@
     */
    @ApiModelProperty(value = "选点逆解析返回的地址名字")
    private String addressName;

    /**
     * x轴
     */
    private String x;
    /**
     * y轴
     */
    private String y;
}

 src/main/java/org/springblade/modules/life/mapper/LifeMapper.xml

@@ -38,6 +38,6 @@


    <select id="selectList" resultType="java.util.HashMap">
        select jd,wd,mechanismName as mechanismname,tpUrl as tpurl,codeUrl as codeurl,introduce from sys_life where  lifetype=#{lifetype} and is_deleted = 0
        select jd,wd,mechanismName as mechanismname,tpUrl as tpurl,codeUrl as codeurl,introduce,x from sys_life where  lifetype=#{lifetype} and is_deleted = 0
    </select>
</mapper>

 src/main/java/org/springblade/modules/mechanism/controller/MechanismController.java

@@ -103,8 +103,8 @@
        mechanism.setRoll("0");
        mechanism.setGd("0");
        String addressName = URLEncoder.encode(mechanism.getAddressName(), "UTF-8");
        String url = "http://192.168.0.115:8080/#/mobileLayout/default";
        //String url = "http://171.34.197.243:786/#/mobileLayout/default";
        //String url = "http://192.168.0.115:8080/#/mobileLayout/default";
        String url = "http://171.34.197.243:786/#/mobileLayout/default";
        String gotos = URLEncoder.encode("arc", "UTF-8");
        String mechanismname = URLEncoder.encode(mechanism.getMechanismname(), "UTF-8");
        String address = URLEncoder.encode(mechanism.getAddress(), "UTF-8");

 src/main/java/org/springblade/modules/mechanism/entity/Mechanism.java

@@ -143,5 +143,13 @@
     */
    @ApiModelProperty(value = "选点逆解析返回的地址名字")
    private String addressName;
    /**
     * x轴
     */
    private String x;
    /**
     * y轴
     */
    private String y;

}

 src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java

@@ -262,10 +262,10 @@
    @PostMapping("put-files-talk")
    public String putFilestak(@RequestParam MultipartFile file) throws IOException, ServerException, InsufficientDataException, InternalException, InvalidResponseException, InvalidKeyException, NoSuchAlgorithmException, XmlParserException, ErrorResponseException {
        //填写你文件上传的地址以及相应信息
        String url = "http://223.82.109.183:2081";
        String access = "zhbaadmin";
        String secret = "zhbapassword";
        String bucket = "zhxy";
        String url = "http://web.byisf.com:9000";
        String access = "adminminio";
        String secret = "adminminio";
        String bucket = "jfpt";
        MinioClient minioClient =
            MinioClient.builder()
                .endpoint(url)
@@ -295,7 +295,53 @@
                .build());

        //文件推送
        String urls = "http://223.82.109.183:2081/zhxy/"+newName;
        String urls = "http://web.byisf.com:9000/jfpt/"+newName;
        //返回
        return urls;
    }

    /**
     * 文件上传,个人头像上传
     *
     * @param file 图片对象
     */
    @GetMapping("put-files-talks")
    public String putFilestaks(@RequestParam MultipartFile file) throws IOException, ServerException, InsufficientDataException, InternalException, InvalidResponseException, InvalidKeyException, NoSuchAlgorithmException, XmlParserException, ErrorResponseException {
        //填写你文件上传的地址以及相应信息
        String url = "http://web.byisf.com:9000";
        String access = "adminminio";
        String secret = "adminminio";
        String bucket = "jfpt";
        MinioClient minioClient =
            MinioClient.builder()
                .endpoint(url)
                .credentials(access, secret)
                .build();
        // 检查存储桶是否已经存在
        boolean isExist = minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucket).build());
        if (!isExist) {
            // 创建一个名为zip的存储桶，用于zip文件。
            minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucket).build());
            minioClient.setBucketPolicy(SetBucketPolicyArgs.builder().bucket(bucket).build());
        }
        String fileName = file.getOriginalFilename();
        String newName = "upload/picture/" + UUID.randomUUID().toString().replaceAll("-", "")
            + fileName.substring(fileName.lastIndexOf("."));
        InputStream in = file.getInputStream();
        String[] split = newName.split("/");
        //创建头部信息
        Map<String, String> headers = new HashMap<>(1 << 2);
        //添加自定义内容类型
        headers.put("Content-Type", "application/octet-stream");
        //上传
        minioClient.putObject(
            PutObjectArgs.builder().bucket(bucket).object(newName).stream(
                in, in.available(), -1)
                .headers(headers)
                .build());

        //文件推送
        String urls = "http://web.byisf.com:9000/jfpt/"+newName;
        //返回
        return urls;
    }

 src/main/java/org/springblade/modules/road/entity/Road.java

@@ -62,5 +62,12 @@
     */
    @ApiModelProperty(value = "选点逆解析返回的地址名字")
    private String addressName;

    /**
     * x轴
     */
    private String x;
    /**
     * y轴
     */
    private String y;
}

 src/main/java/org/springblade/modules/road/mapper/RoadMapper.xml

@@ -17,7 +17,7 @@
    </select>

    <select id="selectList" resultType="java.util.HashMap">
        select roadName as roadname,jd,wd from sys_road
        select roadName as roadname,jd,wd,x from sys_road
    </select>

</mapper>

 src/main/java/org/springblade/modules/sp/entity/Sp.java

@@ -20,7 +20,9 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;

import java.io.Serializable;

import lombok.Data;
import lombok.EqualsAndHashCode;
import io.swagger.annotations.ApiModel;
@@ -42,18 +44,24 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
    * VR名称
    */
        @ApiModelProperty(value = "VR名称")
        @TableField("VrName")
     * VR名称
     */
    @ApiModelProperty(value = "VR名称")
    @TableField("VrName")
    private String vrname;
    /**
    * VR地址
    */
        @ApiModelProperty(value = "VR地址")
        @TableField("VrUrl")
     * VR地址
     */
    @ApiModelProperty(value = "VR地址")
    @TableField("VrUrl")
    private String vrurl;
    /**
     * 经度
     */
    private String jd;
    /**
     * 纬度
     */
    private String wd;
    /**
     * 选点逆解析返回的地址名字
@@ -64,6 +72,12 @@
     * 视频格式
     */
    private String spgs;


    /**
     * x轴
     */
    private String x;
    /**
     * y轴
     */
    private String y;
}

 src/main/java/org/springblade/modules/tagging/entity/Tagging.java

@@ -52,6 +52,13 @@
     */
    @ApiModelProperty(value = "选点逆解析返回的地址名字")
    private String addressName;

    /**
     * x轴
     */
    private String x;
    /**
     * y轴
     */
    private String y;

}

 src/main/java/org/springblade/modules/vr/entity/Vr.java

@@ -60,6 +60,13 @@
     */
    @ApiModelProperty(value = "选点逆解析返回的地址名字")
    private String addressName;

    /**
     * x轴
     */
    private String x;
    /**
     * y轴
     */
    private String y;

}

 src/main/java/sql/ss.menu.mysql

New file
@@ -0,0 +1,10 @@
INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
VALUES ('1522844530959839238', 1123598815738675201, 'ss', 'ss', 'menu', '/ss/ss', NULL, 1, 1, 0, 1, NULL, 0);
INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
VALUES ('1522844530959839239', '1522844530959839238', 'ss_add', '新增', 'add', '/ss/ss/add', 'plus', 1, 2, 1, 1, NULL, 0);
INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
VALUES ('1522844530959839240', '1522844530959839238', 'ss_edit', '修改', 'edit', '/ss/ss/edit', 'form', 2, 2, 2, 1, NULL, 0);
INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
VALUES ('1522844530959839241', '1522844530959839238', 'ss_delete', '删除', 'delete', '/api/ss/ss/remove', 'delete', 3, 2, 3, 1, NULL, 0);
INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
VALUES ('1522844530959839242', '1522844530959839238', 'ss_view', '查看', 'view', '/ss/ss/view', 'file-text', 4, 2, 2, 1, NULL, 0);

 src/main/resources/application-dev.yml

@@ -13,9 +13,9 @@
    #  commandTimeout: 5000
  datasource:
    # MySql
    url: jdbc:mysql://223.82.109.183:2083/zhxyys?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    url: jdbc:mysql://localhost:3306/zhxyys?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    username: root
    password: ZHba@0112
    password: zhxy123
    #url: jdbc:mysql://localhost:3306/zhxyys?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    #username: root
    #password: 131556

 ss/src/api/ss/ss.js

File was renamed from ss/src/api/hdmap/hdmap.js
@@ -2,7 +2,7 @@

export const getList = (current, size, params) => {
  return request({
    url: '/api/hdmap/hdmap/list',
    url: '/api/ss/ss/list',
    method: 'get',
    params: {
      ...params,
@@ -14,7 +14,7 @@

export const getDetail = (id) => {
  return request({
    url: '/api/hdmap/hdmap/detail',
    url: '/api/ss/ss/detail',
    method: 'get',
    params: {
      id
@@ -24,7 +24,7 @@

export const remove = (ids) => {
  return request({
    url: '/api/hdmap/hdmap/remove',
    url: '/api/ss/ss/remove',
    method: 'post',
    params: {
      ids,
@@ -34,7 +34,7 @@

export const add = (row) => {
  return request({
    url: '/api/hdmap/hdmap/submit',
    url: '/api/ss/ss/submit',
    method: 'post',
    data: row
  })
@@ -42,7 +42,7 @@

export const update = (row) => {
  return request({
    url: '/api/hdmap/hdmap/submit',
    url: '/api/ss/ss/submit',
    method: 'post',
    data: row
  })

 ss/src/views/ss/ss.vue

File was renamed from ss/src/views/hdmap/hdmap.vue
@@ -23,7 +23,7 @@
                   size="small"
                   icon="el-icon-delete"
                   plain
                   v-if="permission.hdmap_delete"
                   v-if="permission.ss_delete"
                   @click="handleDelete">删 除
        </el-button>
      </template>
@@ -32,7 +32,7 @@
</template>

<script>
  import {getList, getDetail, add, update, remove} from "@/api/hdmap/hdmap";
  import {getList, getDetail, add, update, remove} from "@/api/ss/ss";
  import {mapGetters} from "vuex";

  export default {
@@ -61,37 +61,10 @@
          column: [
            {
              label: "",
              prop: "id",
              prop: "name",
              rules: [{
                required: true,
                message: "请输入",
                trigger: "blur"
              }]
            },
            {
              label: "活动id",
              prop: "hdid",
              rules: [{
                required: true,
                message: "请输入活动id",
                trigger: "blur"
              }]
            },
            {
              label: "底图类型",
              prop: "maptype",
              rules: [{
                required: true,
                message: "请输入底图类型",
                trigger: "blur"
              }]
            },
            {
              label: "底图路径",
              prop: "mapurl",
              rules: [{
                required: true,
                message: "请输入底图路径",
                trigger: "blur"
              }]
            },
@@ -104,10 +77,10 @@
      ...mapGetters(["permission"]),
      permissionList() {
        return {
          addBtn: this.vaildData(this.permission.hdmap_add, false),
          viewBtn: this.vaildData(this.permission.hdmap_view, false),
          delBtn: this.vaildData(this.permission.hdmap_delete, false),
          editBtn: this.vaildData(this.permission.hdmap_edit, false)
          addBtn: this.vaildData(this.permission.ss_add, false),
          viewBtn: this.vaildData(this.permission.ss_view, false),
          delBtn: this.vaildData(this.permission.ss_delete, false),
          editBtn: this.vaildData(this.permission.ss_edit, false)
        };
      },
      ids() {