pom.xml

@@ -143,30 +143,6 @@
             <artifactId>mapstruct</artifactId>
             <version>${mapstruct.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.websocket</groupId>
-            <artifactId>javax.websocket-api</artifactId>
-            <version>1.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.paho</groupId>
-            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-            <version>1.2.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.integration</groupId>
-            <artifactId>spring-integration-mqtt</artifactId>
-        </dependency>
-
     </dependencies>
 
     <build>

src/main/java/org/energy/common/config/DafConfiguration.java

@@ -35,7 +35,6 @@ public class DafConfiguration implements WebMvcConfigurer {
 		SecureRegistry secureRegistry = new SecureRegistry();
 		secureRegistry.setEnabled(true);
 		secureRegistry.excludePathPatterns("/daf-auth/**");
-		secureRegistry.excludePathPatterns("/daf-scada/**");
 		secureRegistry.excludePathPatterns("/daf-system/menu/auth-routes");
 		secureRegistry.excludePathPatterns("/daf-system/tenant/info");
 		secureRegistry.excludePathPatterns("/doc.html");

src/main/java/org/energy/common/constant/CommonConstant.java

@@ -45,6 +45,6 @@ public interface CommonConstant {
 	/**
 	 * 默认密码
 	 */
-	String DEFAULT_PASSWORD = "";
+	String DEFAULT_PASSWORD = "123456";
 
 }

src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java

@@ -202,6 +202,15 @@ public class EquipmentLedgerController extends DafController {
 		return this.approve(3,ids);
 	}
 
+	/**
+	 * 修改 设备台账编码一览
+	 */
+	@PostMapping("/kai")
+	@ApiOperationSupport(order = 10)
+	@ApiOperation(value = "更新", notes = "传入ids")
+	public R kai(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return this.approve(4, ids);
+	}
 	/**
 	 * 驳回OR审核 设备台账编码一览
 	 */

src/main/java/org/energy/modules/leger/controller/postmanagementController.java

@@ -0,0 +1,259 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.energy.modules.leger.controller;
+
+import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dayu.daf.core.boot.ctrl.DafController;
+import com.dayu.daf.core.log.annotation.ApiLog;
+import com.dayu.daf.core.mp.support.Condition;
+import com.dayu.daf.core.mp.support.Query;
+import com.dayu.daf.core.tool.api.R;
+import com.dayu.daf.core.tool.constant.DafConstant;
+import com.dayu.daf.core.tool.utils.Func;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.xkcoding.http.util.StringUtil;
+import io.micrometer.core.instrument.util.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.SneakyThrows;
+import org.apache.commons.codec.Charsets;
+import org.energy.modules.leger.entity.EquipmentLedger;
+import org.energy.modules.leger.excel.EquipmentLedgerExcel;
+import org.energy.modules.leger.service.IEquipmentLedgerService;
+import org.energy.modules.leger.service.IInventoryDocumentService;
+import org.energy.modules.leger.service.ITechParametersService;
+import org.energy.modules.leger.vo.EquipmentLedgerVO;
+import org.energy.modules.system.util.DataUtils;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备台账编码一览 控制器
+ *
+ * @author Daf
+ * @since 2024-07-04
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/postmanagement")
+@Api(value = "设备台账编码一览", tags = "设备台账编码一览接口")
+public class postmanagementController extends DafController {
+
+	private IEquipmentLedgerService equipmentLedgerService;
+	private IInventoryDocumentService inventoryDocumentService;
+	private ITechParametersService techParametersService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入equipmentLedger")
+	public R<EquipmentLedger> detail(EquipmentLedger equipmentLedger) {
+		EquipmentLedger detail = equipmentLedgerService.getOne(Condition.getQueryWrapper(equipmentLedger));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 设备台账编码一览
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入equipmentLedger")
+	public R<IPage<EquipmentLedger>> list(EquipmentLedger equipmentLedger, Query query) {
+		QueryWrapper<EquipmentLedger> qw = new QueryWrapper<>();
+		qw.orderByAsc("eq_ledger_code");
+		if (StringUtil.isNotEmpty(equipmentLedger.getMajor())) {
+			qw.lambda().like(EquipmentLedger::getMajor, equipmentLedger.getMajor());
+		}
+		if (null != equipmentLedger.getUserStatus()) {
+			qw.lambda().eq(EquipmentLedger::getUserStatus, equipmentLedger.getUserStatus());
+		}
+		if (null != equipmentLedger.getStation()) {
+			qw.lambda().eq(EquipmentLedger::getStation, equipmentLedger.getStation());
+		}
+		if (StringUtil.isNotEmpty(equipmentLedger.getInstallationLocation())) {
+			qw.lambda().like(EquipmentLedger::getInstallationLocation, equipmentLedger.getInstallationLocation());
+		}
+		if (StringUtil.isNotEmpty(equipmentLedger.getEqLedgerCode())) {
+			qw.lambda().like(EquipmentLedger::getEqLedgerCode, equipmentLedger.getEqLedgerCode());
+		}
+		if (StringUtil.isNotEmpty(equipmentLedger.getDeviceDescription())) {
+			qw.lambda().like(EquipmentLedger::getDeviceDescription, equipmentLedger.getDeviceDescription());
+		}
+		if (StringUtil.isNotEmpty(equipmentLedger.getEqType())) {
+			qw.lambda().like(EquipmentLedger::getEqType, equipmentLedger.getEqType());
+		}
+		if (StringUtil.isNotEmpty(equipmentLedger.getMaintenanceTeam())) {
+			qw.lambda().like(EquipmentLedger::getMaintenanceTeam, equipmentLedger.getMaintenanceTeam());
+		}
+		if (StringUtil.isNotEmpty(equipmentLedger.getManufacturingSerialNo())) {
+			qw.lambda().like(EquipmentLedger::getManufacturingSerialNo, equipmentLedger.getManufacturingSerialNo());
+		}
+		IPage<EquipmentLedger> pages = equipmentLedgerService.page(Condition.getPage(query), qw);
+
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 设备台账编码一览
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入equipmentLedger")
+	public R<IPage<EquipmentLedgerVO>> page(EquipmentLedgerVO equipmentLedger, Query query) {
+		IPage<EquipmentLedgerVO> pages = equipmentLedgerService.selectEquipmentLedgerPage(Condition.getPage(query), equipmentLedger);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 设备台账编码一览
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入equipmentLedger")
+	public R save(@Valid @RequestBody EquipmentLedger equipmentLedger) {
+		return R.status(equipmentLedgerService.save(equipmentLedger));
+	}
+
+	/**
+	 * 修改 设备台账编码一览
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入equipmentLedger")
+	public R update(@Valid @RequestBody EquipmentLedger equipmentLedger) {
+		return R.status(equipmentLedgerService.updateById(equipmentLedger));
+	}
+
+	/**
+	 * 新增或修改 设备台账编码一览
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入equipmentLedger")
+	public R submit(@Valid @RequestBody EquipmentLedger equipmentLedger) {
+		return R.status(equipmentLedgerService.saveOrUpdate(equipmentLedger));
+	}
+
+
+	/**
+	 * 删除 设备台账编码一览
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		for (String id : ids.split(",")) {
+			inventoryDocumentService.delInventoryDocument(Long.parseLong(id));
+			techParametersService.delTechParameters(Long.parseLong(id));
+		}
+		return R.status(equipmentLedgerService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 驳回OR审核 设备台账编码一览
+	 */
+	public R approve(Integer status, String ids) {
+		List<EquipmentLedger> list = new ArrayList<>();
+		for (String id : ids.split(",")) {
+			EquipmentLedger equipmentLedger = equipmentLedgerService.getById(Long.parseLong(id));
+			equipmentLedger.setCheckStatus(status);
+			list.add(equipmentLedger);
+		}
+		return R.status(equipmentLedgerService.updateBatchById(list));
+	}
+
+	/**
+	 * 获取对象编号
+	 */
+	@GetMapping("/getKksList")
+	@ApiOperationSupport(order = 11)
+	@ApiOperation(value = "获取kks编号", notes = "获取kks编号")
+	public R<List<EquipmentLedger>> getKksNoList() {
+		List<EquipmentLedger> kksList = equipmentLedgerService.getKksNoList();
+		return R.data(kksList);
+	}
+
+	/**
+	 * 获取对象编号
+	 */
+	@GetMapping("/getDetailList")
+	@ApiOperationSupport(order = 12)
+	@ApiOperation(value = "获取kks信息", notes = "获取kks信息")
+	public R<EquipmentLedger> getDetailList(String KksNo) {
+		EquipmentLedger DetailList = equipmentLedgerService.getDetailList("'" + KksNo + "'");
+		return R.data(DetailList);
+	}
+
+	/**
+	 * 远程搜索
+	 */
+	@GetMapping("/listByCoding")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "远程搜索", notes = "传入")
+	public R<List<EquipmentLedger>> listByCoding(String coding) {
+		QueryWrapper<EquipmentLedger> queryWrapper = new QueryWrapper<>();
+		if (StringUtils.isNotEmpty(coding)) {
+			if (coding.matches("\\d+")) {
+				queryWrapper.nested(wrapper -> wrapper.eq("id", Long.parseLong(coding))
+					.or().lambda().like(EquipmentLedger::getKksEncoding, coding));
+			} else {
+				queryWrapper.lambda().like(EquipmentLedger::getKksEncoding, coding);
+			}
+		}
+		queryWrapper.lambda().eq(EquipmentLedger::getCheckStatus, 2);
+		queryWrapper.lambda().eq(EquipmentLedger::getIsDeleted, DafConstant.DB_NOT_DELETED);
+		queryWrapper.lambda().orderByAsc(EquipmentLedger::getKksEncoding);
+		queryWrapper.lambda().last(" LIMIT 50");
+		List<EquipmentLedger> list = equipmentLedgerService.list(queryWrapper);
+
+		return R.data(list);
+	}
+
+	/**
+	 * 获取kkskey
+	 */
+	@GetMapping("/getKksKey")
+	@ApiOperationSupport(order = 12)
+	@ApiOperation(value = "获取kks编号", notes = "获取kks编号")
+	public R<EquipmentLedger>  getKksKey(String KksNo) {
+		EquipmentLedger DetailList = equipmentLedgerService.getKksKey("'" + KksNo + "'");
+		return R.data(DetailList);
+	}
+
+	/**
+	 * 获取kkskey
+	 */
+	@GetMapping("/getEqLedgerCode")
+	@ApiOperationSupport(order = 13)
+	@ApiOperation(value = "获取kks编号", notes = "获取kks编号")
+	public R<EquipmentLedger> getEqLedgerCode(String eqLedgerCode) {
+		EquipmentLedger DetailList = equipmentLedgerService.getEqLedgerCode("'" + eqLedgerCode + "'");
+		return R.data(DetailList);
+	}
+}

src/main/java/org/energy/modules/master/controller/EquipmentInspectionController.java

@@ -0,0 +1,141 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.energy.modules.master.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import com.dayu.daf.core.mp.support.Condition;
+import com.dayu.daf.core.mp.support.Query;
+import com.dayu.daf.core.tool.api.R;
+import com.dayu.daf.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.master.entity.EquipmentInspection;
+import org.energy.modules.master.vo.EquipmentInspectionVO;
+import org.energy.modules.master.service.IEquipmentInspectionService;
+import com.dayu.daf.core.boot.ctrl.DafController;
+
+import java.util.List;
+
+/**
+ * 工器具检查 控制器
+ *
+ * @author Daf
+ * @since 2025-01-09
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/master/equipmentinspection")
+@Api(value = "工器具检查", tags = "工器具检查接口")
+public class EquipmentInspectionController extends DafController {
+
+	private IEquipmentInspectionService equipmentInspectionService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入equipmentInspection")
+	public R<EquipmentInspection> detail(EquipmentInspection equipmentInspection) {
+		EquipmentInspection detail = equipmentInspectionService.selectDetail(equipmentInspection.getId());
+		return R.data(detail);
+	}
+
+	/**
+	 * 检查内容详情
+	 */
+	@GetMapping("/detail2")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "详情", notes = "传入equipmentInspection")
+	public R<List<EquipmentInspectionVO>> detail2(EquipmentInspection equipmentInspection) {
+		List<EquipmentInspectionVO> detail2 = equipmentInspectionService.selectDetail2(equipmentInspection.getId());
+		return R.data(detail2);
+	}
+
+	/**
+	 * 分页 工器具检查
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入equipmentInspection")
+	public R<IPage<EquipmentInspection>> list(EquipmentInspection equipmentInspection, Query query) {
+		IPage<EquipmentInspection> pages = equipmentInspectionService.page(Condition.getPage(query), Condition.getQueryWrapper(equipmentInspection));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 工器具检查
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入equipmentInspection")
+	public R<IPage<EquipmentInspectionVO>> page(EquipmentInspectionVO equipmentInspection, Query query) {
+		IPage<EquipmentInspectionVO> pages = equipmentInspectionService.selectEquipmentInspectionPage(Condition.getPage(query), equipmentInspection);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 工器具检查
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入equipmentInspection")
+	public R save(@Valid @RequestBody EquipmentInspection equipmentInspection) {
+		return R.status(equipmentInspectionService.save(equipmentInspection));
+	}
+
+	/**
+	 * 修改 工器具检查
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入equipmentInspection")
+	public R update(@Valid @RequestBody EquipmentInspection equipmentInspection) {
+		return R.status(equipmentInspectionService.updateById(equipmentInspection));
+	}
+
+	/**
+	 * 新增或修改 工器具检查
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入equipmentInspection")
+	public R submit(@Valid @RequestBody EquipmentInspection equipmentInspection) {
+		equipmentInspection.setInspectionStatus(1);
+
+		return R.status(equipmentInspectionService.saveOrUpdate(equipmentInspection));
+	}
+
+
+	/**
+	 * 删除 工器具检查
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(equipmentInspectionService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+}

src/main/java/org/energy/modules/master/controller/HistoryRecordController.java

@@ -0,0 +1,126 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.energy.modules.master.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import com.dayu.daf.core.mp.support.Condition;
+import com.dayu.daf.core.mp.support.Query;
+import com.dayu.daf.core.tool.api.R;
+import com.dayu.daf.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.master.entity.HistoryRecord;
+import org.energy.modules.master.vo.HistoryRecordVO;
+import org.energy.modules.master.service.IHistoryRecordService;
+import com.dayu.daf.core.boot.ctrl.DafController;
+
+/**
+ * 历史记录 控制器
+ *
+ * @author Daf
+ * @since 2025-01-07
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/master/historyrecord")
+@Api(value = "历史记录", tags = "历史记录接口")
+public class HistoryRecordController extends DafController {
+
+	private IHistoryRecordService historyRecordService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入historyRecord")
+	public R<HistoryRecord> detail(HistoryRecord historyRecord) {
+		HistoryRecord detail = historyRecordService.selectDetail(historyRecord.getHistoryNumber());
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 历史记录
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入historyRecord")
+	public R<IPage<HistoryRecord>> list(HistoryRecord historyRecord, Query query) {
+		IPage<HistoryRecord> pages = historyRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(historyRecord));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 历史记录
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入historyRecord")
+	public R<IPage<HistoryRecordVO>> page(HistoryRecordVO historyRecord, Query query) {
+		IPage<HistoryRecordVO> pages = historyRecordService.selectHistoryRecordPage(Condition.getPage(query), historyRecord);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 历史记录
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入historyRecord")
+	public R save(@Valid @RequestBody HistoryRecord historyRecord) {
+		return R.status(historyRecordService.save(historyRecord));
+	}
+
+	/**
+	 * 修改 历史记录
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入historyRecord")
+	public R update(@Valid @RequestBody HistoryRecord historyRecord) {
+		return R.status(historyRecordService.updateById(historyRecord));
+	}
+
+	/**
+	 * 新增或修改 历史记录
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入historyRecord")
+	public R submit(@Valid @RequestBody HistoryRecord historyRecord) {
+		return R.status(historyRecordService.saveOrUpdate(historyRecord));
+	}
+
+
+	/**
+	 * 删除 历史记录
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(historyRecordService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+}

src/main/java/org/energy/modules/master/dto/EquipmentInspectionDTO.java

@@ -0,0 +1,18 @@
+package org.energy.modules.master.dto;
+
+import org.energy.modules.master.entity.EquipmentInspection;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 工器具检查数据传输对象实体类
+ *
+ * @author Daf
+ * @since 2025-01-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EquipmentInspectionDTO extends EquipmentInspection {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/energy/modules/master/dto/HistoryRecordDTO.java

@@ -0,0 +1,18 @@
+package org.energy.modules.master.dto;
+
+import org.energy.modules.master.entity.HistoryRecord;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 历史记录数据传输对象实体类
+ *
+ * @author Daf
+ * @since 2025-01-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class HistoryRecordDTO extends HistoryRecord {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/energy/modules/master/entity/EquipmentInspection.java

@@ -0,0 +1,107 @@
+package org.energy.modules.master.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dayu.daf.core.mp.base.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDate;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 工器具检查实体类
+ *
+ * @author Daf
+ * @since 2025-01-09
+ */
+@Data
+@TableName("master_equipment_inspection")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "EquipmentInspection对象", description = "工器具检查")
+public class EquipmentInspection extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	@JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键")
+    private Long id;
+    /**
+     * 工器具编码
+     */
+    @ApiModelProperty(value = "工器具编码")
+    private String toolsCodeId;
+    /**
+     * 检验周期开始日期
+     */
+    @ApiModelProperty(value = "检验周期开始日期")
+    private LocalDate inspectionStartDate;
+    /**
+     * 检验周期结束日期
+     */
+    @ApiModelProperty(value = "检验周期结束日期")
+    private LocalDate inspectionEndDate;
+    /**
+     * 检验频率
+     */
+    @ApiModelProperty(value = "检验频率")
+    private Integer inspectionFrequency;
+    /**
+     * 频率单位
+     */
+    @ApiModelProperty(value = "频率单位")
+    private Integer frequencyUnit;
+    /**
+     * 开始日期
+     */
+    @ApiModelProperty(value = "开始日期")
+    private LocalDate startDate;
+    /**
+     * 计划检查日期
+     */
+    @ApiModelProperty(value = "计划检查日期")
+    private LocalDate inspectionPlanDate;
+    /**
+     * 计划检查流水号
+     */
+    @ApiModelProperty(value = "计划检查流水号")
+    private String inspectionPlanId;
+    /**
+     * 实际检查日期
+     */
+    @ApiModelProperty(value = "实际检查日期")
+    private LocalDate inspectionDate;
+    /**
+     * 检查人
+     */
+    @ApiModelProperty(value = "检查人")
+    private Long inspectorStaffId;
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;
+	/**
+	 * 工器具名称
+	 */
+	@ApiModelProperty(value = "工器具名称")
+	private String toolsCodeName;
+	/**
+	 * 场站编码
+	 */
+	@ApiModelProperty(value = "场站编码")
+	private String stationCode;
+	/**
+	 * 执行状态
+	 */
+	@ApiModelProperty(value = "执行状态")
+	private Integer inspectionStatus;
+
+
+}

src/main/java/org/energy/modules/master/entity/HistoryRecord.java

@@ -0,0 +1,96 @@
+package org.energy.modules.master.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dayu.daf.core.mp.base.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 历史记录实体类
+ *
+ * @author Daf
+ * @since 2025-01-07
+ */
+@Data
+@TableName("master_history_record")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "HistoryRecord对象", description = "历史记录")
+public class HistoryRecord extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	@JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键")
+    private Long id;
+    /**
+     * KKS编码
+     */
+    @ApiModelProperty(value = "KKS编码")
+    private String kksCode;
+    /**
+     * 设备台账编码
+     */
+    @ApiModelProperty(value = "设备台账编码")
+    private String eqLedgerCode;
+    /**
+     * 工器具编码
+     */
+    @ApiModelProperty(value = "工器具编码")
+    private String toolsCodeId;
+    /**
+     * 变更类型
+     */
+    @ApiModelProperty(value = "变更类型")
+    private Integer changeType;
+    /**
+     * 提交时间
+     */
+    @ApiModelProperty(value = "提交时间")
+    private LocalDateTime submitTime;
+    /**
+     * 审批时间
+     */
+    @ApiModelProperty(value = "审批时间")
+    private LocalDateTime approvalTime;
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty(value = "审批状态")
+    private Integer approvalStatus;
+    /**
+     * 审批结果
+     */
+    @ApiModelProperty(value = "审批结果")
+    private Integer approvalResult;
+    /**
+     * 变更人
+     */
+    @ApiModelProperty(value = "变更人")
+    private Long changeStaffId;
+    /**
+     * 审批人
+     */
+    @ApiModelProperty(value = "审批人")
+    private Long approverStaffId;
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;
+	/**
+	 * 工器具编码
+	 */
+	@ApiModelProperty(value = "记录编号")
+	private String historyNumber;
+
+}

