更新代码添加 园区开发区 载体列表页面跳转 经纬度存储 imgurl 替换

ruoyi-admin/src/main/resources/application.yml

@@ -30,7 +30,7 @@ server:
       max: 800
       # Tomcat启动初始化的线程数，默认值10
       min-spare: 100
- 
+
 # 日志配置
 logging:
   level:
@@ -135,3 +135,11 @@ xss:
   excludes: /system/notice/*
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
+
+
+geocode:
+  key: 34182f92976cdab1bb4059352fc9e4a8
+
+business:
+  url:
+    geocode: https://restapi.amap.com/v3/geocode/geo?key=${geocode.key}&address=

ruoyi-system/pom.xml

@@ -28,7 +28,10 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
         <!-- SpringBoot集成thymeleaf模板 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -49,4 +52,4 @@
 
     </dependencies>
 
-</project>
+</project>
\ No newline at end of file

ruoyi-system/src/main/java/com/ruoyi/system/config/BusinessUtils.java

+package com.ruoyi.system.config;
+
+import cn.hutool.json.JSONUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author:zhouxudong
+ *
+ * @version: 1.0 @Date: 2023/11/24 17:13 @Description:
+ */
+@Component
+@Slf4j
+public class BusinessUtils {
+  @Autowired private WebClient webClient;
+
+  // 地理/逆地理编码
+  @Value("${business.url.geocode}")
+  private String geocode;
+
+  /**
+   * @description:    返回格式   116.225202,39.897665
+   * @date: 2023/12/17 15:56
+   * @param: [address, city]
+   * @return: java.lang.String
+   */
+  public String getUserIdetify(String address, String city) {
+    String url = this.geocode + address;
+    if (StringUtils.isNotBlank(city)) {
+      url = url + "&city=" + city;
+    }
+    Map result =
+        this.webClient
+            .get()
+            .uri(url)
+            .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+            .retrieve()
+            .bodyToMono(String.class)
+            .timeout(Duration.ofSeconds(4))
+            .onErrorResume(
+                e -> {
+                  log.error("调用高德接口换取经纬度标识失败：", e);
+                  log.error("调用高德接口换取经纬度标识：{}", address);
+                  return Mono.empty();
+                })
+            .map(str -> JSONUtil.toBean(str, Map.class))
+            .block();
+    log.info("调用经纬度返回参数：{}", result);
+    if (ObjectUtils.isNotEmpty(result)
+        && result.get("status").equals("1")
+        && result.get("infocode").equals("10000")) {
+      String geocodes = JSONUtil.toJsonStr(result.get("geocodes"));
+      List<Map> maps = JSONUtil.toList(geocodes, Map.class);
+      Map map = maps.get(0);
+      return map.get("location").toString();
+    }
+
+    return null;
+  }
+}

ruoyi-system/src/main/java/com/ruoyi/system/config/WebClientConfig.java

+package com.ruoyi.system.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.reactive.function.client.WebClient;
+
+@Configuration
+@Slf4j
+public class WebClientConfig {
+
+  @Bean
+  public WebClient webClient() {
+    return WebClient.builder().build();
+  }
+}

ruoyi-system/src/main/java/com/ruoyi/system/controller/ScSourceInfoController.java

+package com.ruoyi.system.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.ScSourceInfo;
+import com.ruoyi.system.service.IScSourceInfoService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 舒城静态资源数据Controller
+ *
+ * @author ruoyi
+ * @date 2023-12-16
+ */
+@Controller
+@RequestMapping("/scsource")
+public class ScSourceInfoController extends BaseController {
+  private String prefix = "scsource";
+
+  @Autowired private IScSourceInfoService scSourceInfoService;
+
+  @RequiresPermissions("scsource:info:view")
+  @GetMapping()
+  public String info() {
+    return prefix + "/info";
+  }
+
+  /** 查询舒城静态资源数据列表 */
+  @RequiresPermissions("scsource:info:list")
+  @PostMapping("/list")
+  @ResponseBody
+  public TableDataInfo list(ScSourceInfo scSourceInfo) {
+    startPage();
+    List<ScSourceInfo> list = scSourceInfoService.selectScSourceInfoList(scSourceInfo);
+    return getDataTable(list);
+  }
+
+  @GetMapping( "/selectType")
+  public String selectType(HttpServletRequest httpServletRequest, ModelMap mmap)
+  {
+    String type = httpServletRequest.getParameter("type");
+    mmap.put("type",type);
+    return prefix + "/selectType";
+  }
+
+  /** 新增舒城静态资源数据 */
+  @GetMapping("/add")
+  public String add() {
+    return prefix + "/add";
+  }
+
+  /** 新增保存舒城静态资源数据 */
+  @RequiresPermissions("scsource:info:add")
+  @Log(title = "舒城静态资源数据", businessType = BusinessType.INSERT)
+  @PostMapping("/add")
+  @ResponseBody
+  public AjaxResult addSave(ScSourceInfo scSourceInfo) {
+    return toAjax(scSourceInfoService.insertScSourceInfo(scSourceInfo));
+  }
+
+
+
+  /** 修改舒城静态资源数据 */
+  @RequiresPermissions("scsource:info:edit")
+  @GetMapping("/edit/{id}")
+  public String edit(@PathVariable("id") Long id, ModelMap mmap) {
+    ScSourceInfo scSourceInfo = scSourceInfoService.selectScSourceInfoById(id);
+    mmap.put("scSourceInfo", scSourceInfo);
+    return prefix + "/edit";
+  }
+
+  /** 修改保存舒城静态资源数据 */
+  @RequiresPermissions("scsource:info:edit")
+  @Log(title = "舒城静态资源数据", businessType = BusinessType.UPDATE)
+  @PostMapping("/edit")
+  @ResponseBody
+  public AjaxResult editSave(ScSourceInfo scSourceInfo) {
+    return toAjax(scSourceInfoService.updateScSourceInfo(scSourceInfo));
+  }
+
+  /** 删除舒城静态资源数据 */
+  @RequiresPermissions("scsource:info:delete")
+  @Log(title = "舒城静态资源数据", businessType = BusinessType.DELETE)
+  @PostMapping("/remove")
+  @ResponseBody
+  public AjaxResult remove(String ids) {
+    return toAjax(scSourceInfoService.deleteScSourceInfoByIds(ids));
+  }
+}

ruoyi-system/src/main/java/com/ruoyi/system/controller/StarObjectExtensionInfoController.java

@@ -14,11 +14,12 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
  * 星级扩展信息Controller
- * 
+ *
  * @author ruoyi
  * @date 2023-11-24
  */
@@ -50,7 +51,15 @@ public class StarObjectExtensionInfoController extends BaseController
         List<StarObjectExtensionInfo> list = starObjectExtensionInfoService.selectStarObjectExtensionInfoList(starObjectExtensionInfo);
         return getDataTable(list);
     }
-
+    @GetMapping("/infoDetail")
+    public String infoDetail(HttpServletRequest request, ModelMap mmap)
+    {
+        String businessId = request.getParameter("businessId");
+        mmap.put("businessId", businessId);
+        String type = request.getParameter("type");
+        mmap.put("type", type);
+        return prefix + "/infoDetail";
+    }
     /**
      * 导出星级扩展信息列表
      */

ruoyi-system/src/main/java/com/ruoyi/system/controller/SysCarouselInfoController.java

@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 
 /**
  * 轮播图信息Controller
- * 
+ *
  * @author ruoyi
  * @date 2023-10-19
  */
@@ -59,6 +59,17 @@ public class SysCarouselInfoController extends BaseController
     {
         return prefix + "/info";
     }
+    @RequiresPermissions("carousel:info:view")
+
+    @GetMapping("/infoDetail")
+    public String infoDetail(HttpServletRequest request, ModelMap mmap)
+    {
+        String associationId = request.getParameter("associationId");
+        mmap.put("associationId", associationId);
+        String type = request.getParameter("type");
+        mmap.put("type", type);
+        return prefix + "/infoDetail";
+    }
 
     @GetMapping("/videoCover")
     public String industry(HttpServletRequest request, ModelMap mmap)
@@ -69,7 +80,18 @@ public class SysCarouselInfoController extends BaseController
         mmap.put("id",id);
         return prefix + "/video_cover";
     }
-
+    /**
+     * @description: 设置为封面
+     * @date: 2023/12/18 11:16
+     * @param: [id]
+     * @return: boolean
+     **/
+    @PostMapping("/cover/{id}")
+    @ResponseBody
+    public AjaxResult cover(@PathVariable Long id){
+        this.sysCarouselInfoService.cover(id);
+        return success();
+    }
     /**
      * 查询轮播图信息列表
      */

ruoyi-system/src/main/java/com/ruoyi/system/controller/SysCarouselVRInfoController.java

@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 
 /**
  * 轮播图信息Controller
- * 
+ *
  * @author ruoyi
  * @date 2023-10-19
  */
@@ -55,11 +55,22 @@ public class SysCarouselVRInfoController extends BaseController
 
     @RequiresPermissions("carousel:VRinfo:view")
     @GetMapping()
