Merge remote-tracking branch 'origin/main'

main
Dayu 11 months ago
commit 7b102e9390
  1. 164
      src/main/java/org/energy/modules/leger/controller/DynamicledgerController.java
  2. 18
      src/main/java/org/energy/modules/leger/dto/DynamicledgerDTO.java
  3. 72
      src/main/java/org/energy/modules/leger/entity/Dynamicledger.java
  4. 38
      src/main/java/org/energy/modules/leger/mapper/DynamicledgerMapper.java
  5. 256
      src/main/java/org/energy/modules/leger/mapper/DynamicledgerMapper.xml
  6. 38
      src/main/java/org/energy/modules/leger/service/IDynamicledgerService.java
  7. 52
      src/main/java/org/energy/modules/leger/service/impl/DynamicledgerServiceImpl.java
  8. 20
      src/main/java/org/energy/modules/leger/vo/DynamicledgerVO.java

@ -0,0 +1,164 @@
/**
* 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 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.smart.entity.OperationItem;
import org.energy.modules.smart.entity.OperationTicket;
import org.energy.modules.smart.entity.WorkOrder;
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.leger.entity.Dynamicledger;
import org.energy.modules.leger.vo.DynamicledgerVO;
import org.energy.modules.leger.service.IDynamicledgerService;
import com.dayu.daf.core.boot.ctrl.DafController;
import java.util.List;
/**
* L_DYNAMICLEDGER 控制器
*
* @author Daf
* @since 2024-07-17
*/
@RestController
@AllArgsConstructor
@RequestMapping("/leger/dynamicledger")
@Api(value = "L_DYNAMICLEDGER", tags = "L_DYNAMICLEDGER接口")
public class DynamicledgerController extends DafController {
private IDynamicledgerService dynamicledgerService;
/**
* 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入dynamicledger")
public R<Dynamicledger> detail(Dynamicledger dynamicledger) {
Dynamicledger detail = dynamicledgerService.getOne(Condition.getQueryWrapper(dynamicledger));
return R.data(detail);
}
/**
* 分页 L_DYNAMICLEDGER
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入dynamicledger")
public R<IPage<Dynamicledger>> list(Dynamicledger dynamicledger, Query query) {
IPage<Dynamicledger> pages = dynamicledgerService.selectDynamicledgerPageExt(Condition.getPage(query), dynamicledger);
return R.data(pages);
}
/**
* 自定义分页 L_DYNAMICLEDGER
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入dynamicledger")
public R<IPage<DynamicledgerVO>> page(DynamicledgerVO dynamicledger, Query query) {
IPage<DynamicledgerVO> pages = dynamicledgerService.selectDynamicledgerPage(Condition.getPage(query), dynamicledger);
return R.data(pages);
}
/**
* 新增 L_DYNAMICLEDGER
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入dynamicledger")
public R save(@Valid @RequestBody Dynamicledger dynamicledger) {
return R.status(dynamicledgerService.save(dynamicledger));
}
/**
* 修改 L_DYNAMICLEDGER
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入dynamicledger")
public R update(@Valid @RequestBody Dynamicledger dynamicledger) {
return R.status(dynamicledgerService.updateById(dynamicledger));
}
/**
* 新增或修改 L_DYNAMICLEDGER
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入dynamicledger")
public R submit(@Valid @RequestBody Dynamicledger dynamicledger) {
return R.status(dynamicledgerService.saveOrUpdate(dynamicledger));
}
/**
* 删除 L_DYNAMICLEDGER
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(dynamicledgerService.deleteLogic(Func.toLongList(ids)));
}
/**
* 工单
*/
@GetMapping("/workOrder")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "分页", notes = "传入dynamicledger")
public R<List<WorkOrder>> getWorkOrederList(Dynamicledger dynamicledger) {
List<WorkOrder> list = dynamicledgerService.getWorkOrederListbyKksCd(dynamicledger);
return R.data(list);
}
/**
* 工作票
*/
@GetMapping("/workticket")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "分页", notes = "传入dynamicledger")
public R<List<WorkPermit>> getWorkticketList(Dynamicledger dynamicledger) {
List<WorkPermit> list = dynamicledgerService.getWorkticketListbyKksCd(dynamicledger);
return R.data(list);
}
/**
* 操作票
*/
@GetMapping("/operation")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "分页", notes = "传入dynamicledger")
public R<List<OperationTicket>> getoOperationList(Dynamicledger dynamicledger) {
List<OperationTicket> list = dynamicledgerService.getOperationListbyKksCd( dynamicledger);
return R.data(list);
}
}

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