src/main/java/org/energy/modules/master/mapper/EquipmentInspectionMapper.java

@@ -0,0 +1,40 @@
+package org.energy.modules.master.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.energy.modules.master.entity.EquipmentInspection;
+import org.energy.modules.master.vo.EquipmentInspectionVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.org.vo.DepartmentInfoVO;
+
+import java.util.List;
+
+/**
+ * 工器具检查 Mapper 接口
+ *
+ * @author Daf
+ * @since 2025-01-09
+ */
+public interface EquipmentInspectionMapper extends BaseMapper<EquipmentInspection> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param equipmentInspection
+	 * @return
+	 */
+	List<EquipmentInspectionVO> selectEquipmentInspectionPage(IPage page, @Param("entity")EquipmentInspectionVO equipmentInspection);
+
+	/**
+	 * 基本信息
+	 *
+	 */
+	EquipmentInspectionVO selectDetail(@Param("id") Long id);
+
+	/**
+	 * 检查内容信息
+	 *
+	 */
+	List<EquipmentInspectionVO> selectDetail2(@Param("id") Long id);
+}

src/main/java/org/energy/modules/master/mapper/EquipmentInspectionMapper.xml

@@ -0,0 +1,131 @@
+<?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="org.energy.modules.master.mapper.EquipmentInspectionMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="equipmentInspectionResultMap" type="org.energy.modules.master.entity.EquipmentInspection">
+        <id column="id" property="id"/>
+        <result column="status" property="status"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="tools_code_id" property="toolsCodeId"/>
+        <result column="inspection_start_date" property="inspectionStartDate"/>
+        <result column="inspection_end_date" property="inspectionEndDate"/>
+        <result column="inspection_frequency" property="inspectionFrequency"/>
+        <result column="frequency_unit" property="frequencyUnit"/>
+        <result column="start_date" property="startDate"/>
+        <result column="inspection_plan_date" property="inspectionPlanDate"/>
+        <result column="inspection_plan_id" property="inspectionPlanId"/>
+        <result column="inspection_date" property="inspectionDate"/>
+        <result column="inspector_staff_id" property="inspectorStaffId"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+    <resultMap id="equipmentInspectionResultExt" type="org.energy.modules.master.vo.EquipmentInspectionVO">
+        <id column="id" property="id"/>
+        <result column="inspection_status" property="inspectionStatus"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="tools_code_id" property="toolsCodeId"/>
+        <result column="inspection_start_date" property="inspectionStartDate"/>
+        <result column="inspection_end_date" property="inspectionEndDate"/>
+        <result column="inspection_frequency" property="inspectionFrequency"/>
+        <result column="frequency_unit" property="frequencyUnit"/>
+        <result column="start_date" property="startDate"/>
+        <result column="inspection_plan_date" property="inspectionPlanDate"/>
+        <result column="inspection_plan_id" property="inspectionPlanId"/>
+        <result column="inspection_date" property="inspectionDate"/>
+        <result column="inspector_staff_id" property="inspectorStaffId"/>
+        <result column="remark" property="remark"/>
+        <result column="tools_code_name" property="toolsCodeName"/>
+        <result column="station_code" property="stationCode"/>
+
+        <result column="station_name" property="stationName"/>
+        <result column="inspection_status1" property="inspectionStatus1"/>
+
+        <result column="name" property="name"/>
+        <result column="inspection_info" property="inspectionInfo"/>
+        <result column="inspection_standard" property="inspectionStandard"/>
+        <result column="is_quakified" property="isQuakified"/>
+        <result column="remark2" property="remark2"/>
+
+    </resultMap>
+
+
+    <select id="selectEquipmentInspectionPage" resultMap="equipmentInspectionResultExt">
+        select
+            e.id,
+            e.inspection_plan_id,
+            e.tools_code_id,
+            e.tools_code_name,
+            e.inspection_plan_date,
+            s.station_name,
+            d.dict_value as inspection_status1
+        from master_equipment_inspection e
+                 left join org_station_info s on s.station_code=e.station_code and s.is_deleted=0
+                 left join sys_dict d on e.inspection_status = d.dict_key and d.code = 'inspection_status'
+        where
+            e.is_deleted = 0
+        <if test="entity.toolsCodeId!= null and entity.toolsCodeId!= ''">
+            and e.tools_code_id = #{entity.toolsCodeId}
+        </if>
+        <if test="entity.toolsCodeName!= null and entity.toolsCodeName!= ''">
+            and e.tools_code_name = #{entity.toolsCodeName}
+        </if>
+        <if test="entity.inspectionPlanDate!= null and entity.inspectionPlanDate!= ''">
+            and e.inspection_plan_date = #{inspectionPlanDate}
+        </if>
+        <if test="entity.inspectionStatus1!= null and entity.inspectionStatus1!= ''">
+            and e.inspection_status1 = #{entity.inspectionStatus1}
+        </if>
+    </select>
+
+    <select id="selectDetail" resultMap="equipmentInspectionResultExt">
+        select
+            e.id,
+            e.tools_code_id,
+            e.tools_code_name,
+            e.inspection_plan_id,
+            e.inspection_plan_date,
+            e.inspection_date,
+            d.dict_value as inspection_status1,
+            st.name,
+            e.remark
+--             s.inspection_info,
+--             s.inspection_standard,
+--             d2.dict_value as is_quakified,
+--             s.remark as remark2
+        from master_equipment_inspection e
+--                  left join master_equipment_inspec_info s on s.inspection_plan_id=e.inspection_plan_id and s.is_deleted=0
+                 left join sys_dict d on e.inspection_status = d.dict_key and d.code = 'inspection_status'
+--                  left join sys_dict d2 on s.is_quakified = d2.dict_key and d2.code = 'is_quakified'
+                 left join org_staff_info st on st.id=e.inspector_staff_id and st.is_deleted=0
+        where
+            e.is_deleted = 0
+          and e.id = #{id}
+    </select>
+
+    <select id="selectDetail2" resultMap="equipmentInspectionResultExt">
+        select
+            e.id,
+            s.inspection_info,
+            s.inspection_standard,
+            d2.dict_value as is_quakified,
+            s.remark as remark2
+        from master_equipment_inspec_info s
+                 left join master_equipment_inspection e on s.inspection_plan_id=e.inspection_plan_id and e.is_deleted=0
+                 left join sys_dict d2 on s.is_quakified = d2.dict_key and d2.code = 'is_quakified'
+        where
+            s.is_deleted = 0
+          and e.id = #{id}
+    </select>
+
+
+
+</mapper>

src/main/java/org/energy/modules/master/mapper/HistoryRecordMapper.java

@@ -0,0 +1,30 @@
+package org.energy.modules.master.mapper;
+
+import org.energy.modules.master.entity.HistoryRecord;
+import org.energy.modules.master.vo.HistoryRecordVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.energy.modules.org.vo.StationInfoVO;
+
+import java.util.List;
+
+/**
+ * 历史记录 Mapper 接口
+ *
+ * @author Daf
+ * @since 2025-01-07
+ */
+public interface HistoryRecordMapper extends BaseMapper<HistoryRecord> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param historyRecord
+	 * @return
+	 */
+	List<HistoryRecordVO> selectHistoryRecordPage(IPage page, @Param("entity")HistoryRecordVO historyRecord);
+
+	HistoryRecordVO selectDetail(@Param("historyNumber") String historyNumber);
+}

src/main/java/org/energy/modules/master/mapper/HistoryRecordMapper.xml

@@ -0,0 +1,136 @@
+<?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="org.energy.modules.master.mapper.HistoryRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="historyRecordResultMap" type="org.energy.modules.master.entity.HistoryRecord">
+        <id column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="kks_code" property="kksCode"/>
+        <result column="eq_ledger_code" property="eqLedgerCode"/>
+        <result column="tools_code_id" property="toolsCodeId"/>
+        <result column="change_type" property="changeType"/>
+        <result column="submit_time" property="submitTime"/>
+        <result column="approval_time" property="approvalTime"/>
+        <result column="approval_status" property="approvalStatus"/>
+        <result column="approval_result" property="approvalResult"/>
+        <result column="change_staff_id" property="changeStaffId"/>
+        <result column="approver_staff_id" property="approverStaffId"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+    <resultMap id="historyRecordResultExt" type="org.energy.modules.master.vo.HistoryRecordVO">
+        <id column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="kks_code" property="kksCode"/>
+        <result column="eq_ledger_code" property="eqLedgerCode"/>
+        <result column="tools_code_id" property="toolsCodeId"/>
+        <result column="change_type" property="changeType"/>
+        <result column="submit_time" property="submitTime"/>
+        <result column="approval_time" property="approvalTime"/>
+        <result column="approval_status" property="approvalStatus"/>
+        <result column="approval_result" property="approvalResult"/>
+        <result column="change_staff_id" property="changeStaffId"/>
+        <result column="approver_staff_id" property="approverStaffId"/>
+        <result column="remark" property="remark"/>
+        <result column="history_number" property="historyNumber"/>
+
+        <result column="change_type1" property="changeType1"/>
+        <result column="approval_status1" property="approvalStatus1"/>
+        <result column="approval_result1" property="approvalResult1"/>
+        <result column="submit" property="submit"/>
+
+
+        <result column="applicant_number" property="applicantNumber"/>
+        <result column="applicant_date" property="applicantDate"/>
+        <result column="applicant_name" property="applicantName"/>
+        <result column="applicant_dept_id" property="applicantDeptId"/>
+        <result column="urgency_level1" property="urgencyLevel1"/>
+        <result column="change_reason" property="changeReason"/>
+
+        <result column="kks_description" property="kksDescription"/>
+
+        <result column="eq_ledger_code_1" property="eqLedgerCode1"/>
+        <result column="eq_type" property="eqType"/>
+        <result column="factory_area" property="factoryArea"/>
+        <result column="eq_rank" property="eqRank"/>
+        <result column="manufacturer" property="manufacturer"/>
+        <result column="manufacturer_country" property="manufacturerCountry"/>
+        <result column="manufacture_date" property="manufactureDate"/>
+        <result column="supplier" property="supplier"/>
+        <result column="supplier_contact" property="supplierContact"/>
+        <result column="factory_number" property="factoryNumber"/>
+        <result column="production_date" property="productionDate"/>
+        <result column="install_date" property="installDate"/>
+        <result column="design_unit" property="designUnit"/>
+        <result column="installation_unit" property="installationUnit"/>
+        <result column="debugging_unit" property="debuggingUnit"/>
+        <result column="installation_location" property="installationLocation"/>
+        <result column="operation_date" property="operationDate"/>
+        <result column="asset_number" property="assetNumber"/>
+        <result column="cost_center" property="costCenter"/>
+        <result column="drawing_code" property="drawingCode"/>
+
+    </resultMap>
+
+    <select id="selectHistoryRecordPage" resultMap="historyRecordResultExt">
+        select
+        m.history_number
+        , d.dict_value as change_type1
+        , m.submit_Time
+        , m.approval_time
+        , d2.dict_value as approval_status1
+        , d3.dict_value as approval_result1
+        , m.remark
+        ,count(1) as submit
+        from master_history_record m
+        left join sys_dict d on m.change_type = d.dict_key and d.code = 'change_type'
+        left join sys_dict d2 on m.approval_status = d2.dict_key and d2.code = 'approval_status'
+        left join sys_dict d3 on m.approval_result = d3.dict_key and d3.code = 'approval_result'
+        where
+        m.is_deleted = 0
+        group by
+        m.history_number
+        , d.dict_value
+        , m.submit_Time
+        , m.approval_time
+        , d2.dict_value
+        , d3.dict_value
+        , m.remark
+        <if test="entity.changeType1!= null and entity.changeType1!= ''">
+            and m.change_type = #{entity.changeType1}
+        </if>
+        <if test="entity.approvalStatus1!= null and entity.approvalStatus1!= ''">
+            and m.approval_status = #{entity.approvalStatus1}
+        </if>
+        <if test="entity.approvalResult1!= null and entity.approvalResult1!= ''">
+            and m.approval_result = #{entity.approvalResult1}
+        </if>
+    </select>
+
+    <select id="selectDetail" resultMap="historyRecordResultExt">
+        select e.*, k.*,  d.dict_value as change_type1, d2.dict_value as urgency_level1
+          from  master_kks_manage k
+            left join master_equipment_manage e
+        on e.kks_code = k.kks_code
+            and e.is_deleted = 0
+            left join sys_dict d
+            on k.change_type = d.dict_key
+            and d.code = 'change_type'
+            left join sys_dict d2
+            on k.urgency_level = d2.dict_key
+            and d2.code = 'urgency_level'
+        where
+            k.is_deleted = 0
+          and k.applicant_number = #{historyNumber}
+    </select>
+
+</mapper>

src/main/java/org/energy/modules/master/service/IEquipmentInspectionService.java

@@ -0,0 +1,41 @@
+package org.energy.modules.master.service;
+
+import org.energy.modules.master.entity.EquipmentInspection;
+import org.energy.modules.master.vo.EquipmentInspectionVO;
+import com.dayu.daf.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.org.vo.DepartmentInfoVO;
+
+import java.util.List;
+
+/**
+ * 工器具检查 服务类
+ *
+ * @author Daf
+ * @since 2025-01-09
+ */
+public interface IEquipmentInspectionService extends BaseService<EquipmentInspection> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param equipmentInspection
+	 * @return
+	 */
+	IPage<EquipmentInspectionVO> selectEquipmentInspectionPage(IPage<EquipmentInspectionVO> page, EquipmentInspectionVO equipmentInspection);
+
+	/**
+	 * 获取详情
+	 * @param id
+	 * @return
+	 */
+	EquipmentInspectionVO selectDetail(Long id);
+
+	/**
+	 * 获取详情
+	 * @param id
+	 * @return
+	 */
+	List<EquipmentInspectionVO> selectDetail2(Long id);
+}

src/main/java/org/energy/modules/master/service/IHistoryRecordService.java

@@ -0,0 +1,32 @@
+package org.energy.modules.master.service;
+
+import org.energy.modules.master.entity.HistoryRecord;
+import org.energy.modules.master.vo.HistoryRecordVO;
+import com.dayu.daf.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.org.vo.StationInfoVO;
+
+/**
+ * 历史记录 服务类
+ *
+ * @author Daf
+ * @since 2025-01-07
+ */
+public interface IHistoryRecordService extends BaseService<HistoryRecord> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param historyRecord
+	 * @return
+	 */
+	IPage<HistoryRecordVO> selectHistoryRecordPage(IPage<HistoryRecordVO> page, HistoryRecordVO historyRecord);
+
+	/**
+	 * 获取详情
+	 * @param historyNumber
+	 * @return
+	 */
+	HistoryRecordVO selectDetail(String historyNumber);
+}