-    public String info()
-    {
+    public String info() {
+
         return prefix + "/info";
     }
 
+    @GetMapping("/infoDetail")
+    public String resources(HttpServletRequest request, ModelMap mmap)
+    {
+        String associationId = request.getParameter("associationId");
+        mmap.put("associationId", associationId);
+        String type = request.getParameter("type");
+        mmap.put("type", type);
+        String urlType = request.getParameter("urlType");
+        mmap.put("urlType", urlType);
+        return prefix + "/infoDetail";
+    }
     @GetMapping("/videoCover")
     public String industry(HttpServletRequest request, ModelMap mmap)
     {

ruoyi-system/src/main/java/com/ruoyi/system/domain/ScSourceInfo.java

+package com.ruoyi.system.domain;
+
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 舒城静态资源数据对象 sc_source_info
+ *
+ * @author ruoyi
+ * @date 2023-12-16
+ */
+@Data
+public class ScSourceInfo
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 舒城荣誉图片 */
+    @Excel(name = "舒城荣誉")
+    private String honorUrl;
+
+    /** 舒城荣誉信息 */
+    @Excel(name = "舒城荣誉信息")
+    private String details;
+
+    /** 联系信息 */
+    @Excel(name = "联系信息")
+    private String contactInformation;
+
+    /** 备注字段1 */
+    @Excel(name = "备注字段1")
+    private String r1;
+
+    /** 备注字段2 */
+    @Excel(name = "备注字段2")
+    private String r2;
+
+    /** 备注字段3 */
+    @Excel(name = "备注字段3")
+    private String r3;
+
+    /** 备注字段4 */
+    @Excel(name = "备注字段4")
+    private String r4;
+
+    /** 备注字段5 */
+    @Excel(name = "备注字段5")
+    private String r5;
+
+    /** 产业园id */
+    @Excel(name = "产业园")
+    private String developmentName;
+
+    private String developmentId;
+    private String createBy;
+    private String updateBy;
+
+    /** 乐观锁 */
+    private Long version;
+    private Date createTime;
+
+    private Date updateTime;
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCarouselInfo.java

@@ -78,5 +78,6 @@ public class SysCarouselInfo extends BaseEntity {
      */
     @Excel(name = "视频封面")
     private String videoCover;
-
+    //是否是图片封面
+    private Integer imgCover;
 }

ruoyi-system/src/main/java/com/ruoyi/system/enums/SysCollectionTypeEnum.java

@@ -3,8 +3,9 @@ package com.ruoyi.system.enums;
 public enum SysCollectionTypeEnum {
     DUSHIQUAN(0,"都市圈"),
     KAIFAQU(1,"开发区"),
-    YUANUQU(2,"开发区"),
-    TUDI(3,"土地"),;
+    YUANUQU(2,"园区"),
+    TUDI(3,"土地"),
+    CARRIER(4,"载体");
     private Integer code;
     private String name;
 

ruoyi-system/src/main/java/com/ruoyi/system/factory/BusinessServiceFactory.java

+package com.ruoyi.system.factory;
+
+import com.ruoyi.system.service.BaseService;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @Author:zhouxudong
+ *
+ * @version: 1.0 @Date: 2023/11/29 16:06 @Description:
+ */
+public class BusinessServiceFactory {
+
+  public static Map<Integer, BaseService> serviceMap = new ConcurrentHashMap<>();
+  public static List<BaseService> listCommon = new ArrayList<>();
+
+  public static BaseService getBusinessByCode(Integer code) {
+    return serviceMap.get(code);
+  }
+
+  public static void register(Integer code, BaseService commonService) {
+    listCommon.add(commonService);
+    serviceMap.put(code, commonService);
+  }
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScSourceInfoMapper.java

+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.ScSourceInfo;
+
+/**
+ * 舒城静态资源数据Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-12-16
+ */
+public interface ScSourceInfoMapper 
+{
+    /**
+     * 查询舒城静态资源数据
+     * 
+     * @param id 舒城静态资源数据主键
+     * @return 舒城静态资源数据
+     */
+    public ScSourceInfo selectScSourceInfoById(Long id);
+
+    /**
+     * 查询舒城静态资源数据列表
+     * 
+     * @param scSourceInfo 舒城静态资源数据
+     * @return 舒城静态资源数据集合
+     */
+    public List<ScSourceInfo> selectScSourceInfoList(ScSourceInfo scSourceInfo);
+
+    /**
+     * 新增舒城静态资源数据
+     * 
+     * @param scSourceInfo 舒城静态资源数据
+     * @return 结果
+     */
+    public int insertScSourceInfo(ScSourceInfo scSourceInfo);
+
+    /**
+     * 修改舒城静态资源数据
+     * 
+     * @param scSourceInfo 舒城静态资源数据
+     * @return 结果
+     */
+    public int updateScSourceInfo(ScSourceInfo scSourceInfo);
+
+    /**
+     * 删除舒城静态资源数据
+     * 
+     * @param id 舒城静态资源数据主键
+     * @return 结果
+     */
+    public int deleteScSourceInfoById(Long id);
+
+    /**
+     * 批量删除舒城静态资源数据
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteScSourceInfoByIds(String[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysCarouselInfoMapper.java

@@ -5,15 +5,15 @@ import com.ruoyi.system.domain.SysCarouselInfo;
 
 /**
  * 轮播图信息Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2023-10-19
  */
-public interface SysCarouselInfoMapper 
+public interface SysCarouselInfoMapper
 {
     /**
      * 查询轮播图信息
-     * 
+     *
      * @param id 轮播图信息主键
      * @return 轮播图信息
      */
@@ -21,7 +21,7 @@ public interface SysCarouselInfoMapper
 
     /**
      * 查询轮播图信息列表
-     * 
+     *
      * @param sysCarouselInfo 轮播图信息
      * @return 轮播图信息集合
      */
@@ -33,7 +33,7 @@ public interface SysCarouselInfoMapper
 
     /**
      * 新增轮播图信息
-     * 
+     *
      * @param sysCarouselInfo 轮播图信息
      * @return 结果
      */
@@ -41,7 +41,7 @@ public interface SysCarouselInfoMapper
 
     /**
      * 修改轮播图信息
-     * 
+     *
      * @param sysCarouselInfo 轮播图信息
      * @return 结果
      */
@@ -49,7 +49,7 @@ public interface SysCarouselInfoMapper
 
     /**
      * 删除轮播图信息
-     * 
+     *
      * @param id 轮播图信息主键
      * @return 结果
      */
@@ -57,9 +57,11 @@ public interface SysCarouselInfoMapper
 
     /**
      * 批量删除轮播图信息
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteSysCarouselInfoByIds(String[] ids);
+
+    void updateImgCover(SysCarouselInfo carouselInfo);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/BaseService.java

+package com.ruoyi.system.service;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author:zhouxudong
+ * @version: 1.0
+ * @Date: 2023/12/18 14:50
+ * @Description:
+ */
+public interface BaseService {
+    /**
+     * @description: 修改图片默认图
+     * @date: 2023/12/18 15:06
+     * @param: [associationId, imgUrl]
+     * @return: java.lang.Boolean
+     **/
+    Boolean updateImgUrl(Long associationId, String imgUrl);
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IScSourceInfoService.java

+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.ScSourceInfo;
+
+/**
+ * 舒城静态资源数据Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-12-16
+ */
+public interface IScSourceInfoService 
+{
+    /**
+     * 查询舒城静态资源数据
+     * 
+     * @param id 舒城静态资源数据主键
+     * @return 舒城静态资源数据
+     */
+    public ScSourceInfo selectScSourceInfoById(Long id);
+
+    /**
+     * 查询舒城静态资源数据列表
+     * 
+     * @param scSourceInfo 舒城静态资源数据
+     * @return 舒城静态资源数据集合
+     */
+    public List<ScSourceInfo> selectScSourceInfoList(ScSourceInfo scSourceInfo);
+
+    /**
+     * 新增舒城静态资源数据
+     * 
+     * @param scSourceInfo 舒城静态资源数据
+     * @return 结果
+     */
+    public int insertScSourceInfo(ScSourceInfo scSourceInfo);
+
+    /**
+     * 修改舒城静态资源数据
+     * 
+     * @param scSourceInfo 舒城静态资源数据
+     * @return 结果
+     */
+    public int updateScSourceInfo(ScSourceInfo scSourceInfo);
+
+    /**
+     * 批量删除舒城静态资源数据
+     * 
+     * @param ids 需要删除的舒城静态资源数据主键集合
+     * @return 结果
+     */
+    public int deleteScSourceInfoByIds(String ids);
+
+    /**
+     * 删除舒城静态资源数据信息
+     * 
+     * @param id 舒城静态资源数据主键
+     * @return 结果
+     */
+    public int deleteScSourceInfoById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysCarouselInfoService.java

@@ -6,15 +6,15 @@ import java.util.List;
 
 /**
  * 轮播图信息Service接口
- * 
+ *
  * @author ruoyi
  * @date 2023-10-19
  */
-public interface ISysCarouselInfoService 
+public interface ISysCarouselInfoService
 {
     /**
      * 查询轮播图信息
-     * 
+     *
      * @param id 轮播图信息主键
      * @return 轮播图信息
      */
@@ -22,7 +22,7 @@ public interface ISysCarouselInfoService
 
     /**
      * 查询轮播图信息列表
-     * 
+     *
      * @param sysCarouselInfo 轮播图信息
      * @return 轮播图信息集合
      */
@@ -38,7 +38,7 @@ public interface ISysCarouselInfoService
 
     /**
      * 新增轮播图信息
-     * 
+     *
      * @param sysCarouselInfo 轮播图信息
      * @return 结果
      */
@@ -46,7 +46,7 @@ public interface ISysCarouselInfoService
 
     /**
      * 修改轮播图信息
-     * 
+     *
      * @param sysCarouselInfo 轮播图信息
      * @return 结果
      */
@@ -56,7 +56,7 @@ public interface ISysCarouselInfoService
 
     /**
      * 批量删除轮播图信息
-     * 
+     *
      * @param ids 需要删除的轮播图信息主键集合
      * @return 结果
      */
@@ -64,9 +64,11 @@ public interface ISysCarouselInfoService
 
     /**
      * 删除轮播图信息信息
-     * 
+     *
      * @param id 轮播图信息主键
      * @return 结果
      */
     public int deleteSysCarouselInfoById(Long id);
+
+    int cover(Long id);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CarrierInfoServiceImpl.java

 package com.ruoyi.system.service.impl;
 
+import java.math.BigDecimal;
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.enums.SysCollectionTypeEnum;
+import com.ruoyi.system.factory.BusinessServiceFactory;
+import com.ruoyi.system.service.BaseService;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.CarrierInfoMapper;
@@ -11,19 +16,19 @@ import com.ruoyi.common.core.text.Convert;
 
 /**
  * 载体信息Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2023-12-07
  */
 @Service
-public class CarrierInfoServiceImpl implements ICarrierInfoService 
+public class CarrierInfoServiceImpl implements ICarrierInfoService, BaseService, InitializingBean
 {
     @Autowired
     private CarrierInfoMapper carrierInfoMapper;
 
     /**
      * 查询载体信息
-     * 
+     *
      * @param id 载体信息主键
      * @return 载体信息
      */
@@ -35,7 +40,7 @@ public class CarrierInfoServiceImpl implements ICarrierInfoService
 
     /**
      * 查询载体信息列表
-     * 
+     *
      * @param carrierInfo 载体信息
      * @return 载体信息
      */
@@ -54,7 +59,7 @@ public class CarrierInfoServiceImpl implements ICarrierInfoService
 
     /**
      * 新增载体信息
-     * 
+     *
      * @param carrierInfo 载体信息
      * @return 结果
      */
@@ -67,7 +72,7 @@ public class CarrierInfoServiceImpl implements ICarrierInfoService
 
     /**
      * 修改载体信息
-     * 
+     *
      * @param carrierInfo 载体信息
      * @return 结果
      */
@@ -80,7 +85,7 @@ public class CarrierInfoServiceImpl implements ICarrierInfoService
 
     /**
      * 批量删除载体信息
-     * 
+     *
      * @param ids 需要删除的载体信息主键
      * @return 结果
      */
@@ -92,7 +97,7 @@ public class CarrierInfoServiceImpl implements ICarrierInfoService
 
     /**
      * 删除载体信息信息
-     * 
+     *
      * @param id 载体信息主键
      * @return 结果
      */
@@ -101,4 +106,16 @@ public class CarrierInfoServiceImpl implements ICarrierInfoService
     {
         return carrierInfoMapper.deleteCarrierInfoById(id);
     }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+    BusinessServiceFactory.register(SysCollectionTypeEnum.CARRIER.getCode(),this);
+    }
+
+    @Override
+    public Boolean updateImgUrl(Long associationId, String imgUrl) {
+        CarrierInfo carrierInfo = this.carrierInfoMapper.selectCarrierInfoById(associationId);
+        carrierInfo.setImgUrl(imgUrl);
+        return this.carrierInfoMapper.updateCarrierInfo(carrierInfo)==1;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DevelopmentIndustrialLandInfoServiceImpl.java

 package com.ruoyi.system.service.impl;
 
+import java.math.BigDecimal;
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.enums.SysCollectionTypeEnum;
+import com.ruoyi.system.factory.BusinessServiceFactory;
+import com.ruoyi.system.service.BaseService;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.DevelopmentIndustrialLandInfoMapper;
@@ -11,19 +16,19 @@ import com.ruoyi.common.core.text.Convert;
 
 /**
  * 土地信息Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2023-12-07
  */
 @Service
-public class DevelopmentIndustrialLandInfoServiceImpl implements IDevelopmentIndustrialLandInfoService 
+public class DevelopmentIndustrialLandInfoServiceImpl implements IDevelopmentIndustrialLandInfoService , BaseService, InitializingBean
 {
     @Autowired
     private DevelopmentIndustrialLandInfoMapper developmentIndustrialLandInfoMapper;
 
     /**
      * 查询土地信息
-     * 
+     *
      * @param id 土地信息主键
      * @return 土地信息
      */
@@ -35,7 +40,7 @@ public class DevelopmentIndustrialLandInfoServiceImpl implements IDevelopmentInd
 
     /**
      * 查询土地信息列表
-     * 
+     *
      * @param developmentIndustrialLandInfo 土地信息
      * @return 土地信息
      */
@@ -53,7 +58,7 @@ public class DevelopmentIndustrialLandInfoServiceImpl implements IDevelopmentInd
 
     /**
      * 新增土地信息
-     * 
+     *
      * @param developmentIndustrialLandInfo 土地信息
      * @return 结果
      */
@@ -66,7 +71,7 @@ public class DevelopmentIndustrialLandInfoServiceImpl implements IDevelopmentInd
 
     /**
      * 修改土地信息
-     * 
+     *
      * @param developmentIndustrialLandInfo 土地信息
      * @return 结果
      */
@@ -79,7 +84,7 @@ public class DevelopmentIndustrialLandInfoServiceImpl implements IDevelopmentInd
 
     /**
      * 批量删除土地信息
-     * 
+     *
      * @param ids 需要删除的土地信息主键
      * @return 结果
      */
@@ -91,7 +96,7 @@ public class DevelopmentIndustrialLandInfoServiceImpl implements IDevelopmentInd
 
     /**
      * 删除土地信息信息
-     * 
+     *
      * @param id 土地信息主键
      * @return 结果
      */
@@ -100,4 +105,17 @@ public class DevelopmentIndustrialLandInfoServiceImpl implements IDevelopmentInd
     {
         return developmentIndustrialLandInfoMapper.deleteDevelopmentIndustrialLandInfoById(id);
     }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        BusinessServiceFactory.register(SysCollectionTypeEnum.TUDI.getCode(),this);
+    }
+
+    @Override
+    public Boolean updateImgUrl(Long associationId, String imgUrl) {
+        DevelopmentIndustrialLandInfo developmentIndustrialLandInfo = this.developmentIndustrialLandInfoMapper.selectDevelopmentIndustrialLandInfoById(associationId);
+        developmentIndustrialLandInfo.setImgUrl(imgUrl);
+        return this.developmentIndustrialLandInfoMapper.updateDevelopmentIndustrialLandInfo(developmentIndustrialLandInfo)==1;
+    }
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DevelopmentInfoServiceImpl.java

 package com.ruoyi.system.service.impl;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.VO.DevelopmentInfoDetailVO;
+import com.ruoyi.system.config.BusinessUtils;
 import com.ruoyi.system.domain.*;
 import com.ruoyi.system.enums.*;
+import com.ruoyi.system.factory.BusinessServiceFactory;
 import com.ruoyi.system.mapper.*;
+import com.ruoyi.system.service.BaseService;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.service.IDevelopmentInfoService;
 import com.ruoyi.common.core.text.Convert;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 开发区Service业务层处理
@@ -20,13 +27,37 @@ import com.ruoyi.common.core.text.Convert;
  * @date 2023-11-10
  */
 @Service
-public class DevelopmentInfoServiceImpl implements IDevelopmentInfoService {
+public class DevelopmentInfoServiceImpl implements IDevelopmentInfoService, BaseService, InitializingBean {
     @Autowired
     private DevelopmentInfoMapper developmentInfoMapper;
 
     @Autowired
     private SysCollectionMapper sysCollectionMapper;
 
+    @Autowired
+    DevelopmentTrafficInfoServiceImpl developmentTrafficInfoService;
+    @Autowired
+    DevelopmentPrimaryEnterpriseInfoServiceImpl developmentPrimaryEnterpriseInfoService;
+
+    @Autowired
+    DevelopmentPeripheryInfoServiceImpl peripheryInfoService;
+
+    @Autowired
+    DevelopmentInvestmentDirectionInfoServiceImpl investmentDirectionInfoService;
+
+    @Autowired
+    DevelopmentIndustrialLandInfoServiceImpl industrialLandInfoService;
+
+    @Autowired
+    DevelopmentIndustryPolicyInfoServiceImpl policyInfoService;
+
+    @Autowired
+    DevelopmentIndustryFundInfoServiceImpl fundInfoService;
+
+    @Autowired
+    private SysCarouselInfoMapper sysCarouselInfoMapper;
+    @Autowired
+    private BusinessUtils businessUtils;
     /**
      * 查询开发区
      *
@@ -68,8 +99,25 @@ public class DevelopmentInfoServiceImpl implements IDevelopmentInfoService {
      * @return 结果
      */
     @Override
+    @Transactional
     public int updateDevelopmentInfo(DevelopmentInfo developmentInfo) {
         developmentInfo.setUpdateTime(DateUtils.getNowDate());
+        if(StringUtils.isNotBlank(developmentInfo.getAddress())){
+            String cityName = developmentInfo.getCityName();
+            String provinceName = developmentInfo.getProvinceName();
+            String regionName = developmentInfo.getRegionName();
+            StringBuilder sb=new StringBuilder();
+            sb.append(provinceName).append(cityName).append(regionName).append(developmentInfo.getAddress());
+            String address = sb.toString().replace("null", "");
+            String userIdetify = this.businessUtils.getUserIdetify(address, cityName);
+            if(StringUtils.isNotBlank(userIdetify)){
+                String[] split = userIdetify.split(",");
+                developmentInfo.setLongitude(new BigDecimal(split[0]));
+                if(split.length>1){
+                    developmentInfo.setLatitude(new BigDecimal(split[1]));
+                }
+            }
+        }
         return developmentInfoMapper.updateDevelopmentInfo(developmentInfo);
     }
 
@@ -157,29 +205,6 @@ public class DevelopmentInfoServiceImpl implements IDevelopmentInfoService {
         return developmentInfoMapper.selectExcludeByStatus(developmentInfo);
     }
 
-    @Autowired
-    DevelopmentTrafficInfoServiceImpl developmentTrafficInfoService;
-    @Autowired
-    DevelopmentPrimaryEnterpriseInfoServiceImpl developmentPrimaryEnterpriseInfoService;
-
-    @Autowired
-    DevelopmentPeripheryInfoServiceImpl peripheryInfoService;
-
-    @Autowired
-    DevelopmentInvestmentDirectionInfoServiceImpl investmentDirectionInfoService;
-
-    @Autowired
-    DevelopmentIndustrialLandInfoServiceImpl industrialLandInfoService;
-
-    @Autowired
-    DevelopmentIndustryPolicyInfoServiceImpl policyInfoService;
-
-    @Autowired
-    DevelopmentIndustryFundInfoServiceImpl fundInfoService;
-
-    @Autowired
-    private SysCarouselInfoMapper sysCarouselInfoMapper;
-
     @Override
     public DevelopmentInfoDetailVO detail(Long developmentInfoId) {
         DevelopmentInfo developmentInfo = this.selectDevelopmentInfoById(developmentInfoId);
@@ -233,4 +258,28 @@ public class DevelopmentInfoServiceImpl implements IDevelopmentInfoService {
 
         return developmentInfoDetailVO;
     }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        BusinessServiceFactory.register(SysCollectionTypeEnum.KAIFAQU.getCode(),this);
+    }
+
+    @Override
+    public Boolean updateImgUrl(Long associationId, String imgUrl) {
+        DevelopmentInfo developmentInfo = this.developmentInfoMapper.selectDevelopmentInfoById(associationId);
+        developmentInfo.setImgUrl(imgUrl);
+        return this.developmentInfoMapper.updateDevelopmentInfo(developmentInfo)==1;
+    }
+    /**
+     * @description: 设置经纬度
+     * @date: 2023/12/18 15:19
+     * @param: [associationId, longitude, latitude]
+     * @return: java.lang.Boolean
+     **/
+    public Boolean updateImgUrl(Long associationId, BigDecimal longitude, BigDecimal latitude) {
+        DevelopmentInfo developmentInfo = this.developmentInfoMapper.selectDevelopmentInfoById(associationId);
+        developmentInfo.setLongitude(longitude);
+        developmentInfo.setLatitude(latitude);
+        return this.developmentInfoMapper.updateDevelopmentInfo(developmentInfo)==1;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ParkInfoServiceImpl.java

@@ -2,17 +2,23 @@ package com.ruoyi.system.service.impl;
 
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.VO.ParkInfoAllVO;
+import com.ruoyi.system.config.BusinessUtils;
 import com.ruoyi.system.domain.*;
 import com.ruoyi.system.enums.FileSourceObjectTypeEnum;
 import com.ruoyi.system.enums.ParkInfoStatusEnum;
 import com.ruoyi.system.enums.SysCollectionTypeEnum;
+import com.ruoyi.system.factory.BusinessServiceFactory;
 import com.ruoyi.system.mapper.*;
+import com.ruoyi.system.service.BaseService;
 import com.ruoyi.system.service.IParkInfoService;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -23,7 +29,7 @@ import java.util.stream.Collectors;
  * @author ruoyi
  */
 @Service
-public class ParkInfoServiceImpl implements IParkInfoService {
+public class ParkInfoServiceImpl implements IParkInfoService, BaseService, InitializingBean {
     @Autowired
     private ParkInfoMapper parkInfoMapper;
 
@@ -50,7 +56,8 @@ public class ParkInfoServiceImpl implements IParkInfoService {
 
     @Autowired
     private SysCarouselInfoMapper sysCarouselInfoMapper;
-
+    @Autowired
+    private BusinessUtils businessUtils;
     /**
      * 查询parkinfo
      *
@@ -152,6 +159,22 @@ public class ParkInfoServiceImpl implements IParkInfoService {
     @Transactional
     public int updateParkInfo(ParkInfo parkInfo) {
         parkInfo.setUpdateTime(DateUtils.getNowDate());
+        if(StringUtils.isNotBlank(parkInfo.getAddress())){
+            String cityName = parkInfo.getCityName();
+            String provinceName = parkInfo.getProvinceName();
+            String regionName = parkInfo.getRegionName();
+            StringBuilder sb=new StringBuilder();
+            sb.append(provinceName).append(cityName).append(regionName).append(parkInfo.getAddress());
+            String address = sb.toString().replace("null", "");
+            String userIdetify = this.businessUtils.getUserIdetify(address, cityName);
+            if(StringUtils.isNotBlank(userIdetify)){
+                String[] split = userIdetify.split(",");
+                parkInfo.setLongitude(new BigDecimal(split[0]));
+                if(split.length>1){
+                    parkInfo.setLatitude(new BigDecimal(split[1]));
+                }
+            }
+        }
         return parkInfoMapper.updateParkInfo(parkInfo);
     }
 
@@ -243,4 +266,25 @@ public class ParkInfoServiceImpl implements IParkInfoService {
 
         return parkInfoAllVO;
     }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        BusinessServiceFactory.register(SysCollectionTypeEnum.YUANUQU.getCode(),this);
+    }
+
+    @Override
+    public Boolean updateImgUrl(Long associationId, String imgUrl) {
+        ParkInfo parkInfo = this.parkInfoMapper.selectParkInfoById(associationId);
+        parkInfo.setImgUrl(imgUrl);
+
+        return this.parkInfoMapper.updateParkInfo(parkInfo)==1;
+    }
+
+
+    public Boolean updateImgUrl(Long associationId, BigDecimal longitude, BigDecimal latitude) {
+        ParkInfo parkInfo = this.parkInfoMapper.selectParkInfoById(associationId);
+        parkInfo.setLongitude(longitude);
+        parkInfo.setLatitude(latitude);
+        return this.parkInfoMapper.updateParkInfo(parkInfo)==1;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScSourceInfoServiceImpl.java

+package com.ruoyi.system.service.impl;
+
+import java.util.Date;
+import java.util.List;
+
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.DevelopmentInfo;
+import com.ruoyi.system.service.IDevelopmentInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.ScSourceInfoMapper;
+import com.ruoyi.system.domain.ScSourceInfo;
+import com.ruoyi.system.service.IScSourceInfoService;
+import com.ruoyi.common.core.text.Convert;
+import org.springframework.util.CollectionUtils;
+
+/**
+ * 舒城静态资源数据Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-12-16
+ */
+@Service
+public class ScSourceInfoServiceImpl implements IScSourceInfoService {
+  @Autowired private ScSourceInfoMapper scSourceInfoMapper;
+  @Autowired
+  private IDevelopmentInfoService iDevelopmentInfoService;
+  /**
+   * 查询舒城静态资源数据
+   *
+   * @param id 舒城静态资源数据主键
+   * @return 舒城静态资源数据
+   */
+  @Override
+  public ScSourceInfo selectScSourceInfoById(Long id) {
+    return scSourceInfoMapper.selectScSourceInfoById(id);
+  }
+
+  /**
+   * 查询舒城静态资源数据列表
+   *
+   * @param scSourceInfo 舒城静态资源数据
+   * @return 舒城静态资源数据
+   */
+  @Override
+  public List<ScSourceInfo> selectScSourceInfoList(ScSourceInfo scSourceInfo) {
+    List<ScSourceInfo> scSourceInfos = scSourceInfoMapper.selectScSourceInfoList(scSourceInfo);
+    for (ScSourceInfo sourceInfo : scSourceInfos) {
+      String developmentId = sourceInfo.getDevelopmentId();
+      DevelopmentInfo developmentInfo = iDevelopmentInfoService.selectDevelopmentInfoById(Long.valueOf(developmentId));
+      sourceInfo.setDevelopmentName(developmentInfo.getName());
+    }
+    return scSourceInfos;
+  }
+
+  /**
+   * 新增舒城静态资源数据
+   *
+   * @param scSourceInfo 舒城静态资源数据
+   * @return 结果
+   */
+  @Override
+  public int insertScSourceInfo(ScSourceInfo scSourceInfo) {
+    String developmentId = scSourceInfo.getDevelopmentId();
+
+    ScSourceInfo scSource=new ScSourceInfo();
+    scSource.setDevelopmentId(developmentId);
+    List<ScSourceInfo> scSourceInfos = scSourceInfoMapper.selectScSourceInfoList(scSource);
+
+    if(CollectionUtils.isEmpty(scSourceInfos)){
+      scSourceInfo.setDevelopmentId(developmentId);
+      scSourceInfo.setCreateTime(new Date());
+      return scSourceInfoMapper.insertScSourceInfo(scSourceInfo);
+    }
+    throw new ServiceException("已维护该开发区数据");
+  }
+
+  /**
+   * 修改舒城静态资源数据
+   *
+   * @param scSourceInfo 舒城静态资源数据
+   * @return 结果
+   */
+  @Override
+  public int updateScSourceInfo(ScSourceInfo scSourceInfo) {
+    return scSourceInfoMapper.updateScSourceInfo(scSourceInfo);
+  }
+
+  /**
+   * 批量删除舒城静态资源数据
+   *
+   * @param ids 需要删除的舒城静态资源数据主键
+   * @return 结果
+   */
+  @Override
+  public int deleteScSourceInfoByIds(String ids) {
+    return scSourceInfoMapper.deleteScSourceInfoByIds(Convert.toStrArray(ids));
+  }
+
+  /**
+   * 删除舒城静态资源数据信息
+   *
+   * @param id 舒城静态资源数据主键
+   * @return 结果
+   */
+  @Override
+  public int deleteScSourceInfoById(Long id) {
+    return scSourceInfoMapper.deleteScSourceInfoById(id);
+  }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysCarouselInfoServiceImpl.java

 package com.ruoyi.system.service.impl;
 
 import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.SysCarouselInfo;
+import com.ruoyi.system.factory.BusinessServiceFactory;
 import com.ruoyi.system.mapper.SysCarouselInfoMapper;
+import com.ruoyi.system.service.BaseService;
 import com.ruoyi.system.service.ISysCarouselInfoService;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -143,4 +147,29 @@ public class SysCarouselInfoServiceImpl implements ISysCarouselInfoService {
     public int deleteSysCarouselInfoById(Long id) {
         return sysCarouselInfoMapper.deleteSysCarouselInfoById(id);
     }
+
+    /**
+     * @description: 设置为封面
+     * @date: 2023/12/18 11:16
+     * @param: [id]
+     * @return: boolean
+     **/
+    @Override
+    @Transactional
+    public int cover(Long id) {
+        SysCarouselInfo sysCarouselInfo = this.sysCarouselInfoMapper.selectSysCarouselInfoById(id);
+        SysCarouselInfo carouselInfo=new SysCarouselInfo();
+        carouselInfo.setAssociationId(sysCarouselInfo.getAssociationId());
+        carouselInfo.setType(sysCarouselInfo.getType());
+        carouselInfo.setUrlType(1);
+        carouselInfo.setImgCover(0);
+        this.sysCarouselInfoMapper.updateImgCover(carouselInfo);
+        sysCarouselInfo.setImgCover(1);
+        BaseService baseService = BusinessServiceFactory.getBusinessByCode(sysCarouselInfo.getType());
+        Boolean result=baseService.updateImgUrl(sysCarouselInfo.getAssociationId(),sysCarouselInfo.getImgUrl());
+        if(!result){
+            throw new ServiceException("封面设置失败");
+        }
+        return this.sysCarouselInfoMapper.updateSysCarouselInfo(sysCarouselInfo);
+    }
 }

ruoyi-system/src/main/resources/mapper/carousel/SysCarouselInfoMapper.xml

@@ -18,10 +18,11 @@
         <result property="linkUrl"    column="link_url"    />
         <result property="urlType"    column="url_type"    />
         <result property="videoCover"    column="video_cover"    />
+        <result property="imgCover"    column="img_cover"    />
     </resultMap>
 
     <sql id="selectSysCarouselInfoVo">
-        select id, create_time, update_time, img_url, description, status, type, order_number, association_id, association_name, link_url, url_type, video_cover from sys_carousel_info
+        select id, create_time, update_time, img_url, description, status, type, order_number, association_id, association_name, link_url, url_type, video_cover,img_cover from sys_carousel_info
     </sql>
 
     <select id="selectSysCarouselInfoList" parameterType="SysCarouselInfo" resultMap="SysCarouselInfoResult">
@@ -78,6 +79,7 @@
             <if test="linkUrl != null">link_url,</if>
             <if test="urlType != null">url_type,</if>
             <if test="videoCover != null">video_cover,</if>
+            <if test="imgCover != null">img_cover,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="createTime != null">#{createTime},</if>
@@ -92,6 +94,7 @@
             <if test="linkUrl != null">#{linkUrl},</if>
             <if test="urlType != null">#{urlType},</if>
             <if test="videoCover != null">#{videoCover},</if>
+            <if test="imgCover != null">#{imgCover},</if>
         </trim>
     </insert>
 
@@ -110,10 +113,13 @@
             <if test="linkUrl != null">link_url = #{linkUrl},</if>
             <if test="urlType != null">url_type = #{urlType},</if>
             <if test="videoCover != null">video_cover = #{videoCover},</if>
+            <if test="imgCover != null">img_cover = #{imgCover},</if>
         </trim>
         where id = #{id}
     </update>
-
+    <update id="updateImgCover">
+        update sys_carousel_info set img_cover=#{imgCover} where url_type=#{urlType} and type=#{type} and association_id=#{associationId}
+    </update>
     <delete id="deleteSysCarouselInfoById" parameterType="Long">
         delete from sys_carousel_info where id = #{id}
     </delete>
@@ -125,4 +131,4 @@
         </foreach>
     </delete>
 
-</mapper>
+</mapper>
\ No newline at end of file

ruoyi-system/src/main/resources/mapper/system/ScSourceInfoMapper.xml

+<?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.ruoyi.system.mapper.ScSourceInfoMapper">
+    
+    <resultMap type="ScSourceInfo" id="ScSourceInfoResult">
+        <result property="id"    column="id"    />
+        <result property="honorUrl"    column="honor_url"    />
+        <result property="details"    column="details"    />
+        <result property="contactInformation"    column="contact_information"    />
+        <result property="r1"    column="r1"    />
+        <result property="r2"    column="r2"    />
+        <result property="r3"    column="r3"    />
+        <result property="r4"    column="r4"    />
+        <result property="r5"    column="r5"    />
+        <result property="developmentId"    column="development_id"    />
+        <result property="version"    column="version"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectScSourceInfoVo">
+        select id, honor_url, details, contact_information, r1, r2, r3, r4, r5, development_id, version, create_by, create_time, update_by, update_time from sc_source_info
+    </sql>
+
+    <select id="selectScSourceInfoList" parameterType="ScSourceInfo" resultMap="ScSourceInfoResult">
+        <include refid="selectScSourceInfoVo"/>
+        <where>  
+            <if test="honorUrl != null  and honorUrl != ''"> and honor_url = #{honorUrl}</if>
+            <if test="details != null  and details != ''"> and details = #{details}</if>
+            <if test="contactInformation != null  and contactInformation != ''"> and contact_information = #{contactInformation}</if>
+            <if test="r1 != null  and r1 != ''"> and r1 = #{r1}</if>
+            <if test="r2 != null  and r2 != ''"> and r2 = #{r2}</if>
+            <if test="r3 != null  and r3 != ''"> and r3 = #{r3}</if>
+            <if test="r4 != null  and r4 != ''"> and r4 = #{r4}</if>
+            <if test="r5 != null  and r5 != ''"> and r5 = #{r5}</if>
+            <if test="developmentId != null "> and development_id = #{developmentId}</if>
+            <if test="version != null "> and version = #{version}</if>
+        </where>
+    </select>
+    
+    <select id="selectScSourceInfoById" parameterType="Long" resultMap="ScSourceInfoResult">
+        <include refid="selectScSourceInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertScSourceInfo" parameterType="ScSourceInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into sc_source_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="honorUrl != null and honorUrl != ''">honor_url,</if>
+            <if test="details != null and details != ''">details,</if>
+            <if test="contactInformation != null and contactInformation != ''">contact_information,</if>
+            <if test="r1 != null">r1,</if>
+            <if test="r2 != null">r2,</if>
+            <if test="r3 != null">r3,</if>
+            <if test="r4 != null">r4,</if>
+            <if test="r5 != null">r5,</if>
+            <if test="developmentId != null">development_id,</if>
+            <if test="version != null">version,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="honorUrl != null and honorUrl != ''">#{honorUrl},</if>
+            <if test="details != null and details != ''">#{details},</if>
+            <if test="contactInformation != null and contactInformation != ''">#{contactInformation},</if>
+            <if test="r1 != null">#{r1},</if>
+            <if test="r2 != null">#{r2},</if>
+            <if test="r3 != null">#{r3},</if>
+            <if test="r4 != null">#{r4},</if>
+            <if test="r5 != null">#{r5},</if>
+            <if test="developmentId != null">#{developmentId},</if>
+            <if test="version != null">#{version},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateScSourceInfo" parameterType="ScSourceInfo">
+        update sc_source_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="honorUrl != null and honorUrl != ''">honor_url = #{honorUrl},</if>
+            <if test="details != null and details != ''">details = #{details},</if>
+            <if test="contactInformation != null and contactInformation != ''">contact_information = #{contactInformation},</if>
+            <if test="r1 != null">r1 = #{r1},</if>
+            <if test="r2 != null">r2 = #{r2},</if>
+            <if test="r3 != null">r3 = #{r3},</if>
+            <if test="r4 != null">r4 = #{r4},</if>
+            <if test="r5 != null">r5 = #{r5},</if>
+            <if test="developmentId != null">development_id = #{developmentId},</if>
+            <if test="version != null">version = #{version},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteScSourceInfoById" parameterType="Long">
+        delete from sc_source_info where id = #{id}
+    </delete>
+
+    <delete id="deleteScSourceInfoByIds" parameterType="String">
+        delete from sc_source_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file

ruoyi-system/src/main/resources/templates/carousel/VRinfo/infoDetail.html

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('轮播图信息列表')"/>
+</head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <!--                            <li>-->
+                        <!--                                <label>图片地址链接：</label>-->
+                        <!--                                <input type="text" name="imgUrl"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>图片描述：</label>-->
+                        <!--                                <input type="text" name="description"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>排序：</label>-->
+                        <!--                                <input type="text" name="orderNumber"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>关联id：</label>-->
+                        <!--                                <input type="text" name="associationId"/>-->
+                        <!--                            </li>-->
+                        <li>
+                            <input type="hidden" readonly="readonly" id="associationId" th:value="${associationId}"/>
+                        </li>
+                        <li>
+                            <input type="hidden" readonly="readonly" hidden id="type" th:value="${type}"/>
+                        </li>
+                        <li>
+                            <input type="hidden" readonly="readonly" hidden id="urlType" th:value="${urlType}"/>
+                        </li>
+                        <!--                            <li>-->
+                        <!--                                <label>转跳链接：</label>-->
+                        <!--                                <input type="text" name="linkUrl"/>-->
+                        <!--                            </li>-->
+                        <!--<li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>-->
+                    </ul>
+                </div>
+            </form>
+        </div>
+
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="carousel:info:add">
+                <i class="fa fa-plus"></i> 添加
+            </a>
+            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
+               shiro:hasPermission="carousel:info:edit">
+                <i class="fa fa-edit"></i> 修改
+            </a>
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
+               shiro:hasPermission="carousel:info:remove">
+                <i class="fa fa-remove"></i> 删除
+            </a>
+            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="carousel:info:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('carousel:info:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('carousel:info:remove')}]];
+    var datas = [[${@dict.getType('sys_carousel_status')}]];
+    var datasType = [[${@dict.getType('lyy_business_type')}]];
+    var datasUrlType = [[${@dict.getType('sys_carousel_urltype')}]];
+    var prefix = ctx + "carousel/VRinfo";
+
+    var type= $("#type").val();
+    var associationId= $("#associationId").val();
+    var urlType= $("#urlType").val();
+    $(function () {
+        var options = {
+            url: prefix + "/list?associationId="+associationId+"&urlType="+urlType+"&type="+type,
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "轮播图信息",
+            sortName: "id",
+            sortOrder: "desc",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'id',
+                    title: '主键id',
+                    visible: false
+                },
+                {
+                    field: 'imgUrl',
+                    title: 'VR链接地址'
+                }, {
+                    field: 'urlType',
+                    title: '资源类型',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(datasUrlType, value);
+                    }
+                },
+                {
+                    field: 'description',
+                    title: '描述'
+                },
+                {
+                    field: 'status',
+                    title: '状态',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(datas, value);
+                    }
+                },
+                {
+                    field: 'type',
+                    title: '类型',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(datasType, value);
+                    }
+                },
+                {
+                    field: 'orderNumber',
+                    title: '排序'
+                },
+                // {
+                //     field: 'associationId',
+                //     title: '关联id'
+                // },
+                {
+                    field: 'associationName',
+                    title: '名称'
+                },
+                // {
+                //     field: 'linkUrl',
+                //     title: '转跳链接'
+                // },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    });
+</script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/carousel/info/infoDetail.html

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('轮播信息列表')"/>
+</head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <input type="hidden" readonly="readonly" id="associationId" th:value="${associationId}"/>
+                        </li>
+                        <li>
+                            <input type="hidden" readonly="readonly" hidden id="type" th:value="${type}"/>
+                        </li>
+                       <!-- <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>-->
+                    </ul>
+                </div>
+            </form>
+        </div>
+
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="carousel:info:add">
+                <i class="fa fa-plus"></i> 添加
+            </a>
+            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
+               shiro:hasPermission="carousel:info:edit">
+                <i class="fa fa-edit"></i> 修改
+            </a>
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
+               shiro:hasPermission="carousel:info:remove">
+                <i class="fa fa-remove"></i> 删除
+            </a>
+            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="carousel:info:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
+            <a class="btn btn-primary single disabled" onclick="cover()">
+                <i class="fa fa-unlock"></i> 设为封面
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('carousel:info:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('carousel:info:remove')}]];
+    var datas = [[${@dict.getType('sys_carousel_status')}]];
+    var datasType = [[${@dict.getType('lyy_business_type')}]];
+    var datasUrlType = [[${@dict.getType('sys_carousel_urltype')}]];
+    var prefix = ctx + "carousel/info";
+    function cover() {
+        $.operate.post(prefix + "/cover/" + $.table.selectColumns("id"));
+    }
+
+    $(function () {
+        var type= $("#type").val();
+        var associationId= $("#associationId").val();
+        var options = {
+            url: prefix + "/list?associationId="+associationId+"&type="+type,
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "轮播信息",
+            sortName: "id",
+            sortOrder: "desc",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'id',
+                    title: '主键id',
+                    visible: false
+                },
+                {
+                    field: 'imgUrl',
+                    formatter: function (value, row, index) {
+                        let urlType = row.urlType;
+                        var actions = [];
+                        if (urlType == 1) {
+                            actions.push('<img style="width:50px;height:50px" src=' + value + '>');
+                        } else if (urlType == 2) {
+                            actions.push
+                            ('<video style="width:50px;height:50px" controls>' +
+                                '<source src="' + value + '" type="video/mp4">' +
+                                '    您的浏览器不支持Video标签。' +
+                                '</video>');
+                        }
+
+                        return actions.join('');
+                    },
+                    title: '链接地址'
+                }, {
+                    field: 'urlType',
+                    title: '资源类型',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(datasUrlType, value);
+                    }
+                },
+                {
+                    field: 'description',
+                    title: '描述'
+                },
+                {
+                    field: 'status',
+                    title: '状态',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(datas, value);
+                    }
+                },
+                {
+                    field: 'type',
+                    title: '类型',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(datasType, value);
+                    }
+                },
+                {
+                    field: 'orderNumber',
+                    title: '排序'
+                },
+                // {
+                //     field: 'associationId',
+                //     title: '关联id'
+                // },
+                {
+                    field: 'associationName',
+                    title: '名称'
+                },
+                {
+                    field: 'imgCover',
+                    title: '是否为图片封面',
+                    formatter: function (value, row, index) {
+                        return value===1 ?'是':"否";
+                    }
+                },
+                // {
+                //     field: 'linkUrl',
+                //     title: '转跳链接'
+                // },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        let urlType = row.urlType;
+                        if (urlType == 2 || urlType == 3 ) {
+                            var title = "\'编辑封面\'";
+                            var url = "\'/carousel/info/videoCover?videoId=" + row.id + "\'";
+                            actions.push(
+                                '<a class="btn btn-primary btn-xs ' + editFlag +
+                                '" href="javascript:void(0)"' +
+                                ' onclick="$.modal.open(' + title + ',' + url + ')">' +
+                                '<i class="fa fa-edit"></i>' +
+                                '编辑封面</a> '
+                            );
+                        }
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    });
+</script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/carrier/info/info.html

@@ -116,6 +116,8 @@
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'轮播管理\',\'/carousel/info/infoDetail?associationId=' + row.id  +'&type='+5+ '\')"><i class="fa fa-edit"></i>轮播管理</a> ');
+                        actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'VR管理\',\'/carousel/VRinfo/infoDetail?associationId=' + row.id  +'&type='+5+'&urlType='+3+ '\')"><i class="fa fa-edit"></i>VR管理</a> ');
                         return actions.join('');
                     }
                 }]
@@ -144,4 +146,4 @@
         }
     </script>
 </body>
-</html>
+</html>
\ No newline at end of file

ruoyi-system/src/main/resources/templates/developmentInfo/info/info.html

@@ -572,16 +572,19 @@
                     formatter: function (value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'详情\',\'/developmentInfo/info/detail/' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑开发区信息</a> ');
-                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'区位交通信息\',\'/developmentInfo/traffic?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑区位交通信息</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'重点企业信息\',\'/developmentInfo/primaryEnterprise?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑重点企业信息</a> <br>');
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'开发区到周边距离信息\',\'/developmentInfo/periphery?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑开发区到周边距离信息</a> ');
-                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'开发区所属园区信息\',\'/developmentInfo/park?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑开发区所属园区信息</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'其他产业资产信息\',\'/developmentInfo/otherProperty?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑其他产业资产信息</a> <br>');
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'招商方向信息\',\'/developmentInfo/investmentDirection?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑招商方向信息</a> ');
-                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'产业政策信息\',\'/developmentInfo/industryPolicy?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑产业政策信息</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'产业基金信息\',\'/developmentInfo/industryFund?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑产业基金信息</a> <br>');
-                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'产业用地信息\',\'/developmentInfo/industrialLand?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑产业用地信息</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'区位交通信息\',\'/developmentInfo/traffic?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>区位交通管理</a> ');
+                        actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'重点企业信息\',\'/developmentInfo/primaryEnterprise?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>重点企业管理</a> <br>');
+                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'开发区到周边距离信息\',\'/developmentInfo/periphery?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>周边城市管理</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'开发区所属园区信息\',\'/developmentInfo/park?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>所属园区管理</a> ');
+                        actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'其他产业资产信息\',\'/developmentInfo/otherProperty?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>产业资产管理</a> <br>');
+                        actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'招商方向信息\',\'/developmentInfo/investmentDirection?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>招商方向管理</a> ');
+                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'产业政策信息\',\'/developmentInfo/industryPolicy?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>产业政策管理</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'产业基金信息\',\'/developmentInfo/industryFund?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>产业基金管理</a> <br>');
+                        actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'产业用地信息\',\'/developmentInfo/industrialLand?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>用地管理</a> ');
+                        actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'VR管理\',\'/carousel/VRinfo/infoDetail?associationId=' + row.id  +'&type='+1+'&urlType='+3+ '\')"><i class="fa fa-edit"></i>VR管理</a> ');
+                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'轮播管理\',\'/carousel/info/infoDetail?associationId=' + row.id  +'&type='+1+ '\')"><i class="fa fa-edit"></i>轮播管理</a> ');
+                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'星级详情\',\'/star_object/info/infoDetail?businessId=' + row.id  +'&type='+1+ '\')"><i class="fa fa-edit"></i>星级管理</a> ');
                         // actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'产业用地信息\',\'/developmentInfo/info/update?developmentId=' + row.id + '\')"><i class="fa fa-edit"></i>编辑产业用地信息</a> ');
                         let status = row.status;
                         if (status == 2) {
@@ -612,4 +615,4 @@
     }
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file

