MS-QJVSRANLTYEO\Administrator преди 4 години
родител
ревизия
126d14c386

+ 15 - 1
Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/StationDeviceManageController.java

@@ -1,6 +1,9 @@
 package com.yijia.station.controller;
 
 import java.util.List;
+
+import com.yijia.common.core.domain.entity.SysUser;
+import com.yijia.common.utils.SecurityUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -24,7 +27,7 @@ import com.yijia.common.core.page.TableDataInfo;
  * 油站设备管理Controller
  * 
  * @author yijia
- * @date 2020-12-09
+ * @date 2021-01-13
  */
 @RestController
 @RequestMapping("/station/manage")
@@ -100,4 +103,15 @@ public class StationDeviceManageController extends BaseController
     {
         return toAjax(stationDeviceManageService.deleteStationDeviceManageByIds(deviceIds));
     }
+
+    /**
+     * 状态修改
+     */
+    @PreAuthorize("@ss.hasPermi('station:manage:edit')")
+    @Log(title = "油站设备管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeManageStatus")
+    public AjaxResult changeManageStatus(@RequestBody StationDeviceManage stationDeviceManage)
+    {
+        return toAjax(stationDeviceManageService.updateStationDeviceManage(stationDeviceManage));
+    }
 }

+ 5 - 5
Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/domain/StationDeviceManage.java

@@ -9,7 +9,7 @@ import com.yijia.common.core.domain.BaseEntity;
  * 油站设备管理对象 station_device_manage
  * 
  * @author yijia
- * @date 2020-12-09
+ * @date 2021-01-13
  */
 public class StationDeviceManage extends BaseEntity
 {
@@ -26,8 +26,8 @@ public class StationDeviceManage extends BaseEntity
     @Excel(name = "设备名称")
     private String deviceName;
 
-    /** $column.columnComment */
-    @Excel(name = "设备名称")
+    /** 油站id */
+    @Excel(name = "油站id")
     private Long stationId;
 
     /** 油站名称 */
@@ -47,8 +47,8 @@ public class StationDeviceManage extends BaseEntity
     private String gunNo;
 
     /** 设备状态:1:在用,2:停用,3:维修、保养 */
-    @Excel(name = "设备状态:1:在用,2:停用,3:维修、保养")
-    private String deviceStatus;
+    @Excel(name = "设备状态")
+    private java.lang.String deviceStatus;
 
     /** 设备厂家 */
     @Excel(name = "设备厂家")

+ 1 - 1
Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/mapper/StationDeviceManageMapper.java

@@ -7,7 +7,7 @@ import com.yijia.station.domain.StationDeviceManage;
  * 油站设备管理Mapper接口
  * 
  * @author yijia
- * @date 2020-12-09
+ * @date 2021-01-13
  */
 public interface StationDeviceManageMapper 
 {

+ 1 - 1
Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/service/IStationDeviceManageService.java

@@ -7,7 +7,7 @@ import com.yijia.station.domain.StationDeviceManage;
  * 油站设备管理Service接口
  * 
  * @author yijia
- * @date 2020-12-09
+ * @date 2021-01-13
  */
 public interface IStationDeviceManageService 
 {

+ 1 - 1
Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/service/impl/StationDeviceManageServiceImpl.java

@@ -11,7 +11,7 @@ import com.yijia.station.service.IStationDeviceManageService;
  * 油站设备管理Service业务层处理
  * 
  * @author yijia
- * @date 2020-12-09
+ * @date 2021-01-13
  */
 @Service
 public class StationDeviceManageServiceImpl implements IStationDeviceManageService 

+ 1 - 3
Yijia-SaaS/yijia-station/src/main/resources/mapper/station/StationDeviceManageMapper.xml

@@ -42,10 +42,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where device_id = #{deviceId}
     </select>
         
-    <insert id="insertStationDeviceManage" parameterType="StationDeviceManage">
+    <insert id="insertStationDeviceManage" parameterType="StationDeviceManage" useGeneratedKeys="true" keyProperty="deviceId">
         insert into station_device_manage
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="deviceId != null">device_id,</if>
             <if test="deviceNo != null">device_no,</if>
             <if test="deviceName != null">device_name,</if>
             <if test="stationId != null">station_id,</if>
@@ -57,7 +56,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceFactory != null">device_factory,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="deviceId != null">#{deviceId},</if>
             <if test="deviceNo != null">#{deviceNo},</if>
             <if test="deviceName != null">#{deviceName},</if>
             <if test="stationId != null">#{stationId},</if>