src/main/java/org/energy/modules/master/service/impl/EquipmentInspectionServiceImpl.java

@@ -0,0 +1,36 @@
+package org.energy.modules.master.service.impl;
+
+import org.energy.modules.master.entity.EquipmentInspection;
+import org.energy.modules.master.vo.EquipmentInspectionVO;
+import org.energy.modules.master.mapper.EquipmentInspectionMapper;
+import org.energy.modules.master.service.IEquipmentInspectionService;
+import com.dayu.daf.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+/**
+ * 工器具检查 服务实现类
+ *
+ * @author Daf
+ * @since 2025-01-09
+ */
+@Service
+public class EquipmentInspectionServiceImpl extends BaseServiceImpl<EquipmentInspectionMapper, EquipmentInspection> implements IEquipmentInspectionService {
+
+	@Override
+	public IPage<EquipmentInspectionVO> selectEquipmentInspectionPage(IPage<EquipmentInspectionVO> page, EquipmentInspectionVO equipmentInspection) {
+		return page.setRecords(baseMapper.selectEquipmentInspectionPage(page, equipmentInspection));
+	}
+
+	@Override
+	public EquipmentInspectionVO selectDetail(Long id) {
+		return baseMapper.selectDetail(id);
+	}
+
+	@Override
+	public List<EquipmentInspectionVO> selectDetail2(Long id) {
+		return (List<EquipmentInspectionVO>) baseMapper.selectDetail2(id);
+	}
+}

src/main/java/org/energy/modules/master/service/impl/HistoryRecordServiceImpl.java

@@ -0,0 +1,31 @@
+package org.energy.modules.master.service.impl;
+
+import org.energy.modules.master.entity.HistoryRecord;
+import org.energy.modules.master.vo.HistoryRecordVO;
+import org.energy.modules.master.mapper.HistoryRecordMapper;
+import org.energy.modules.master.service.IHistoryRecordService;
+import com.dayu.daf.core.mp.base.BaseServiceImpl;
+import org.energy.modules.org.vo.StationInfoVO;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 历史记录 服务实现类
+ *
+ * @author Daf
+ * @since 2025-01-07
+ */
+@Service
+public class HistoryRecordServiceImpl extends BaseServiceImpl<HistoryRecordMapper, HistoryRecord> implements IHistoryRecordService {
+
+	@Override
+	public IPage<HistoryRecordVO> selectHistoryRecordPage(IPage<HistoryRecordVO> page, HistoryRecordVO historyRecord) {
+		return page.setRecords(baseMapper.selectHistoryRecordPage(page, historyRecord));
+	}
+
+	@Override
+	public HistoryRecordVO selectDetail(String historyNumber) {
+		return baseMapper.selectDetail(historyNumber);
+	}
+
+}

src/main/java/org/energy/modules/master/vo/EquipmentInspectionVO.java

@@ -0,0 +1,29 @@
+package org.energy.modules.master.vo;
+
+import org.energy.modules.master.entity.EquipmentInspection;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 工器具检查视图实体类
+ *
+ * @author Daf
+ * @since 2025-01-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "EquipmentInspectionVO对象", description = "工器具检查")
+public class EquipmentInspectionVO extends EquipmentInspection {
+	private static final long serialVersionUID = 1L;
+
+	private String stationName;
+	private String inspectionStatus1;
+
+	private String name;
+	private String inspectionInfo;
+	private String inspectionStandard;
+	private String isQuakified;
+	private String remark2;
+
+}

src/main/java/org/energy/modules/master/vo/HistoryRecordVO.java

@@ -0,0 +1,58 @@
+package org.energy.modules.master.vo;
+
+import org.energy.modules.master.entity.HistoryRecord;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+import java.util.Date;
+
+/**
+ * 历史记录视图实体类
+ *
+ * @author Daf
+ * @since 2025-01-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "HistoryRecordVO对象", description = "历史记录")
+public class HistoryRecordVO extends HistoryRecord {
+	private static final long serialVersionUID = 1L;
+
+
+	private String changeType1;
+	private String approvalStatus1;
+	private String approvalResult1;
+	private String submit;
+
+
+	private String applicantNumber;
+	private Date applicantDate;
+	private String applicantName;
+	private String applicantDeptId;
+	private String urgencyLevel1;
+	private String changeReason;
+
+	private String kksDescription;
+	private String eqLedgerCode1;
+	private String eqType;
+	private String factoryArea;
+	private String eqRank;
+	private String manufacturer;
+	private String manufacturerCountry;
+	private Date manufactureDate;
+	private String supplier;
+	private String supplierContact;
+	private String factoryNumber;
+	private Date productionDate;
+	private Date installDate;
+	private String designUnit;
+	private String installationUnit;
+	private String debuggingUnit;
+	private String installationLocation;
+	private String operationDate;
+	private String assetNumber;
+	private String costCenter;
+	private String drawingCode;
+
+}

src/main/java/org/energy/modules/org/controller/DepartmentInfoController.java

@@ -0,0 +1,150 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.energy.modules.org.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import com.dayu.daf.core.mp.support.Condition;
+import com.dayu.daf.core.mp.support.Query;
+import com.dayu.daf.core.tool.api.R;
+import com.dayu.daf.core.tool.utils.Func;
+import org.energy.modules.org.vo.PositionInfoVO;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.org.entity.DepartmentInfo;
+import org.energy.modules.org.vo.DepartmentInfoVO;
+import org.energy.modules.org.service.IDepartmentInfoService;
+import com.dayu.daf.core.boot.ctrl.DafController;
+
+import java.util.List;
+
+/**
+ * 部门信息 控制器
+ *
+ * @author Daf
+ * @since 2024-12-26
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/org/departmentinfo")
+@Api(value = "部门信息", tags = "部门信息接口")
+public class DepartmentInfoController extends DafController {
+
+	private IDepartmentInfoService departmentInfoService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入departmentInfo")
+	public R<DepartmentInfo> detail(DepartmentInfo departmentInfo) {
+		DepartmentInfo detail = departmentInfoService.selectDetail(departmentInfo.getId());
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 部门信息
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入departmentInfo")
+	public R<IPage<DepartmentInfo>> list(DepartmentInfo departmentInfo, Query query) {
+		IPage<DepartmentInfo> pages = departmentInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(departmentInfo));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 部门信息
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入departmentInfo")
+	public R<IPage<DepartmentInfoVO>> page(DepartmentInfoVO departmentInfo, Query query) {
+		IPage<DepartmentInfoVO> pages = departmentInfoService.selectDepartmentInfoPage(Condition.getPage(query), departmentInfo);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 部门信息
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入departmentInfo")
+	public R save(@Valid @RequestBody DepartmentInfo departmentInfo) {
+		return R.status(departmentInfoService.save(departmentInfo));
+	}
+
+	/**
+	 * 修改 部门信息
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入departmentInfo")
+	public R update(@Valid @RequestBody DepartmentInfo departmentInfo) {
+		return R.status(departmentInfoService.updateById(departmentInfo));
+	}
+
+	/**
+	 * 新增或修改 部门信息
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入departmentInfo")
+	public R submit(@Valid @RequestBody DepartmentInfo departmentInfo) {
+		return R.status(departmentInfoService.saveOrUpdate(departmentInfo));
+	}
+
+
+	/**
+	 * 删除 部门信息
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(departmentInfoService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 部門下拉列表信息
+	 */
+	@GetMapping("/selectDepartmentInfo")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "下拉", notes = "")
+	public List<DepartmentInfoVO> departmentSelectInfo(String stationCode) {
+		List<DepartmentInfoVO>  departmentInfoList= departmentInfoService.departmentInfoData(stationCode);
+		return departmentInfoList;
+	}
+
+	/**
+	 * 部門狀態下拉列表信息
+	 */
+	@GetMapping("/selectDepartmentStatusInfo")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "下拉", notes = "")
+	public List<DepartmentInfoVO> departmentStatusSelectInfo(String stationCode) {
+		List<DepartmentInfoVO>  departmentStatusInfoList= departmentInfoService.departmentStatusInfoData();
+		return departmentStatusInfoList;
+	}
+
+}

src/main/java/org/energy/modules/org/controller/PositionInfoController.java

@@ -0,0 +1,140 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.energy.modules.org.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import com.dayu.daf.core.mp.support.Condition;
+import com.dayu.daf.core.mp.support.Query;
+import com.dayu.daf.core.tool.api.R;
+import com.dayu.daf.core.tool.utils.Func;
+import org.energy.modules.leger.service.IInspectionStandardsService;
+import org.energy.modules.leger.service.IInventoryDocumentService;
+import org.energy.modules.leger.service.ITechParametersService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.org.entity.PositionInfo;
+import org.energy.modules.org.vo.PositionInfoVO;
+import org.energy.modules.org.service.IPositionInfoService;
+import com.dayu.daf.core.boot.ctrl.DafController;
+
+import java.util.List;
+
+/**
+ * 岗位信息 控制器
+ *
+ * @author Daf
+ * @since 2024-12-17
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/org/positioninfo")
+@Api(value = "岗位信息", tags = "岗位信息接口")
+public class PositionInfoController extends DafController {
+
+	private IPositionInfoService positionInfoService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入positionInfo")
+	public R<PositionInfo> detail(PositionInfo positionInfo) {
+		PositionInfoVO detail = positionInfoService.selectDetail(positionInfo.getId());
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 岗位信息
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入positionInfo")
+	public R<IPage<PositionInfo>> list(PositionInfo positionInfo, Query query) {
+		IPage<PositionInfo> pages = positionInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(positionInfo));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 岗位信息
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入positionInfo")
+	public R<IPage<PositionInfoVO>> page(PositionInfoVO positionInfo, Query query) {
+		IPage<PositionInfoVO> pages = positionInfoService.selectPositionInfoPage(Condition.getPage(query), positionInfo);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 岗位信息
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入positionInfo")
+	public R save(@Valid @RequestBody PositionInfo positionInfo) {
+		return R.status(positionInfoService.save(positionInfo));
+	}
+
+	/**
+	 * 修改 岗位信息
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入positionInfo")
+	public R update(@Valid @RequestBody PositionInfo positionInfo) {
+		return R.status(positionInfoService.updateById(positionInfo));
+	}
+
+	/**
+	 * 新增或修改 岗位信息
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入positionInfo")
+	public R submit(@Valid @RequestBody PositionInfo positionInfo) {
+		return R.status(positionInfoService.saveOrUpdate(positionInfo));
+	}
+
+
+	/**
+	 * 删除 岗位信息
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(positionInfoService.deleteLogic(Func.toLongList(ids)));
+	}
+	/**
+	 * 岗位下拉列表信息
+	 */
+	@GetMapping("/selectInfo")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "下拉", notes = "")
+	public List<PositionInfoVO> positionSelectInfo(String stationCode) {
+		List<PositionInfoVO>  positionInfoList= positionInfoService.positionInfoData(stationCode);
+		return positionInfoList;
+	}
+
+}

src/main/java/org/energy/modules/org/controller/ShiftInfoController.java

@@ -0,0 +1,139 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.energy.modules.org.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import com.dayu.daf.core.mp.support.Condition;
+import com.dayu.daf.core.mp.support.Query;
+import com.dayu.daf.core.tool.api.R;
+import com.dayu.daf.core.tool.utils.Func;
+import org.energy.modules.org.vo.DepartmentInfoVO;
+import org.energy.modules.org.vo.PositionInfoVO;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.org.entity.ShiftInfo;
+import org.energy.modules.org.vo.ShiftInfoVO;
+import org.energy.modules.org.service.IShiftInfoService;
+import com.dayu.daf.core.boot.ctrl.DafController;
+
+import java.util.List;
+
+/**
+ * 值别信息 控制器
+ *
+ * @author Daf
+ * @since 2024-12-30
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/org/shiftinfo")
+@Api(value = "值别信息", tags = "值别信息接口")
+public class ShiftInfoController extends DafController {
+
+	private IShiftInfoService shiftInfoService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入shiftInfo")
+	public R<ShiftInfo> detail(ShiftInfo shiftInfo) {
+		ShiftInfo detail = shiftInfoService.selectDetail(shiftInfo.getId());
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 值别信息
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入shiftInfo")
+	public R<IPage<ShiftInfo>> list(ShiftInfo shiftInfo, Query query) {
+		IPage<ShiftInfo> pages = shiftInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(shiftInfo));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 值别信息
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入shiftInfo")
+	public R<IPage<ShiftInfoVO>> page(ShiftInfoVO shiftInfo, Query query) {
+		IPage<ShiftInfoVO> pages = shiftInfoService.selectShiftInfoPage(Condition.getPage(query), shiftInfo);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 值别信息
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入shiftInfo")
+	public R save(@Valid @RequestBody ShiftInfo shiftInfo) {
+		return R.status(shiftInfoService.save(shiftInfo));
+	}
+
+	/**
+	 * 修改 值别信息
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入shiftInfo")
+	public R update(@Valid @RequestBody ShiftInfo shiftInfo) {
+		return R.status(shiftInfoService.updateById(shiftInfo));
+	}
+
+	/**
+	 * 新增或修改 值别信息
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入shiftInfo")
+	public R submit(@Valid @RequestBody ShiftInfo shiftInfo) {
+		return R.status(shiftInfoService.saveOrUpdate(shiftInfo));
+	}
+
+
+	/**
+	 * 删除 值别信息
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(shiftInfoService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 值别下拉列表信息
+	 */
+	@GetMapping("/selectShiftInfo")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "下拉", notes = "")
+	public List<ShiftInfoVO> shiftSelectInfo(String stationCode) {
+		List<ShiftInfoVO>  shiftInfoList= shiftInfoService.shiftInfoData(stationCode);
+		return shiftInfoList;
+	}
+}

src/main/java/org/energy/modules/org/controller/StaffInfoController.java

@@ -0,0 +1,181 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.energy.modules.org.controller;
+
+import com.alibaba.excel.EasyExcel;
+import com.dayu.daf.core.log.annotation.ApiLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+import com.dayu.daf.core.mp.support.Condition;
+import com.dayu.daf.core.mp.support.Query;
+import com.dayu.daf.core.tool.api.R;
+import com.dayu.daf.core.tool.utils.Func;
+import lombok.SneakyThrows;
+import org.apache.commons.codec.Charsets;
+import org.energy.modules.leger.excel.ToolInventoryRecordExcel;
+import org.energy.modules.leger.vo.ToolInventoryRecordVO;
+import org.energy.modules.org.excel.StaffInfoExcel;
+import org.energy.modules.org.vo.DepartmentInfoVO;
+import org.energy.modules.system.util.DataUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.org.entity.StaffInfo;
+import org.energy.modules.org.vo.StaffInfoVO;
+import org.energy.modules.org.service.IStaffInfoService;
+import com.dayu.daf.core.boot.ctrl.DafController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.net.URLEncoder;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 人员信息 控制器
+ *
+ * @author Daf
+ * @since 2024-12-20
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/org/staffinfo")
+@Api(value = "人员信息", tags = "人员信息接口")
+public class StaffInfoController extends DafController {
+
+	private IStaffInfoService staffInfoService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入staffInfo")
+	public R<StaffInfoVO> detail(StaffInfo staffInfo) {
+		StaffInfoVO detail = staffInfoService.selectDetail(staffInfo.getId());
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 人员信息
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入staffInfo")
+	public R<IPage<StaffInfo>> list(StaffInfo staffInfo, Query query) {
+		IPage<StaffInfo> pages = staffInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(staffInfo));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 人员信息
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入staffInfo")
+	public R<IPage<StaffInfoVO>> page(StaffInfoVO staffInfo, Query query) {
+		IPage<StaffInfoVO> pages = staffInfoService.selectStaffInfoPage(Condition.getPage(query), staffInfo);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 人员信息
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入staffInfo")
+	public R save(@Valid @RequestBody StaffInfo staffInfo) {
+		return R.status(staffInfoService.save(staffInfo));
+	}
+
+	/**
+	 * 修改 人员信息
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入staffInfo")
+	public R update(@Valid @RequestBody StaffInfo staffInfo) {
+		return R.status(staffInfoService.updateById(staffInfo));
+	}
+
+	/**
+	 * 新增或修改 人员信息
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入staffInfo")
+	public R submit(@Valid @RequestBody StaffInfo staffInfo) {
+		return R.status(staffInfoService.saveOrUpdate(staffInfo));
+	}
+
+
+	/**
+	 * 删除 人员信息
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(staffInfoService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 导出
+	 */
+	@SneakyThrows
+	@GetMapping("export")
+	@ApiOperationSupport(order = 10)
+	@ApiOperation(value = "导出", notes = "传入")
+	@ApiLog
+	public void exportUser(@ApiIgnore @RequestParam Map<String, Object> entity, HttpServletResponse response) {
+		StaffInfoVO vo = DataUtils.mapToEntity(entity, StaffInfoVO::new);
+		List<StaffInfoExcel> list = staffInfoService.export(vo);
+		response.setContentType("application/vnd.ms-excel");
+		response.setCharacterEncoding(Charsets.UTF_8.name());
+		String fileName = URLEncoder.encode("人员管理数据导出", Charsets.UTF_8.name());
+		response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+		EasyExcel.write(response.getOutputStream(), StaffInfoExcel.class).sheet("人员管理").doWrite(list);
+	}
+
+	/**
+	 * 人員性別下拉列表信息
+	 */
+	@GetMapping("/selectStaffSexInfo")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "下拉", notes = "")
+	public List<StaffInfoVO> staffSexSelectInfo(String stationCode) {
+		List<StaffInfoVO>  staffSexInfoList= staffInfoService.staffSexInfoData();
+		return staffSexInfoList;
+	}
+
+	/**
+	 * 人員下拉列表信息（值别用）
+	 */
+	@GetMapping("/selectStaffInfo")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "下拉", notes = "")
+	public List<StaffInfoVO> staffSelectInfo(String stationCode) {
+		List<StaffInfoVO>  staffInfoList= staffInfoService.staffInfoData();
+		return staffInfoList;
+	}
+
+}