@ -0,0 +1,72 @@
package org.energy.modules.leger.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;
/**
* L_DYNAMICLEDGER实体类
*
* @author Daf
* @since 2024-07-17
*/
@Data
@TableName("l_dynamicledger")
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "Dynamicledger对象", description = "L_DYNAMICLEDGER")
public class Dynamicledger extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@ApiModelProperty(value = "主键")
private Long id;
/**
* 场站
*/
@ApiModelProperty(value = "场站")
private Integer station;
/**
* KKS编码
*/
@ApiModelProperty(value = "KKS编码")
private String kksEncoding;
/**
* KSS描述
*/
@ApiModelProperty(value = "KSS描述")
private String kksDescription;
/**
* 工单
*/
@ApiModelProperty(value = "工单")
private Integer workOrder;
/**
* 工作票
*/
@ApiModelProperty(value = "工作票")
private Integer workTicket;
/**
* 操作票
*/
@ApiModelProperty(value = "操作票")
private Integer operation;
/**
* 开始日期
*/
@ApiModelProperty(value = "开始日期")
private String startDate;
/**
* 结束日期
*/
@ApiModelProperty(value = "结束日期")
private String endDate;
}

@ -0,0 +1,38 @@
package org.energy.modules.leger.mapper;
import org.apache.ibatis.annotations.Param;
import org.energy.modules.leger.entity.Dynamicledger;
import org.energy.modules.leger.vo.DynamicledgerVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.energy.modules.smart.entity.OperationTicket;
import org.energy.modules.smart.entity.WorkOrder;
import org.energy.modules.smart.entity.WorkPermit;
import java.util.List;
/**
* L_DYNAMICLEDGER Mapper 接口
*
* @author Daf
* @since 2024-07-17
*/
public interface DynamicledgerMapper extends BaseMapper<Dynamicledger> {
/**
* 自定义分页
*
* @param page
* @param dynamicledger
* @return
*/
List<DynamicledgerVO> selectDynamicledgerPage(IPage page, DynamicledgerVO dynamicledger);
List<Dynamicledger> selectDynamicledgerPageExt(IPage page, @Param("entity")Dynamicledger dynamicledger);
List<WorkOrder> getWorkOrederListbyKksCd( @Param("entity")Dynamicledger dynamicledger);
List<WorkPermit> getWorkticketListbyKksCd(@Param("entity") Dynamicledger dynamicledger);
List<OperationTicket> getOperationListbyKksCd( @Param("entity")Dynamicledger dynamicledger);
}

