+ 开发环境服务配置变更

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/AdmEmsDeviceController.java

@@ -0,0 +1,105 @@
+package com.ruoyi.ems.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+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.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.ems.domain.AdmEmsDevice;
+import com.ruoyi.ems.service.IAdmEmsDeviceService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 能源设备Controller
+ *
+ * @author ruoyi
+ * @date 2024-08-07
+ */
+@RestController
+@RequestMapping("/device")
+public class AdmEmsDeviceController extends BaseController {
+    @Autowired
+    private IAdmEmsDeviceService admEmsDeviceService;
+
+    /**
+     * 查询能源设备列表
+     */
+    @RequiresPermissions("ems:device:list")
+    @GetMapping("/list")
+    public TableDataInfo list(AdmEmsDevice admEmsDevice) {
+        startPage();
+        List<AdmEmsDevice> list = admEmsDeviceService.selectAdmEmsDeviceList(admEmsDevice);
+        return getDataTable(list);
+    }
+
+//    @RequiresPermissions("ems:device:list")
+//    @GetMapping("/qry/stat")
+//    public TableDataInfo qryDeviceStat() {
+//        List<AdmEmsDevice> list = admEmsDeviceService.selectAdmEmsDeviceList();
+//        return getDataTable(list);
+//    }
+
+    /**
+     * 导出能源设备列表
+     */
+    @RequiresPermissions("ems:device:export")
+    @Log(title = "能源设备", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, AdmEmsDevice admEmsDevice) {
+        List<AdmEmsDevice> list = admEmsDeviceService.selectAdmEmsDeviceList(admEmsDevice);
+        ExcelUtil<AdmEmsDevice> util = new ExcelUtil<AdmEmsDevice>(AdmEmsDevice.class);
+        util.exportExcel(response, list, "能源设备数据");
+    }
+
+    /**
+     * 获取能源设备详细信息
+     */
+    @RequiresPermissions("ems:device:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(admEmsDeviceService.selectAdmEmsDeviceById(id));
+    }
+
+    /**
+     * 新增能源设备
+     */
+    @RequiresPermissions("ems:device:add")
+    @Log(title = "能源设备", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody AdmEmsDevice admEmsDevice) {
+        return toAjax(admEmsDeviceService.insertAdmEmsDevice(admEmsDevice));
+    }
+
+    /**
+     * 修改能源设备
+     */
+    @RequiresPermissions("ems:device:edit")
+    @Log(title = "能源设备", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody AdmEmsDevice admEmsDevice) {
+        return toAjax(admEmsDeviceService.updateAdmEmsDevice(admEmsDevice));
+    }
+
+    /**
+     * 删除能源设备
+     */
+    @RequiresPermissions("ems:device:remove")
+    @Log(title = "能源设备", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(admEmsDeviceService.deleteAdmEmsDeviceByIds(ids));
+    }
+}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/AdmEmsDevice.java