ruoyi-system/src/main/resources/templates/land/info/info.html

@@ -115,6 +115,8 @@
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'轮播管理\',\'/carousel/info/infoDetail?associationId=' + row.id  +'&type='+4+ '\')"><i class="fa fa-edit"></i>轮播管理</a> ');
+                        actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'VR管理\',\'/carousel/VRinfo/infoDetail?associationId=' + row.id  +'&type='+4+'&urlType='+3+ '\')"><i class="fa fa-edit"></i>VR管理</a> ');
                         return actions.join('');
                     }
                 }]
@@ -142,4 +144,4 @@
         }
     </script>
 </body>
-</html>
+</html>
\ No newline at end of file

ruoyi-system/src/main/resources/templates/parkInfo/info/info.html

@@ -383,11 +383,8 @@
                     field: 'isHotPark',
                     title: '是否为热点园区',
                     formatter: function (value, row, index) {
-                        if (value == 1) {
-                            return "是";
-                        } else if (value == 0) {
-                            return "否"
-                        }
+                        console.info("是否为热点园区:"+value);
+                        return value === 1?"是":"否"
                     }
 
                 },
@@ -401,14 +398,18 @@
                     formatter: function (value, row, index) {
                         var actions = [];
                         let id = row.id;
-                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" style="margin-top:5px"  href="javascript:void(0)" onclick="$.modal.openTab(\'详情信息\',\'/parkInfo/info/detail/' + id + '\')"><i class="fa fa-edit"></i>详情信息</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" style="margin-top:5px"  href="javascript:void(0)" onclick="$.operate.edit(\'' + id + '\')"><i class="fa fa-edit"></i>编辑园区详情</a> ');
-                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'区位交通信息\',\'/parkinfo/traffic?parkId=' + id + '\')"><i class="fa fa-edit"></i>编辑区位交通信息</a> ');
-                        actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'污水处理能力\',\'/parkinfo/sewage?parkId=' + id + '\')"><i class="fa fa-edit"></i>编辑污水处理能力</a>  <br>');
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'物流资源信息\',\'/parkinfo/resources?parkId=' + id + '\')"><i class="fa fa-edit"></i>编辑物流资源信息</a> ');
+                        let name = row.name;
+                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" style="margin-top:5px"  href="javascript:void(0)" onclick="$.modal.openTab(\'详情信息\',\'/parkInfo/info/detail/' + id + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" style="margin-top:5px"  href="javascript:void(0)" onclick="$.operate.edit(\'' + id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'区位交通信息\',\'/parkinfo/traffic?parkId=' + id + '\')"><i class="fa fa-edit"></i>区位交通管理</a> ');
+                        actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'污水处理能力\',\'/parkinfo/sewage?parkId=' + id + '\')"><i class="fa fa-edit"></i>污水信息管理</a>  <br>');
+                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'物流资源信息\',\'/parkinfo/resources?parkId=' + id + '\')"><i class="fa fa-edit"></i>物流资源管理</a> ');
                         // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'载体信息\',\'/carrier/info?parkId=' + id + '\')"><i class="fa fa-edit"></i>编辑载体</a> ');
