大屏燃气企业标点信息

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/system/TEnterpriseInfoController.java

@@ -57,6 +57,17 @@ public class TEnterpriseInfoController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     *查询所有企业信息
+     * @param tEnterpriseInfo
+     * @return
+     */
+    @GetMapping("/enterpriseInfoList")
+    public AjaxResult enterpriseInfoList(TEnterpriseInfo tEnterpriseInfo)
+    {
+        return AjaxResult.success(tEnterpriseInfoService.enterpriseInfoList(tEnterpriseInfo));
+    }
+
     /**
      * 导出企业信息列表
      */

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TEnterpriseInfo.java

@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zehong.common.annotation.Excel;
 import com.zehong.common.core.domain.BaseEntity;
 
+import java.math.BigDecimal;
+
 /**
  * 企业信息对象 t_enterprise_info
  *
@@ -34,6 +36,15 @@ public class TEnterpriseInfo extends BaseEntity
     @Excel(name = "经营区域")
     private String businessArea;
 
+    /** 经度 */
+    private BigDecimal longitude;
+
+    /** 纬度 */
+    private BigDecimal latitude;
+
+    /** 图表类型 */
+    private String iconType;
+
     /** 许可证编号 */
     @Excel(name = "许可证编号")
     private String licenseKey;
@@ -98,6 +109,23 @@ public class TEnterpriseInfo extends BaseEntity
     {
         return businessArea;
     }