src/main/java/org/energy/modules/org/controller/StationInfoController.java

@@ -0,0 +1,199 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.energy.modules.org.controller;
+
+import com.xkcoding.http.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+
+import javax.swing.text.html.parser.Entity;
+import javax.validation.Valid;
+
+import com.dayu.daf.core.mp.support.Condition;
+import com.dayu.daf.core.mp.support.Query;
+import com.dayu.daf.core.tool.api.R;
+import com.dayu.daf.core.tool.utils.Func;
+import org.energy.modules.org.vo.PositionInfoVO;
+import org.energy.modules.smart.entity.WorkPermit;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.org.entity.StationInfo;
+import org.energy.modules.org.vo.StationInfoVO;
+import org.energy.modules.org.service.IStationInfoService;
+import com.dayu.daf.core.boot.ctrl.DafController;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 场站信息 控制器
+ *
+ * @author Daf
+ * @since 2024-12-31
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/org/stationinfo")
+@Api(value = "场站信息", tags = "场站信息接口")
+public class StationInfoController extends DafController {
+
+	private IStationInfoService stationInfoService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入stationInfo")
+	public R<StationInfo> detail(StationInfo stationInfo) {
+		StationInfo detail = stationInfoService.selectDetail(stationInfo.getId());
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 场站信息
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入stationInfo")
+	public R<IPage<StationInfo>> list(StationInfo stationInfo, Query query) {
+		IPage<StationInfo> pages = stationInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(stationInfo));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 场站信息
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入stationInfo")
+	public R<IPage<StationInfoVO>> page(StationInfoVO stationInfo, Query query) {
+		IPage<StationInfoVO> pages = stationInfoService.selectStationInfoPage(Condition.getPage(query), stationInfo);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 场站信息
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入stationInfo")
+	public R save(@Valid @RequestBody StationInfo stationInfo) {
+		return R.status(stationInfoService.save(stationInfo));
+	}
+
+	/**
+	 * 修改 场站信息
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入stationInfo")
+	public R update(@Valid @RequestBody StationInfo stationInfo) {
+		return R.status(stationInfoService.updateById(stationInfo));
+	}
+
+	/**
+	 * 新增或修改 场站信息
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入stationInfo")
+	public R submit(@Valid @RequestBody StationInfo stationInfo) {
+		String date = LocalDate.now().toString().replace("-","");
+		String maxNo = stationInfoService.getMaxNo(date);
+		int number;
+		if (StringUtil.isNotEmpty(maxNo)){
+			number = Integer.parseInt(maxNo.substring(9));
+			number++;
+		}else{
+			number = 1;
+		}
+		String numFormat = String.format("%04d", number);
+		String no = "L" + date + numFormat;
+
+		String id = date + numFormat;
+		long formFillerId = Long.parseLong(id);
+
+		stationInfo.setFormFillerId(formFillerId);
+		stationInfo.setStationCode(no);
+		stationInfo.setStationStatus(1);
+		return R.status(stationInfoService.saveOrUpdate(stationInfo));
+	}
+
+
+	/**
+	 * 删除 场站信息
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(stationInfoService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 电站下拉列表信息
+	 */
+	@GetMapping("/selectStationInfo")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "下拉", notes = "")
+	public List<StationInfoVO> stationSelectInfo(String stationCode) {
+		List<StationInfoVO>  stationInfoList= stationInfoService.stationInfoData(stationCode);
+		return stationInfoList;
+	}
+
+	/**
+	 * 电站下拉列表信息
+	 */
+	@GetMapping("/selectStationTypeInfo")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "下拉", notes = "")
+	public List<StationInfoVO> stationTypeSelectInfo(String stationCode) {
+		List<StationInfoVO>  stationTypeInfoList= stationInfoService.stationTypeInfoData(stationCode);
+		return stationTypeInfoList;
+	}
+
+	/**
+	 * 电站下拉列表信息
+	 */
+	@GetMapping("/selectMaintenanceStatusInfo")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "下拉", notes = "")
+	public List<StationInfoVO> maintenanceStatusSelectInfo(String stationCode) {
+		List<StationInfoVO>  maintenanceStatusInfoList= stationInfoService.maintenanceStatusInfoData(stationCode);
+		return maintenanceStatusInfoList;
+	}
+
+	/**
+	 * 停用电站一览
+	 */
+	@PostMapping("/closeStation")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "更新", notes = "传入ids")
+	public R closeStation(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		StationInfo stationInfo = new StationInfo();
+		stationInfo.setId(Long.parseLong(ids));
+		stationInfo.setStationStatus(2);
+		return R.status(stationInfoService.updateById(stationInfo));
+	}
+
+
+}

src/main/java/org/energy/modules/org/controller/TeamInfoController.java

@@ -0,0 +1,138 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.energy.modules.org.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import com.dayu.daf.core.mp.support.Condition;
+import com.dayu.daf.core.mp.support.Query;
+import com.dayu.daf.core.tool.api.R;
+import com.dayu.daf.core.tool.utils.Func;
+import org.energy.modules.org.vo.PositionInfoVO;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.org.entity.TeamInfo;
+import org.energy.modules.org.vo.TeamInfoVO;
+import org.energy.modules.org.service.ITeamInfoService;
+import com.dayu.daf.core.boot.ctrl.DafController;
+
+import java.util.List;
+
+/**
+ * 班组信息 控制器
+ *
+ * @author Daf
+ * @since 2024-12-25
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/org/teaminfo")
+@Api(value = "班组信息", tags = "班组信息接口")
+public class TeamInfoController extends DafController {
+
+	private ITeamInfoService teamInfoService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入teamInfo")
+	public R<TeamInfo> detail(TeamInfo teamInfo) {
+		TeamInfo detail = teamInfoService.selectDetail(teamInfo.getId());
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 班组信息
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入teamInfo")
+	public R<IPage<TeamInfo>> list(TeamInfo teamInfo, Query query) {
+		IPage<TeamInfo> pages = teamInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(teamInfo));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 班组信息
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入teamInfo")
+	public R<IPage<TeamInfoVO>> page(TeamInfoVO teamInfo, Query query) {
+		IPage<TeamInfoVO> pages = teamInfoService.selectTeamInfoPage(Condition.getPage(query), teamInfo);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 班组信息
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入teamInfo")
+	public R save(@Valid @RequestBody TeamInfo teamInfo) {
+		return R.status(teamInfoService.save(teamInfo));
+	}
+
+	/**
+	 * 修改 班组信息
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入teamInfo")
+	public R update(@Valid @RequestBody TeamInfo teamInfo) {
+		return R.status(teamInfoService.updateById(teamInfo));
+	}
+
+	/**
+	 * 新增或修改 班组信息
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入teamInfo")
+	public R submit(@Valid @RequestBody TeamInfo teamInfo) {
+		return R.status(teamInfoService.saveOrUpdate(teamInfo));
+	}
+
+
+	/**
+	 * 删除 班组信息
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(teamInfoService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 班组下拉列表信息
+	 */
+	@GetMapping("/selectTeamInfo")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "下拉", notes = "")
+	public List<TeamInfoVO> teamSelectInfo(String stationCode) {
+		List<TeamInfoVO>  teamInfoList= teamInfoService.teamInfoData(stationCode);
+		return teamInfoList;
+	}
+}

src/main/java/org/energy/modules/org/dto/DepartmentInfoDTO.java

@@ -0,0 +1,18 @@
+package org.energy.modules.org.dto;
+
+import org.energy.modules.org.entity.DepartmentInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 部门信息数据传输对象实体类
+ *
+ * @author Daf
+ * @since 2024-12-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DepartmentInfoDTO extends DepartmentInfo {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/energy/modules/org/dto/PositionInfoDTO.java

@@ -0,0 +1,18 @@
+package org.energy.modules.org.dto;
+
+import org.energy.modules.org.entity.PositionInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 岗位信息数据传输对象实体类
+ *
+ * @author Daf
+ * @since 2024-12-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PositionInfoDTO extends PositionInfo {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/energy/modules/org/dto/ShiftInfoDTO.java

@@ -0,0 +1,18 @@
+package org.energy.modules.org.dto;
+
+import org.energy.modules.org.entity.ShiftInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 值别信息数据传输对象实体类
+ *
+ * @author Daf
+ * @since 2024-12-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ShiftInfoDTO extends ShiftInfo {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/energy/modules/org/dto/StaffInfoDTO.java

@@ -0,0 +1,18 @@
+package org.energy.modules.org.dto;
+
+import org.energy.modules.org.entity.StaffInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 人员信息数据传输对象实体类
+ *
+ * @author Daf
+ * @since 2024-12-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class StaffInfoDTO extends StaffInfo {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/energy/modules/org/dto/StationInfoDTO.java

@@ -0,0 +1,18 @@
+package org.energy.modules.org.dto;
+
+import org.energy.modules.org.entity.StationInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 场站信息数据传输对象实体类
+ *
+ * @author Daf
+ * @since 2024-12-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class StationInfoDTO extends StationInfo {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/energy/modules/org/dto/TeamInfoDTO.java

@@ -0,0 +1,18 @@
+package org.energy.modules.org.dto;
+
+import org.energy.modules.org.entity.TeamInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 班组信息数据传输对象实体类
+ *
+ * @author Daf
+ * @since 2024-12-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TeamInfoDTO extends TeamInfo {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/energy/modules/org/entity/DepartmentInfo.java

@@ -0,0 +1,67 @@
+package org.energy.modules.org.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dayu.daf.core.mp.base.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDate;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 部门信息实体类
+ *
+ * @author Daf
+ * @since 2024-12-26
+ */
+@Data
+@TableName("org_department_info")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "DepartmentInfo对象", description = "部门信息")
+public class DepartmentInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	@JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键")
+    private Long id;
+    /**
+     * 场站编码
+     */
+    @ApiModelProperty(value = "场站编码")
+    private String stationCode;
+    /**
+     * 部门编号
+     */
+    @ApiModelProperty(value = "部门编号")
+    private String departmentNumber;
+    /**
+     * 部门名称
+     */
+    @ApiModelProperty(value = "部门名称")
+    private String departmentName;
+    /**
+     * 创建日期
+     */
+    @ApiModelProperty(value = "创建日期")
+    private LocalDate creationDate;
+    /**
+     * 部门状态
+     */
+    @ApiModelProperty(value = "部门状态")
+    private String departmentStatus;
+    /**
+     * 部门简介
+     */
+    @ApiModelProperty(value = "部门简介")
+    private String departmentDescription;
+
+
+}

src/main/java/org/energy/modules/org/entity/PositionInfo.java

@@ -0,0 +1,72 @@
+package org.energy.modules.org.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dayu.daf.core.mp.base.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDate;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 岗位信息实体类
+ *
+ * @author Daf
+ * @since 2024-12-17
+ */
+@Data
+@TableName("org_position_info")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "PositionInfo对象", description = "岗位信息")
+public class PositionInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	@JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键")
+    private Long id;
+    /**
+     * 场站编码
+     */
+    @ApiModelProperty(value = "场站编码")
+    private String stationCode;
+    /**
+     * 岗位编号
+     */
+    @ApiModelProperty(value = "岗位编号")
+    private String postNumber;
+    /**
+     * 岗位名称
+     */
+    @ApiModelProperty(value = "岗位名称")
+    private String postName;
+    /**
+     * 创建日期
+     */
+    @ApiModelProperty(value = "创建日期")
+    private LocalDate creationDate;
+    /**
+     * 岗位简介
+     */
+    @ApiModelProperty(value = "岗位简介")
+    private String positionDescription;
+	/**
+	 * 班组编号
+	 */
+	@ApiModelProperty(value = "班组编号")
+	private String teamNumber;
+	/**
+	 * 部门编号
+	 */
+	@ApiModelProperty(value = "部门编号")
+	private String departmentNumber;
+
+
+}

src/main/java/org/energy/modules/org/entity/ShiftInfo.java

@@ -0,0 +1,72 @@
+package org.energy.modules.org.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dayu.daf.core.mp.base.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDate;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 值别信息实体类
+ *
+ * @author Daf
+ * @since 2024-12-30
+ */
+@Data
+@TableName("org_shift_info")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "ShiftInfo对象", description = "值别信息")
+public class ShiftInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	@JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键")
+    private Long id;
+    /**
+     * 场站编码
+     */
+    @ApiModelProperty(value = "场站编码")
+    private String stationCode;
+    /**
+     * 值别编号
+     */
+    @ApiModelProperty(value = "值别编号")
+    private String shiftNumber;
+    /**
+     * 值别名称
+     */
+    @ApiModelProperty(value = "值别名称")
+    private String shiftName;
+    /**
+     * 创建日期
+     */
+    @ApiModelProperty(value = "创建日期")
+    private LocalDate creationDate;
+    /**
+     * 班组编号
+     */
+    @ApiModelProperty(value = "班组编号")
+    private String teamNumber;
+    /**
+     * 联系电话
+     */
+    @ApiModelProperty(value = "联系电话")
+    private String contactPhone;
+    /**
+     * 值别简介
+     */
+    @ApiModelProperty(value = "值别简介")
+    private String shiftDescription;
+
+
+}

src/main/java/org/energy/modules/org/entity/StaffInfo.java

@@ -0,0 +1,121 @@
+package org.energy.modules.org.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dayu.daf.core.mp.base.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 人员信息实体类
+ *
+ * @author Daf
+ * @since 2024-12-20
+ */
+@Data
+@TableName("org_staff_info")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "StaffInfo对象", description = "人员信息")
+public class StaffInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	@JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键")
+    private Long id;
+    /**
+     * 账号
+     */
+    @ApiModelProperty(value = "账号")
+    private String account;
+    /**
+     * 姓名
+     */
+    @ApiModelProperty(value = "姓名")
+    private String name;
+    /**
+     * 性别
+     */
+    @ApiModelProperty(value = "性别")
+    private String sex;
+    /**
+     * 电话号码
+     */
+    @ApiModelProperty(value = "电话号码")
+    private String phoneNumber;
+    /**
+     * 场站编码
+     */
+    @ApiModelProperty(value = "场站编码")
+    private String stationCode;
+    /**
+     * 部门编号
+     */
+    @ApiModelProperty(value = "部门编号")
+    private String departmentNumber;
+    /**
+     * 岗位编号
+     */
+    @ApiModelProperty(value = "岗位编号")
+    private String postNumber;
+    /**
+     * 班组编号
+     */
+    @ApiModelProperty(value = "班组编号")
+    private String teamNumber;
+    /**
+     * 值别编码
+     */
+    @ApiModelProperty(value = "值别编码")
+    private String shiftNumber;
+    /**
+     * 生效日期
+     */
+	@JsonFormat(shape = JsonFormat.Shape.STRING,pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "生效日期")
+    private Date effectiveDate;
+    /**
+     * 失效日期
+     */
+	@JsonFormat(shape = JsonFormat.Shape.STRING,pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "失效日期")
+    private Date invalidDate;
+    /**
+     * 场站负责人
+     */
+    @ApiModelProperty(value = "场站负责人")
+    private Integer stationHead;
+    /**
+     * 部门负责人
+     */
+    @ApiModelProperty(value = "部门负责人")
+    private Integer deptHead;
+    /**
+     * 岗位负责人
+     */
+    @ApiModelProperty(value = "岗位负责人")
+    private Integer positionHead;
+    /**
+     * 班组负责人
+     */
+    @ApiModelProperty(value = "班组负责人")
+    private Integer teamHead;
+    /**
+     * 值长
+     */
+    @ApiModelProperty(value = "值长")
+    private Integer shiftLeader;
+
+
+}

src/main/java/org/energy/modules/org/entity/StationInfo.java