-                        actions.push('<a class="btn btn-defaule btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'招商方向信息\',\'/parkinfo/investmentdirection?parkId=' + id + '\')"><i class="fa fa-edit"></i>编辑招商方向信息</a> ');
-                        actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'政策信息\',\'/parkinfo/policy?parkId=' + id + '\')"><i class="fa fa-edit"></i>编辑政策信息</a>  ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'招商方向信息\',\'/parkinfo/investmentdirection?parkId=' + id + '\')"><i class="fa fa-edit"></i>招商方向管理</a> ');
+                        actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'政策信息\',\'/parkinfo/policy?parkId=' + id + '\')"><i class="fa fa-edit"></i>政策管理</a> <br>  ');
+                        actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'VR管理\',\'/carousel/VRinfo/infoDetail?associationId=' + id +'&type='+2+'&urlType='+3+ '\')"><i class="fa fa-edit"></i>VR管理</a>');
+                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'轮播详情\',\'/carousel/info/infoDetail?associationId=' + id +'&type='+2+'\')"><i class="fa fa-edit"></i>轮播管理</a> ');
+                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'星级详情\',\'/star_object/info/infoDetail?businessId=' + id +'&type='+2+'\')"><i class="fa fa-edit"></i>星级管理</a> ');
                         // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.operate.remove(\'' + id + '\')"><i class="fa fa-remove"></i>删除</a>');
                         let status = row.status;
                         if (status == 2) {
@@ -442,4 +443,4 @@
     }
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file