+
+    public BigDecimal getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(BigDecimal longitude) {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(BigDecimal latitude) {
+        this.latitude = latitude;
+    }
+
     public void setLicenseKey(String licenseKey)
     {
         this.licenseKey = licenseKey;
@@ -121,6 +149,14 @@ public class TEnterpriseInfo extends BaseEntity
         this.annualSupervisionInspection = annualSupervisionInspection;
     }
 
+    public String getIconType() {
+        return iconType;
+    }
+
+    public void setIconType(String iconType) {
+        this.iconType = iconType;
+    }
+
     public String getAnnualSupervisionInspection()
     {
         return annualSupervisionInspection;

gassafetyprogress-system/src/main/java/com/zehong/system/domain/vo/TEnterpriseInfoVO.java

+package com.zehong.system.domain.vo;
+
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+
+/**
+ * 企业信息对象 t_enterprise_info
+ *
+ * @author zehong
+ * @date 2022-01-24
+ */
+@Data
+public class TEnterpriseInfoVO extends BaseEntity
+{
+
+    /** 企业id */
+    private Long enterpriseId;
+
+    /** 企业名称 */
+    private String enterpriseName;
+
+    /** 企业切换使用 */
+    private String companyType;
+
+    /** 经度 */
+    private BigDecimal longitude;
+
+    /** 纬度 */
+    private BigDecimal latitude;
+
+    /** 图表类型 */
+    private String iconType;
+
+    /** 注册地址 */
+    private String registerAddress;
+
+    /** 法定代表人 */
+    private String legalRepresentative;
+
+    /** 经营区域 */
+    private String businessArea;
+
+    /** 许可证编号 */
+    private String licenseKey;
+
+    /** 许可证有效期 */
+    private String licenseValidityTime;
+
+    /** 年度监督检查情况 */
+    private String annualSupervisionInspection;
+
+    /** 备注 */
+    private String remarks;
+
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/ITEnterpriseInfoService.java

@@ -2,6 +2,7 @@ package com.zehong.system.service;
 
 import java.util.List;
 import com.zehong.system.domain.TEnterpriseInfo;
+import com.zehong.system.domain.vo.TEnterpriseInfoVO;
 
 /**
  * 企业信息Service接口
@@ -19,6 +20,8 @@ public interface ITEnterpriseInfoService
      */
     public TEnterpriseInfo selectTEnterpriseInfoById(Long enterpriseId);
 
+    public List<TEnterpriseInfoVO> enterpriseInfoList(TEnterpriseInfo tEnterpriseInfo);
+
     /**
      * 查询企业信息列表
      * 

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TEnterpriseInfoServiceImpl.java

 package com.zehong.system.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 import com.zehong.common.utils.DateUtils;
+import com.zehong.common.utils.bean.BeanUtils;
+import com.zehong.system.domain.vo.TEnterpriseInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zehong.system.mapper.TEnterpriseInfoMapper;
@@ -32,6 +35,28 @@ public class TEnterpriseInfoServiceImpl implements ITEnterpriseInfoService
         return tEnterpriseInfoMapper.selectTEnterpriseInfoById(enterpriseId);
     }
 
+    /**
+     * 查询企业信息列表
+     *
+     * @param tEnterpriseInfo 企业信息
+     * @return 企业信息
+     */
+    @Override
+    public List<TEnterpriseInfoVO> enterpriseInfoList(TEnterpriseInfo tEnterpriseInfo)
+    {
+        List<TEnterpriseInfoVO> list = new ArrayList<>();
+        List<TEnterpriseInfo> enterpriseInfoList = tEnterpriseInfoMapper.selectTEnterpriseInfoList(tEnterpriseInfo);
+
+        for(TEnterpriseInfo info : enterpriseInfoList){
+            TEnterpriseInfoVO tEnterpriseInfoVO = new TEnterpriseInfoVO();
+            BeanUtils.copyProperties(info, tEnterpriseInfoVO);
+            tEnterpriseInfoVO.setCompanyType(info.getEnterpriseId().toString());
+
+            list.add(tEnterpriseInfoVO);
+        }
+        return list;
+    }
+
     /**
      * 查询企业信息列表
      * 

gassafetyprogress-system/src/main/resources/mapper/system/TEnterpriseInfoMapper.xml

@@ -10,6 +10,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="registerAddress"    column="register_address"    />
         <result property="legalRepresentative"    column="legal_representative"    />
         <result property="businessArea"    column="business_area"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="iconType"    column="icon_type"    />
         <result property="licenseKey"    column="license_key"    />
         <result property="licenseValidityTime"    column="license_validity_time"    />
         <result property="annualSupervisionInspection"    column="annual_supervision_inspection"    />
@@ -23,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectTEnterpriseInfoVo">
         select enterprise_id, enterprise_name, register_address, legal_representative,
-        business_area, license_key, license_validity_time, annual_supervision_inspection,
+        business_area, longitude, latitude, icon_type, license_key, license_validity_time, annual_supervision_inspection,
         create_by, create_time, update_by, update_time, remarks from t_enterprise_info
     </sql>
 
@@ -55,6 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="registerAddress != null">register_address,</if>
             <if test="legalRepresentative != null">legal_representative,</if>
             <if test="businessArea != null">business_area,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="iconType != null">icon_type,</if>
             <if test="licenseKey != null">license_key,</if>
             <if test="licenseValidityTime != null">license_validity_time,</if>
             <if test="annualSupervisionInspection != null">annual_supervision_inspection,</if>
@@ -70,6 +76,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="registerAddress != null">#{registerAddress},</if>
             <if test="legalRepresentative != null">#{legalRepresentative},</if>
             <if test="businessArea != null">#{businessArea},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="iconType != null">#{iconType},</if>
             <if test="licenseKey != null">#{licenseKey},</if>
             <if test="licenseValidityTime != null">#{licenseValidityTime},</if>
             <if test="annualSupervisionInspection != null">#{annualSupervisionInspection},</if>
@@ -89,6 +98,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="registerAddress != null">register_address = #{registerAddress},</if>
             <if test="legalRepresentative != null">legal_representative = #{legalRepresentative},</if>
             <if test="businessArea != null">business_area = #{businessArea},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="iconType != null">icon_type = #{iconType},</if>
             <if test="licenseKey != null">license_key = #{licenseKey},</if>
             <if test="licenseValidityTime != null">license_validity_time = #{licenseValidityTime},</if>
             <if test="annualSupervisionInspection != null">annual_supervision_inspection = #{annualSupervisionInspection},</if>