@@ -0,0 +1,135 @@
+package org.energy.modules.org.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dayu.daf.core.mp.base.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 场站信息实体类
+ *
+ * @author Daf
+ * @since 2024-12-31
+ */
+@Data
+@TableName("org_station_info")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "StationInfo对象", description = "场站信息")
+public class StationInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	@JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键")
+    private Long id;
+    /**
+     * 填表人
+     */
+    @ApiModelProperty(value = "填表人")
+    private Long formFillerId;
+    /**
+     * 填表日期
+     */
+    @ApiModelProperty(value = "填表日期")
+    private Date formFillDate;
+    /**
+     * 场站编码
+     */
+    @ApiModelProperty(value = "场站编码")
+    private String stationCode;
+    /**
+     * 场站名称
+     */
+    @ApiModelProperty(value = "场站名称")
+    private String stationName;
+    /**
+     * 类型
+     */
+    @ApiModelProperty(value = "类型")
+    private String stationType;
+    /**
+     * 地理位置
+     */
+    @ApiModelProperty(value = "地理位置")
+    private String geoLocation;
+    /**
+     * 装机容量
+     */
+    @ApiModelProperty(value = "装机容量")
+    private String installedCapacity;
+    /**
+     * 电压等级
+     */
+    @ApiModelProperty(value = "电压等级")
+    private String voltageLevel;
+    /**
+     * 负荷率
+     */
+    @ApiModelProperty(value = "负荷率")
+    private String loadRate;
+    /**
+     * 电压输入等级
+     */
+    @ApiModelProperty(value = "电压输入等级")
+    private String inputVoltageLevel;
+    /**
+     * 电压输出等级
+     */
+    @ApiModelProperty(value = "电压输出等级")
+    private String outputVoltageLevel;
+    /**
+     * 投运日期
+     */
+    @ApiModelProperty(value = "投运日期")
+    private Date operationDate;
+    /**
+     * 运维状态
+     */
+    @ApiModelProperty(value = "运维状态")
+    private String maintenanceStatus;
+    /**
+     * 联系电话
+     */
+    @ApiModelProperty(value = "联系电话")
+    private String contactPhone;
+    /**
+     * 最近巡检日期
+     */
+    @ApiModelProperty(value = "最近巡检日期")
+    private Date lastInspectionDate;
+    /**
+     * 下次巡检日期
+     */
+    @ApiModelProperty(value = "下次巡检日期")
+    private Date nextInspectionDate;
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+	/**
+	 * 电站状态
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty(value = "电站状态")
+	private Integer stationStatus;
+
+	/**
+	 * 班组编号
+	 */
+	@ApiModelProperty(value = "班组编号")
+	private String teamNumber;
+
+}

src/main/java/org/energy/modules/org/entity/TeamInfo.java

@@ -0,0 +1,71 @@
+package org.energy.modules.org.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dayu.daf.core.mp.base.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDate;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 班组信息实体类
+ *
+ * @author Daf
+ * @since 2024-12-25
+ */
+@Data
+@TableName("org_team_info")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "TeamInfo对象", description = "班组信息")
+public class TeamInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	@JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键")
+    private Long id;
+    /**
+     * 场站编码
+     */
+    @ApiModelProperty(value = "场站编码")
+    private String stationCode;
+    /**
+     * 班组编号
+     */
+    @ApiModelProperty(value = "班组编号")
+    private String teamNumber;
+    /**
+     * 班组名称
+     */
+    @ApiModelProperty(value = "班组名称")
+    private String teamName;
+    /**
+     * 创建日期
+     */
+    @ApiModelProperty(value = "创建日期")
+    private LocalDate creationDate;
+    /**
+     * 班组简介
+     */
+    @ApiModelProperty(value = "班组简介")
+    private String teamDescription;
+    /**
+     * 责任班组
+     */
+    @ApiModelProperty(value = "责任班组")
+    private String responsibleTeam;
+	/**
+	 * 部门编号
+	 */
+	@ApiModelProperty(value = "部门编号")
+	private String departmentNumber;
+
+}

src/main/java/org/energy/modules/org/excel/StaffInfoExcel.java

@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.energy.modules.org.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * EquipmentLedge model export
+ * @author edwong
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(16)
+public class StaffInfoExcel implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "场站")
+	private String stationCode;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "账号")
+	private String account;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "姓名")
+	private String name;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "电话号")
+	private String phoneNumber;
+
+
+
+}

src/main/java/org/energy/modules/org/mapper/DepartmentInfoMapper.java

@@ -0,0 +1,34 @@
+package org.energy.modules.org.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.energy.modules.org.entity.DepartmentInfo;
+import org.energy.modules.org.vo.DepartmentInfoVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.org.vo.TeamInfoVO;
+
+import java.util.List;
+
+/**
+ * 部门信息 Mapper 接口
+ *
+ * @author Daf
+ * @since 2024-12-26
+ */
+public interface DepartmentInfoMapper extends BaseMapper<DepartmentInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param departmentInfo
+	 * @return
+	 */
+	List<DepartmentInfoVO> selectDepartmentInfoPage(IPage page, @Param("entity")DepartmentInfoVO departmentInfo);
+
+	DepartmentInfoVO selectDetail(@Param("id") Long id);
+
+	List<DepartmentInfoVO> departmentInfoData(@Param("stationCode") String stationCode);
+
+	List<DepartmentInfoVO> departmentStatusInfoData();
+}

src/main/java/org/energy/modules/org/mapper/DepartmentInfoMapper.xml

@@ -0,0 +1,92 @@
+<?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="org.energy.modules.org.mapper.DepartmentInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="departmentInfoResultMap" type="org.energy.modules.org.entity.DepartmentInfo">
+        <id column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="station_code" property="stationCode"/>
+        <result column="department_number" property="departmentNumber"/>
+        <result column="department_name" property="departmentName"/>
+        <result column="creation_date" property="creationDate"/>
+        <result column="department_status" property="departmentStatus"/>
+        <result column="department_description" property="departmentDescription"/>
+    </resultMap>
+
+    <resultMap id="departmentInfoResultExt" type="org.energy.modules.org.vo.DepartmentInfoVO">
+        <id column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="station_code" property="stationCode"/>
+        <result column="department_number" property="departmentNumber"/>
+        <result column="department_name" property="departmentName"/>
+        <result column="creation_date" property="creationDate"/>
+        <result column="department_status" property="departmentStatus"/>
+        <result column="department_description" property="departmentDescription"/>
+
+        <result column="station_name" property="stationName"/>
+        <result column="name" property="name"/>
+        <result column="team_quantity" property="teamQuantity"/>
+    </resultMap>
+
+
+    <select id="selectDepartmentInfoPage" resultMap="departmentInfoResultExt">
+        select d.*,stt.station_name, s.name
+        from org_department_info d
+        left join org_station_info stt on d.station_code=stt.station_code and stt.is_deleted = 0
+        left join org_staff_info s on d.department_number=s.department_number and d.station_code=s.station_code and s.dept_head = 1 and s.is_deleted = 0
+        where
+        d.is_deleted = 0
+        <if test="entity.stationName!= null and entity.stationName!= ''">
+            and stt.station_name = #{entity.stationName}
+        </if>
+        <if test="entity.departmentNumber!= null and entity.departmentNumber!= ''">
+            and d.department_number = #{entity.departmentNumber}
+        </if>
+        <if test="entity.departmentName!= null and entity.departmentName!= ''">
+            and d.department_name = #{entity.departmentName}
+        </if>
+        <if test="entity.departmentDescription!= null and entity.departmentDescription!= ''">
+            and d.department_description = #{entity.departmentDescription}
+        </if>
+    </select>
+
+    <select id="selectDetail" resultMap="departmentInfoResultExt">
+        select d.*,stt.station_name, s.name,
+        (select count(*) from org_department_info d
+        left join org_team_info t on d.department_number=t.department_number and  d.station_code=t.station_code and t.is_deleted = 0
+        where t.is_deleted = 0) as team_quantity
+        from org_department_info d
+        left join org_station_info stt on d.station_code=stt.station_code and stt.is_deleted = 0
+        left join org_staff_info s on d.department_number=s.department_number and d.station_code=s.station_code and s.dept_head = 1 and s.is_deleted = 0
+        where
+            d.is_deleted = 0
+            and d.id = #{id}
+    </select>
+
+    <select id="departmentInfoData" resultMap="departmentInfoResultExt">
+        SELECT
+        distinct  station_code,
+        department_number,
+        department_name
+        FROM org_department_info
+        where is_deleted = 0
+        <if test="stationCode!= null and stationCode!= ''">
+            and station_code = #{stationCode}
+        </if>
+    </select>
+
+    <select id="departmentStatusInfoData" resultMap="departmentInfoResultExt">
+        SELECT
+        distinct  department_status
+        FROM org_department_info
+    </select>
+</mapper>

src/main/java/org/energy/modules/org/mapper/PositionInfoMapper.java

@@ -0,0 +1,33 @@
+package org.energy.modules.org.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.energy.modules.org.entity.PositionInfo;
+import org.energy.modules.org.vo.PositionInfoVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.smart.vo.WorkOrderVO;
+
+import java.util.List;
+
+/**
+ * 岗位信息 Mapper 接口
+ *
+ * @author Daf
+ * @since 2024-12-17
+ */
+public interface PositionInfoMapper extends BaseMapper<PositionInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param positionInfo
+	 * @return
+	 */
+	List<PositionInfoVO> selectPositionInfoPage(IPage page, @Param("entity")PositionInfoVO positionInfo);
+
+	PositionInfoVO selectDetail(@Param("id") Long id);
+
+	List<PositionInfoVO> positionInfoData(@Param("stationCode") String stationCode);
+
+}

src/main/java/org/energy/modules/org/mapper/PositionInfoMapper.xml

@@ -0,0 +1,87 @@
+<?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="org.energy.modules.org.mapper.PositionInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="positionInfoResultMap" type="org.energy.modules.org.entity.PositionInfo">
+        <id column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="station_code" property="stationCode"/>
+        <result column="post_number" property="postNumber"/>
+        <result column="post_name" property="postName"/>
+        <result column="creation_date" property="creationDate"/>
+        <result column="position_description" property="positionDescription"/>
+        <result column="team_number" property="teamNumber"/>
+        <result column="department_number" property="departmentNumber"/>
+    </resultMap>
+
+    <resultMap id="positionInfoResultExt" type="org.energy.modules.org.vo.PositionInfoVO">
+        <id column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="station_code" property="stationCode"/>
+        <result column="post_number" property="postNumber"/>
+        <result column="post_name" property="postName"/>
+        <result column="creation_date" property="creationDate"/>
+        <result column="position_description" property="positionDescription"/>
+        <result column="team_number" property="teamNumber"/>
+        <result column="department_number" property="departmentNumber"/>
+
+        <result column="station_name" property="stationName"/>
+        <result column="name" property="name"/>
+        <result column="team_name" property="teamName"/>
+        <result column="department_name" property="departmentName"/>
+        <result column="personnel_quantity" property="personnelQuantity"/>
+    </resultMap>
+
+    <select id="selectPositionInfoPage" resultMap="positionInfoResultExt">
+        select p.*,stt.station_name, s.name, t.team_name,d.department_name
+        from org_position_info p
+                 left join org_station_info stt on p.station_code=stt.station_code and stt.is_deleted = 0
+                 left join org_staff_info s on p.station_code=s.station_code and s.is_deleted = 0
+                 left join org_team_info t on p.team_number=t.team_number and t.station_code=p.station_code and t.is_deleted = 0
+                 left join org_department_info d on p.department_number=d.department_number and d.station_code=p.station_code and d.is_deleted = 0
+        where
+           p.is_deleted = 0
+        <if test="entity.postNumber!= null and entity.postNumber!= ''">
+            and p.post_number = #{entity.postNumber}
+        </if>
+        <if test="entity.postName!= null and entity.postName!= ''">
+            and p.post_name = #{entity.postName}
+        </if>
+    </select>
+
+    <select id="selectDetail" resultMap="positionInfoResultExt">
+        select p.*,stt.station_name, s.name, t.team_name,d.department_name,
+               (select count(*) from org_staff_info s
+                                         left join org_position_info p on p.post_number=s.post_number and  p.station_code=s.station_code and p.is_deleted = 0
+                where s.is_deleted = 0) as personnel_quantity
+        from org_position_info p
+                 left join org_station_info stt on p.station_code=stt.station_code and stt.is_deleted = 0
+                 left join org_staff_info s on p.station_code=s.station_code and s.is_deleted = 0
+                 left join org_team_info t on p.team_number=t.team_number and t.station_code=p.station_code and t.is_deleted = 0
+                 left join org_department_info d on p.department_number=d.department_number and d.station_code=p.station_code and d.is_deleted = 0
+        where
+           p.is_deleted = 0
+          and p.id = #{id}
+    </select>
+
+    <select id="positionInfoData" resultMap="positionInfoResultExt">
+        SELECT
+           distinct  station_code,
+               post_number,
+               post_name
+        FROM org_position_info
+        where is_deleted = 0
+        <if test="stationCode!= null and stationCode!= ''">
+            and station_code = #{stationCode}
+        </if>
+    </select>
+</mapper>

src/main/java/org/energy/modules/org/mapper/ShiftInfoMapper.java

@@ -0,0 +1,31 @@
+package org.energy.modules.org.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.energy.modules.org.entity.ShiftInfo;
+import org.energy.modules.org.vo.PositionInfoVO;
+import org.energy.modules.org.vo.ShiftInfoVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 值别信息 Mapper 接口
+ *
+ * @author Daf
+ * @since 2024-12-30
+ */
+public interface ShiftInfoMapper extends BaseMapper<ShiftInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param shiftInfo
+	 * @return
+	 */
+	List<ShiftInfoVO> selectShiftInfoPage(IPage page, @Param("entity")ShiftInfoVO shiftInfo);
+
+	ShiftInfoVO selectDetail(@Param("id") Long id);
+
+	List<ShiftInfoVO> shiftInfoData(@Param("stationCode") String stationCode);
+}

src/main/java/org/energy/modules/org/mapper/ShiftInfoMapper.xml

@@ -0,0 +1,91 @@
+<?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="org.energy.modules.org.mapper.ShiftInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="shiftInfoResultMap" type="org.energy.modules.org.entity.ShiftInfo">
+        <id column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="station_code" property="stationCode"/>
+        <result column="shift_number" property="shiftNumber"/>
+        <result column="shift_name" property="shiftName"/>
+        <result column="creation_date" property="creationDate"/>
+        <result column="team_number" property="teamNumber"/>
+        <result column="contact_phone" property="contactPhone"/>
+        <result column="shift_description" property="shiftDescription"/>
+    </resultMap>
+
+    <resultMap id="shiftInfoResultExt" type="org.energy.modules.org.vo.ShiftInfoVO">
+        <id column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="station_code" property="stationCode"/>
+        <result column="shift_number" property="shiftNumber"/>
+        <result column="shift_name" property="shiftName"/>
+        <result column="creation_date" property="creationDate"/>
+        <result column="team_number" property="teamNumber"/>
+        <result column="contact_phone" property="contactPhone"/>
+        <result column="shift_description" property="shiftDescription"/>
+
+        <result column="station_name" property="stationName"/>
+        <result column="name" property="name"/>
+        <result column="name2" property="name2"/>
+        <result column="team_name" property="teamName"/>
+    </resultMap>
+
+
+    <select id="selectShiftInfoPage" resultMap="shiftInfoResultExt">
+        select s.*, stt.station_name, st.name, t.team_name
+        from org_shift_info s
+                 left join org_station_info stt on s.station_code=stt.station_code and stt.is_deleted = 0
+                 left join org_staff_info st on s.station_code=st.station_code and st.shift_leader = 1 and st.is_deleted = 0
+                 left join org_team_info t on s.team_number=t.team_number and t.station_code=s.station_code and t.is_deleted = 0
+        where
+            s.is_deleted = 0
+        <if test="entity.stationName!= null and entity.stationName!= ''">
+            and stt.station_name = #{entity.stationName}
+        </if>
+        <if test="entity.shiftNumber!= null and entity.shiftNumber!= ''">
+            and s.shift_number = #{entity.shiftNumber}
+        </if>
+        <if test="entity.shiftName!= null and entity.shiftName!= ''">
+            and s.shift_name = #{entity.shiftName}
+        </if>
+        <if test="entity.teamName!= null and entity.teamName!= ''">
+            and t.team_name = #{entity.teamName}
+        </if>
+    </select>
+
+    <select id="selectDetail" resultMap="shiftInfoResultExt">
+        select s.*, stt.station_name, st.name, t.team_name, (select name from org_shift_info s
+                                                                                  left join org_staff_info st on st.team_number=s.team_number and  st.shift_number=s.shift_number and st.is_deleted = 0
+                                                             where s.is_deleted = 0 and s.id = #{id}) as name2
+        from org_shift_info s
+                 left join org_station_info stt on s.station_code=stt.station_code and stt.is_deleted = 0
+                 left join org_staff_info st on s.station_code=st.station_code and st.shift_leader = 1 and st.is_deleted = 0
+                 left join org_team_info t on s.team_number=t.team_number and t.station_code=s.station_code and t.is_deleted = 0
+        where
+            s.is_deleted = 0
+          and s.id = #{id}
+    </select>
+
+    <select id="shiftInfoData" resultMap="shiftInfoResultExt">
+        SELECT
+        distinct  station_code,
+        shift_number,
+        shift_name
+        FROM org_shift_info
+        where is_deleted = 0
+        <if test="stationCode!= null and stationCode!= ''">
+            and station_code = #{stationCode}
+        </if>
+    </select>
+
+</mapper>

src/main/java/org/energy/modules/org/mapper/StaffInfoMapper.java

@@ -0,0 +1,43 @@
+package org.energy.modules.org.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.energy.modules.leger.excel.ToolInventoryRecordExcel;
+import org.energy.modules.leger.vo.ToolInventoryRecordVO;
+import org.energy.modules.org.entity.StaffInfo;
+import org.energy.modules.org.excel.StaffInfoExcel;
+import org.energy.modules.org.vo.DepartmentInfoVO;
+import org.energy.modules.org.vo.PositionInfoVO;
+import org.energy.modules.org.vo.StaffInfoVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.smart.vo.WorkOrderVO;
+
+import java.util.List;
+
+/**
+ * 人员信息 Mapper 接口
+ *
+ * @author Daf
+ * @since 2024-12-20
+ */
+public interface StaffInfoMapper extends BaseMapper<StaffInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param staffInfo
+	 * @return
+	 */
+	List<StaffInfoVO> selectStaffInfoPage(IPage page, @Param("entity")StaffInfoVO staffInfo);
+
+	StaffInfoVO selectDetail(@Param("id") Long id);
+
+	List<StaffInfoExcel> exportData(@Param("vo") StaffInfoVO staffInfo);
+
+	List<StaffInfoVO> staffSexInfoData();
+
+	List<StaffInfoVO> staffInfoData();
+
+
+}