@ -0,0 +1,256 @@
<?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.leger.mapper.DynamicledgerMapper">
<!-- 通用查询映射结果 -->
<resultMap id="dynamicledgerResultMap" type="org.energy.modules.leger.entity.Dynamicledger">
<id column="id" property="id"/>
<result column="status" property="status"/>
<result column="create_time" property="createTime"/>
<result column="create_user" property="createUser"/>
<result column="update_time" property="updateTime"/>
<result column="update_user" property="updateUser"/>
<result column="is_deleted" property="isDeleted"/>
<result column="station" property="station"/>
<result column="kks_encoding" property="kksEncoding"/>
<result column="kks_description" property="kksDescription"/>
<result column="work_order" property="workOrder"/>
<result column="work_ticket" property="workTicket"/>
<result column="operation" property="operation"/>
<result column="start_date" property="startDate"/>
<result column="end_date" property="endDate"/>
</resultMap>
<select id="selectDynamicledgerPage" resultMap="dynamicledgerResultMap">
select * from l_dynamicledger where is_deleted = 0
</select>
<select id="selectDynamicledgerPageExt" resultMap="dynamicledgerResultMap">
select
a.station as status
,a.kks_encoding
, a.kks_description
, kk.work_order
, jj.work_ticket
, ll.operation
from
l_equipment_ledger a
, (
select
aa.kks_encoding
, count(b.equipment_ledger_id) as work_order
from
l_equipment_ledger aa
left join smt_work_order b
on aa.id = b.equipment_ledger_id
and b.is_deleted = '0'
<if test="entity.station!= null and entity.station!= ''">
and aa.station = #{entity.station}
</if>
<if test="entity.kksEncoding!= null and entity.kksEncoding!= ''">
and aa.kks_encoding like CONCAT('%',#{entity.kksEncoding}, '%')
</if>
<if test="entity.startDate != null and entity.startDate!= ''">
and cast(b.occurrence_time as character varying) &gt;= #{entity.startDate}
</if>
<if test="entity.endDate != null and entity.endDate != ''">
and cast(b.end_time as character varying) &lt;= #{entity.endDate}
</if>
where
aa.is_deleted = '0'
group by
aa.kks_encoding
) kk
, (
select
aa.kks_encoding
, count(c.work_ticket_no) as work_ticket
from
l_equipment_ledger aa
left join smt_work_permit c
on aa.kks_encoding = c.kks_encoding
and c.is_deleted = '0'
<if test="entity.station != null and entity.station != ''">
and aa.station = #{entity.station}
</if>
<if test="entity.kksEncoding!= null and entity.kksEncoding!= ''">
and aa.kks_encoding like CONCAT('%',#{entity.kksEncoding}, '%')
</if>
<if test="entity.startDate != null and entity.startDate!= ''">
and cast(c.plan_start_date as character varying) &gt;= #{entity.startDate}
</if>
<if test="entity.endDate != null and entity.endDate != ''">
and cast(c.plan_end_date as character varying) &lt;= #{entity.endDate}
</if>
where
aa.is_deleted = '0'
group by
aa.kks_encoding
) jj
, (
select
aa.kks_encoding
, count(d.operation_ticket_no) as operation
from
l_equipment_ledger aa
left join smt_operation_ticket d
on aa.kks_encoding = d.kks_encoding
and d.is_deleted = '0'
<if test="entity.station != null and entity.station!= ''">
and aa.station = #{entity.station}
</if>
<if test="entity.kksEncoding!= null and entity.kksEncoding!= ''">
and aa.kks_encoding like CONCAT('%',#{entity.kksEncoding}, '%')
</if>
<if test="entity.startDate != null and entity.startDate!= ''">
and cast(d.planned_start_time as character varying) &gt;= #{entity.startDate}
</if>
<if test="entity.endDate != null and entity.endDate != ''">
and cast(d.planned_end_time as character varying) &lt;= #{entity.endDate}
</if>
where
aa.is_deleted = '0'
group by
aa.kks_encoding
) ll
where
a.kks_encoding = kk.kks_encoding
and a.kks_encoding = jj.kks_encoding
and a.kks_encoding = ll.kks_encoding
and a.is_deleted = '0'
<if test="entity.station != null and entity.station!= ''">
and a.station = #{entity.station}
</if>
<if test="entity.kksEncoding!= null and entity.kksEncoding!= ''">
and a.kks_encoding like CONCAT('%',#{entity.kksEncoding}, '%')
</if>
</select>
<!-- 通用查询映射结果 -->
<resultMap id="workOrderResultMap" type="org.energy.modules.smart.entity.WorkOrder">
<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="id" property="id"/>
<result column="equipment_ledger_id" property="equipmentLedgerId"/>
<result column="work_order_no" property="workOrderNo"/>
<result column="work_order_type" property="workOrderType"/>
<result column="description" property="description"/>
<result column="manager_user_id" property="managerUserId"/>
<result column="responsibility_team" property="responsibilityTeam"/>
<result column="planned_factory" property="plannedFactory"/>
<result column="maintenance_task_type" property="maintenanceTaskType"/>
<result column="user_status" property="userStatus"/>
<result column="occurrence_time" property="occurrenceTime"/>
<result column="task_team" property="taskTeam"/>
<result column="processing_time" property="processingTime"/>
<result column="cause_incident" property="causeIncident"/>
<result column="process_description" property="processDescription"/>
<result column="end_time" property="endTime"/>
<result column="handling_result" property="handlingResult"/>
<result column="approval_status" property="approvalStatus"/>
</resultMap>
<select id="getWorkOrederListbyKksCd" resultMap="workOrderResultMap">
select
b.*
from
l_equipment_ledger a
, smt_work_order b
where
a.id = b.equipment_ledger_id
and a.is_deleted = '0'
and b.is_deleted = '0'
and a.kks_encoding = #{entity.kksEncoding}
</select>
<!-- 通用查询映射结果 -->
<resultMap id="WorkticketResultMap" type="org.energy.modules.smart.entity.WorkPermit">
<id column="id" property="id"/>
<result column="status" property="status"/>
<result column="create_time" property="createTime"/>
<result column="create_user" property="createUser"/>
<result column="update_time" property="updateTime"/>
<result column="update_user" property="updateUser"/>
<result column="is_deleted" property="isDeleted"/>
<result column="kks_encoding" property="kksEncoding"/>
<result column="kks_description" property="kksDescription"/>
<result column="stations" property="stations"/>
<result column="work_ticket_no" property="workTicketNo"/>
<result column="work_ticket_type" property="workTicketType"/>
<result column="tickets" property="tickets"/>
<result column="team" property="team"/>
<result column="work_charge_person" property="workChargePerson"/>
<result column="work_class_members" property="workClassMembers"/>
<result column="licensors" property="licensors"/>
<result column="issuer" property="issuer"/>
<result column="functional_location" property="functionalLocation"/>
<result column="place_work" property="placeWork"/>
<result column="job_description" property="jobDescription"/>
<result column="plan_start_date" property="planStartDate"/>
<result column="plan_end_date" property="planEndDate"/>
<result column="working_conditions" property="workingConditions"/>
<result column="actual_end_date" property="actualEndDate"/>
<result column="is_extended" property="isExtended"/>
<result column="planned_extension_date" property="plannedExtensionDate"/>
<result column="ext_reg_reason" property="extRegReason"/>
<result column="ischanged" property="ischanged"/>
<result column="change_reason" property="changeReason"/>
<result column="summary" property="summary"/>
<result column="work_state" property="workState"/>
<result column="check_status" property="checkStatus"/>
</resultMap>
<select id="getWorkticketListbyKksCd" resultMap="WorkticketResultMap">
select * from smt_work_permit where is_deleted = '0'
and kks_encoding = #{entity.kksEncoding}
</select>
<resultMap id="OperationResultMap" type="org.energy.modules.smart.entity.OperationTicket">
<id column="id" property="id"/>
<result column="status" property="status"/>
<result column="create_time" property="createTime"/>
<result column="create_user" property="createUser"/>
<result column="update_time" property="updateTime"/>
<result column="update_user" property="updateUser"/>
<result column="is_deleted" property="isDeleted"/>
<result column="kks_encoding" property="kksEncoding"/>
<result column="kks_description" property="kksDescription"/>
<result column="station" property="station"/>
<result column="operation_ticket_no" property="operationTicketNo"/>
<result column="operation_ticket_type" property="operationTicketType"/>
<result column="work_team" property="workTeam"/>
<result column="work_leader" property="workLeader"/>
<result column="guardian" property="guardian"/>
<result column="giving_orders_user" property="givingOrdersUser"/>
<result column="job_risk_level" property="jobRiskLevel"/>
<result column="control_level" property="controlLevel"/>
<result column="planned_start_time" property="plannedStartTime"/>
<result column="planned_end_time" property="plannedEndTime"/>
<result column="work_issuance_time" property="workIssuanceTime"/>
<result column="personnel_qualification" property="personnelQualification"/>
<result column="personnel_state" property="personnelState"/>
<result column="personnel_pritection" property="personnelPritection"/>
<result column="safe_distance" property="safeDistance"/>
<result column="wrong_interval" property="wrongInterval"/>
<result column="security_measures_implement" property="securityMeasuresImplement"/>
<result column="conduct_process_inspections" property="conductProcessInspections"/>
<result column="security_training_implement" property="securityTrainingImplement"/>
<result column="other" property="other"/>
<result column="security_measures_disclosure" property="securityMeasuresDisclosure"/>
<result column="risk_control_evaluation" property="riskControlEvaluation"/>
<result column="sts" property="sts"/>
<result column="is_quakified" property="isQuakified"/>
<result column="review_status" property="reviewStatus"/>
</resultMap>
<select id="getOperationListbyKksCd" resultMap="OperationResultMap">
select * from smt_operation_ticket where is_deleted = '0'
and kks_encoding = #{entity.kksEncoding}
</select>
</mapper>

@ -0,0 +1,38 @@
package org.energy.modules.leger.service;
import org.energy.modules.leger.entity.Dynamicledger;
import org.energy.modules.leger.vo.DynamicledgerVO;
import com.dayu.daf.core.mp.base.BaseService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.energy.modules.smart.entity.OperationTicket;
import org.energy.modules.smart.entity.WorkOrder;
import org.energy.modules.smart.entity.WorkPermit;
import java.util.List;
/**
* L_DYNAMICLEDGER 服务类
*
* @author Daf
* @since 2024-07-17
*/
public interface IDynamicledgerService extends BaseService<Dynamicledger> {
/**
* 自定义分页
*
* @param page
* @param dynamicledger
* @return
*/
IPage<DynamicledgerVO> selectDynamicledgerPage(IPage<DynamicledgerVO> page, DynamicledgerVO dynamicledger);
IPage<Dynamicledger> selectDynamicledgerPageExt(IPage<Dynamicledger> page, Dynamicledger dynamicledger);
List<WorkOrder> getWorkOrederListbyKksCd(Dynamicledger dynamicledger);
List<WorkPermit> getWorkticketListbyKksCd(Dynamicledger dynamicledger);
List<OperationTicket> getOperationListbyKksCd( Dynamicledger dynamicledger);
}

@ -0,0 +1,52 @@
package org.energy.modules.leger.service.impl;
import org.energy.modules.leger.entity.Dynamicledger;
import org.energy.modules.leger.vo.DynamicledgerVO;
import org.energy.modules.leger.mapper.DynamicledgerMapper;
import org.energy.modules.leger.service.IDynamicledgerService;
import com.dayu.daf.core.mp.base.BaseServiceImpl;
import org.energy.modules.smart.entity.OperationTicket;
import org.energy.modules.smart.entity.WorkOrder;
import org.energy.modules.smart.entity.WorkPermit;
import org.energy.modules.smart.vo.WorkOrderVO;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;
/**
* L_DYNAMICLEDGER 服务实现类
*
* @author Daf
* @since 2024-07-17
*/
@Service
public class DynamicledgerServiceImpl extends BaseServiceImpl<DynamicledgerMapper, Dynamicledger> implements IDynamicledgerService {
@Override
public IPage<DynamicledgerVO> selectDynamicledgerPage(IPage<DynamicledgerVO> page, DynamicledgerVO dynamicledger) {
return page.setRecords(baseMapper.selectDynamicledgerPage(page, dynamicledger));
}
@Override
public IPage<Dynamicledger> selectDynamicledgerPageExt(IPage<Dynamicledger> page, Dynamicledger dynamicledger) {
return page.setRecords(baseMapper.selectDynamicledgerPageExt(page, dynamicledger));
}
@Override
public List<WorkOrder> getWorkOrederListbyKksCd(Dynamicledger dynamicledger) {
return baseMapper.getWorkOrederListbyKksCd(dynamicledger);
}
@Override
public List<WorkPermit> getWorkticketListbyKksCd( Dynamicledger dynamicledger) {
return baseMapper.getWorkticketListbyKksCd(dynamicledger);
}
@Override
public List<OperationTicket> getOperationListbyKksCd(Dynamicledger dynamicledger) {
return baseMapper.getOperationListbyKksCd(dynamicledger);
}
}

@ -0,0 +1,20 @@
package org.energy.modules.leger.vo;
import org.energy.modules.leger.entity.Dynamicledger;
import lombok.Data;
import lombok.EqualsAndHashCode;
import io.swagger.annotations.ApiModel;
/**
* L_DYNAMICLEDGER视图实体类
*
* @author Daf
* @since 2024-07-17
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "DynamicledgerVO对象", description = "L_DYNAMICLEDGER")
public class DynamicledgerVO extends Dynamicledger {
private static final long serialVersionUID = 1L;
}
Loading…
Cancel
Save