Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety-progress

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

+package com.zehong.web.controller.system;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TEnterpriseInfo;
+import com.zehong.system.service.ITEnterpriseInfoService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 企业信息Controller
+ *
+ * @author zehong
+ * @date 2022-01-24
+ */
+@RestController
+@RequestMapping("/regulation/info")
+public class TEnterpriseInfoController extends BaseController
+{
+    @Autowired
+    private ITEnterpriseInfoService tEnterpriseInfoService;
+
+    /**
+     * 查询企业信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TEnterpriseInfo tEnterpriseInfo)
+    {
+        startPage();
+        List<TEnterpriseInfo> list = tEnterpriseInfoService.selectTEnterpriseInfoList(tEnterpriseInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出企业信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:export')")
+    @Log(title = "企业信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TEnterpriseInfo tEnterpriseInfo)
+    {
+        List<TEnterpriseInfo> list = tEnterpriseInfoService.selectTEnterpriseInfoList(tEnterpriseInfo);
+        ExcelUtil<TEnterpriseInfo> util = new ExcelUtil<TEnterpriseInfo>(TEnterpriseInfo.class);
+        return util.exportExcel(list, "企业信息数据");
+    }
+
+    /**
+     * 获取企业信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:query')")
+    @GetMapping(value = "/{enterpriseId}")
+    public AjaxResult getInfo(@PathVariable("enterpriseId") Long enterpriseId)
+    {
+        return AjaxResult.success(tEnterpriseInfoService.selectTEnterpriseInfoById(enterpriseId));
+    }
+
+    /**
+     * 新增企业信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:add')")
+    @Log(title = "企业信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TEnterpriseInfo tEnterpriseInfo)
+    {
+        return toAjax(tEnterpriseInfoService.insertTEnterpriseInfo(tEnterpriseInfo));
+    }
+
+    /**
+     * 修改企业信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:edit')")
+    @Log(title = "企业信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TEnterpriseInfo tEnterpriseInfo)
+    {
+        return toAjax(tEnterpriseInfoService.updateTEnterpriseInfo(tEnterpriseInfo));
+    }
+
+    /**
+     * 删除企业信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:remove')")
+    @Log(title = "企业信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{enterpriseIds}")
+    public AjaxResult remove(@PathVariable Long[] enterpriseIds)
+    {
+        return toAjax(tEnterpriseInfoService.deleteTEnterpriseInfoByIds(enterpriseIds));
+    }
+}

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

+package com.zehong.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 企业信息对象 t_enterprise_info
+ *
+ * @author zehong
+ * @date 2022-01-24
+ */
+public class TEnterpriseInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 企业id */
+    private Long enterpriseId;
+
+    /** 企业名称 */
+    @Excel(name = "企业名称")
+    private String enterpriseName;
+
+    /** 注册地址 */
+    @Excel(name = "注册地址")
+    private String registerAddress;
+
+    /** 法定代表人 */
+    @Excel(name = "法定代表人")
+    private String legalRepresentative;
+
+    /** 经营区域 */
+    @Excel(name = "经营区域")
+    private String businessArea;
+
+    /** 许可证编号 */
+    @Excel(name = "许可证编号")
+    private String licenseKey;
+
+    /** 许可证有效期 */
+    @Excel(name = "许可证有效期")
+    private String licenseValidityTime;
+
+    /** 年度监督检查情况 */
+    @Excel(name = "年度监督检查情况")
+    private String annualSupervisionInspection;
+
+    /** 是否删除(0正常，1删除) */
+    private String isDel;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setEnterpriseId(Long enterpriseId)
+    {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Long getEnterpriseId()
+    {
+        return enterpriseId;
+    }
+    public void setEnterpriseName(String enterpriseName)
+    {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public String getEnterpriseName()
+    {
+        return enterpriseName;
+    }
+    public void setRegisterAddress(String registerAddress)
+    {
+        this.registerAddress = registerAddress;
+    }
+
+    public String getRegisterAddress()
+    {
+        return registerAddress;
+    }
+    public void setLegalRepresentative(String legalRepresentative)
+    {
+        this.legalRepresentative = legalRepresentative;
+    }
+
+    public String getLegalRepresentative()
+    {
+        return legalRepresentative;
+    }
+    public void setBusinessArea(String businessArea)
+    {
+        this.businessArea = businessArea;
+    }
+
+    public String getBusinessArea()
+    {
+        return businessArea;
+    }
+    public void setLicenseKey(String licenseKey)
+    {
+        this.licenseKey = licenseKey;
+    }
+
+    public String getLicenseKey()
+    {
+        return licenseKey;
+    }
+    public void setLicenseValidityTime(String licenseValidityTime)
+    {
+        this.licenseValidityTime = licenseValidityTime;
+    }
+
+    public String getLicenseValidityTime()
+    {
+        return licenseValidityTime;
+    }
+    public void setAnnualSupervisionInspection(String annualSupervisionInspection)
+    {
+        this.annualSupervisionInspection = annualSupervisionInspection;
+    }
+
+    public String getAnnualSupervisionInspection()
+    {
+        return annualSupervisionInspection;
+    }
+    public void setIsDel(String isDel)
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel()
+    {
+        return isDel;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("enterpriseId", getEnterpriseId())
+            .append("enterpriseName", getEnterpriseName())
+            .append("registerAddress", getRegisterAddress())
+            .append("legalRepresentative", getLegalRepresentative())
+            .append("businessArea", getBusinessArea())
+            .append("licenseKey", getLicenseKey())
+            .append("licenseValidityTime", getLicenseValidityTime())
+            .append("annualSupervisionInspection", getAnnualSupervisionInspection())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TEnterpriseInfoMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TEnterpriseInfo;
+
+/**
+ * 企业信息Mapper接口
+ * 
+ * @author zehong
+ * @date 2022-01-24
+ */
+public interface TEnterpriseInfoMapper 
+{
+    /**
+     * 查询企业信息
+     * 
+     * @param enterpriseId 企业信息ID
+     * @return 企业信息
+     */
+    public TEnterpriseInfo selectTEnterpriseInfoById(Long enterpriseId);
+
+    /**
+     * 查询企业信息列表
+     * 
+     * @param tEnterpriseInfo 企业信息
+     * @return 企业信息集合
+     */
+    public List<TEnterpriseInfo> selectTEnterpriseInfoList(TEnterpriseInfo tEnterpriseInfo);
+
+    /**
+     * 新增企业信息
+     * 
+     * @param tEnterpriseInfo 企业信息
+     * @return 结果
+     */
+    public int insertTEnterpriseInfo(TEnterpriseInfo tEnterpriseInfo);
+
+    /**
+     * 修改企业信息
+     * 
+     * @param tEnterpriseInfo 企业信息
+     * @return 结果
+     */
+    public int updateTEnterpriseInfo(TEnterpriseInfo tEnterpriseInfo);
+
+    /**
+     * 删除企业信息
+     * 
+     * @param enterpriseId 企业信息ID
+     * @return 结果
+     */
+    public int deleteTEnterpriseInfoById(Long enterpriseId);
+
+    /**
+     * 批量删除企业信息
+     * 
+     * @param enterpriseIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTEnterpriseInfoByIds(Long[] enterpriseIds);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TEnterpriseInfo;
+
+/**
+ * 企业信息Service接口
+ * 
+ * @author zehong
+ * @date 2022-01-24
+ */
+public interface ITEnterpriseInfoService 
+{
+    /**
+     * 查询企业信息
+     * 
+     * @param enterpriseId 企业信息ID
+     * @return 企业信息
+     */
+    public TEnterpriseInfo selectTEnterpriseInfoById(Long enterpriseId);
+
+    /**
+     * 查询企业信息列表
+     * 
+     * @param tEnterpriseInfo 企业信息
+     * @return 企业信息集合
+     */
+    public List<TEnterpriseInfo> selectTEnterpriseInfoList(TEnterpriseInfo tEnterpriseInfo);
+
+    /**
+     * 新增企业信息
+     * 
+     * @param tEnterpriseInfo 企业信息
+     * @return 结果
+     */
+    public int insertTEnterpriseInfo(TEnterpriseInfo tEnterpriseInfo);
+
+    /**
+     * 修改企业信息
+     * 
+     * @param tEnterpriseInfo 企业信息
+     * @return 结果
+     */
+    public int updateTEnterpriseInfo(TEnterpriseInfo tEnterpriseInfo);
+
+    /**
+     * 批量删除企业信息
+     * 
+     * @param enterpriseIds 需要删除的企业信息ID
+     * @return 结果
+     */
+    public int deleteTEnterpriseInfoByIds(Long[] enterpriseIds);
+
+    /**
+     * 删除企业信息信息
+     * 
+     * @param enterpriseId 企业信息ID
+     * @return 结果
+     */
+    public int deleteTEnterpriseInfoById(Long enterpriseId);
+}

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

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import com.zehong.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TEnterpriseInfoMapper;
+import com.zehong.system.domain.TEnterpriseInfo;
+import com.zehong.system.service.ITEnterpriseInfoService;
+
+/**
+ * 企业信息Service业务层处理
+ * 
+ * @author zehong
+ * @date 2022-01-24
+ */
+@Service
+public class TEnterpriseInfoServiceImpl implements ITEnterpriseInfoService 
+{
+    @Autowired
+    private TEnterpriseInfoMapper tEnterpriseInfoMapper;
+
+    /**
+     * 查询企业信息
+     * 
+     * @param enterpriseId 企业信息ID
+     * @return 企业信息
+     */
+    @Override
+    public TEnterpriseInfo selectTEnterpriseInfoById(Long enterpriseId)
+    {
+        return tEnterpriseInfoMapper.selectTEnterpriseInfoById(enterpriseId);
+    }
+
+    /**
+     * 查询企业信息列表
+     * 
+     * @param tEnterpriseInfo 企业信息
+     * @return 企业信息
+     */
+    @Override
+    public List<TEnterpriseInfo> selectTEnterpriseInfoList(TEnterpriseInfo tEnterpriseInfo)
+    {
+        return tEnterpriseInfoMapper.selectTEnterpriseInfoList(tEnterpriseInfo);
+    }
+
+    /**
+     * 新增企业信息
+     * 
+     * @param tEnterpriseInfo 企业信息
+     * @return 结果
+     */
+    @Override
+    public int insertTEnterpriseInfo(TEnterpriseInfo tEnterpriseInfo)
+    {
+        tEnterpriseInfo.setCreateTime(DateUtils.getNowDate());
+        return tEnterpriseInfoMapper.insertTEnterpriseInfo(tEnterpriseInfo);
+    }
+
+    /**
+     * 修改企业信息
+     * 
+     * @param tEnterpriseInfo 企业信息
+     * @return 结果
+     */
+    @Override
+    public int updateTEnterpriseInfo(TEnterpriseInfo tEnterpriseInfo)
+    {
+        tEnterpriseInfo.setUpdateTime(DateUtils.getNowDate());
+        return tEnterpriseInfoMapper.updateTEnterpriseInfo(tEnterpriseInfo);
+    }
+
+    /**
+     * 批量删除企业信息
+     * 
+     * @param enterpriseIds 需要删除的企业信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTEnterpriseInfoByIds(Long[] enterpriseIds)
+    {
+        return tEnterpriseInfoMapper.deleteTEnterpriseInfoByIds(enterpriseIds);
+    }
+
+    /**
+     * 删除企业信息信息
+     * 
+     * @param enterpriseId 企业信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTEnterpriseInfoById(Long enterpriseId)
+    {
+        return tEnterpriseInfoMapper.deleteTEnterpriseInfoById(enterpriseId);
+    }
+}

gassafetyprogress-system/src/main/resources/mapper/system/TEnterpriseInfoMapper.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.zehong.system.mapper.TEnterpriseInfoMapper">
+
+    <resultMap type="TEnterpriseInfo" id="TEnterpriseInfoResult">
+        <result property="enterpriseId"    column="enterprise_id"    />
+        <result property="enterpriseName"    column="enterprise_name"    />
+        <result property="registerAddress"    column="register_address"    />
+        <result property="legalRepresentative"    column="legal_representative"    />
+        <result property="businessArea"    column="business_area"    />
+        <result property="licenseKey"    column="license_key"    />
+        <result property="licenseValidityTime"    column="license_validity_time"    />
+        <result property="annualSupervisionInspection"    column="annual_supervision_inspection"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectTEnterpriseInfoVo">
+        select enterprise_id, enterprise_name, register_address, legal_representative,
+        business_area, license_key, license_validity_time, annual_supervision_inspection,
+        create_by, create_time, update_by, update_time, remarks from t_enterprise_info
+    </sql>
+
+    <select id="selectTEnterpriseInfoList" parameterType="TEnterpriseInfo" resultMap="TEnterpriseInfoResult">
+        <include refid="selectTEnterpriseInfoVo"/>
+        <where>
+            1=1 and is_del='0'
+            <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+            <if test="registerAddress != null  and registerAddress != ''"> and register_address = #{registerAddress}</if>
+            <if test="legalRepresentative != null  and legalRepresentative != ''"> and legal_representative = #{legalRepresentative}</if>
+            <if test="businessArea != null  and businessArea != ''"> and business_area = #{businessArea}</if>
+            <if test="licenseKey != null  and licenseKey != ''"> and license_key = #{licenseKey}</if>
+            <if test="licenseValidityTime != null  and licenseValidityTime != ''"> and license_validity_time = #{licenseValidityTime}</if>
+            <if test="annualSupervisionInspection != null  and annualSupervisionInspection != ''"> and annual_supervision_inspection = #{annualSupervisionInspection}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+    </select>
+
+    <select id="selectTEnterpriseInfoById" parameterType="Long" resultMap="TEnterpriseInfoResult">
+        <include refid="selectTEnterpriseInfoVo"/>
+        where enterprise_id = #{enterpriseId} and is_del='0'
+    </select>
+
+    <insert id="insertTEnterpriseInfo" parameterType="TEnterpriseInfo" useGeneratedKeys="true" keyProperty="enterpriseId">
+        insert into t_enterprise_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="enterpriseName != null">enterprise_name,</if>
+            <if test="registerAddress != null">register_address,</if>
+            <if test="legalRepresentative != null">legal_representative,</if>
+            <if test="businessArea != null">business_area,</if>
+            <if test="licenseKey != null">license_key,</if>
+            <if test="licenseValidityTime != null">license_validity_time,</if>
+            <if test="annualSupervisionInspection != null">annual_supervision_inspection,</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>
+            <if test="isDel != null">is_del,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="enterpriseName != null">#{enterpriseName},</if>
+            <if test="registerAddress != null">#{registerAddress},</if>
+            <if test="legalRepresentative != null">#{legalRepresentative},</if>
+            <if test="businessArea != null">#{businessArea},</if>
+            <if test="licenseKey != null">#{licenseKey},</if>
+            <if test="licenseValidityTime != null">#{licenseValidityTime},</if>
+            <if test="annualSupervisionInspection != null">#{annualSupervisionInspection},</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>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTEnterpriseInfo" parameterType="TEnterpriseInfo">
+        update t_enterprise_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
+            <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="licenseKey != null">license_key = #{licenseKey},</if>
+            <if test="licenseValidityTime != null">license_validity_time = #{licenseValidityTime},</if>
+            <if test="annualSupervisionInspection != null">annual_supervision_inspection = #{annualSupervisionInspection},</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>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where enterprise_id = #{enterpriseId}
+    </update>
+
+    <update id="deleteTEnterpriseInfoById" parameterType="Long">
+        update  t_enterprise_info set is_del='1' where enterprise_id = #{enterpriseId}
+    </update>
+
+    <update id="deleteTEnterpriseInfoByIds" parameterType="String">
+        update  t_enterprise_info set is_del='1' where enterprise_id in
+        <foreach item="enterpriseId" collection="array" open="(" separator="," close=")">
+            #{enterpriseId}
+        </foreach>
+    </update>
+</mapper>

gassafetyprogress-web/src/api/regulation/info.js

+import request from '@/utils/request'
+
+// 查询企业信息列表
+export function listInfo(query) {
+  return request({
+    url: '/regulation/info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询企业信息详细
+export function getInfo(enterpriseId) {
+  return request({
+    url: '/regulation/info/' + enterpriseId,
+    method: 'get'
+  })
+}
+
+// 新增企业信息
+export function addInfo(data) {
+  return request({
+    url: '/regulation/info',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改企业信息
+export function updateInfo(data) {
+  return request({
+    url: '/regulation/info',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除企业信息
+export function delInfo(enterpriseId) {
+  return request({
+    url: '/regulation/info/' + enterpriseId,
+    method: 'delete'
+  })
+}
+
+// 导出企业信息
+export function exportInfo(query) {
+  return request({
+    url: '/regulation/info/export',
+    method: 'get',
+    params: query
+  })
+}

gassafetyprogress-web/vue.config.js

@@ -34,7 +34,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.2.28:8080`,
+        target: `http://localhost:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''