src/main/java/org/energy/modules/org/mapper/StaffInfoMapper.xml

@@ -0,0 +1,129 @@
+<?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="org.energy.modules.org.mapper.StaffInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="staffInfoResultMap" type="org.energy.modules.org.entity.StaffInfo">
+        <id column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="account" property="account"/>
+        <result column="name" property="name"/>
+        <result column="sex" property="sex"/>
+        <result column="phone_number" property="phoneNumber"/>
+        <result column="station_code" property="stationCode"/>
+        <result column="department_number" property="departmentId"/>
+        <result column="post_number" property="postNumber"/>
+        <result column="team_id" property="teamId"/>
+        <result column="shift_id" property="shiftId"/>
+        <result column="effective_date" property="effectiveDate"/>
+        <result column="invalid_date" property="invalidDate"/>
+        <result column="station_head" property="stationHead"/>
+        <result column="dept_head" property="deptHead"/>
+        <result column="position_head" property="positionHead"/>
+        <result column="team_head" property="teamHead"/>
+        <result column="shift_leader" property="shiftLeader"/>
+    </resultMap>
+
+    <resultMap id="staffInfoResultExt" type="org.energy.modules.org.vo.StaffInfoVO">
+        <id column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="account" property="account"/>
+        <result column="name" property="name"/>
+        <result column="sex" property="sex"/>
+        <result column="phone_number" property="phoneNumber"/>
+        <result column="station_code" property="stationCode"/>
+        <result column="department_number" property="departmentNumber"/>
+        <result column="post_number" property="postNumber"/>
+        <result column="team_number" property="teamNumber"/>
+        <result column="shift_number" property="shiftNumber"/>
+        <result column="effective_date" property="effectiveDate"/>
+        <result column="invalid_date" property="invalidDate"/>
+        <result column="station_head" property="stationHead"/>
+        <result column="dept_head" property="deptHead"/>
+        <result column="position_head" property="positionHead"/>
+        <result column="team_head" property="teamHead"/>
+        <result column="shift_leader" property="shiftLeader"/>
+
+<!--        <result column="dict_value" property="dictValue"/>-->
+        <result column="station_name" property="stationName"/>
+        <result column="post_name" property="postName"/>
+        <result column="team_name" property="teamName"/>
+        <result column="department_name" property="departmentName"/>
+        <result column="shift_name" property="shiftName"/>
+    </resultMap>
+
+    <select id="selectStaffInfoPage" resultMap="staffInfoResultExt">
+        select distinct s.*, st.station_name, p.post_name ,t.team_name,d.department_name
+        from org_staff_info s
+        left join org_station_info st on s.station_code=st.station_code and st.is_deleted = 0
+        left join org_position_info P on p.post_number=s.post_number and p.station_code=s.station_code and p.is_deleted = 0
+        left join org_team_info t on s.team_number=t.team_number and t.station_code=s.station_code and t.is_deleted = 0
+        left join org_department_info d on s.department_number=d.department_number and d.station_code=s.station_code and d.is_deleted = 0
+        where
+        s.is_deleted = 0
+        <if test="entity.stationName!= null and entity.stationName!= ''">
+            and s.station_name = #{entity.stationName}
+        </if>
+        <if test="entity.account!= null and entity.account!= ''">
+            and s.account = #{entity.account}
+        </if>
+        <if test="entity.name!= null and entity.name!= ''">
+            and s.name = #{entity.name}
+        </if>
+        <if test="entity.departmentName!= null and entity.departmentName!= ''">
+            and s.department_name = #{entity.departmentName}
+        </if>
+    </select>
+
+    <select id="selectDetail" resultMap="staffInfoResultExt">
+        select distinct s.*, st.station_name, P.post_name,t.team_name, sh.shift_name, d.department_name
+        from org_staff_info s
+--                  left join sys_dict sd on s.sex=sd.dict_key and sd.code = 'sex' and sd.is_deleted = 0
+                 left join org_station_info st on s.station_code =st.station_code and st.is_deleted = 0
+                 left join org_position_info P on p.post_number=s.post_number and p.station_code=s.station_code and p.is_deleted = 0
+                 left join org_team_info t on s.team_number = t.team_number and t.station_code=s.station_code and t.is_deleted = 0
+                 left join org_shift_info sh on s.shift_number = sh.shift_number and sh.station_code=s.station_code and sh.is_deleted = 0
+                 left join org_department_info d on s.department_number = d.department_number and d.station_code=s.station_code and d.is_deleted = 0
+        where
+            s.is_deleted = 0
+          and s.id = #{id}
+    </select>
+
+    <select id="exportData" resultType="org.energy.modules.org.excel.StaffInfoExcel">
+        SELECT station_code,
+        account,
+        name,
+        phone_number
+        FROM org_staff_info a
+        where a.is_deleted = 0
+        <if test="vo.stationCode != null and vo.stationCode != ''">
+            and a.station_code LIKE CONCAT('%', #{vo.stationCode}, '%')
+        </if>
+        <if test="vo.account != null and vo.account != ''">
+            AND a.account LIKE CONCAT('%', #{vo.account}, '%')
+        </if>
+        <if test="vo.name != null and vo.name != ''">
+            AND a.name LIKE CONCAT('%', #{vo.name}, '%')
+        </if>
+    </select>
+
+    <select id="staffSexInfoData" resultMap="staffInfoResultExt">
+        SELECT
+            distinct  sex
+        FROM org_staff_info
+    </select>
+
+    <select id="staffInfoData" resultMap="staffInfoResultExt">
+        SELECT
+            distinct  name
+        FROM org_staff_info
+    </select>
+</mapper>

src/main/java/org/energy/modules/org/mapper/StationInfoMapper.java

@@ -0,0 +1,40 @@
+package org.energy.modules.org.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.energy.modules.org.entity.StationInfo;
+import org.energy.modules.org.vo.PositionInfoVO;
+import org.energy.modules.org.vo.StationInfoVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 场站信息 Mapper 接口
+ *
+ * @author Daf
+ * @since 2024-12-31
+ */
+public interface StationInfoMapper extends BaseMapper<StationInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param stationInfo
+	 * @return
+	 */
+	List<StationInfoVO> selectStationInfoPage(IPage page, @Param("entity")StationInfoVO stationInfo);
+
+	StationInfoVO selectDetail(@Param("id") Long id);
+
+	List<StationInfoVO> stationInfoData(@Param("stationCode") String stationCode);
+	List<StationInfoVO> stationTypeInfoData(@Param("stationCode") String stationCode);
+	List<StationInfoVO> maintenanceStatusInfoData(@Param("stationCode") String stationCode);
+
+	/**
+	 * 获取最大编号
+	 */
+	String getMaxNo(String date);
+}

src/main/java/org/energy/modules/org/mapper/StationInfoMapper.xml

@@ -0,0 +1,136 @@
+<?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="org.energy.modules.org.mapper.StationInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="stationInfoResultMap" type="org.energy.modules.org.entity.StationInfo">
+        <id column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="status" property="status"/>
+        <result column="form_filler_id" property="formFillerId"/>
+        <result column="form_fill_date" property="formFillDate"/>
+        <result column="station_code" property="stationCode"/>
+        <result column="station_name" property="stationName"/>
+        <result column="station_type" property="stationType"/>
+        <result column="geo_location" property="geoLocation"/>
+        <result column="installed_capacity" property="installedCapacity"/>
+        <result column="voltage_level" property="voltageLevel"/>
+        <result column="load_rate" property="loadRate"/>
+        <result column="input_voltage_level" property="inputVoltageLevel"/>
+        <result column="output_voltage_level" property="outputVoltageLevel"/>
+        <result column="operation_date" property="operationDate"/>
+        <result column="maintenance_status" property="maintenanceStatus"/>
+        <result column="contact_phone" property="contactPhone"/>
+        <result column="last_inspection_date" property="lastInspectionDate"/>
+        <result column="next_inspection_date" property="nextInspectionDate"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+    <resultMap id="stationInfoResultExt" type="org.energy.modules.org.vo.StationInfoVO">
+        <id column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="status" property="status"/>
+        <result column="form_filler_id" property="formFillerId"/>
+        <result column="form_fill_date" property="formFillDate"/>
+        <result column="station_code" property="stationCode"/>
+        <result column="station_name" property="stationName"/>
+        <result column="station_type" property="stationType"/>
+        <result column="geo_location" property="geoLocation"/>
+        <result column="installed_capacity" property="installedCapacity"/>
+        <result column="voltage_level" property="voltageLevel"/>
+        <result column="load_rate" property="loadRate"/>
+        <result column="input_voltage_level" property="inputVoltageLevel"/>
+        <result column="output_voltage_level" property="outputVoltageLevel"/>
+        <result column="operation_date" property="operationDate"/>
+        <result column="maintenance_status" property="maintenanceStatus"/>
+        <result column="contact_phone" property="contactPhone"/>
+        <result column="last_inspection_date" property="lastInspectionDate"/>
+        <result column="next_inspection_date" property="nextInspectionDate"/>
+        <result column="remark" property="remark"/>
+        <result column="team_number" property="teamNumber"/>
+        <result column="station_status" property="stationStatus"/>
+
+
+        <result column="name" property="name"/>
+        <result column="team_name" property="teamName"/>
+        <result column="formFiller_name" property="formFillerName"/>
+        <result column="dict_value" property="dictValue"/>
+    </resultMap>
+
+
+    <select id="selectStationInfoPage" resultMap="stationInfoResultExt">
+        select s.*, d.dict_value
+        from org_station_info s
+        left join sys_dict d on s.station_status=d.dict_key and  d.code = 'station_status' and d.is_deleted = 0
+
+        where
+            s.is_deleted = 0
+        <if test="entity.stationName!= null and entity.stationName!= ''">
+            and s.station_name = #{entity.stationName}
+        </if>
+        <if test="entity.stationType!= null and entity.stationType!= ''">
+            and s.station_type = #{entity.stationType}
+        </if>
+    </select>
+
+    <select id="selectDetail" resultMap="stationInfoResultExt">
+        select s.*, t.team_name, st.name,(select name from org_staff_info st
+                                                                     inner join org_station_info s on st.id=s.form_filler_id and s.is_deleted = 0
+                                            where st.is_deleted = 0) as formFiller_name
+        from org_station_info s
+                 left join org_team_info t on t.station_code=s.station_code and t.team_number=s.team_number and t.is_deleted = 0
+                 left join org_staff_info st on s.station_code=st.station_code and  station_head =1 and st.is_deleted = 0
+        where
+            s.is_deleted = 0
+          and s.id = #{id}
+    </select>
+
+    <select id="stationInfoData" resultMap="stationInfoResultExt">
+        SELECT
+        distinct  station_code,
+        station_name
+        FROM org_station_info
+        where is_deleted = 0
+        <if test="stationCode!= null and stationCode!= ''">
+            and station_code = #{stationCode}
+        </if>
+    </select>
+
+    <select id="stationTypeInfoData" resultMap="stationInfoResultExt">
+        SELECT
+        distinct  station_code,
+        station_type
+        FROM org_station_info
+        where is_deleted = 0
+        <if test="stationCode!= null and stationCode!= ''">
+            and station_code = #{stationCode}
+        </if>
+    </select>
+
+    <select id="maintenanceStatusInfoData" resultMap="stationInfoResultExt">
+        SELECT
+        distinct  station_code,
+        maintenance_status
+        FROM org_station_info
+        where is_deleted = 0
+        <if test="stationCode!= null and stationCode!= ''">
+            and station_code = #{stationCode}
+        </if>
+    </select>
+
+    <select id="getMaxNo" resultType="java.lang.String">
+        SELECT max(station_code)
+        FROM org_station_info where station_code like CONCAT('%', #{date}, '%')
+    </select>
+
+
+
+</mapper>

src/main/java/org/energy/modules/org/mapper/TeamInfoMapper.java

@@ -0,0 +1,31 @@
+package org.energy.modules.org.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.energy.modules.org.entity.TeamInfo;
+import org.energy.modules.org.vo.PositionInfoVO;
+import org.energy.modules.org.vo.TeamInfoVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 班组信息 Mapper 接口
+ *
+ * @author Daf
+ * @since 2024-12-25
+ */
+public interface TeamInfoMapper extends BaseMapper<TeamInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param teamInfo
+	 * @return
+	 */
+	List<TeamInfoVO> selectTeamInfoPage(IPage page, @Param("entity")TeamInfoVO teamInfo);
+
+	TeamInfoVO selectDetail(@Param("id") Long id);
+
+	List<TeamInfoVO> teamInfoData(@Param("stationCode") String stationCode);
+}

src/main/java/org/energy/modules/org/mapper/TeamInfoMapper.xml

@@ -0,0 +1,92 @@
+<?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="org.energy.modules.org.mapper.TeamInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="teamInfoResultMap" type="org.energy.modules.org.entity.TeamInfo">
+        <id column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="station_code" property="stationCode"/>
+        <result column="team_number" property="teamNumber"/>
+        <result column="team_name" property="teamName"/>
+        <result column="creation_date" property="creationDate"/>
+        <result column="team_description" property="teamDescription"/>
+        <result column="responsible_team" property="responsibleTeam"/>
+        <result column="department_number" property="departmentNumber"/>
+    </resultMap>
+
+    <resultMap id="teamInfoResultExt" type="org.energy.modules.org.vo.TeamInfoVO">
+        <id column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="station_code" property="stationCode"/>
+        <result column="team_number" property="teamNumber"/>
+        <result column="team_name" property="teamName"/>
+        <result column="creation_date" property="creationDate"/>
+        <result column="team_description" property="teamDescription"/>
+        <result column="responsible_team" property="responsibleTeam"/>
+        <result column="department_number" property="departmentNumber"/>
+
+        <result column="station_name" property="stationName"/>
+        <result column="name" property="name"/>
+        <result column="department_name" property="departmentName"/>
+        <result column="shift_quantity" property="shiftQuantity"/>
+    </resultMap>
+
+
+    <select id="selectTeamInfoPage" resultMap="teamInfoResultExt">
+        select t.*,stt.station_name,s.name,d.department_name
+        from org_team_info t
+                 left join org_station_info stt on t.station_code=stt.station_code and stt.is_deleted = 0
+                 left join org_staff_info s on t.team_number=s.team_number and t.station_code=s.station_code and s.team_head = 1 and s.is_deleted = 0
+                 left join org_department_info d on t.department_number=d.department_number and d.station_code=t.station_code and d.is_deleted = 0
+        where
+            t.is_deleted = 0
+        <if test="entity.stationName!= null and entity.stationName!= ''">
+            and stt.station_name = #{entity.stationName}
+        </if>
+        <if test="entity.teamNumber!= null and entity.teamNumber!= ''">
+            and t.team_number = #{entity.teamNumber}
+        </if>
+        <if test="entity.teamName!= null and entity.teamName!= ''">
+            and t.team_name = #{entity.teamName}
+        </if>
+        <if test="entity.departmentName!= null and entity.departmentName!= ''">
+            and d.department_name = #{entity.departmentName}
+        </if>
+    </select>
+
+    <select id="selectDetail" resultMap="teamInfoResultExt">
+        select t.*,stt.station_name,s.name,d.department_name,
+               (select count(*) from org_team_info t
+                                         left join org_shift_info sh on sh.team_number=t.team_number and  sh.station_code=t.station_code and sh.is_deleted = 0
+                where t.is_deleted = 0) as shift_quantity
+        from org_team_info t
+                 left join org_station_info stt on t.station_code=stt.station_code and stt.is_deleted = 0
+                 left join org_staff_info s on t.team_number=s.team_number and t.station_code=s.station_code and s.team_head = 1 and s.is_deleted = 0
+                 left join org_department_info d on t.department_number=d.department_number and d.station_code=t.station_code and d.is_deleted = 0
+        where
+            t.is_deleted = 0
+          and t.id = #{id}
+    </select>
+
+    <select id="teamInfoData" resultMap="teamInfoResultExt">
+        SELECT
+        distinct  station_code,
+        team_number,
+        team_name
+        FROM org_team_info
+        where is_deleted = 0
+        <if test="stationCode!= null and stationCode!= ''">
+            and station_code = #{stationCode}
+        </if>
+    </select>
+
+</mapper>

src/main/java/org/energy/modules/org/service/IDepartmentInfoService.java

@@ -0,0 +1,48 @@
+package org.energy.modules.org.service;
+
+import org.energy.modules.org.entity.DepartmentInfo;
+import org.energy.modules.org.vo.DepartmentInfoVO;
+import com.dayu.daf.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.org.vo.TeamInfoVO;
+
+import java.util.List;
+
+/**
+ * 部门信息 服务类
+ *
+ * @author Daf
+ * @since 2024-12-26
+ */
+public interface IDepartmentInfoService extends BaseService<DepartmentInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param departmentInfo
+	 * @return
+	 */
+	IPage<DepartmentInfoVO> selectDepartmentInfoPage(IPage<DepartmentInfoVO> page, DepartmentInfoVO departmentInfo);
+
+	/**
+	 * 获取详情
+	 * @param id
+	 * @return
+	 */
+	DepartmentInfoVO selectDetail(Long id);
+
+	/**
+	 * 获取部門下拉详情
+	 *
+	 * @return
+	 */
+	List<DepartmentInfoVO> departmentInfoData(String stationCode);
+
+	/**
+	 * 获取部门状态下拉详情
+	 *
+	 * @return
+	 */
+	List<DepartmentInfoVO> departmentStatusInfoData();
+}

src/main/java/org/energy/modules/org/service/IPositionInfoService.java

@@ -0,0 +1,42 @@
+package org.energy.modules.org.service;
+
+import org.energy.modules.org.entity.PositionInfo;
+import org.energy.modules.org.vo.PositionInfoVO;
+import com.dayu.daf.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.smart.vo.WorkOrderVO;
+
+import java.util.List;
+
+/**
+ * 岗位信息 服务类
+ *
+ * @author Daf
+ * @since 2024-12-17
+ */
+public interface IPositionInfoService extends BaseService<PositionInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param positionInfo
+	 * @return
+	 */
+	IPage<PositionInfoVO> selectPositionInfoPage(IPage<PositionInfoVO> page, PositionInfoVO positionInfo);
+
+	/**
+	 * 获取详情
+	 * @param id
+	 * @return
+	 */
+	PositionInfoVO selectDetail(Long id);
+
+	/**
+	 * 获取下拉详情
+	 *
+	 * @return
+	 */
+	List<PositionInfoVO> positionInfoData(String stationCode);
+
+}

