增加停车场及轮班人员

src/main/java/com/lqkj/info/controller/ParkingLotController.java

@@ -0,0 +1,112 @@
+package com.lqkj.info.controller;
+
+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.lqkj.common.annotation.Log;
+import com.lqkj.common.core.controller.BaseController;
+import com.lqkj.common.core.model.ResultUtil;
+import com.lqkj.common.enums.BusinessType;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.lqkj.info.entity.ParkingLot;
+import com.lqkj.info.service.ParkingLotService;
+import com.lqkj.common.utils.poi.ExcelUtil;
+import com.github.pagehelper.PageInfo;
+
+/**
+ * 停车场信息Controller
+ * 
+ * @author lqkj
+ * @date 2024-12-23
+ */
+@Api(tags = {"停车场信息"})
+@RestController
+@RequestMapping("/info/parkingLot")
+public class ParkingLotController extends BaseController
+{
+    @Autowired
+    private ParkingLotService parkingLotService;
+
+    /**
+     * 查询停车场信息列表
+     */
+    @ApiOperation("查询停车场信息列表")
+    @PreAuthorize("@ss.hasPermi('info:parkingLot:list')")
+    @GetMapping("/list")
+    public ResultUtil list(ParkingLot parkingLot)
+    {
+        startPage( parkingLot);
+        PageInfo<ParkingLot> pageInfo = new PageInfo<>(parkingLotService.selectParkingLotList(parkingLot));
+        return ResultUtil.success(pageInfo);
+    }
+
+    /**
+     * 导出停车场信息列表
+     */
+    @ApiOperation("导出停车场信息列表")
+    @PreAuthorize("@ss.hasPermi('info:parkingLot:export')")
+    @Log(title = "停车场信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public ResultUtil export(ParkingLot parkingLot)
+    {
+        List<ParkingLot> list = parkingLotService.selectParkingLotList(parkingLot);
+        ExcelUtil<ParkingLot> util = new ExcelUtil<ParkingLot>(ParkingLot.class);
+        return util.exportExcel(list, "停车场信息数据");
+    }
+
+    /**
+     * 获取停车场信息详细信息
+     */
+    @ApiOperation("获取停车场信息详细信息")
+    @PreAuthorize("@ss.hasPermi('info:parkingLot:query')")
+    @GetMapping(value = "/{parkingId}")
+    public ResultUtil getInfo(@PathVariable("parkingId") Integer parkingId)
+    {
+        return ResultUtil.success(parkingLotService.selectParkingLotByParkingId(parkingId));
+    }
+
+    /**
+     * 新增停车场信息
+     */
+    @ApiOperation("新增停车场信息")
+    @PreAuthorize("@ss.hasPermi('info:parkingLot:add')")
+    @Log(title = "停车场信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public ResultUtil add(@RequestBody ParkingLot parkingLot)
+    {
+        return resultByRows(parkingLotService.insertParkingLot(parkingLot));
+    }
+
+    /**
+     * 修改停车场信息
+     */
+    @ApiOperation("修改停车场信息")
+    @PreAuthorize("@ss.hasPermi('info:parkingLot:edit')")
+    @Log(title = "停车场信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public ResultUtil edit(@RequestBody ParkingLot parkingLot)
+    {
+        return resultByRows(parkingLotService.updateParkingLot(parkingLot));
+    }
+
+    /**
+     * 删除停车场信息
+     */
+    @ApiOperation("删除停车场信息")
+    @PreAuthorize("@ss.hasPermi('info:parkingLot:remove')")
+    @Log(title = "停车场信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{parkingIds}")
+    public ResultUtil remove(@PathVariable Integer[] parkingIds)
+    {
+        return resultByRows(parkingLotService.deleteParkingLotByParkingIds(parkingIds));
+    }
+}

src/main/java/com/lqkj/info/controller/ShiftPersonnelController.java

@@ -0,0 +1,112 @@
+package com.lqkj.info.controller;
+
+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.lqkj.common.annotation.Log;
+import com.lqkj.common.core.controller.BaseController;
+import com.lqkj.common.core.model.ResultUtil;
+import com.lqkj.common.enums.BusinessType;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.lqkj.info.entity.ShiftPersonnel;
+import com.lqkj.info.service.ShiftPersonnelService;
+import com.lqkj.common.utils.poi.ExcelUtil;
+import com.github.pagehelper.PageInfo;
+
+/**
+ * 轮班人员信息Controller
+ * 
+ * @author lqkj
+ * @date 2024-12-23
+ */
+@Api(tags = {"轮班人员信息"})
+@RestController
+@RequestMapping("/info/shiftPersonnel")
+public class ShiftPersonnelController extends BaseController
+{
+    @Autowired
+    private ShiftPersonnelService shiftPersonnelService;
+
+    /**
+     * 查询轮班人员信息列表
+     */
+    @ApiOperation("查询轮班人员信息列表")
+    @PreAuthorize("@ss.hasPermi('info:shiftPersonnel:list')")
+    @GetMapping("/list")
+    public ResultUtil list(ShiftPersonnel shiftPersonnel)
+    {
+        startPage( shiftPersonnel);
+        PageInfo<ShiftPersonnel> pageInfo = new PageInfo<>(shiftPersonnelService.selectShiftPersonnelList(shiftPersonnel));
+        return ResultUtil.success(pageInfo);
+    }
+
+    /**
+     * 导出轮班人员信息列表
+     */
+    @ApiOperation("导出轮班人员信息列表")
+    @PreAuthorize("@ss.hasPermi('info:shiftPersonnel:export')")
+    @Log(title = "轮班人员信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public ResultUtil export(ShiftPersonnel shiftPersonnel)
+    {
+        List<ShiftPersonnel> list = shiftPersonnelService.selectShiftPersonnelList(shiftPersonnel);
+        ExcelUtil<ShiftPersonnel> util = new ExcelUtil<ShiftPersonnel>(ShiftPersonnel.class);
+        return util.exportExcel(list, "轮班人员信息数据");
+    }
+
+    /**
+     * 获取轮班人员信息详细信息
+     */
+    @ApiOperation("获取轮班人员信息详细信息")
+    @PreAuthorize("@ss.hasPermi('info:shiftPersonnel:query')")
+    @GetMapping(value = "/{personnelId}")
+    public ResultUtil getInfo(@PathVariable("personnelId") Integer personnelId)
+    {
+        return ResultUtil.success(shiftPersonnelService.selectShiftPersonnelByPersonnelId(personnelId));
+    }
+
+    /**
+     * 新增轮班人员信息
+     */
+    @ApiOperation("新增轮班人员信息")
+    @PreAuthorize("@ss.hasPermi('info:shiftPersonnel:add')")
+    @Log(title = "轮班人员信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public ResultUtil add(@RequestBody ShiftPersonnel shiftPersonnel)
+    {
+        return resultByRows(shiftPersonnelService.insertShiftPersonnel(shiftPersonnel));
+    }
+
+    /**
+     * 修改轮班人员信息
+     */
+    @ApiOperation("修改轮班人员信息")
+    @PreAuthorize("@ss.hasPermi('info:shiftPersonnel:edit')")
+    @Log(title = "轮班人员信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public ResultUtil edit(@RequestBody ShiftPersonnel shiftPersonnel)
+    {
+        return resultByRows(shiftPersonnelService.updateShiftPersonnel(shiftPersonnel));
+    }
+
+    /**
+     * 删除轮班人员信息
+     */
+    @ApiOperation("删除轮班人员信息")
+    @PreAuthorize("@ss.hasPermi('info:shiftPersonnel:remove')")
+    @Log(title = "轮班人员信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{personnelIds}")
+    public ResultUtil remove(@PathVariable Integer[] personnelIds)
+    {
+        return resultByRows(shiftPersonnelService.deleteShiftPersonnelByPersonnelIds(personnelIds));
+    }
+}

src/main/java/com/lqkj/info/entity/ElevatorInfo.java

@@ -48,6 +48,9 @@ public class ElevatorInfo extends BaseEntity
     /** 运行时间 */
     private String runTime;
 
+    /** 连接状态 */
+    private Integer connectStatus;
+
     public void setElevatorId(Integer elevatorId) 
     {
         this.elevatorId = elevatorId;
@@ -127,6 +130,14 @@ public class ElevatorInfo extends BaseEntity
         this.runTime = runTime;
     }
 
+    public Integer getConnectStatus() {
+        return connectStatus;
+    }
+
+    public void setConnectStatus(Integer connectStatus) {
+        this.connectStatus = connectStatus;
+    }
+
     @Override
     public String toString() {
         return "ElevatorInfo{" +
@@ -139,6 +150,7 @@ public class ElevatorInfo extends BaseEntity
                 ", type=" + type +
                 ", runFloor='" + runFloor + '\'' +
                 ", runTime='" + runTime + '\'' +
+                ", connectStatus=" + connectStatus +
                 '}';
     }
 }

src/main/java/com/lqkj/info/entity/ParkingLot.java

@@ -0,0 +1,121 @@
+package com.lqkj.info.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.lqkj.common.annotation.Excel;
+import com.lqkj.common.core.model.BaseEntity;
+import org.springframework.data.annotation.Transient;
+
+/**
+ * 停车场信息对象 parking_lot
+ * 
+ * @author lqkj
+ * @date 2024-12-23
+ */
+public class ParkingLot extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 停车场id */
+    private Integer parkingId;
+
+    /** 停车场名称 */
+    @Excel(name = "停车场名称")
+    private String parkingName;
+
+    /** 坐标 */
+    @Excel(name = "坐标")
+    private String lngLat;
+
+    /** 空余车位 */
+    @Excel(name = "空余车位")
+    private Integer freeSpots;
+
+    /** 空余充电桩 */
+    @Excel(name = "空余充电桩")
+    private Integer freeChargers;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String memo;
+
+    /** 值班人员 */
+    @Transient
+    private String personnelName;
+
+    public void setParkingId(Integer parkingId) 
+    {
+        this.parkingId = parkingId;
+    }
+
+    public Integer getParkingId() 
+    {
+        return parkingId;
+    }
+    public void setParkingName(String parkingName) 
+    {
+        this.parkingName = parkingName;
+    }
+
+    public String getParkingName() 
+    {
+        return parkingName;
+    }
+    public void setLngLat(String lngLat) 
+    {
+        this.lngLat = lngLat;
+    }
+
+    public String getLngLat() 
+    {
+        return lngLat;
+    }
+    public void setFreeSpots(Integer freeSpots) 
+    {
+        this.freeSpots = freeSpots;
+    }
+
+    public Integer getFreeSpots() 
+    {
+        return freeSpots;
+    }
+    public void setFreeChargers(Integer freeChargers) 
+    {
+        this.freeChargers = freeChargers;
+    }
+
+    public Integer getFreeChargers() 
+    {
+        return freeChargers;
+    }
+    public void setMemo(String memo) 
+    {
+        this.memo = memo;
+    }
+
+    public String getMemo() 
+    {
+        return memo;
+    }
+
+    public String getPersonnelName() {
+        return personnelName;
+    }
+
+    public void setPersonnelName(String personnelName) {
+        this.personnelName = personnelName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("parkingId", getParkingId())
+            .append("parkingName", getParkingName())
+            .append("lngLat", getLngLat())
+            .append("freeSpots", getFreeSpots())
+            .append("freeChargers", getFreeChargers())
+            .append("memo", getMemo())
+            .append("personnelName", getPersonnelName())
+            .toString();
+    }
+}

src/main/java/com/lqkj/info/entity/ShiftPersonnel.java

@@ -0,0 +1,110 @@
+package com.lqkj.info.entity;
+
+import java.time.LocalTime;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.lqkj.common.annotation.Excel;
+import com.lqkj.common.core.model.BaseEntity;
+
+/**
+ * 轮班人员信息对象 shift_personnel
+ * 
+ * @author lqkj
+ * @date 2024-12-23
+ */
+public class ShiftPersonnel extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 轮班人员id */
+    private Integer personnelId;
+
+    /** 停车场id */
+    @Excel(name = "停车场id")
+    private Integer parkingId;
+
+    /** 轮班人员名字 */
+    @Excel(name = "轮班人员名字")
+    private String personnelName;
+
+    /** 值班开始时间 */
+    @JsonFormat(pattern = "HH:mm:ss")
+    @Excel(name = "值班开始时间", width = 30, dateFormat = "HH:mm:ss")
+    private LocalTime startTime;
+
+    /** 值班结束时间 */
+    @JsonFormat(pattern = "HH:mm:ss")
+    @Excel(name = "值班结束时间", width = 30, dateFormat = "HH:mm:ss")
+    private LocalTime endTime;
+
+    /** 备注 */
+    private String memo;
+
+    public void setPersonnelId(Integer personnelId) 
+    {
+        this.personnelId = personnelId;
+    }
+
+    public Integer getPersonnelId() 
+    {
+        return personnelId;
+    }
+    public void setParkingId(Integer parkingId) 
+    {
+        this.parkingId = parkingId;
+    }
+
+    public Integer getParkingId() 
+    {
+        return parkingId;
+    }
+    public void setPersonnelName(String personnelName) 
+    {
+        this.personnelName = personnelName;
+    }
+
+    public String getPersonnelName() 
+    {
+        return personnelName;
+    }
+    public void setStartTime(LocalTime startTime) 
+    {
+        this.startTime = startTime;
+    }
+
+    public LocalTime getStartTime() 
+    {
+        return startTime;
+    }
+    public void setEndTime(LocalTime endTime) 
+    {
+        this.endTime = endTime;
+    }
+
+    public LocalTime getEndTime() 
+    {
+        return endTime;
+    }
+    public void setMemo(String memo) 
+    {
+        this.memo = memo;
+    }
+
+    public String getMemo() 
+    {
+        return memo;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("personnelId", getPersonnelId())
+            .append("parkingId", getParkingId())
+            .append("personnelName", getPersonnelName())
+            .append("startTime", getStartTime())
+            .append("endTime", getEndTime())
+            .append("memo", getMemo())
+            .toString();
+    }
+}

src/main/java/com/lqkj/info/mapper/ParkingLotMapper.java

@@ -0,0 +1,68 @@
+package com.lqkj.info.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import com.lqkj.info.entity.ParkingLot;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * 停车场信息Mapper接口
+ * 
+ * @author lqkj
+ * @date 2024-12-23
+ */
+@Mapper
+public interface ParkingLotMapper 
+{
+    /**
+     * 查询停车场信息
+     * 
+     * @param parkingId 停车场信息主键
+     * @return 停车场信息
+     */
+    public ParkingLot selectParkingLotByParkingId(Integer parkingId);
+
+    /**
+     * 查询停车场信息列表
+     * 
+     * @param parkingLot 停车场信息
+     * @return 停车场信息集合
+     */
+    public List<ParkingLot> selectParkingLotList(ParkingLot parkingLot);
+
+    /**
+     * 新增停车场信息
+     * 
+     * @param parkingLot 停车场信息
+     * @return 结果
+     */
+    public int insertParkingLot(ParkingLot parkingLot);
+
+    /**
+     * 修改停车场信息
+     * 
+     * @param parkingLot 停车场信息
+     * @return 结果
+     */
+    public int updateParkingLot(ParkingLot parkingLot);
+
+    /**
+     * 删除停车场信息
+     * 
+     * @param parkingId 停车场信息主键
+     * @return 结果
+     */
+    public int deleteParkingLotByParkingId(Integer parkingId);
+
+    /**
+     * 批量删除停车场信息
+     * 
+     * @param parkingIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteParkingLotByParkingIds(Integer[] parkingIds);
+
+
+
+}

src/main/java/com/lqkj/info/mapper/ShiftPersonnelMapper.java

@@ -0,0 +1,68 @@
+package com.lqkj.info.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import com.lqkj.info.entity.ShiftPersonnel;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * 轮班人员信息Mapper接口
+ * 
+ * @author lqkj
+ * @date 2024-12-23
+ */
+@Mapper
+public interface ShiftPersonnelMapper 
+{
+    /**
+     * 查询轮班人员信息
+     * 
+     * @param personnelId 轮班人员信息主键
+     * @return 轮班人员信息
+     */
+    public ShiftPersonnel selectShiftPersonnelByPersonnelId(Integer personnelId);
+
+    /**
+     * 查询轮班人员信息列表
+     * 
+     * @param shiftPersonnel 轮班人员信息
+     * @return 轮班人员信息集合
+     */
+    public List<ShiftPersonnel> selectShiftPersonnelList(ShiftPersonnel shiftPersonnel);
+
+    /**
+     * 新增轮班人员信息
+     * 
+     * @param shiftPersonnel 轮班人员信息
+     * @return 结果
+     */
+    public int insertShiftPersonnel(ShiftPersonnel shiftPersonnel);
+
+    /**
+     * 修改轮班人员信息
+     * 
+     * @param shiftPersonnel 轮班人员信息
+     * @return 结果
+     */
+    public int updateShiftPersonnel(ShiftPersonnel shiftPersonnel);
+
+    /**
+     * 删除轮班人员信息
+     * 
+     * @param personnelId 轮班人员信息主键
+     * @return 结果
+     */
+    public int deleteShiftPersonnelByPersonnelId(Integer personnelId);
+
+    /**
+     * 批量删除轮班人员信息
+     * 
+     * @param personnelIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteShiftPersonnelByPersonnelIds(Integer[] personnelIds);
+
+
+    String selectPersonnelName(Integer parkingId);
+}

src/main/java/com/lqkj/info/service/BuildingInfoService.java

@@ -3,6 +3,7 @@ package com.lqkj.info.service;
 import java.util.List;
 
 import com.lqkj.type.service.BuildingTypeService;
+import org.apache.commons.lang.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.lqkj.info.mapper.BuildingInfoMapper;
@@ -60,6 +61,7 @@ public class BuildingInfoService
     
     public int insertBuildingInfo(BuildingInfo buildingInfo)
     {
+        buildingInfo.setMemo(StringEscapeUtils.unescapeHtml(buildingInfo.getMemo()));
         return buildingInfoMapper.insertBuildingInfo(buildingInfo);
     }
 
@@ -72,6 +74,7 @@ public class BuildingInfoService
     
     public int updateBuildingInfo(BuildingInfo buildingInfo)
     {
+        buildingInfo.setMemo(StringEscapeUtils.unescapeHtml(buildingInfo.getMemo()));
         return buildingInfoMapper.updateBuildingInfo(buildingInfo);
     }
 

src/main/java/com/lqkj/info/service/ParkingLotService.java

@@ -0,0 +1,101 @@
+package com.lqkj.info.service;
+
+import java.util.List;
+
+import com.lqkj.info.mapper.ShiftPersonnelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.lqkj.info.mapper.ParkingLotMapper;
+import com.lqkj.info.entity.ParkingLot;
+import com.lqkj.common.utils.uuid.IdUtils;
+/**
+ * 停车场信息Service业务层处理
+ * 
+ * @author lqkj
+ * @date 2024-12-23
+ */
+@Service
+public class ParkingLotService
+{
+    @Autowired
+    private ParkingLotMapper parkingLotMapper;
+
+    @Autowired
+    private ShiftPersonnelMapper shiftPersonnelMapper;
+
+    /**
+     * 查询停车场信息
+     * 
+     * @param parkingId 停车场信息主键
+     * @return 停车场信息
+     */
+    
+    public ParkingLot selectParkingLotByParkingId(Integer parkingId)
+    {
+        return parkingLotMapper.selectParkingLotByParkingId(parkingId);
+    }
+
+    /**
+     * 查询停车场信息列表
+     * 
+     * @param parkingLot 停车场信息
+     * @return 停车场信息
+     */
+    public List<ParkingLot> selectParkingLotList(ParkingLot parkingLot)
+    {
+        List<ParkingLot> parkingLots = parkingLotMapper.selectParkingLotList(parkingLot);
+        parkingLots.forEach(p -> {
+            String personnelName = shiftPersonnelMapper.selectPersonnelName(p.getParkingId());
+            p.setPersonnelName(personnelName);
+        });
+        return parkingLots;
+    }
+
+    /**
+     * 新增停车场信息
+     * 
+     * @param parkingLot 停车场信息
+     * @return 结果
+     */
+    
+    public int insertParkingLot(ParkingLot parkingLot)
+    {
+        return parkingLotMapper.insertParkingLot(parkingLot);
+    }
+
+    /**
+     * 修改停车场信息
+     * 
+     * @param parkingLot 停车场信息
+     * @return 结果
+     */
+    
+    public int updateParkingLot(ParkingLot parkingLot)
+    {
+        return parkingLotMapper.updateParkingLot(parkingLot);
+    }
+
+    /**
+     * 批量删除停车场信息
+     * 
+     * @param parkingIds 需要删除的停车场信息主键
+     * @return 结果
+     */
+    
+    public int deleteParkingLotByParkingIds(Integer[] parkingIds)
+    {
+        return parkingLotMapper.deleteParkingLotByParkingIds(parkingIds);
+    }
+
+    /**
+     * 删除停车场信息信息
+     * 
+     * @param parkingId 停车场信息主键
+     * @return 结果
+     */
+    
+    public int deleteParkingLotByParkingId(Integer parkingId)
+    {
+        return parkingLotMapper.deleteParkingLotByParkingId(parkingId);
+    }
+}

src/main/java/com/lqkj/info/service/ShiftPersonnelService.java

@@ -0,0 +1,91 @@
+package com.lqkj.info.service;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.lqkj.info.mapper.ShiftPersonnelMapper;
+import com.lqkj.info.entity.ShiftPersonnel;
+import com.lqkj.common.utils.uuid.IdUtils;
+/**
+ * 轮班人员信息Service业务层处理
+ * 
+ * @author lqkj
+ * @date 2024-12-23
+ */
+@Service
+public class ShiftPersonnelService
+{
+    @Autowired
+    private ShiftPersonnelMapper shiftPersonnelMapper;
+
+    /**
+     * 查询轮班人员信息
+     * 
+     * @param personnelId 轮班人员信息主键
+     * @return 轮班人员信息
+     */
+    
+    public ShiftPersonnel selectShiftPersonnelByPersonnelId(Integer personnelId)
+    {
+        return shiftPersonnelMapper.selectShiftPersonnelByPersonnelId(personnelId);
+    }
+
+    /**
+     * 查询轮班人员信息列表
+     * 
+     * @param shiftPersonnel 轮班人员信息
+     * @return 轮班人员信息
+     */
+    public List<ShiftPersonnel> selectShiftPersonnelList(ShiftPersonnel shiftPersonnel)
+    {
+        return shiftPersonnelMapper.selectShiftPersonnelList(shiftPersonnel);
+    }
+
+    /**
+     * 新增轮班人员信息
+     * 
+     * @param shiftPersonnel 轮班人员信息
+     * @return 结果
+     */
+    
+    public int insertShiftPersonnel(ShiftPersonnel shiftPersonnel)
+    {
+        return shiftPersonnelMapper.insertShiftPersonnel(shiftPersonnel);
+    }
+
+    /**
+     * 修改轮班人员信息
+     * 
+     * @param shiftPersonnel 轮班人员信息
+     * @return 结果
+     */
+    
+    public int updateShiftPersonnel(ShiftPersonnel shiftPersonnel)
+    {
+        return shiftPersonnelMapper.updateShiftPersonnel(shiftPersonnel);
+    }
+
+    /**
+     * 批量删除轮班人员信息
+     * 
+     * @param personnelIds 需要删除的轮班人员信息主键
+     * @return 结果
+     */
+    
+    public int deleteShiftPersonnelByPersonnelIds(Integer[] personnelIds)
+    {
+        return shiftPersonnelMapper.deleteShiftPersonnelByPersonnelIds(personnelIds);
+    }
+
+    /**
+     * 删除轮班人员信息信息
+     * 
+     * @param personnelId 轮班人员信息主键
+     * @return 结果
+     */
+    
+    public int deleteShiftPersonnelByPersonnelId(Integer personnelId)
+    {
+        return shiftPersonnelMapper.deleteShiftPersonnelByPersonnelId(personnelId);
+    }
+}

src/main/resources/db/migration/V1_10__20241223.sql

@@ -0,0 +1,36 @@
+create table if not exists parking_lot (
+                             parking_id           SERIAL               not null,
+                             parking_name         VARCHAR(255)         null,
+                             lng_lat              VARCHAR(255)         null,
+                             free_spots           INT4                 null,
+                             free_chargers        INT4                 null,
+                             memo                 VARCHAR(255)         null,
+                             constraint PK_PARKING_LOT primary key (parking_id)
+);
+comment on table parking_lot is
+'停车场信息';
+comment on column parking_lot.parking_id is
+'停车场id';
+comment on column parking_lot.parking_name is
+'停车场名称';
+comment on column parking_lot.lng_lat is
+'坐标';
+comment on column parking_lot.free_spots is
+'空余车位';
+comment on column parking_lot.free_chargers is
+'空余充电桩';
+comment on column parking_lot.memo is
+'备注';
+
+    -- 菜单 SQL
+with temp_menu as (
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('停车场信息', '2200', '1', 'parkingLot', 'info/parkingLot/index', false, true, 'C', true, true, 'info:parkingLot:list', 'operation', 'admin', now(), '', null, '停车场信息菜单') returning menu_id
+    )
+-- 按钮 SQL
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('停车场信息查询', (select * from temp_menu), '1',  '#', '', false, true, 'F', true, true, 'info:parkingLot:query',        '#', 'admin', now(), '', null, ''),
+    ('停车场信息新增', (select * from temp_menu), '2',  '#', '', false, true, 'F', true, true, 'info:parkingLot:add',          '#', 'admin', now(), '', null, ''),
+    ('停车场信息修改', (select * from temp_menu), '3',  '#', '', false, true, 'F', true, true, 'info:parkingLot:edit',         '#', 'admin', now(), '', null, ''),
+    ('停车场信息删除', (select * from temp_menu), '4',  '#', '', false, true, 'F', true, true, 'info:parkingLot:remove',       '#', 'admin', now(), '', null, ''),
+    ('停车场信息导出', (select * from temp_menu), '5',  '#', '', false, true, 'F', true, true, 'info:parkingLot:export',       '#', 'admin', now(), '', null, '');

src/main/resources/db/migration/V1_11__20241223.sql

@@ -0,0 +1,36 @@
+create table if not exists shift_personnel (
+    personnel_id           SERIAL               not null,
+    parking_id             INT4                 null,
+    personnel_name         VARCHAR(255)         null,
+    start_time             TIME                 NULL,
+    end_time               TIME                 NULL,
+    memo                   VARCHAR(255)         null,
+    constraint PK_SHIFT_PERSONNEL primary key (personnel_id)
+    );
+comment on table shift_personnel is
+'轮班人员信息';
+comment on column shift_personnel.personnel_id is
+'轮班人员id';
+comment on column shift_personnel.parking_id is
+'停车场id';
+comment on column shift_personnel.personnel_name is
+'轮班人员名字';
+comment on column shift_personnel.start_time is
+'值班开始时间';
+comment on column shift_personnel.end_time is
+'值班结束时间';
+comment on column shift_personnel.memo is
+'备注';
+
+-- 菜单 SQL
+with temp_menu as (
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('轮班人员信息', '2200', '1', 'shiftPersonnel', 'info/shiftPersonnel/index', false, true, 'C', true, true, 'info:shiftPersonnel:list', 'operation', 'admin', now(), '', null, '轮班人员信息菜单') returning menu_id
+    )
+-- 按钮 SQL
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('轮班人员信息查询', (select * from temp_menu), '1',  '#', '', false, true, 'F', true, true, 'info:shiftPersonnel:query',        '#', 'admin', now(), '', null, ''),
+    ('轮班人员信息新增', (select * from temp_menu), '2',  '#', '', false, true, 'F', true, true, 'info:shiftPersonnel:add',          '#', 'admin', now(), '', null, ''),
+    ('轮班人员信息修改', (select * from temp_menu), '3',  '#', '', false, true, 'F', true, true, 'info:shiftPersonnel:edit',         '#', 'admin', now(), '', null, ''),
+    ('轮班人员信息删除', (select * from temp_menu), '4',  '#', '', false, true, 'F', true, true, 'info:shiftPersonnel:remove',       '#', 'admin', now(), '', null, ''),
+    ('轮班人员信息导出', (select * from temp_menu), '5',  '#', '', false, true, 'F', true, true, 'info:shiftPersonnel:export',       '#', 'admin', now(), '', null, '');

src/main/resources/db/migration/V1_9__20241219.sql

@@ -0,0 +1,3 @@
+ALTER TABLE elevator_info
+    add COLUMN if not exists connect_status int;
+comment on column elevator_info.connect_status is '连接状态';

src/main/resources/mapper/info/ElevatorInfoMapper.xml

@@ -14,10 +14,11 @@
 		<result property="type" column="type"/>
 		<result property="runFloor"    column="run_floors"    />
 		<result property="runTime"    column="run_time"    />
+		<result property="connectStatus"    column="connect_status"    />
 	</resultMap>
 
 	<sql id="selectElevatorInfoVo">
-		select elevator_id, elevator_code, building_id, status, elevator_name, upkeep_num, type, run_floors, run_time from elevator_info
+		select elevator_id, elevator_code, building_id, status, elevator_name, upkeep_num, type, run_floors, run_time, connect_status from elevator_info
 	</sql>
 
 	<select id="selectElevatorInfoList" parameterType="ElevatorInfo" resultMap="ElevatorInfoResult">
@@ -30,6 +31,7 @@
 			<if test="type != null "> and type = #{type}</if>
 			<if test="runFloor != null and runFloor != ''"> and run_floors like concat('%', #{runFloor}, '%')</if>
 			<if test="runTime != null and runTime != ''"> and run_time like concat('%', #{runTime}, '%')</if>
+			<if test="connectStatus != null "> and connect_status = #{connectStatus}</if>
 		</where>
 		order by elevator_id
 
@@ -51,6 +53,7 @@
 		    <if test="type != null">type,</if>
 		    <if test="runFloor != null and runFloor != ''">run_floors,</if>
 		    <if test="runTime != null and runTime != ''">run_time,</if>
+		    <if test="connectStatus != null">connect_status,</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="elevatorCode != null and elevatorCode != ''">#{elevatorCode},</if>
@@ -61,6 +64,7 @@
 		    <if test="type != null">#{type},</if>
 		    <if test="runFloor != null and runFloor != ''">#{runFloor},</if>
 		    <if test="runTime != null and runTime != ''">#{runTime},</if>
+		    <if test="connectStatus != null">#{connectStatus},</if>
 		</trim>
 	</insert>
 
@@ -75,6 +79,7 @@
 		    type = #{type},
 			run_floors = #{runFloor},
 		    run_time = #{runTime},
+		    connect_status = #{connectStatus}
 		</trim>
 		where elevator_id = #{elevatorId}
 	</update>

src/main/resources/mapper/info/ParkingLotMapper.xml

@@ -0,0 +1,74 @@
+<?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.lqkj.info.mapper.ParkingLotMapper">
+
+	<resultMap type="ParkingLot" id="ParkingLotResult">
+		<result property="parkingId"    column="parking_id"    />
+		<result property="parkingName"    column="parking_name"    />
+		<result property="lngLat"    column="lng_lat"    />
+		<result property="freeSpots"    column="free_spots"    />
+		<result property="freeChargers"    column="free_chargers"    />
+		<result property="memo"    column="memo"    />
+	</resultMap>
+
+	<sql id="selectParkingLotVo">
+		select parking_id, parking_name, lng_lat, free_spots, free_chargers, memo from parking_lot
+	</sql>
+
+	<select id="selectParkingLotList" parameterType="ParkingLot" resultMap="ParkingLotResult">
+		<include refid="selectParkingLotVo"/>
+		<where>
+			<if test="parkingName != null  and parkingName != ''"> and parking_name like concat('%', #{parkingName}, '%')</if>
+		</where>
+		order by parking_id
+
+	</select>
+
+	<select id="selectParkingLotByParkingId" parameterType="Integer" resultMap="ParkingLotResult">
+		<include refid="selectParkingLotVo"/>
+		where parking_id = #{parkingId}
+	</select>
+
+	<insert id="insertParkingLot" parameterType="ParkingLot" useGeneratedKeys="true" keyProperty="parkingId">
+		insert into parking_lot
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="parkingName != null and parkingName != ''">parking_name,</if>
+			<if test="lngLat != null and lngLat != ''">lng_lat,</if>
+			<if test="freeSpots != null">free_spots,</if>
+			<if test="freeChargers != null">free_chargers,</if>
+			<if test="memo != null and memo != ''">memo,</if>
+		</trim>
+		<trim prefix="values (" suffix=")" suffixOverrides=",">
+			<if test="parkingName != null and parkingName != ''">#{parkingName},</if>
+			<if test="lngLat != null and lngLat != ''">#{lngLat},</if>
+			<if test="freeSpots != null">#{freeSpots},</if>
+			<if test="freeChargers != null">#{freeChargers},</if>
+			<if test="memo != null and memo != ''">#{memo},</if>
+		</trim>
+	</insert>
+
+	<update id="updateParkingLot" parameterType="ParkingLot">
+		update parking_lot
+		<trim prefix="SET" suffixOverrides=",">
+			<if test="parkingName != null  and parkingName != ''">parking_name = #{parkingName},</if>
+			lng_lat = #{lngLat},
+			free_spots = #{freeSpots},
+			free_chargers = #{freeChargers},
+			memo = #{memo},
+		</trim>
+		where parking_id = #{parkingId}
+	</update>
+
+	<delete id="deleteParkingLotByParkingId" parameterType="Integer">
+		delete from parking_lot where parking_id = #{parkingId}
+	</delete>
+
+	<delete id="deleteParkingLotByParkingIds" parameterType="String">
+		delete from parking_lot where parking_id in
+		<foreach item="parkingId" collection="array" open="(" separator="," close=")">
+			#{parkingId}
+		</foreach>
+	</delete>
+</mapper>

src/main/resources/mapper/info/ShiftPersonnelMapper.xml

@@ -0,0 +1,81 @@
+<?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.lqkj.info.mapper.ShiftPersonnelMapper">
+
+	<resultMap type="ShiftPersonnel" id="ShiftPersonnelResult">
+		<result property="personnelId"    column="personnel_id"    />
+		<result property="parkingId"    column="parking_id"    />
+		<result property="personnelName"    column="personnel_name"    />
+		<result property="startTime"    column="start_time"    />
+		<result property="endTime"    column="end_time"    />
+		<result property="memo"    column="memo"    />
+	</resultMap>
+
+	<sql id="selectShiftPersonnelVo">
+		select personnel_id, parking_id, personnel_name, start_time, end_time, memo from shift_personnel
+	</sql>
+
+	<select id="selectShiftPersonnelList" parameterType="ShiftPersonnel" resultMap="ShiftPersonnelResult">
+		<include refid="selectShiftPersonnelVo"/>
+		<where>
+			<if test="personnelName != null  and personnelName != ''"> and personnel_name like concat('%', #{personnelName}, '%')</if>
+			<if test="parkingId != null "> and parking_id = #{parkingId}</if>
+			<if test="startTime != null "> and start_time like concat('%', #{startTime}, '%')</if>
+			<if test="endTime != null "> and end_time like concat('%', #{endTime}, '%')</if>
+		</where>
+		order by personnel_id
+
+	</select>
+
+	<select id="selectShiftPersonnelByPersonnelId" parameterType="Integer" resultMap="ShiftPersonnelResult">
+		<include refid="selectShiftPersonnelVo"/>
+		where personnel_id = #{personnelId}
+	</select>
+	<select id="selectPersonnelName" resultType="java.lang.String">
+		select personnel_name from shift_personnel where parking_id = #{parkingId}
+		and CURRENT_TIME BETWEEN start_time AND end_time
+	</select>
+
+	<insert id="insertShiftPersonnel" parameterType="ShiftPersonnel" useGeneratedKeys="true" keyProperty="personnelId">
+		insert into shift_personnel
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="parkingId != null">parking_id,</if>
+			<if test="personnelName != null and personnelName != ''">personnel_name,</if>
+			<if test="startTime != null">start_time,</if>
+			<if test="endTime != null">end_time,</if>
+			<if test="memo != null and memo != ''">memo,</if>
+		</trim>
+		<trim prefix="values (" suffix=")" suffixOverrides=",">
+			<if test="parkingId != null">#{parkingId},</if>
+			<if test="personnelName != null and personnelName != ''">#{personnelName},</if>
+			<if test="startTime != null">#{startTime},</if>
+			<if test="endTime != null">#{endTime},</if>
+			<if test="memo != null and memo != ''">#{memo},</if>
+		</trim>
+	</insert>
+
+	<update id="updateShiftPersonnel" parameterType="ShiftPersonnel">
+		update shift_personnel
+		<trim prefix="SET" suffixOverrides=",">
+			parking_id = #{parkingId},
+			personnel_name = #{personnelName},
+			start_time = #{startTime},
+			end_time = #{endTime},
+			memo = #{memo},
+		</trim>
+		where personnel_id = #{personnelId}
+	</update>
+
+	<delete id="deleteShiftPersonnelByPersonnelId" parameterType="Integer">
+		delete from shift_personnel where personnel_id = #{personnelId}
+	</delete>
+
+	<delete id="deleteShiftPersonnelByPersonnelIds" parameterType="String">
+		delete from shift_personnel where personnel_id in
+		<foreach item="personnelId" collection="array" open="(" separator="," close=")">
+			#{personnelId}
+		</foreach>
+	</delete>
+</mapper>