@@ -0,0 +1,137 @@
+package com.ruoyi.ems.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 能源设备对象 adm_ems_device
+ * 
+ * @author ruoyi
+ * @date 2024-08-07
+ */
+public class AdmEmsDevice extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 序号 */
+    private Long id;
+
+    /** 设备代码 */
+    @Excel(name = "设备代码")
+    private String deviceCode;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String deviceName;
+
+    /** 设备类型 */
+    @Excel(name = "设备类型")
+    private Integer deviceType;
+
+    /** 设备状态 */
+    @Excel(name = "设备状态")
+    private Integer deviceStatus;
+
+    /** 设备类型 */
+    @Excel(name = "设备类型")
+    private String areaType;
+
+    /** 归属区域代码 */
+    @Excel(name = "归属区域代码")
+    private String refArea;
+
+    /** 归属设施代码 */
+    @Excel(name = "归属设施代码")
+    private String refFacs;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setDeviceCode(String deviceCode) 
+    {
+        this.deviceCode = deviceCode;
+    }
+
+    public String getDeviceCode() 
+    {
+        return deviceCode;
+    }
+    public void setDeviceName(String deviceName) 
+    {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName() 
+    {
+        return deviceName;
+    }
+    public void setDeviceType(Integer deviceType) 
+    {
+        this.deviceType = deviceType;
+    }
+
+    public Integer getDeviceType() 
+    {
+        return deviceType;
+    }
+    public void setDeviceStatus(Integer deviceStatus) 
+    {
+        this.deviceStatus = deviceStatus;
+    }
+
+    public Integer getDeviceStatus() 
+    {
+        return deviceStatus;
+    }
+    public void setAreaType(String areaType) 
+    {
+        this.areaType = areaType;
+    }
+
+    public String getAreaType() 
+    {
+        return areaType;
+    }
+    public void setRefArea(String refArea) 
+    {
+        this.refArea = refArea;
+    }
+
+    public String getRefArea() 
+    {
+        return refArea;
+    }
+    public void setRefFacs(String refFacs) 
+    {
+        this.refFacs = refFacs;
+    }
+
+    public String getRefFacs() 
+    {
+        return refFacs;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("deviceCode", getDeviceCode())
+            .append("deviceName", getDeviceName())
+            .append("deviceType", getDeviceType())
+            .append("deviceStatus", getDeviceStatus())
+            .append("areaType", getAreaType())
+            .append("refArea", getRefArea())
+            .append("refFacs", getRefFacs())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/AdmEmsDeviceMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.ems.mapper;
+
+import java.util.List;
+import com.ruoyi.ems.domain.AdmEmsDevice;
+
+/**
+ * 能源设备Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-08-07
+ */
+public interface AdmEmsDeviceMapper 
+{
+    /**
+     * 查询能源设备
+     * 
+     * @param id 能源设备主键
+     * @return 能源设备
+     */
+    public AdmEmsDevice selectAdmEmsDeviceById(Long id);
+
+    /**
+     * 查询能源设备列表
+     * 
+     * @param admEmsDevice 能源设备
+     * @return 能源设备集合
+     */
+    public List<AdmEmsDevice> selectAdmEmsDeviceList(AdmEmsDevice admEmsDevice);
+
+    /**
+     * 新增能源设备
+     * 
+     * @param admEmsDevice 能源设备
+     * @return 结果
+     */
+    public int insertAdmEmsDevice(AdmEmsDevice admEmsDevice);
+
+    /**
+     * 修改能源设备
+     * 
+     * @param admEmsDevice 能源设备
+     * @return 结果
+     */
+    public int updateAdmEmsDevice(AdmEmsDevice admEmsDevice);
+
+    /**
+     * 删除能源设备
+     * 
+     * @param id 能源设备主键
+     * @return 结果
+     */
+    public int deleteAdmEmsDeviceById(Long id);
+
+    /**
+     * 批量删除能源设备
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAdmEmsDeviceByIds(Long[] ids);
+}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IAdmEmsDeviceService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.ems.service;
+
+import java.util.List;
+import com.ruoyi.ems.domain.AdmEmsDevice;
+
+/**
+ * 能源设备Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-08-07
+ */
+public interface IAdmEmsDeviceService 
+{
+    /**
+     * 查询能源设备
+     * 
+     * @param id 能源设备主键
+     * @return 能源设备
+     */
+    public AdmEmsDevice selectAdmEmsDeviceById(Long id);
+
+    /**
+     * 查询能源设备列表
+     * 
+     * @param admEmsDevice 能源设备
+     * @return 能源设备集合
+     */
+    public List<AdmEmsDevice> selectAdmEmsDeviceList(AdmEmsDevice admEmsDevice);
+
+    /**
+     * 新增能源设备
+     * 
+     * @param admEmsDevice 能源设备
+     * @return 结果
+     */
+    public int insertAdmEmsDevice(AdmEmsDevice admEmsDevice);
+
+    /**
+     * 修改能源设备
+     * 
+     * @param admEmsDevice 能源设备
+     * @return 结果
+     */
+    public int updateAdmEmsDevice(AdmEmsDevice admEmsDevice);
+
+    /**
+     * 批量删除能源设备
+     * 
+     * @param ids 需要删除的能源设备主键集合
+     * @return 结果
+     */
+    public int deleteAdmEmsDeviceByIds(Long[] ids);
+
+    /**
+     * 删除能源设备信息
+     * 
+     * @param id 能源设备主键
+     * @return 结果
+     */
+    public int deleteAdmEmsDeviceById(Long id);
+}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/AdmEmsDeviceServiceImpl.java

@@ -0,0 +1,96 @@
+package com.ruoyi.ems.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.core.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.ems.mapper.AdmEmsDeviceMapper;
+import com.ruoyi.ems.domain.AdmEmsDevice;
+import com.ruoyi.ems.service.IAdmEmsDeviceService;
+
+/**
+ * 能源设备Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-08-07
+ */
+@Service
+public class AdmEmsDeviceServiceImpl implements IAdmEmsDeviceService 
+{
+    @Autowired
+    private AdmEmsDeviceMapper admEmsDeviceMapper;
+
+    /**
+     * 查询能源设备
+     * 
+     * @param id 能源设备主键
+     * @return 能源设备
+     */
+    @Override
+    public AdmEmsDevice selectAdmEmsDeviceById(Long id)
+    {
+        return admEmsDeviceMapper.selectAdmEmsDeviceById(id);
+    }
+
+    /**
+     * 查询能源设备列表
+     * 
+     * @param admEmsDevice 能源设备
+     * @return 能源设备
+     */
+    @Override
+    public List<AdmEmsDevice> selectAdmEmsDeviceList(AdmEmsDevice admEmsDevice)
+    {
+        return admEmsDeviceMapper.selectAdmEmsDeviceList(admEmsDevice);
+    }
+
+    /**
+     * 新增能源设备
+     * 
+     * @param admEmsDevice 能源设备
+     * @return 结果
+     */
+    @Override
+    public int insertAdmEmsDevice(AdmEmsDevice admEmsDevice)
+    {
+        admEmsDevice.setCreateTime(DateUtils.getNowDate());
+        return admEmsDeviceMapper.insertAdmEmsDevice(admEmsDevice);
+    }
+
+    /**
+     * 修改能源设备
+     * 
+     * @param admEmsDevice 能源设备
+     * @return 结果
+     */
+    @Override
+    public int updateAdmEmsDevice(AdmEmsDevice admEmsDevice)
+    {
+        admEmsDevice.setUpdateTime(DateUtils.getNowDate());
+        return admEmsDeviceMapper.updateAdmEmsDevice(admEmsDevice);
+    }
+
+    /**
+     * 批量删除能源设备
+     * 
+     * @param ids 需要删除的能源设备主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAdmEmsDeviceByIds(Long[] ids)
+    {
+        return admEmsDeviceMapper.deleteAdmEmsDeviceByIds(ids);
+    }
+
+    /**
+     * 删除能源设备信息
+     * 
+     * @param id 能源设备主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAdmEmsDeviceById(Long id)
+    {
+        return admEmsDeviceMapper.deleteAdmEmsDeviceById(id);
+    }
+}

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/AdmEmsDeviceMapper.xml

@@ -0,0 +1,94 @@
+<?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.ems.mapper.AdmEmsDeviceMapper">
+
+    <resultMap type="com.ruoyi.ems.domain.AdmEmsDevice" id="AdmEmsDeviceResult">
+        <result property="id"    column="id"    />
+        <result property="deviceCode"    column="device_code"    />
+        <result property="deviceName"    column="device_name"    />
+        <result property="deviceType"    column="device_type"    />
+        <result property="deviceStatus"    column="device_status"    />
+        <result property="areaType"    column="area_type"    />
+        <result property="refArea"    column="ref_area"    />
+        <result property="refFacs"    column="ref_facs"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectAdmEmsDeviceVo">
+        select id, device_code, device_name, device_type, device_status, area_type, ref_area, ref_facs, create_time, update_time from adm_ems_device
+    </sql>
+
+    <select id="selectAdmEmsDeviceList" parameterType="com.ruoyi.ems.domain.AdmEmsDevice" resultMap="AdmEmsDeviceResult">
+        <include refid="selectAdmEmsDeviceVo"/>
+        <where>
+            <if test="deviceCode != null  and deviceCode != ''"> and device_code = #{deviceCode}</if>
+            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="deviceType != null "> and device_type = #{deviceType}</if>
+            <if test="deviceStatus != null "> and device_status = #{deviceStatus}</if>
+            <if test="areaType != null  and areaType != ''"> and area_type = #{areaType}</if>
+            <if test="refArea != null  and refArea != ''"> and ref_area = #{refArea}</if>
+            <if test="refFacs != null  and refFacs != ''"> and ref_facs = #{refFacs}</if>
+        </where>
+    </select>
+
+    <select id="selectAdmEmsDeviceById" parameterType="Long" resultMap="AdmEmsDeviceResult">
+        <include refid="selectAdmEmsDeviceVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertAdmEmsDevice" parameterType="com.ruoyi.ems.domain.AdmEmsDevice" useGeneratedKeys="true" keyProperty="id">
+        insert into adm_ems_device
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="deviceCode != null and deviceCode != ''">device_code,</if>
+            <if test="deviceName != null and deviceName != ''">device_name,</if>
+            <if test="deviceType != null">device_type,</if>
+            <if test="deviceStatus != null">device_status,</if>
+            <if test="areaType != null">area_type,</if>
+            <if test="refArea != null">ref_area,</if>
+            <if test="refFacs != null">ref_facs,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="deviceCode != null and deviceCode != ''">#{deviceCode},</if>
+            <if test="deviceName != null and deviceName != ''">#{deviceName},</if>
+            <if test="deviceType != null">#{deviceType},</if>
+            <if test="deviceStatus != null">#{deviceStatus},</if>
+            <if test="areaType != null">#{areaType},</if>
+            <if test="refArea != null">#{refArea},</if>
+            <if test="refFacs != null">#{refFacs},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateAdmEmsDevice" parameterType="com.ruoyi.ems.domain.AdmEmsDevice">
+        update adm_ems_device
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deviceCode != null and deviceCode != ''">device_code = #{deviceCode},</if>
+            <if test="deviceName != null and deviceName != ''">device_name = #{deviceName},</if>
+            <if test="deviceType != null">device_type = #{deviceType},</if>
+            <if test="deviceStatus != null">device_status = #{deviceStatus},</if>
+            <if test="areaType != null">area_type = #{areaType},</if>
+            <if test="refArea != null">ref_area = #{refArea},</if>
+            <if test="refFacs != null">ref_facs = #{refFacs},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteAdmEmsDeviceById" parameterType="Long">
+        delete from adm_ems_device where id = #{id}
+    </delete>
+
+    <delete id="deleteAdmEmsDeviceByIds" parameterType="String">
+        delete from adm_ems_device where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ems-cloud/ruoyi-gateway/src/main/resources/application-local.yml

@@ -34,6 +34,13 @@ spring:
             - Path=/ems/**
           filters:
             - StripPrefix=0
+        - id: ems-server-74
+          uri: http://172.192.13.74:9202
+          predicates:
+            - Path=/74/ems/**
+          filters:
+            - StripPrefix=0
+            - RewritePath=/74/ems/(?<segment>.*), /ems/${segment}
         # 定时任务
         - id: ruoyi-job
           uri: lb://ruoyi-job
@@ -66,4 +73,4 @@ security:
       - /auth/login
       - /auth/register
       - /*/v2/api-docs
-      - /csrf
+      - /csrf