src/main/java/org/energy/modules/org/service/IShiftInfoService.java

@@ -0,0 +1,41 @@
+package org.energy.modules.org.service;
+
+import org.energy.modules.org.entity.ShiftInfo;
+import org.energy.modules.org.vo.PositionInfoVO;
+import org.energy.modules.org.vo.ShiftInfoVO;
+import com.dayu.daf.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+/**
+ * 值别信息 服务类
+ *
+ * @author Daf
+ * @since 2024-12-30
+ */
+public interface IShiftInfoService extends BaseService<ShiftInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param shiftInfo
+	 * @return
+	 */
+	IPage<ShiftInfoVO> selectShiftInfoPage(IPage<ShiftInfoVO> page, ShiftInfoVO shiftInfo);
+
+	/**
+	 * 获取详情
+	 * @param id
+	 * @return
+	 */
+	ShiftInfoVO selectDetail(Long id);
+
+	/**
+	 * 获取下拉详情
+	 *
+	 * @return
+	 */
+	List<ShiftInfoVO> shiftInfoData(String stationCode);
+}

src/main/java/org/energy/modules/org/service/IStaffInfoService.java

@@ -0,0 +1,60 @@
+package org.energy.modules.org.service;
+
+import org.energy.modules.leger.excel.ToolInventoryRecordExcel;
+import org.energy.modules.leger.vo.ToolInventoryRecordVO;
+import org.energy.modules.org.entity.StaffInfo;
+import org.energy.modules.org.excel.StaffInfoExcel;
+import org.energy.modules.org.vo.DepartmentInfoVO;
+import org.energy.modules.org.vo.StaffInfoVO;
+import com.dayu.daf.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.smart.vo.WorkOrderVO;
+
+import java.util.List;
+
+/**
+ * 人员信息 服务类
+ *
+ * @author Daf
+ * @since 2024-12-20
+ */
+public interface IStaffInfoService extends BaseService<StaffInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param staffInfo
+	 * @return
+	 */
+	IPage<StaffInfoVO> selectStaffInfoPage(IPage<StaffInfoVO> page, StaffInfoVO staffInfo);
+
+	/**
+	 * 获取详情
+	 * @param id
+	 * @return
+	 */
+	StaffInfoVO selectDetail(Long id);
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param staffInfo
+	 * @return
+	 */
+	List<StaffInfoExcel> export(StaffInfoVO staffInfo);
+
+	/**
+	 * 获取性別下拉详情
+	 *
+	 * @return
+	 */
+	List<StaffInfoVO> staffSexInfoData();
+
+	/**
+	 * 获取人员下拉详情
+	 *
+	 * @return
+	 */
+	List<StaffInfoVO> staffInfoData();
+}

src/main/java/org/energy/modules/org/service/IStationInfoService.java

@@ -0,0 +1,63 @@
+package org.energy.modules.org.service;
+
+import org.energy.modules.org.entity.StationInfo;
+import org.energy.modules.org.vo.StationInfoVO;
+import com.dayu.daf.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 场站信息 服务类
+ *
+ * @author Daf
+ * @since 2024-12-31
+ */
+public interface IStationInfoService extends BaseService<StationInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param stationInfo
+	 * @return
+	 */
+	IPage<StationInfoVO> selectStationInfoPage(IPage<StationInfoVO> page, StationInfoVO stationInfo);
+
+	/**
+	 * 获取详情
+	 * @param id
+	 * @return
+	 */
+	StationInfoVO selectDetail(Long id);
+
+	/**
+	 * 下拉
+	 *
+	 * @return
+	 */
+	List<StationInfoVO> stationInfoData(String stationCode);
+
+	/**
+	 * 下拉
+	 *
+	 * @return
+	 */
+	List<StationInfoVO> stationTypeInfoData(String stationCode);
+
+	/**
+	 * 下拉
+	 *
+	 * @return
+	 */
+	List<StationInfoVO> maintenanceStatusInfoData(String stationCode);
+
+	/**
+	 * 获取最大场站编号
+	 *
+	 * @param date
+	 */
+	String getMaxNo(String date);
+
+}

src/main/java/org/energy/modules/org/service/ITeamInfoService.java

@@ -0,0 +1,42 @@
+package org.energy.modules.org.service;
+
+import org.energy.modules.org.entity.TeamInfo;
+import org.energy.modules.org.vo.PositionInfoVO;
+import org.energy.modules.org.vo.TeamInfoVO;
+import com.dayu.daf.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+/**
+ * 班组信息 服务类
+ *
+ * @author Daf
+ * @since 2024-12-25
+ */
+public interface ITeamInfoService extends BaseService<TeamInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param teamInfo
+	 * @return
+	 */
+	IPage<TeamInfoVO> selectTeamInfoPage(IPage<TeamInfoVO> page, TeamInfoVO teamInfo);
+
+	/**
+	 * 获取详情
+	 * @param id
+	 * @return
+	 */
+	TeamInfoVO selectDetail(Long id);
+
+	/**
+	 * 获取下拉详情
+	 *
+	 * @return
+	 */
+	List<TeamInfoVO> teamInfoData(String stationCode);
+
+}

src/main/java/org/energy/modules/org/service/impl/DepartmentInfoServiceImpl.java

@@ -0,0 +1,42 @@
+package org.energy.modules.org.service.impl;
+
+import org.energy.modules.org.entity.DepartmentInfo;
+import org.energy.modules.org.vo.DepartmentInfoVO;
+import org.energy.modules.org.mapper.DepartmentInfoMapper;
+import org.energy.modules.org.service.IDepartmentInfoService;
+import com.dayu.daf.core.mp.base.BaseServiceImpl;
+import org.energy.modules.org.vo.TeamInfoVO;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+/**
+ * 部门信息 服务实现类
+ *
+ * @author Daf
+ * @since 2024-12-26
+ */
+@Service
+public class DepartmentInfoServiceImpl extends BaseServiceImpl<DepartmentInfoMapper, DepartmentInfo> implements IDepartmentInfoService {
+
+	@Override
+	public IPage<DepartmentInfoVO> selectDepartmentInfoPage(IPage<DepartmentInfoVO> page, DepartmentInfoVO departmentInfo) {
+		return page.setRecords(baseMapper.selectDepartmentInfoPage(page, departmentInfo));
+	}
+
+	@Override
+	public DepartmentInfoVO selectDetail(Long id) {
+		return baseMapper.selectDetail(id);
+	}
+	@Override
+	public List<DepartmentInfoVO> departmentInfoData(String stationCode) {
+		return baseMapper.departmentInfoData(stationCode);
+	}
+
+	@Override
+	public List<DepartmentInfoVO> departmentStatusInfoData() {
+		return baseMapper.departmentStatusInfoData();
+	}
+
+}

src/main/java/org/energy/modules/org/service/impl/PositionInfoServiceImpl.java

@@ -0,0 +1,36 @@
+package org.energy.modules.org.service.impl;
+
+import org.energy.modules.org.entity.PositionInfo;
+import org.energy.modules.org.vo.PositionInfoVO;
+import org.energy.modules.org.mapper.PositionInfoMapper;
+import org.energy.modules.org.service.IPositionInfoService;
+import com.dayu.daf.core.mp.base.BaseServiceImpl;
+import org.energy.modules.smart.vo.WorkOrderVO;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+/**
+ * 岗位信息 服务实现类
+ *
+ * @author Daf
+ * @since 2024-12-17
+ */
+@Service
+public class PositionInfoServiceImpl extends BaseServiceImpl<PositionInfoMapper, PositionInfo> implements IPositionInfoService {
+
+	@Override
+	public IPage<PositionInfoVO> selectPositionInfoPage(IPage<PositionInfoVO> page, PositionInfoVO positionInfo) {
+		return page.setRecords(baseMapper.selectPositionInfoPage(page, positionInfo));
+	}
+
+	@Override
+	public PositionInfoVO selectDetail(Long id) {
+		return baseMapper.selectDetail(id);
+	}
+	@Override
+	public List<PositionInfoVO> positionInfoData(String stationCode) {
+		return baseMapper.positionInfoData(stationCode);
+	}
+}

src/main/java/org/energy/modules/org/service/impl/ShiftInfoServiceImpl.java

@@ -0,0 +1,37 @@
+package org.energy.modules.org.service.impl;
+
+import org.energy.modules.org.entity.ShiftInfo;
+import org.energy.modules.org.vo.PositionInfoVO;
+import org.energy.modules.org.vo.ShiftInfoVO;
+import org.energy.modules.org.mapper.ShiftInfoMapper;
+import org.energy.modules.org.service.IShiftInfoService;
+import com.dayu.daf.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+/**
+ * 值别信息 服务实现类
+ *
+ * @author Daf
+ * @since 2024-12-30
+ */
+@Service
+public class ShiftInfoServiceImpl extends BaseServiceImpl<ShiftInfoMapper, ShiftInfo> implements IShiftInfoService {
+
+	@Override
+	public IPage<ShiftInfoVO> selectShiftInfoPage(IPage<ShiftInfoVO> page, ShiftInfoVO shiftInfo) {
+		return page.setRecords(baseMapper.selectShiftInfoPage(page, shiftInfo));
+	}
+
+	@Override
+	public ShiftInfoVO selectDetail(Long id) {
+		return baseMapper.selectDetail(id);
+	}
+
+	@Override
+	public List<ShiftInfoVO> shiftInfoData(String stationCode) {
+		return baseMapper.shiftInfoData(stationCode);
+	}
+}

src/main/java/org/energy/modules/org/service/impl/StaffInfoServiceImpl.java

@@ -0,0 +1,55 @@
+package org.energy.modules.org.service.impl;
+
+import io.micrometer.core.instrument.util.StringUtils;
+import org.energy.modules.leger.excel.ToolInventoryRecordExcel;
+import org.energy.modules.leger.vo.ToolInventoryRecordVO;
+import org.energy.modules.org.entity.StaffInfo;
+import org.energy.modules.org.excel.StaffInfoExcel;
+import org.energy.modules.org.vo.DepartmentInfoVO;
+import org.energy.modules.org.vo.PositionInfoVO;
+import org.energy.modules.org.vo.StaffInfoVO;
+import org.energy.modules.org.mapper.StaffInfoMapper;
+import org.energy.modules.org.service.IStaffInfoService;
+import com.dayu.daf.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+/**
+ * 人员信息 服务实现类
+ *
+ * @author Daf
+ * @since 2024-12-20
+ */
+@Service
+public class StaffInfoServiceImpl extends BaseServiceImpl<StaffInfoMapper, StaffInfo> implements IStaffInfoService {
+
+	@Override
+	public IPage<StaffInfoVO> selectStaffInfoPage(IPage<StaffInfoVO> page, StaffInfoVO staffInfo) {
+		return page.setRecords(baseMapper.selectStaffInfoPage(page, staffInfo));
+	}
+
+	@Override
+	public StaffInfoVO selectDetail(Long id) {
+		return baseMapper.selectDetail(id);
+	}
+
+	@Override
+	public List<StaffInfoExcel> export(StaffInfoVO StaffInfo) {
+		List<StaffInfoExcel> list = baseMapper.exportData(StaffInfo);
+		return list;
+	}
+
+	@Override
+	public List<StaffInfoVO> staffSexInfoData() {
+		return baseMapper.staffSexInfoData();
+	}
+
+	@Override
+	public List<StaffInfoVO> staffInfoData() {
+		return baseMapper.staffInfoData();
+	}
+
+
+}

src/main/java/org/energy/modules/org/service/impl/StationInfoServiceImpl.java

@@ -0,0 +1,54 @@
+package org.energy.modules.org.service.impl;
+
+import org.energy.modules.org.entity.StationInfo;
+import org.energy.modules.org.vo.StationInfoVO;
+import org.energy.modules.org.mapper.StationInfoMapper;
+import org.energy.modules.org.service.IStationInfoService;
+import com.dayu.daf.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 场站信息 服务实现类
+ *
+ * @author Daf
+ * @since 2024-12-31
+ */
+@Service
+public class StationInfoServiceImpl extends BaseServiceImpl<StationInfoMapper, StationInfo> implements IStationInfoService {
+
+	@Override
+	public IPage<StationInfoVO> selectStationInfoPage(IPage<StationInfoVO> page, StationInfoVO stationInfo) {
+		return page.setRecords(baseMapper.selectStationInfoPage(page, stationInfo));
+	}
+
+	@Override
+	public StationInfoVO selectDetail(Long id) {
+		return baseMapper.selectDetail(id);
+	}
+
+	@Override
+	public List<StationInfoVO> stationInfoData(String stationCode) {
+		return baseMapper.stationInfoData(stationCode);
+	}
+
+	@Override
+	public List<StationInfoVO> stationTypeInfoData(String stationCode) {
+		return baseMapper.stationTypeInfoData(stationCode);
+	}
+
+	@Override
+	public List<StationInfoVO> maintenanceStatusInfoData(String stationCode) {
+		return baseMapper.maintenanceStatusInfoData(stationCode);
+	}
+
+	@Override
+	public String getMaxNo(String date){
+		String maxNo = baseMapper.getMaxNo(date);
+		return maxNo;
+	}
+
+}

src/main/java/org/energy/modules/org/service/impl/TeamInfoServiceImpl.java

@@ -0,0 +1,37 @@
+package org.energy.modules.org.service.impl;
+
+import org.energy.modules.org.entity.TeamInfo;
+import org.energy.modules.org.vo.PositionInfoVO;
+import org.energy.modules.org.vo.TeamInfoVO;
+import org.energy.modules.org.mapper.TeamInfoMapper;
+import org.energy.modules.org.service.ITeamInfoService;
+import com.dayu.daf.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+/**
+ * 班组信息 服务实现类
+ *
+ * @author Daf
+ * @since 2024-12-25
+ */
+@Service
+public class TeamInfoServiceImpl extends BaseServiceImpl<TeamInfoMapper, TeamInfo> implements ITeamInfoService {
+
+	@Override
+	public IPage<TeamInfoVO> selectTeamInfoPage(IPage<TeamInfoVO> page, TeamInfoVO teamInfo) {
+		return page.setRecords(baseMapper.selectTeamInfoPage(page, teamInfo));
+	}
+
+	@Override
+	public TeamInfoVO selectDetail(Long id) {
+		return baseMapper.selectDetail(id);
+	}
+	@Override
+	public List<TeamInfoVO> teamInfoData(String stationCode) {
+		return baseMapper.teamInfoData(stationCode);
+	}
+
+}

src/main/java/org/energy/modules/org/vo/DepartmentInfoVO.java