ruoyi-system/src/main/resources/templates/scsource/add.html

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增数据')" />
+    <th:block th:include="include :: summernote-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-info-add">
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">荣誉：</label>
+                <div class="col-sm-8">
+                    <textarea name="honorUrl" placeholder="请使用‘;’分隔" class="form-control" required></textarea>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">荣誉信息：</label>
+                <div class="col-sm-8">
+                    <textarea name="details" placeholder="请使用‘;’分隔" class="form-control" required></textarea>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">联系信息：</label>
+                <div class="col-sm-8">
+                    <textarea name="contactInformation" placeholder="数据格式：‘***局:手机号;***局:手机号’" class="form-control" required></textarea>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label class="col-sm-3 control-label">关联id：</label>
+                <div class="col-sm-8">
+                    <input id="developmentId" name="developmentId" class="form-control" type="text" readonly="readonly">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">开发区名称：</label>
+                <div class="col-sm-8">
+                    <div class="input-group">
+                        <input class="form-control" placeholder="请选择开发区"  type="text" id="developmentName" name="developmentName" onclick="selectType()" required>
+                        <span class="input-group-addon"><i class="fa fa-search"></i></span>
+                    </div>
+                </div>
+            </div>
+
+            <!--<div class="form-group">
+                <label class="col-sm-3 control-label">所属开发区：</label>
+                <div class="col-sm-8">
+                    <input name="developmentName" placeholder="请填写开发区名字全称" class="form-control" type="text" required/>
+                </div>
+            </div>-->
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: summernote-js" />
+    <th:block th:include="include :: bootstrap-fileinput-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "scsource"
+        var carousel = ctx + "carousel/info"
+        $("#form-info-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-info-add').serialize());
+            }
+        }
+
+        // 根据当前激活的选项卡获取（方式一）
+        function selectType(){
+            var options = {
+                title: '选择',
+                url: carousel + "/selectType?type="+1,
+                callBack: doSubmit2
+            };
+            $.modal.openOptions(options);
+        }
+
+        function doSubmit2(index, layero){
+            var rows = layero.find("iframe")[0].contentWindow.getSelections();
+            if (rows.length == 0) {
+                $.modal.alertWarning("请至少选择一条记录");
+                return;
+            }
+            $('#developmentName').val(rows.name);
+            $('#developmentId').val(rows.id);
+            $.modal.close(index);
+        }
+        $(function() {
+            $('.summernote').summernote({
+                lang: 'zh-CN',
+                dialogsInBody: true,
+                callbacks: {
+                    onChange: function(contents, $edittable) {
+                        $("input[name='" + this.id + "']").val(contents);
+                    },
+                    onImageUpload: function(files) {
+                        var obj = this;
+                    	var data = new FormData();
+                    	data.append("file", files[0]);
+                    	$.ajax({
+                            type: "post",
+                            url: ctx + "common/upload",
+                    		data: data,
+                    		cache: false,
+                    		contentType: false,
+                    		processData: false,
+                    		dataType: 'json',
+                    		success: function(result) {
+                    		    if (result.code == web_status.SUCCESS) {
+                    		        $('#' + obj.id).summernote('insertImage', result.url);
+                    		    } else {
+                    		        $.modal.alertError(result.msg);
+                    		    }
+                    		},
+                    		error: function(error) {
+                    		    $.modal.alertWarning("图片上传失败。");
+                    		}
+                    	});
+                    }
+                }
+            });
+        });
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/scsource/edit.html

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改数据')" />
+    <th:block th:include="include :: summernote-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-info-edit" th:object="${scSourceInfo}">
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">荣誉：</label>
+                <div class="col-sm-8">
+                    <textarea name="honorUrl" placeholder="请使用‘;’分隔" class="form-control" required>[[*{honorUrl}]]</textarea>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">荣誉信息：</label>
+                <div class="col-sm-8">
+                    <textarea name="details" placeholder="请使用‘;’分隔" class="form-control" required>[[*{details}]]</textarea>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">联系信息：</label>
+                <div class="col-sm-8">
+                    <textarea name="contactInformation" class="form-control"  placeholder="数据格式：‘***局:手机号;***局:手机号’" required>[[*{contactInformation}]]</textarea>
+                </div>
+            </div>
+           <!-- <div class="form-group">
+                <label class="col-sm-3 control-label">所属开发区：</label>
+                <div class="col-sm-8">
+                    <input name="developmentName" th:field="*{developmentName}" placeholder="请填写开发区名字全称" class="form-control" type="text">
+                </div>
+            </div>-->
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: summernote-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "scsource";
+        $("#form-info-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-info-edit').serialize());
+            }
+        }
+
+        $(function() {
+            $('.summernote').each(function(i) {
+                $('#' + this.id).summernote({
+                    lang: 'zh-CN',
+                    dialogsInBody: true,
+                    callbacks: {
+                        onChange: function(contents, $edittable) {
+                            $("input[name='" + this.id + "']").val(contents);
+                        },
+                        onImageUpload: function(files) {
+                            var obj = this;
+                            var data = new FormData();
+                            data.append("file", files[0]);
+                            $.ajax({
+                                type: "post",
+                                url: ctx + "common/upload",
+                                data: data,
+                                cache: false,
+                                contentType: false,
+                                processData: false,
+                                dataType: 'json',
+                                success: function(result) {
+                                    if (result.code == web_status.SUCCESS) {
+                                        $('#' + obj.id).summernote('insertImage', result.url);
+                                    } else {
+                                        $.modal.alertError(result.msg);
+                                    }
+                                },
+                                error: function(error) {
+                                    $.modal.alertWarning("图片上传失败。");
+                                }
+                            });
+                        }
+                    }
+                });
+                var content = $("input[name='" + this.id + "']").val();
+                $('#' + this.id).summernote('code', content);
+            })
+        });
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/scsource/info.html

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('数据列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="scsource:info:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="scsource:info:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="scsource:info:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('scsource:info:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('scsource:info:remove')}]];
+        var listFlag = [[${@permission.hasPermi('scsource:info:list')}]];
+        var prefix = ctx + "scsource";
+        /*字典列表-详细*/
+        function detail(id) {
+            var url = prefix + '/detail/' + id;
+            $.modal.openTab("字典数据", url);
+        }
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "静态资源数据",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'id',
+                    title: '主键id',
+                    visible: false
+                },
+                    {
+                        field: 'honorUrl',
+                        title: '荣誉'
+                    },
+                {
+                    field: 'details',
+                    title: '荣誉信息'
+                },
+                {
+                    field: 'contactInformation',
+                    title: '联系信息'
+                },
+                {
+                    field: 'developmentName',
+                    title: '所属开发区'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/scsource/selectType.html

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+	<th:block th:include="include :: header('选择')" />
+</head>
+<body class="gray-bg">
+	 <input type="hidden" id="rowIds">
+
+     <div class="container-div">
+		<div class="row">
+
+			<div class="col-sm-12 search-collapse">
+				<form id="formId">
+					<div class="select-list">
+						<ul>
+							<li>
+								<label>名称：</label>
+								<input type="text" name="name"/>
+							</li>
+							<li>
+								<input type="hidden" name="type" id="type" th:value="${type}"  >
+							</li>
+<!--							<li>-->
+<!--								<label>所属id：</label>-->
+<!--								<input type="hidden" name="parentId" />-->
+<!--							</li>-->
+							<li>
+								<label>所属名称：</label>
+								<input type="text" name="parentName">
+							</li>
+							<li>
+								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+								<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+							</li>
+						</ul>
+					</div>
+				</form>
+			</div>
+			<div class="col-sm-12 select-table table-striped">
+				<table id="bootstrap-table"></table>
+			</div>
+		</div>
+	</div>
+    <div th:include="include :: footer"></div>
+    <script th:inline="javascript">
+        var prefix = ctx + "carousel/info";
+		console.info("type"+$("#type").val());
+		var datacarriers = [
+			// {
+			//     id: "100",
+			//     type: "1",
+			//     name: "商品名称",
+			//     distance: "100",
+			//     costTime: "12.5",
+			// }
+		];
+
+        $(function() {
+            var options = {
+                // url: prefix + "/listSelectType/"+$("#type").val()+"/"+$("#name").val(),
+                url: prefix + "/listSelectType",
+				// data: 'type='+$("#type"),
+		        showSearch: false,
+		        showRefresh: false,
+		        showToggle: false,
+		        showColumns: false,
+                columns: [{
+					radio: true
+		        },
+				{
+					field : 'id',
+					title : '类型id'
+				},
+				{
+					field : 'name',
+					title : '名称'
+				},
+				{
+					field : 'parentId',
+					title : '所属id'
+				},
+				{
+					field : 'parentName',
+					title : '所属名称'
+				}
+				// ,
+		        // {
+		        //     title: '操作',
+		        //     align: 'center',
+		        //     formatter: function(value, row, index) {
+		        //     	var actions = [];
+		        //     	actions.push('<a class="btn btn-success btn-xs" href="#"><i class="fa fa-edit"></i>编辑</a> ');
+                //         actions.push('<a class="btn btn-danger btn-xs" href="#"><i class="fa fa-remove"></i>删除</a>');
+				// 		return actions.join('');
+		        //     }
+		        // }
+				]
+            };
+            $.table.init(options);
+        });
+        
+        /* 添加用户-选择用户-提交(子页面调用父页面形式) */
+		// function submitHandler(index, layero) {
+		// 	var id = $.table.selectFirstColumns();
+		// 	if (id.length == 0) {
+       	// 		$.modal.alertWarning("请选择一条记录");
+       	// 		return;
+       	// 	}
+		// 	var name = $.table.selectColumns('name');
+		// 	$.modal.close();
+		// 	// 父页面的方法
+		// 	// activeWindow().selectUsers();
+		// 	// 父页面的变量
+		// 	console.info("qqqqqq",id[0],name[0]);
+		// 	debugger;
+		// 	activeWindow().$('#associationName').val(name[0]);
+		// 	activeWindow().$('#associationId').val(id[0]);
+		// }
+        
+		/* 添加用户-选择用户-提交(回调形式-父页面调用子页面) */
+		function getSelections() {
+			var dataObject = {};
+			var name = $.table.selectColumns('name');
+			dataObject.name = name[0];
+			var id = $.table.selectFirstColumns();
+			dataObject.id = id[0];
+			// return $.table.selectFirstColumns();
+			return dataObject;
+		}
+
+		// $("#bootstrap-table").on("check.bs.table check-all.bs.table uncheck.bs.table uncheck-all.bs.table", function (e, rowsAfter, rowsBefore) {
+        //     var rows = $.common.equals("uncheck-all", e.type) ? rowsBefore : rowsAfter;
+        //     var rowIds = $.table.affectedRowIds(rows);
+        //     $("#rowIds").val(rowIds);
+        // });
+    </script>
+</body>
+</html>
\ No newline at end of file

ruoyi-system/src/main/resources/templates/star_object/info/infoDetail.html

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('星级扩展信息列表')"/>
+</head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <input type="hidden" readonly="readonly" id="businessId" th:value="${businessId}"/>
+                        </li>
+                        <li>
+                            <input type="hidden" readonly="readonly" hidden id="type" th:value="${type}"/>
+                        </li>
+
+                       <!-- <li>
+                            <label>标题</label>
+                            <input type="text" name="title"/>
+                        </li>
+
+                        <li>
+                            <label>标题介绍：</label>
+                            <input type="text" name="titleIntroduce"/>
+                        </li>
+                        <li>
+                            <label>对象类型</label>
+                            &lt;!&ndash;                                                        <input type="text" name="objectType"/>&ndash;&gt;
+
+
+                            <select id="objectType" name="objectType" class="form-control m-b"
+                                    th:with="type=${@dict.getType('lyy_business_type')}">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                        th:value="${dict.dictValue}"></option>
+                            </select>
+
+
+                        </li>
+                        <li>
+                            <label>对象id</label>
+                            <input type="text" name="objectId"/>
+                        </li>
+
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>-->
+                    </ul>
+                </div>
+            </form>
+        </div>
+
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="star_object:info:add">
+                <i class="fa fa-plus"></i> 添加
+            </a>
+            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
+               shiro:hasPermission="star_object:info:edit">
+                <i class="fa fa-edit"></i> 修改
+            </a>
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
+               shiro:hasPermission="star_object:info:remove">
+                <i class="fa fa-remove"></i> 删除
+            </a>
+            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="star_object:info:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('star_object:info:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('star_object:info:remove')}]];
+    var prefix = ctx + "star_object/info";
+    var datasType = [[${@dict.getType('lyy_business_type')}]];
+    var type= $("#type").val();
+    var businessId= $("#businessId").val();
+    $(function () {
+        var options = {
+            url: prefix + "/list?objectId="+businessId+"&objectType="+type,
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "星级扩展信息",
+            columns: [{
+                checkbox: true
+            },
+                // {
+                //     field: 'id',
+                //     title: '',
+                //     visible: false
+                // },
+                {
+                    field: 'titleOfType',
+                    title: '模块名称'
+                },
+                {
+                    field: 'sortNumber',
+                    title: '排序'
+                },
+                {
+                    field: 'title',
+                    title: '标题'
+                },
+                {
+                    field: 'titleIntroduce',
+                    title: '标题介绍'
+                },
+                {
+                    field: 'coverUrl',
+                    title: '封面',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+
+                        actions.push('<img style="width:50px;height:50px" src='+value+'>');
+                        return actions.join('');
+                    }
+                },
+
+                {
+                    field: 'objectType',
+                    title: '类型',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(datasType, value);
+                    }
+                },
+                {
+                    field: 'objectName',
+                    title: '名称'
+                },
+
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    });
+</script>
+</body>
+</html>