@@ -0,0 +1,26 @@
+package org.energy.modules.org.vo;
+
+import org.energy.modules.org.entity.DepartmentInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+import java.util.Date;
+
+/**
+ * 部门信息视图实体类
+ *
+ * @author Daf
+ * @since 2024-12-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "DepartmentInfoVO对象", description = "部门信息")
+public class DepartmentInfoVO extends DepartmentInfo {
+	private static final long serialVersionUID = 1L;
+
+	private String stationName;
+	private String name;
+	private String teamQuantity;
+	private Date createTime;
+}

src/main/java/org/energy/modules/org/vo/PositionInfoVO.java

@@ -0,0 +1,36 @@
+package org.energy.modules.org.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.energy.modules.org.entity.PositionInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+import java.util.Date;
+
+/**
+ * 岗位信息视图实体类
+ *
+ * @author Daf
+ * @since 2024-12-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "PositionInfoVO对象", description = "岗位信息")
+public class PositionInfoVO extends PositionInfo {
+	private static final long serialVersionUID = 1L;
+
+	private String stationName;
+
+	private String name;
+
+	private String teamName;
+
+	private String departmentName;
+
+	private String personnelQuantity;
+
+	private Date createTime;
+
+
+}

src/main/java/org/energy/modules/org/vo/ShiftInfoVO.java

@@ -0,0 +1,32 @@
+package org.energy.modules.org.vo;
+
+import org.energy.modules.org.entity.ShiftInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+import java.util.Date;
+
+/**
+ * 值别信息视图实体类
+ *
+ * @author Daf
+ * @since 2024-12-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "ShiftInfoVO对象", description = "值别信息")
+public class ShiftInfoVO extends ShiftInfo {
+	private static final long serialVersionUID = 1L;
+
+	private String stationName;
+
+	private String name;
+
+	private String name2;
+
+	private String teamName;
+
+	private Date createTime;
+
+}

src/main/java/org/energy/modules/org/vo/StaffInfoVO.java

@@ -0,0 +1,30 @@
+package org.energy.modules.org.vo;
+
+import org.energy.modules.org.entity.StaffInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+import java.util.Date;
+
+/**
+ * 人员信息视图实体类
+ *
+ * @author Daf
+ * @since 2024-12-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "StaffInfoVO对象", description = "人员信息")
+public class StaffInfoVO extends StaffInfo {
+	private static final long serialVersionUID = 1L;
+
+//	private String dictValue;
+	private String stationName;
+	private String postName;
+	private String teamName;
+	private String departmentName;
+	private String shiftName;
+
+
+}

src/main/java/org/energy/modules/org/vo/StationInfoVO.java

@@ -0,0 +1,33 @@
+package org.energy.modules.org.vo;
+
+import org.energy.modules.org.entity.StationInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+import java.util.Date;
+
+/**
+ * 场站信息视图实体类
+ *
+ * @author Daf
+ * @since 2024-12-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "StationInfoVO对象", description = "场站信息")
+public class StationInfoVO extends StationInfo {
+	private static final long serialVersionUID = 1L;
+
+	private String formFillerName;
+
+	private String name;
+
+	private String teamName;
+
+	private Date createTime;
+
+	private String dictValue;
+
+
+}

src/main/java/org/energy/modules/org/vo/TeamInfoVO.java

@@ -0,0 +1,29 @@
+package org.energy.modules.org.vo;
+
+import org.energy.modules.org.entity.TeamInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+import java.util.Date;
+
+/**
+ * 班组信息视图实体类
+ *
+ * @author Daf
+ * @since 2024-12-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "TeamInfoVO对象", description = "班组信息")
+public class TeamInfoVO extends TeamInfo {
+	private static final long serialVersionUID = 1L;
+
+	private String stationName;
+	private String name;
+	private String departmentName;
+	private String shiftQuantity;
+	private Date createTime;
+
+
+}

src/main/java/org/energy/modules/system/controller/DataScopeController.java

@@ -119,3 +119,4 @@ public class DataScopeController extends DafController {
 	}
 
 }
+

src/main/java/org/energy/modules/system/controller/DemoController.java

@@ -0,0 +1,126 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.energy.modules.system.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import com.dayu.daf.core.mp.support.Condition;
+import com.dayu.daf.core.mp.support.Query;
+import com.dayu.daf.core.tool.api.R;
+import com.dayu.daf.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.system.entity.Demo;
+import org.energy.modules.system.vo.DemoVO;
+import org.energy.modules.system.service.IDemoService;
+import com.dayu.daf.core.boot.ctrl.DafController;
+
+/**
+ *  控制器
+ *
+ * @author Daf
+ * @since 2024-10-25
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/system/demo")
+@Api(value = "", tags = "接口")
+public class DemoController extends DafController {
+
+	private IDemoService demoService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入demo")
+	public R<Demo> detail(Demo demo) {
+		Demo detail = demoService.getOne(Condition.getQueryWrapper(demo));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入demo")
+	public R<IPage<Demo>> list(Demo demo, Query query) {
+		IPage<Demo> pages = demoService.page(Condition.getPage(query), Condition.getQueryWrapper(demo));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入demo")
+	public R<IPage<DemoVO>> page(DemoVO demo, Query query) {
+		IPage<DemoVO> pages = demoService.selectDemoPage(Condition.getPage(query), demo);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入demo")
+	public R save(@Valid @RequestBody Demo demo) {
+		return R.status(demoService.save(demo));
+	}
+
+	/**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入demo")
+	public R update(@Valid @RequestBody Demo demo) {
+		return R.status(demoService.updateById(demo));
+	}
+
+	/**
+	 * 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入demo")
+	public R submit(@Valid @RequestBody Demo demo) {
+		return R.status(demoService.saveOrUpdate(demo));
+	}
+
+
+	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(demoService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+}

src/main/java/org/energy/modules/system/controller/MenuController.java

@@ -123,9 +123,6 @@ public class MenuController extends DafController {
 	@ApiOperation(value = "新增或修改", notes = "传入menu")
 	public R submit(@Valid @RequestBody Menu menu) {
 		menu.setIsDeleted(DafConstant.DB_NOT_DELETED);
-		if (menu.getParentId() == null) {
-			menu.setParentId(Long.parseLong("0"));
-		}
 		return R.status(menuService.saveOrUpdate(menu));
 	}
 

src/main/java/org/energy/modules/system/dto/DemoDTO.java

@@ -0,0 +1,18 @@
+package org.energy.modules.system.dto;
+
+import org.energy.modules.system.entity.Demo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 数据传输对象实体类
+ *
+ * @author Daf
+ * @since 2024-10-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DemoDTO extends Demo {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/energy/modules/system/entity/Demo.java

@@ -0,0 +1,42 @@
+package org.energy.modules.system.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dayu.daf.core.mp.base.BaseEntity;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 实体类
+ *
+ * @author Daf
+ * @since 2024-10-25
+ */
+@Data
+@TableName("sys_demo")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "Demo对象", description = "Demo对象")
+public class Demo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键")
+    private Integer id;
+    /**
+     * 名称
+     */
+    @ApiModelProperty(value = "名称")
+    private String name;
+    /**
+     * 编号
+     */
+    @ApiModelProperty(value = "编号")
+    private String code;
+
+
+}

src/main/java/org/energy/modules/system/mapper/DemoMapper.java

@@ -0,0 +1,26 @@
+package org.energy.modules.system.mapper;
+
+import org.energy.modules.system.entity.Demo;
+import org.energy.modules.system.vo.DemoVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ *  Mapper 接口
+ *
+ * @author Daf
+ * @since 2024-10-25
+ */
+public interface DemoMapper extends BaseMapper<Demo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param demo
+	 * @return
+	 */
+	List<DemoVO> selectDemoPage(IPage page, DemoVO demo);
+
+}

src/main/java/org/energy/modules/system/mapper/DemoMapper.xml

@@ -0,0 +1,24 @@
+<?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="org.energy.modules.system.mapper.DemoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="demoResultMap" type="org.energy.modules.system.entity.Demo">
+        <id column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="status" property="status"/>
+        <result column="name" property="name"/>
+        <result column="code" property="code"/>
+    </resultMap>
+
+
+    <select id="selectDemoPage" resultMap="demoResultMap">
+        select * from sys_demo where is_deleted = 0
+    </select>
+
+</mapper>

src/main/java/org/energy/modules/system/service/IDemoService.java

@@ -0,0 +1,25 @@
+package org.energy.modules.system.service;
+
+import org.energy.modules.system.entity.Demo;
+import org.energy.modules.system.vo.DemoVO;
+import com.dayu.daf.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务类
+ *
+ * @author Daf
+ * @since 2024-10-25
+ */
+public interface IDemoService extends BaseService<Demo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param demo
+	 * @return
+	 */
+	IPage<DemoVO> selectDemoPage(IPage<DemoVO> page, DemoVO demo);
+
+}

src/main/java/org/energy/modules/system/service/impl/DemoServiceImpl.java

@@ -0,0 +1,25 @@
+package org.energy.modules.system.service.impl;
+
+import org.energy.modules.system.entity.Demo;
+import org.energy.modules.system.vo.DemoVO;
+import org.energy.modules.system.mapper.DemoMapper;
+import org.energy.modules.system.service.IDemoService;
+import com.dayu.daf.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务实现类
+ *
+ * @author Daf
+ * @since 2024-10-25
+ */
+@Service
+public class DemoServiceImpl extends BaseServiceImpl<DemoMapper, Demo> implements IDemoService {
+
+	@Override
+	public IPage<DemoVO> selectDemoPage(IPage<DemoVO> page, DemoVO demo) {
+		return page.setRecords(baseMapper.selectDemoPage(page, demo));
+	}
+
+}

src/main/java/org/energy/modules/system/service/impl/UserServiceImpl.java

@@ -139,7 +139,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 	@Override
 	public boolean resetPassword(String userIds) {
 		User user = new User();
-		user.setPassword(DigestUtil.encrypt(CommonConstant.DEFAULT_PASSWORD));
+//		user.setPassword(DigestUtil.encrypt(CommonConstant.DEFAULT_PASSWORD));
+		user.setPassword(DigestUtil.encrypt("8Nn!yjWKpR"));
 		user.setUpdateTime(DateUtil.now());
 		return this.update(user, Wrappers.<User>update().lambda().in(User::getId, Func.toLongList(userIds)));
 	}

src/main/java/org/energy/modules/system/vo/DemoVO.java

@@ -0,0 +1,20 @@
+package org.energy.modules.system.vo;
+
+import org.energy.modules.system.entity.Demo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 视图实体类
+ *
+ * @author Daf
+ * @since 2024-10-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "DemoVO对象", description = "DemoVO对象")
+public class DemoVO extends Demo {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/sql/operationitem.menu.sql

@@ -0,0 +1,24 @@
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1811234865114099714', 1123598815738675201, 'operationitem', '', 'menu', '/smart/operationitem', NULL, 1, 1, 0, 1, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1811234865114099715', '1811234865114099714', 'operationitem_add', '新增', 'add', '/smart/operationitem/add', 'plus', 1, 2, 1, 1, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1811234865114099716', '1811234865114099714', 'operationitem_edit', '修改', 'edit', '/smart/operationitem/edit', 'form', 2, 2, 2, 1, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1811234865114099717', '1811234865114099714', 'operationitem_delete', '删除', 'delete', '/api/smart/operationitem/remove', 'delete', 3, 2, 3, 1, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1811234865114099718', '1811234865114099714', 'operationitem_view', '查看', 'view', '/smart/operationitem/view', 'file-text', 4, 2, 2, 1, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1811234865114099719', '1811234865114099714', 'operationitem_col_id', '主键', 'prop', '', '', 5, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1811234865114099720', '1811234865114099714', 'operationitem_col_operationTicketNo', '操作票编号', 'prop', '', '', 6, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1811234865114099721', '1811234865114099714', 'operationitem_col_operationItemNo', '操作项目编号', 'prop', '', '', 7, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1811234865114099722', '1811234865114099714', 'operationitem_col_itmeName', '项目名称', 'prop', '', '', 8, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1811234865114099723', '1811234865114099714', 'operationitem_col_securityMeasures', '危害因素', 'prop', '', '', 9, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1811234865114099724', '1811234865114099714', 'operationitem_col_riskLevel', '风险等级', 'prop', '', '', 10, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1811234865114099725', '1811234865114099714', 'operationitem_col_other', '其他', 'prop', '', '', 11, 3, 0, 0, NULL, 0);

src/main/java/sql/operationticket.menu.sql

@@ -0,0 +1,68 @@
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605377', 1123598815738675201, 'operationticket', '', 'menu', '/smart/operationticket', NULL, 1, 1, 0, 1, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605378', '1810945288805605377', 'operationticket_add', '新增', 'add', '/smart/operationticket/add', 'plus', 1, 2, 1, 1, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605379', '1810945288805605377', 'operationticket_edit', '修改', 'edit', '/smart/operationticket/edit', 'form', 2, 2, 2, 1, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605380', '1810945288805605377', 'operationticket_delete', '删除', 'delete', '/api/smart/operationticket/remove', 'delete', 3, 2, 3, 1, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605381', '1810945288805605377', 'operationticket_view', '查看', 'view', '/smart/operationticket/view', 'file-text', 4, 2, 2, 1, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605382', '1810945288805605377', 'operationticket_col_id', '主键', 'prop', '', '', 5, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605383', '1810945288805605377', 'operationticket_col_kksEncoding', 'KKS编码', 'prop', '', '', 6, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605384', '1810945288805605377', 'operationticket_col_kksDescription', 'KSS描述', 'prop', '', '', 7, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605385', '1810945288805605377', 'operationticket_col_station', '场站', 'prop', '', '', 8, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605386', '1810945288805605377', 'operationticket_col_operationTicketNo', '操作票编号', 'prop', '', '', 9, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605387', '1810945288805605377', 'operationticket_col_operationTicketType', '操作票类型', 'prop', '', '', 10, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605388', '1810945288805605377', 'operationticket_col_workTeam', '工作班组', 'prop', '', '', 11, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605389', '1810945288805605377', 'operationticket_col_workLeader', '工作负责人', 'prop', '', '', 12, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605390', '1810945288805605377', 'operationticket_col_guardian', '监护人', 'prop', '', '', 13, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605391', '1810945288805605377', 'operationticket_col_givingOrdersUser', '发令人', 'prop', '', '', 14, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605392', '1810945288805605377', 'operationticket_col_jobRiskLevel', '作业风险等级', 'prop', '', '', 15, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605393', '1810945288805605377', 'operationticket_col_controlLevel', '控制等级', 'prop', '', '', 16, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605394', '1810945288805605377', 'operationticket_col_plannedStartTime', '计划开始时间', 'prop', '', '', 17, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605395', '1810945288805605377', 'operationticket_col_plannedEndTime', '计划结束时间', 'prop', '', '', 18, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605396', '1810945288805605377', 'operationticket_col_workIssuanceTime', '工作签发时间', 'prop', '', '', 19, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605397', '1810945288805605377', 'operationticket_col_personnelQualification', '人员资格', 'prop', '', '', 20, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605398', '1810945288805605377', 'operationticket_col_personnelState', '人员状态', 'prop', '', '', 21, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605399', '1810945288805605377', 'operationticket_col_personnelPritection', '人员防护', 'prop', '', '', 22, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605400', '1810945288805605377', 'operationticket_col_safeDistance', '安全距离', 'prop', '', '', 23, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605401', '1810945288805605377', 'operationticket_col_wrongInterval', '走错间隔', 'prop', '', '', 24, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605402', '1810945288805605377', 'operationticket_col_securityMeasuresImplement', '安全措施落实', 'prop', '', '', 25, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605403', '1810945288805605377', 'operationticket_col_conductProcessInspections', '开展过程检查', 'prop', '', '', 26, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605404', '1810945288805605377', 'operationticket_col_securityTrainingImplement', '安全培训落实', 'prop', '', '', 27, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605405', '1810945288805605377', 'operationticket_col_other', '其他', 'prop', '', '', 28, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605406', '1810945288805605377', 'operationticket_col_securityMeasuresDisclosure', '安全技术措施交底', 'prop', '', '', 29, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605407', '1810945288805605377', 'operationticket_col_riskControlEvaluation', '作业后风险管控情况评价', 'prop', '', '', 30, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605408', '1810945288805605377', 'operationticket_col_sts', '系统状态', 'prop', '', '', 31, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605409', '1810945288805605377', 'operationticket_col_isQuakified', '是否合格', 'prop', '', '', 32, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1810945288805605410', '1810945288805605377', 'operationticket_col_reviewStatus', '审核状态', 'prop', '', '', 33, 3, 0, 0, NULL, 0);

src/main/java/sql/productioninformation.menu.sql

@@ -0,0 +1,30 @@
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1812723339080069121', 1123598815738675201, 'productioninformation', '', 'menu', '/release/productioninformation', NULL, 1, 1, 0, 1, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1812723339080069122', '1812723339080069121', 'productioninformation_add', '新增', 'add', '/release/productioninformation/add', 'plus', 1, 2, 1, 1, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1812723339080069123', '1812723339080069121', 'productioninformation_edit', '修改', 'edit', '/release/productioninformation/edit', 'form', 2, 2, 2, 1, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1812723339080069124', '1812723339080069121', 'productioninformation_delete', '删除', 'delete', '/api/release/productioninformation/remove', 'delete', 3, 2, 3, 1, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1812723339080069125', '1812723339080069121', 'productioninformation_view', '查看', 'view', '/release/productioninformation/view', 'file-text', 4, 2, 2, 1, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1812723339080069126', '1812723339080069121', 'productioninformation_col_id', '主键', 'prop', '', '', 5, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1812723339080069127', '1812723339080069121', 'productioninformation_col_messageEncoding', '消息编码', 'prop', '', '', 6, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1812723339080069128', '1812723339080069121', 'productioninformation_col_messageTopic', '消息主题', 'prop', '', '', 7, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1812723339080069129', '1812723339080069121', 'productioninformation_col_messageType', '消息类型', 'prop', '', '', 8, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1812723339080069130', '1812723339080069121', 'productioninformation_col_messageContent', '消息内容', 'prop', '', '', 9, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1812723339080069131', '1812723339080069121', 'productioninformation_col_publisher', '发布人', 'prop', '', '', 10, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1812723339080069132', '1812723339080069121', 'productioninformation_col_messageLevel', '消息等级', 'prop', '', '', 11, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1812723339080069133', '1812723339080069121', 'productioninformation_col_isDiscontinue', '是否停用', 'prop', '', '', 12, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1812723339080069134', '1812723339080069121', 'productioninformation_col_releaseTime', '发布时间', 'prop', '', '', 13, 3, 0, 0, NULL, 0);
+INSERT INTO `sys_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1812723339080069135', '1812723339080069121', 'productioninformation_col_checkstatus', '审核状态', 'prop', '', '', 14, 3, 0, 0, NULL, 0);

src/main/resources/application-dev.yml

@@ -2,7 +2,7 @@
 spring:
   redis:
     ##redis 单机环境配置
-    host: 172.16.10.66
+    host: localhost
     port: 6379
     password:
     database: 0
@@ -12,10 +12,15 @@ spring:
     #  nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
     #  commandTimeout: 5000
   datasource:
+#    url: jdbc:postgresql://4s27589o64.vicp.fun:32355/om?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
     url: jdbc:postgresql://192.168.10.102:5432/om?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
     username: admin
     password: 123456
     driver-class-name: org.postgresql.Driver
+#    url: jdbc:mysql://localhost:3306/sys?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+#    username: root
+#    password: 123456
+#    driver-class-name: com.mysql.cj.jdbc.Driver
 
 #第三方登陆
 social: