Commit 121aaf13 authored by renchao's avatar renchao
parents 49e234cd 5c5c73c2
package cn.wise.sc.acquisition.business.controller;
import cn.wise.im.common.http.R;
import cn.wise.sc.acquisition.business.constant.Rcode;
import cn.wise.sc.acquisition.business.service.IDataStatisticsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 前端控制器
* </p>
*
* @author ztw
* @since 2021-04-26
*/
@Api(tags = "数据统计")
@RestController
@RequestMapping("/business/t-processes-truck")
@Validated
public class DataStatisticsController {
@Autowired
private IDataStatisticsService dataStatisticsService;
@ApiOperation(value = "统计概览-检测项数量统计")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "type", value = "类型1:图 2:表", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "cycle", value = "统计周期1:本周 2:本月 3:本季度,4:本年", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "startDate", value = "开始日期", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "endDate", value = "结束日期", paramType = "query", dataType = "String")
})
@GetMapping("/countByPhoto")
public R countByPhoto(Integer type, String TruckID, Integer cycle, String startDate, String endDate) {
Rcode.NOT_PARAM.assertNotNull(type);
if(type == 1){
return dataStatisticsService.countByPhoto(TruckID, cycle, startDate, endDate);
}else if(type == 2){
return dataStatisticsService.countByTable(TruckID, cycle, startDate, endDate);
}else{
return R.fail(402, "参数错误");
}
}
}
......@@ -10,11 +10,7 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
/**
* <p>
......@@ -44,7 +40,7 @@ public class TEquipmentAccountController {
@ApiOperation(value = "新增设备")
@PostMapping("/create")
public R create(TEquipmentAccountQuery query) {
public R create(@RequestBody TEquipmentAccountQuery query) {
return equipmentAccountService.create(query);
}
......
package cn.wise.sc.acquisition.business.controller;
import cn.wise.im.common.http.R;
import cn.wise.sc.acquisition.business.model.PageQuery;
import cn.wise.sc.acquisition.business.model.query.TEquipmentAccountQuery;
import cn.wise.sc.acquisition.business.model.query.TEquipmentCheckQuery;
import cn.wise.sc.acquisition.business.service.ITEquipmentCheckService;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotBlank;
/**
* <p>
* 前端控制器
* </p>
*
* @author ztw
* @since 2021-04-25
*/
@Api(tags = "设备点检管理")
@RestController
@RequestMapping("/business/t-equipment-check")
@Validated
public class TEquipmentCheckController {
@Autowired
private ITEquipmentCheckService equipmentCheckService;
@ApiOperation(value = "设备点检分页")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "EquipmentName", value = "设备名称", paramType = "query", dataType = "EquipmentName")
})
@GetMapping("/getPage")
public R getPage(PageQuery pageQuery, String EquipmentName) {
return equipmentCheckService.getPage(pageQuery, EquipmentName);
}
@ApiOperation(value = "设备点检详情")
@GetMapping("/getDetail/{EquipmentID}")
public R getDetail(@PathVariable @NotBlank String EquipmentID) {
return equipmentCheckService.getDetail(EquipmentID);
}
@ApiOperation(value = "保存设备点检结果")
@PostMapping("/checking")
public R update(@RequestBody TEquipmentCheckQuery query) {
return equipmentCheckService.checking(query);
}
}
package cn.wise.sc.acquisition.business.controller;
import cn.wise.im.common.http.R;
import cn.wise.sc.acquisition.business.model.PageQuery;
import cn.wise.sc.acquisition.business.model.query.TEquipmentRunQuery;
import cn.wise.sc.acquisition.business.service.ITEquipmentRunService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotBlank;
/**
* <p>
* 前端控制器
* </p>
*
* @author ztw
* @since 2021-04-25
*/
@Api(tags = "设备运行管理")
@RestController
@RequestMapping("/business/t-equipment-run")
@Validated
public class TEquipmentRunController {
@Autowired
private ITEquipmentRunService equipmentRunService;
@ApiOperation(value = "设备运行分页")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "EquipmentName", value = "设备名称", paramType = "query", dataType = "EquipmentName")
})
@GetMapping("/getPage")
public R getPage(PageQuery pageQuery, String EquipmentName) {
return equipmentRunService.getPage(pageQuery, EquipmentName);
}
@ApiOperation(value = "设备运行详情")
@GetMapping("/getDetail/{EquipmentID}")
public R getDetail(@PathVariable @NotBlank String EquipmentID) {
return equipmentRunService.getDetail(EquipmentID);
}
@ApiOperation(value = "保存设备运行结果")
@PostMapping("/running")
public R running(@RequestBody TEquipmentRunQuery query) {
return equipmentRunService.running(query);
}
}
package cn.wise.sc.acquisition.business.controller;
import cn.wise.im.common.http.R;
import cn.wise.sc.acquisition.business.model.PageQuery;
import cn.wise.sc.acquisition.business.model.query.TEquipmentTroubleQuery;
import cn.wise.sc.acquisition.business.service.ITEquipmentTroubleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotBlank;
/**
* <p>
* 前端控制器
* </p>
*
* @author ztw
* @since 2021-04-25
*/
@Api(tags = "设备隐患管理")
@RestController
@RequestMapping("/business/t-equipment-trouble")
@Validated
public class TEquipmentTroubleController {
@Autowired
private ITEquipmentTroubleService equipmentTroubleService;
@ApiOperation(value = "设备隐患分页")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "EquipmentName", value = "设备名称", paramType = "query", dataType = "EquipmentName")
})
@GetMapping("/getPage")
public R getPage(PageQuery pageQuery, String EquipmentName) {
return equipmentTroubleService.getPage(pageQuery, EquipmentName);
}
@ApiOperation(value = "设备隐患详情")
@GetMapping("/getDetail/{EquipmentID}")
public R getDetail(@PathVariable @NotBlank String EquipmentID) {
return equipmentTroubleService.getDetail(EquipmentID);
}
@ApiOperation(value = "保存设备隐患结果")
@PostMapping("/trouble")
public R trouble(@RequestBody TEquipmentTroubleQuery query) {
return equipmentTroubleService.trouble(query);
}
}
package cn.wise.sc.acquisition.business.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 前端控制器
* </p>
*
* @author ztw
* @since 2021-04-26
*/
@RestController
@RequestMapping("/business/t-processes-truck")
public class TProcessesTruckController {
}
package cn.wise.sc.acquisition.business.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 前端控制器
* </p>
*
* @author ztw
* @since 2021-04-26
*/
@RestController
@RequestMapping("/business/t-weight")
public class TWeightController {
}
package cn.wise.sc.acquisition.business.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2021-04-25
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("T_Equipment_Check")
public class TEquipmentCheck implements Serializable {
private static final long serialVersionUID=1L;
/**
* ID号
*/
@TableId("Uid")
private String Uid;
/**
* 设备编码
*/
@TableField("EquipmentID")
private String EquipmentID;
/**
* 设备名称
*/
@TableField("EquipmentName")
private String EquipmentName;
/**
* 点检部位
*/
@TableField("Djbw")
private String Djbw;
/**
* 点检内容
*/
@TableField("Djnr")
private String Djnr;
/**
* 点检标准
*/
@TableField("Djbz")
private String Djbz;
/**
* 点检周期
*/
@TableField("Djzq")
private Integer Djzq;
/**
* 周期类型,天、月等
*/
@TableField("Zqlx")
private String Zqlx;
/**
* 点检结果,正常、异常
*/
@TableField("Djjg")
private String Djjg;
/**
* 异常记录
*/
@TableField("Ycjl")
private String Ycjl;
/**
* 点检人
*/
@TableField("Djr")
private String Djr;
/**
* 点检日期
*/
@TableField("Djrq")
private LocalDateTime Djrq;
}
package cn.wise.sc.acquisition.business.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2021-04-25
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("T_Equipment_Run")
public class TEquipmentRun implements Serializable {
private static final long serialVersionUID=1L;
@TableId("Uid")
private String Uid;
/**
* 设备编码
*/
@TableField("EquipmentID")
private String EquipmentID;
/**
* 设备名称
*/
@TableField("EquipmentName")
private String EquipmentName;
/**
* 运行日期
*/
@TableField("RunDate")
private LocalDateTime RunDate;
/**
* 当天运行时间h
*/
@TableField("RunHour")
private Float RunHour;
/**
* 当天停机时间
*/
@TableField("StopHour")
private Float StopHour;
/**
* 停机原因:故障/维修/保养
*/
@TableField("StopType")
private String StopType;
/**
* 驾驶员/操作人员
*/
@TableField("Driver")
private String Driver;
/**
* 填写人
*/
@TableField("Txr")
private String Txr;
/**
* 日期标记,如:2021年01月
*/
@TableField("Tag")
private String Tag;
}
package cn.wise.sc.acquisition.business.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2021-04-25
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("T_Equipment_Trouble")
public class TEquipmentTrouble implements Serializable {
private static final long serialVersionUID=1L;
/**
* ID号
*/
@TableId("Uid")
private String Uid;
/**
* 设备编码
*/
@TableField("EquipmentID")
private String EquipmentID;
/**
* 设备名称
*/
@TableField("EquipmentName")
private String EquipmentName;
/**
* 隐患发现人
*/
@TableField("Fxr")
private String Fxr;
/**
* 隐患发现日期
*/
@TableField("Fxrq")
private LocalDateTime Fxrq;
/**
* 隐患描述
*/
@TableField("Yhms")
private String Yhms;
/**
* 隐患处理措施
*/
@TableField("Clcs")
private String Clcs;
/**
* 隐患处理日期
*/
@TableField("Clrq")
private LocalDateTime Clrq;
/**
* 是否已修好:1是,0否
*/
private String clr;
/**
* 填报人
*/
@TableField("Txr")
private String Txr;
/**
* 填报日期
*/
@TableField("Txrq")
private LocalDateTime Txrq;
/**
* 隐患处理状态:已处理和未处理
*/
@TableField("Clzt")
private String Clzt;
}
package cn.wise.sc.acquisition.business.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2021-04-26
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("T_Processes_Truck")
public class TProcessesTruck implements Serializable {
private static final long serialVersionUID=1L;
/**
* ID号
*/
@TableId("Uid")
private String Uid;
/**
* 采区名称
*/
@TableField("StopeName")
private String StopeName;
/**
* 平台名称
*/
@TableField("StepName")
private String StepName;
/**
* 爆区名称
*/
@TableField("BlastAreaName")
private String BlastAreaName;
/**
* 运输日期
*/
@TableField("DeliveryDate")
private LocalDateTime DeliveryDate;
/**
* 项目经理
*/
@TableField("Manager")
private String Manager;
/**
* 主管项目领导
*/
@TableField("Supervisor")
private String Supervisor;
/**
* 生产技术部
*/
@TableField("TechDepart")
private String TechDepart;
/**
* 制表人
*/
@TableField("Tabulator")
private String Tabulator;
/**
* 矿车编号
*/
@TableField("TruckID")
private String TruckID;
/**
* 矿车司机
*/
@TableField("Driver")
private String Driver;
/**
* 挖机编号
*/
@TableField("ExcavatorID")
private String ExcavatorID;
/**
* 运距
*/
@TableField("Distance")
private Float Distance;
/**
* 装车内容
*/
@TableField("WorkType")
private String WorkType;
/**
* 矿车开始读数(H)
*/
@TableField("StartTime")
private Float StartTime;
/**
* 矿车结束读数(H)
*/
@TableField("EndTime")
private Float EndTime;
/**
* 矿车工作时间(H)
*/
@TableField("WorkTime")
private Float WorkTime;
/**
* 车数合计
*/
@TableField("Cshj")
private Integer Cshj;
/**
* 吨位合计
*/
@TableField("Dwhj")
private Double Dwhj;
/**
* 吨公里合计
*/
@TableField("Dglhj")
private Double Dglhj;
/**
* 备注
*/
@TableField("Bz")
private String Bz;
/**
* 日期标记,如:2021年01月
*/
@TableField("Tag")
private String Tag;
}
package cn.wise.sc.acquisition.business.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2021-04-26
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("T_Weight")
public class TWeight implements Serializable {
private static final long serialVersionUID=1L;
/**
* ID号
*/
@TableId("Uid")
private String Uid;
/**
* 日期
*/
@TableField("Rq")
private String Rq;
/**
* 时间
*/
@TableField("Sj")
private String Sj;
/**
* 矿车编号
*/
@TableField("TruckID")
private String TruckID;
/**
* 总毛重
*/
@TableField("Mz")
private Float Mz;
/**
* 总皮重
*/
@TableField("Pz")
private Float Pz;
/**
* 总净重
*/
@TableField("Jz")
private Float Jz;
/**
* 日期标记,如:2021年01月
*/
@TableField("Tag")
private String Tag;
}
package cn.wise.sc.acquisition.business.mapper;
import cn.wise.sc.acquisition.business.model.vo.DataStatisticsTableVo;
import cn.wise.sc.acquisition.business.model.vo.DataStatisticsVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* <p>
* Mapper 接口
* </p>
*
* @author ztw
* @since 2020-08-07
*/
public interface DataStatisticsMapper {
List<DataStatisticsVo> countByPhoto(@Param("params") Map<String, Object> params);
List<DataStatisticsTableVo> countByTable(@Param("params") Map<String, Object> params);
}
package cn.wise.sc.acquisition.business.mapper;
import cn.wise.sc.acquisition.business.entity.TEquipmentCheck;
import cn.wise.sc.acquisition.business.model.vo.TEquipmentCheckVo;
import cn.wise.sc.acquisition.business.model.vo.UserVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.util.Map;
/**
* <p>
* Mapper 接口
* </p>
*
* @author ztw
* @since 2021-04-25
*/
public interface TEquipmentCheckMapper extends BaseMapper<TEquipmentCheck> {
IPage<TEquipmentCheckVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
}
package cn.wise.sc.acquisition.business.mapper;
import cn.wise.sc.acquisition.business.entity.TEquipmentRun;
import cn.wise.sc.acquisition.business.model.vo.TEquipmentCheckVo;
import cn.wise.sc.acquisition.business.model.vo.TEquipmentRunVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.util.Map;
/**
* <p>
* Mapper 接口
* </p>
*
* @author ztw
* @since 2021-04-25
*/
public interface TEquipmentRunMapper extends BaseMapper<TEquipmentRun> {
IPage<TEquipmentRunVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
}
package cn.wise.sc.acquisition.business.mapper;
import cn.wise.sc.acquisition.business.entity.TEquipmentTrouble;
import cn.wise.sc.acquisition.business.model.vo.TEquipmentCheckVo;
import cn.wise.sc.acquisition.business.model.vo.TEquipmentTroubleVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.util.Map;
/**
* <p>
* Mapper 接口
* </p>
*
* @author ztw
* @since 2021-04-25
*/
public interface TEquipmentTroubleMapper extends BaseMapper<TEquipmentTrouble> {
IPage<TEquipmentTroubleVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
}
package cn.wise.sc.acquisition.business.mapper;
import cn.wise.sc.acquisition.business.entity.TProcessesTruck;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author ztw
* @since 2021-04-26
*/
public interface TProcessesTruckMapper extends BaseMapper<TProcessesTruck> {
}
package cn.wise.sc.acquisition.business.mapper;
import cn.wise.sc.acquisition.business.entity.TWeight;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author ztw
* @since 2021-04-26
*/
public interface TWeightMapper extends BaseMapper<TWeight> {
}
<?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="cn.wise.sc.acquisition.business.mapper.DataStatisticsMapper">
<select id="countByPhoto" resultType="cn.wise.sc.acquisition.business.model.vo.DataStatisticsVo">
SELECT tw.Rq as name, SUM(tw.Jz) as value
FROM T_Weight tw
where 1=1
<if test="params.cycle == 1 ">
and datediff(week, tw.Rq,getdate())=0
</if>
<if test="params.cycle == 2 ">
and datediff(month, tw.Rq,getdate())=0
</if>
<if test="params.cycle = 3 ">
and datediff(quarter, tw.Rq,getdate())=0
</if>
<if test="params.cycle = 4 ">
and datediff(year, tw.Rq,getdate())=0
</if>
<if test="params.startDate != null and params.startDate != ''">
and tw.Rq > &gt;= #{params.startDate}
</if>
<if test="params.endDate != null and params.endDate != ''">
and tw.Rq > &lt;= #{params.endDate}
</if>
<if test="params.startDate == null and params.endDate == null">
and datediff(week, tw.Rq,getdate())=0
</if>
group by tw.Rq
</select>
<select id="countByTable" resultType="cn.wise.sc.acquisition.business.model.vo.DataStatisticsTableVo">
SELECT tw.Uid,tw.Rq,tw.Sj,tw.TruckID,'发货单位' as clientName,tpt.WorkType,tw.Mz,tw.Pz,tw.Jz
FROM T_Weight tw
left join T_Processes_Truck tpt on tpt.TruckID = tw.TruckID
where 1=1
<if test="params.cycle == 1 ">
and datediff(week, tw.Rq,getdate())=0
</if>
<if test="params.cycle == 2 ">
and datediff(month, tw.Rq,getdate())=0
</if>
<if test="params.cycle = 3 ">
and datediff(quarter, tw.Rq,getdate())=0
</if>
<if test="params.cycle = 4 ">
and datediff(year, tw.Rq,getdate())=0
</if>
<if test="params.startDate != null and params.startDate != ''">
and tw.Rq > &gt;= #{params.startDate}
</if>
<if test="params.endDate != null and params.endDate != ''">
and tw.Rq > &lt;= #{params.endDate}
</if>
<if test="params.startDate == null and params.endDate == null">
and datediff(week, tw.Rq,getdate())=0
</if>
</select>
</mapper>
<?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="cn.wise.sc.acquisition.business.mapper.TEquipmentCheckMapper">
<select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TEquipmentCheckVo">
select tea.EquipmentID,tea.EquipmentName,
tec.Uid,tec.Djbw,tec.Djnr,tec.Djbz,tec.Djzq,tec.Zqlx,tec.Djjg,tec.Ycjl,tec.Djr,tec.Djrq
from T_Equipment_Account tea
left join T_Equipment_Check tec on tec.EquipmentID = tea.EquipmentID
<include refid="where"/>
order by tea.Ccrq desc
</select>
<sql id="where">
<where>
<if test="params.Djr != null and params.Djr != ''">
and tec.Djr = #{params.Djr}
</if>
<if test="params.EquipmentName != null and params.EquipmentName != ''">
and tea.EquipmentName like concat('%', #{params.EquipmentName}, '%')
</if>
</where>
</sql>
</mapper>
<?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="cn.wise.sc.acquisition.business.mapper.TEquipmentRunMapper">
<select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TEquipmentRunVo">
select tea.EquipmentID,tea.EquipmentName,
ter.Uid,ter.RunDate,ter.RunHour,ter.StopHour,ter.StopType,ter.Driver,ter.Txr,ter.Tag
from T_Equipment_Account tea
left join T_Equipment_Run ter on ter.EquipmentID = tea.EquipmentID
<include refid="where"/>
order by tea.Ccrq desc
</select>
<sql id="where">
<where>
<if test="params.Txr != null and params.Txr != ''">
and ter.Txr = #{params.Txr}
</if>
<if test="params.EquipmentName != null and params.EquipmentName != ''">
and tea.EquipmentName like concat('%', #{params.EquipmentName}, '%')
</if>
</where>
</sql>
</mapper>
<?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="cn.wise.sc.acquisition.business.mapper.TEquipmentTroubleMapper">
<select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TEquipmentTroubleVo">
select tea.EquipmentID,tea.EquipmentName,
tet.Uid,tet.Fxr,tet.Fxrq,tet.Yhms,tet.Clcs,tet.Clrq,tet.clr,tet.Txr,tet.Txrq,tet.Clzt
from T_Equipment_Account tea
left join T_Equipment_Trouble tet on tet.EquipmentID = tea.EquipmentID
<include refid="where"/>
order by tea.Ccrq desc
</select>
<sql id="where">
<where>
<if test="params.Txr != null and params.Txr != ''">
and tet.Txr = #{params.Txr}
</if>
<if test="params.EquipmentName != null and params.EquipmentName != ''">
and tea.EquipmentName like concat('%', #{params.EquipmentName}, '%')
</if>
</where>
</sql>
</mapper>
<?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="cn.wise.sc.acquisition.business.mapper.TProcessesTruckMapper">
</mapper>
<?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="cn.wise.sc.acquisition.business.mapper.TWeightMapper">
</mapper>
......@@ -20,115 +20,115 @@ public class TEquipmentAccountQuery {
@ApiModelProperty("设备编码")
private String EquipmentID;
private String equipmentID;
/**
* 设备名称
*/
@ApiModelProperty("设备名称")
private String EquipmentName;
private String equipmentName;
/**
* 所属工序
*/
@ApiModelProperty("所属工序")
private String ProcessesName;
private String processesName;
/**
* 设备类型,包括租赁和自有
*/
@ApiModelProperty("设备类型,包括租赁和自有")
private String EquipmentType;
private String equipmentType;
/**
* 机长
*/
@ApiModelProperty("机长")
private String EquManager;
private String equManager;
/**
* 规格型号
*/
@ApiModelProperty("规格型号")
private String Ggxh;
private String ggxh;
/**
* 生产能力
*/
@ApiModelProperty("生产能力")
private String Scnl;
private String scnl;
/**
* 装机容量
*/
@ApiModelProperty("装机容量")
private String Zjrl;
private String zjrl;
/**
* 生产厂家
*/
@ApiModelProperty("生产厂家")
private String Sccj;
private String sccj;
/**
* 出厂日期
*/
@ApiModelProperty("出厂日期")
private LocalDateTime Ccrq;
private LocalDateTime ccrq;
/**
* 出厂编号
*/
@ApiModelProperty("出厂编号")
private String Ccbh;
private String ccbh;
/**
* 耐用年限
*/
@ApiModelProperty("耐用年限")
private String Nynx;
private String nynx;
/**
* 资产编码
*/
@ApiModelProperty("资产编码")
private String Zcbm;
private String zcbm;
/**
* 设备原值
*/
@ApiModelProperty("设备原值")
private Float Yz;
private Float yz;
/**
* 启用日期
*/
@ApiModelProperty("启用日期")
private LocalDateTime Qyrq;
private LocalDateTime qyrq;
/**
* 燃料类别
*/
@ApiModelProperty("燃料类别")
private String Rllb;
private String rllb;
/**
* 转速
*/
@ApiModelProperty("转速")
private String Zs;
private String zs;
/**
* 状态,分为在用1和报废0
*/
@ApiModelProperty("状态,分为在用1和报废0")
private Boolean IsUsing;
private Boolean isUsing;
/**
* 备注
*/
@ApiModelProperty("备注")
private String Bz;
private String bz;
}
package cn.wise.sc.acquisition.business.model.query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2021-04-25
*/
@Data
@ApiModel("设备点检Query")
public class TEquipmentCheckQuery {
/**
* ID号
*/
@ApiModelProperty("Uid")
private String uid;
/**
* 设备编码
*/
@ApiModelProperty("设备编码")
private String equipmentID;
/**
* 设备名称
*/
@ApiModelProperty("设备名称")
private String equipmentName;
/**
* 点检部位
*/
@ApiModelProperty("点检部位")
private String djbw;
/**
* 点检内容
*/
@ApiModelProperty("点检内容")
private String djnr;
/**
* 点检标准
*/
@ApiModelProperty("点检标准")
private String djbz;
/**
* 点检周期
*/
@ApiModelProperty("点检周期")
private Integer djzq;
/**
* 周期类型,天、月等
*/
@ApiModelProperty("周期类型,天、月等")
private String zqlx;
/**
* 点检结果,正常、异常
*/
@ApiModelProperty("点检结果,正常、异常")
private String djjg;
/**
* 异常记录
*/
@ApiModelProperty("异常记录")
private String ycjl;
/**
* 点检人
*/
@ApiModelProperty("点检人")
private String djr;
/**
* 点检日期
*/
@ApiModelProperty("点检日期")
private LocalDateTime djrq;
}
package cn.wise.sc.acquisition.business.model.query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2021-04-25
*/
@Data
@ApiModel("设备运行Query")
public class TEquipmentRunQuery {
/**
* ID号
*/
@ApiModelProperty("Uid")
private String uid;
/**
* 设备编码
*/
@ApiModelProperty("设备编码")
private String equipmentID;
/**
* 设备名称
*/
@ApiModelProperty("设备名称")
private String equipmentName;
/**
* 运行日期
*/
@ApiModelProperty("运行日期")
private LocalDateTime runDate;
/**
*
*/
@ApiModelProperty("当天运行时间h")
private Float runHour;
/**
* 当天停机时间
*/
@ApiModelProperty("StopHour")
private Float stopHour;
/**
* 停机原因:故障/维修/保养
*/
@ApiModelProperty("StopType")
private String stopType;
/**
* 驾驶员/操作人员
*/
@ApiModelProperty("Driver")
private String driver;
/**
* 填写人
*/
@ApiModelProperty("Txr")
private String txr;
/**
* 日期标记,如:2021年01月
*/
@ApiModelProperty("Tag")
private String tag;
}
package cn.wise.sc.acquisition.business.model.query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2021-04-25
*/
@Data
@ApiModel("设备隐患Query")
public class TEquipmentTroubleQuery {
/**
* ID号
*/
@ApiModelProperty("Uid")
private String uid;
/**
* 设备编码
*/
@ApiModelProperty("设备编码")
private String equipmentID;
/**
* 设备名称
*/
@ApiModelProperty("设备名称")
private String equipmentName;
/**
* 隐患发现人
*/
@ApiModelProperty("隐患发现人")
private String fxr;
/**
* 隐患发现日期
*/
@ApiModelProperty("隐患发现日期")
private LocalDateTime fxrq;
/**
* 隐患描述
*/
@ApiModelProperty("隐患描述")
private String yhms;
/**
* 隐患处理措施
*/
@ApiModelProperty("隐患处理措施")
private String clcs;
/**
* 隐患处理日期
*/
@ApiModelProperty("隐患处理日期")
private LocalDateTime clrq;
/**
* 是否已修好:1是,0否
*/
@ApiModelProperty("是否已修好:1是,0否")
private String clr;
/**
* 填报人
*/
@ApiModelProperty("填报人")
private String txr;
/**
* 填报日期
*/
@ApiModelProperty("填报日期")
private LocalDateTime txrq;
/**
* 隐患处理状态:已处理和未处理
*/
@ApiModelProperty("隐患处理状态:已处理和未处理")
private String clzt;
}
package cn.wise.sc.acquisition.business.model.vo;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: ztw
* @create: 2021-04-26
**/
@Data
@ApiModel("数据统计-产量统计表格展示类")
public class DataStatisticsTableVo {
/**
* ID号
*/
@TableId("地磅称重表id")
private String Uid;
/**
* 日期
*/
@ApiModelProperty("日期")
private String Rq;
/**
* 时间
*/
@ApiModelProperty("时间")
private String Sj;
/**
* 矿车编号
*/
@ApiModelProperty("矿车编号")
private String TruckID;
@ApiModelProperty("发货单位")
private String clientName;
@ApiModelProperty("货品名称")
private String WorkType;
/**
* 总毛重
*/
@ApiModelProperty("总毛重")
private Float Mz;
/**
* 总皮重
*/
@ApiModelProperty("总皮重")
private Float Pz;
/**
* 总净重
*/
@ApiModelProperty("总净重")
private Float Jz;
}
package cn.wise.sc.acquisition.business.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: ztw
* @create: 2021-04-26
**/
@Data
@ApiModel("数据统计-展示类")
public class DataStatisticsVo {
@ApiModelProperty("id标识")
private Integer id;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("值")
private String value;
}
package cn.wise.sc.acquisition.business.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
/**
* @description:
* @author: ztw
* @create: 2021-04-25
**/
@Data
@ApiModel("设备点检Vo")
public class TEquipmentCheckVo {
@ApiModelProperty("Uid")
private String Uid;
/**
* 设备编码
*/
@ApiModelProperty("设备编码")
private String EquipmentID;
/**
* 设备名称
*/
@ApiModelProperty("设备名称")
private String EquipmentName;
/**
* 点检部位
*/
@ApiModelProperty("点检部位")
private String Djbw;
/**
*
*/
@ApiModelProperty("点检内容")
private String Djnr;
/**
* 点检标准
*/
@ApiModelProperty("点检标准")
private String Djbz;
/**
* 点检周期
*/
@ApiModelProperty("点检周期")
private Integer Djzq;
/**
* 周期类型,天、月等
*/
@ApiModelProperty("周期类型,天、月等")
private String Zqlx;
/**
* 点检结果,正常、异常
*/
@ApiModelProperty("点检结果,正常、异常")
private String Djjg;
/**
* 异常记录
*/
@ApiModelProperty("异常记录")
private String Ycjl;
/**
* 点检人
*/
@ApiModelProperty("点检人")
private String Djr;
/**
* 点检日期
*/
@ApiModelProperty("点检日期")
private LocalDateTime Djrq;
}
package cn.wise.sc.acquisition.business.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
/**
* @description:
* @author: ztw
* @create: 2021-04-25
**/
@Data
@ApiModel("设备运行Vo")
public class TEquipmentRunVo {
@ApiModelProperty("Uid")
private String Uid;
/**
* 设备编码
*/
@ApiModelProperty("设备编码")
private String EquipmentID;
/**
* 设备名称
*/
@ApiModelProperty("设备名称")
private String EquipmentName;
/**
* 运行日期
*/
@ApiModelProperty("运行日期")
private LocalDateTime RunDate;
/**
*
*/
@ApiModelProperty("当天运行时间h")
private Float RunHour;
/**
* 当天停机时间
*/
@ApiModelProperty("StopHour")
private Float StopHour;
/**
* 停机原因:故障/维修/保养
*/
@ApiModelProperty("StopType")
private String StopType;
/**
* 驾驶员/操作人员
*/
@ApiModelProperty("Driver")
private String Driver;
/**
* 填写人
*/
@ApiModelProperty("Txr")
private String Txr;
/**
* 日期标记,如:2021年01月
*/
@ApiModelProperty("Tag")
private String Tag;
}
package cn.wise.sc.acquisition.business.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
/**
* @description:
* @author: ztw
* @create: 2021-04-25
**/
@Data
@ApiModel("设备隐患Vo")
public class TEquipmentTroubleVo {
@ApiModelProperty("Uid")
private String Uid;
/**
* 设备编码
*/
@ApiModelProperty("设备编码")
private String EquipmentID;
/**
* 设备名称
*/
@ApiModelProperty("设备名称")
private String EquipmentName;
/**
* 隐患发现人
*/
@ApiModelProperty("隐患发现人")
private String Fxr;
/**
* 隐患发现日期
*/
@ApiModelProperty("隐患发现日期")
private LocalDateTime Fxrq;
/**
* 隐患描述
*/
@ApiModelProperty("隐患描述")
private String Yhms;
/**
* 隐患处理措施
*/
@ApiModelProperty("隐患处理措施")
private String Clcs;
/**
* 隐患处理日期
*/
@ApiModelProperty("隐患处理日期")
private LocalDateTime Clrq;
/**
* 是否已修好:1是,0否
*/
@ApiModelProperty("是否已修好:1是,0否")
private String clr;
/**
* 填报人
*/
@ApiModelProperty("填报人")
private String Txr;
/**
* 填报日期
*/
@ApiModelProperty("填报日期")
private LocalDateTime Txrq;
/**
* 隐患处理状态:已处理和未处理
*/
@ApiModelProperty("隐患处理状态:已处理和未处理")
private String Clzt;
}
package cn.wise.sc.acquisition.business.service;
import cn.wise.im.common.http.R;
import cn.wise.sc.acquisition.business.model.vo.DataStatisticsTableVo;
import cn.wise.sc.acquisition.business.model.vo.DataStatisticsVo;
import java.util.List;
/**
* <p>
* 服务类
* </p>
*
* @author ztw
* @since 2021-04-26
*/
public interface IDataStatisticsService {
R<List<DataStatisticsVo>> countByPhoto(String TruckID, Integer cycle, String startDate, String endDate);
R<List<DataStatisticsTableVo>> countByTable(String TruckID, Integer cycle, String startDate, String endDate);
}
package cn.wise.sc.acquisition.business.service;
import cn.wise.im.common.http.R;
import cn.wise.sc.acquisition.business.entity.TEquipmentCheck;
import cn.wise.sc.acquisition.business.model.PageQuery;
import cn.wise.sc.acquisition.business.model.query.TEquipmentCheckQuery;
import cn.wise.sc.acquisition.business.model.vo.TEquipmentCheckVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author ztw
* @since 2021-04-25
*/
public interface ITEquipmentCheckService extends IService<TEquipmentCheck> {
R<IPage<TEquipmentCheckVo>> getPage(PageQuery pageQuery, String EquipmentName);
R<TEquipmentCheck> getDetail(String EquipmentID);
R checking(TEquipmentCheckQuery query);
}
package cn.wise.sc.acquisition.business.service;
import cn.wise.im.common.http.R;
import cn.wise.sc.acquisition.business.entity.TEquipmentRun;
import cn.wise.sc.acquisition.business.model.PageQuery;
import cn.wise.sc.acquisition.business.model.query.TEquipmentRunQuery;
import cn.wise.sc.acquisition.business.model.vo.TEquipmentRunVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author ztw
* @since 2021-04-25
*/
public interface ITEquipmentRunService extends IService<TEquipmentRun> {
R<IPage<TEquipmentRunVo>> getPage(PageQuery pageQuery, String EquipmentName);
R<TEquipmentRun> getDetail(String EquipmentID);
R running(TEquipmentRunQuery query);
}
package cn.wise.sc.acquisition.business.service;
import cn.wise.im.common.http.R;
import cn.wise.sc.acquisition.business.entity.TEquipmentTrouble;
import cn.wise.sc.acquisition.business.model.PageQuery;
import cn.wise.sc.acquisition.business.model.query.TEquipmentCheckQuery;
import cn.wise.sc.acquisition.business.model.query.TEquipmentTroubleQuery;
import cn.wise.sc.acquisition.business.model.vo.TEquipmentTroubleVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author ztw
* @since 2021-04-25
*/
public interface ITEquipmentTroubleService extends IService<TEquipmentTrouble> {
R<IPage<TEquipmentTroubleVo>> getPage(PageQuery pageQuery, String EquipmentName);
R<TEquipmentTrouble> getDetail(String EquipmentID);
R trouble(TEquipmentTroubleQuery query);
}
package cn.wise.sc.acquisition.business.service;
import cn.wise.sc.acquisition.business.entity.TProcessesTruck;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author ztw
* @since 2021-04-26
*/
public interface ITProcessesTruckService extends IService<TProcessesTruck> {
}
package cn.wise.sc.acquisition.business.service;
import cn.wise.sc.acquisition.business.entity.TWeight;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author ztw
* @since 2021-04-26
*/
public interface ITWeightService extends IService<TWeight> {
}
package cn.wise.sc.acquisition.business.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import cn.wise.im.common.http.R;
import cn.wise.sc.acquisition.business.mapper.DataStatisticsMapper;
import cn.wise.sc.acquisition.business.model.vo.DataStatisticsTableVo;
import cn.wise.sc.acquisition.business.model.vo.DataStatisticsVo;
import cn.wise.sc.acquisition.business.service.IDataStatisticsService;
import io.jsonwebtoken.lang.Assert;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.*;
/**
* <p>
* 服务实现类
* </p>
*
* @author ztw
* @since 2021-01-12
*/
@Service
public class DataStatisticsServiceImpl implements IDataStatisticsService {
@Resource
private DataStatisticsMapper dataStatisticsMapper;
/**
* 产品产量统计-图
* @param TruckID
* @param cycle
* @param startDate
* @param endDate
* @return
*/
@Override
public R<List<DataStatisticsVo>> countByPhoto(String TruckID, Integer cycle, String startDate, String endDate){
Map<String, Object> params = new HashMap<>();
params.put("TruckID", TruckID);
params.put("cycle", cycle);
params.put("startDate", startDate);
params.put("endDate", endDate);
List<DataStatisticsVo> list = dataStatisticsMapper.countByPhoto(params);
return R.ok(list);
}
/**
* 产品产量统计-表
* @param TruckID
* @param cycle
* @param startDate
* @param endDate
* @return
*/
@Override
public R<List<DataStatisticsTableVo>> countByTable(String TruckID, Integer cycle, String startDate, String endDate){
Map<String, Object> params = new HashMap<>();
params.put("TruckID", TruckID);
params.put("cycle", cycle);
params.put("startDate", startDate);
params.put("endDate", endDate);
List<DataStatisticsTableVo> list = dataStatisticsMapper.countByTable(params);
return R.ok(list);
}
}
package cn.wise.sc.acquisition.business.service.impl;
import cn.wise.im.common.http.R;
import cn.wise.sc.acquisition.business.constant.Rcode;
import cn.wise.sc.acquisition.business.entity.TEquipmentAccount;
import cn.wise.sc.acquisition.business.entity.TEquipmentCheck;
import cn.wise.sc.acquisition.business.mapper.TEquipmentAccountMapper;
import cn.wise.sc.acquisition.business.mapper.TEquipmentCheckMapper;
import cn.wise.sc.acquisition.business.model.PageQuery;
import cn.wise.sc.acquisition.business.model.query.TEquipmentAccountQuery;
import cn.wise.sc.acquisition.business.model.query.TEquipmentCheckQuery;
import cn.wise.sc.acquisition.business.model.vo.TEquipmentCheckVo;
import cn.wise.sc.acquisition.business.model.vo.UserVo;
import cn.wise.sc.acquisition.business.service.ITEquipmentCheckService;
import cn.wise.sc.acquisition.business.wrapper.page.Query;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* <p>
* 服务实现类
* </p>
*
* @author ztw
* @since 2021-04-25
*/
@Service
@Transactional
public class TEquipmentCheckServiceImpl extends ServiceImpl<TEquipmentCheckMapper, TEquipmentCheck> implements ITEquipmentCheckService {
@Resource
private TEquipmentCheckMapper equipmentCheckMapper;
@Resource
private TEquipmentAccountMapper equipmentAccountMapper;
/**
* 设备点检分页
* @param pageQuery
* @param EquipmentName
* @return
*/
@Override
public R<IPage<TEquipmentCheckVo>> getPage(PageQuery pageQuery, String EquipmentName) {
Map<String, Object> params = new HashMap<>();
params.put("EquipmentName", EquipmentName);
Page<TEquipmentCheckVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
IPage<TEquipmentCheckVo> pages = equipmentCheckMapper.getPage(page, params);
return R.ok(pages);
}
/**
* 设备点检详情
* @param EquipmentID
* @return
*/
@Override
public R<TEquipmentCheck> getDetail(String EquipmentID) {
Rcode.NOT_PARAM.assertNotNull(EquipmentID);
TEquipmentAccount account = equipmentAccountMapper.selectById(EquipmentID);
Rcode.NOT_FOUND.assertNotNull(account);
QueryWrapper<TEquipmentCheck> checkWrapper = new QueryWrapper<>();
checkWrapper.eq("EquipmentID", account.getEquipmentID());
List<TEquipmentCheck> checkList = equipmentCheckMapper.selectList(checkWrapper);
TEquipmentCheck check = null;
if(checkList != null && checkList.size()>0){ //已经点检过的
check = checkList.get(0);
}else{
check = new TEquipmentCheck();
check.setEquipmentID(account.getEquipmentID()).setEquipmentName(account.getEquipmentName());
}
Rcode.NOT_FOUND.assertNotNull(check);
return R.ok(check);
}
/**
* 保存设备点检结果
* @param query
* @return
*/
@Override
public R checking(TEquipmentCheckQuery query) {
Rcode.NOT_PARAM.assertNotNull(query);
Rcode.NOT_PARAM.assertNotNull(query.getEquipmentID());
Rcode.NOT_PARAM.assertNotNull(query.getEquipmentName());
TEquipmentCheck check = new TEquipmentCheck();
BeanUtils.copyProperties(query, check);
//Uid=null新增,Uid!=null 修改
if(StringUtils.isNoneBlank(check.getUid())){
equipmentCheckMapper.updateById(check);
}else{
equipmentCheckMapper.insert(check);
}
return R.ok();
}
}
package cn.wise.sc.acquisition.business.service.impl;
import cn.wise.im.common.http.R;
import cn.wise.sc.acquisition.business.constant.Rcode;
import cn.wise.sc.acquisition.business.entity.TEquipmentAccount;
import cn.wise.sc.acquisition.business.entity.TEquipmentCheck;
import cn.wise.sc.acquisition.business.entity.TEquipmentRun;
import cn.wise.sc.acquisition.business.mapper.TEquipmentAccountMapper;
import cn.wise.sc.acquisition.business.mapper.TEquipmentRunMapper;
import cn.wise.sc.acquisition.business.model.PageQuery;
import cn.wise.sc.acquisition.business.model.query.TEquipmentCheckQuery;
import cn.wise.sc.acquisition.business.model.query.TEquipmentRunQuery;
import cn.wise.sc.acquisition.business.model.vo.TEquipmentCheckVo;
import cn.wise.sc.acquisition.business.model.vo.TEquipmentRunVo;
import cn.wise.sc.acquisition.business.service.ITEquipmentRunService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* <p>
* 服务实现类
* </p>
*
* @author ztw
* @since 2021-04-25
*/
@Service
@Transactional
public class TEquipmentRunServiceImpl extends ServiceImpl<TEquipmentRunMapper, TEquipmentRun> implements ITEquipmentRunService {
@Resource
private TEquipmentRunMapper equipmentRunMapper;
@Resource
private TEquipmentAccountMapper equipmentAccountMapper;
/**
* 设备运行分页
* @param pageQuery
* @param EquipmentName
* @return
*/
@Override
public R<IPage<TEquipmentRunVo>> getPage(PageQuery pageQuery, String EquipmentName) {
Map<String, Object> params = new HashMap<>();
params.put("EquipmentName", EquipmentName);
Page<TEquipmentRunVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
IPage<TEquipmentRunVo> pages = equipmentRunMapper.getPage(page, params);
return R.ok(pages);
}
/**
* 设备运行详情
* @param EquipmentID
* @return
*/
@Override
public R<TEquipmentRun> getDetail(String EquipmentID) {
Rcode.NOT_PARAM.assertNotNull(EquipmentID);
TEquipmentAccount account = equipmentAccountMapper.selectById(EquipmentID);
Rcode.NOT_FOUND.assertNotNull(account);
QueryWrapper<TEquipmentRun> checkWrapper = new QueryWrapper<>();
checkWrapper.eq("EquipmentID", account.getEquipmentID());
List<TEquipmentRun> runList = equipmentRunMapper.selectList(checkWrapper);
TEquipmentRun run = null;
if(runList != null && runList.size()>0){ //已经点检过的
run = runList.get(0);
}else{
run = new TEquipmentRun();
run.setEquipmentID(account.getEquipmentID()).setEquipmentName(account.getEquipmentName());
}
Rcode.NOT_FOUND.assertNotNull(run);
return R.ok(run);
}
/**
* 保存设备运行结果
* @param query
* @return
*/
@Override
public R running(TEquipmentRunQuery query) {
Rcode.NOT_PARAM.assertNotNull(query);
Rcode.NOT_PARAM.assertNotNull(query.getEquipmentID());
Rcode.NOT_PARAM.assertNotNull(query.getEquipmentName());
TEquipmentRun run = new TEquipmentRun();
BeanUtils.copyProperties(query, run);
//Uid=null新增,Uid!=null 修改
if(StringUtils.isNoneBlank(run.getUid())){
equipmentRunMapper.updateById(run);
}else{
equipmentRunMapper.insert(run);
}
return R.ok();
}
}
package cn.wise.sc.acquisition.business.service.impl;
import cn.wise.im.common.http.R;
import cn.wise.sc.acquisition.business.constant.Rcode;
import cn.wise.sc.acquisition.business.entity.TEquipmentAccount;
import cn.wise.sc.acquisition.business.entity.TEquipmentCheck;
import cn.wise.sc.acquisition.business.entity.TEquipmentTrouble;
import cn.wise.sc.acquisition.business.mapper.TEquipmentAccountMapper;
import cn.wise.sc.acquisition.business.mapper.TEquipmentTroubleMapper;
import cn.wise.sc.acquisition.business.model.PageQuery;
import cn.wise.sc.acquisition.business.model.query.TEquipmentCheckQuery;
import cn.wise.sc.acquisition.business.model.query.TEquipmentTroubleQuery;
import cn.wise.sc.acquisition.business.model.vo.TEquipmentCheckVo;
import cn.wise.sc.acquisition.business.model.vo.TEquipmentTroubleVo;
import cn.wise.sc.acquisition.business.service.ITEquipmentTroubleService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* <p>
* 服务实现类
* </p>
*
* @author ztw
* @since 2021-04-25
*/
@Service
public class TEquipmentTroubleServiceImpl extends ServiceImpl<TEquipmentTroubleMapper, TEquipmentTrouble> implements ITEquipmentTroubleService {
@Resource
private TEquipmentTroubleMapper equipmentTroubleMapper;
@Resource
private TEquipmentAccountMapper equipmentAccountMapper;
/**
* 设备隐患分页
* @param pageQuery
* @param EquipmentName
* @return
*/
@Override
public R<IPage<TEquipmentTroubleVo>> getPage(PageQuery pageQuery, String EquipmentName) {
Map<String, Object> params = new HashMap<>();
params.put("EquipmentName", EquipmentName);
Page<TEquipmentTroubleVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
IPage<TEquipmentTroubleVo> pages = equipmentTroubleMapper.getPage(page, params);
return R.ok(pages);
}
/**
* 设备隐患详情
* @param EquipmentID
* @return
*/
@Override
public R<TEquipmentTrouble> getDetail(String EquipmentID) {
Rcode.NOT_PARAM.assertNotNull(EquipmentID);
TEquipmentAccount account = equipmentAccountMapper.selectById(EquipmentID);
Rcode.NOT_FOUND.assertNotNull(account);
QueryWrapper<TEquipmentTrouble> checkWrapper = new QueryWrapper<>();
checkWrapper.eq("EquipmentID", account.getEquipmentID());
List<TEquipmentTrouble> checkList = equipmentTroubleMapper.selectList(checkWrapper);
TEquipmentTrouble trouble = null;
if(checkList != null && checkList.size()>0){ //已经隐患过的
trouble = checkList.get(0);
}else{
trouble = new TEquipmentTrouble();
trouble.setEquipmentID(account.getEquipmentID()).setEquipmentName(account.getEquipmentName());
}
Rcode.NOT_FOUND.assertNotNull(trouble);
return R.ok(trouble);
}
/**
* 保存设备隐患结果
* @param query
* @return
*/
@Override
public R trouble(TEquipmentTroubleQuery query) {
Rcode.NOT_PARAM.assertNotNull(query);
Rcode.NOT_PARAM.assertNotNull(query.getEquipmentID());
Rcode.NOT_PARAM.assertNotNull(query.getEquipmentName());
TEquipmentTrouble trouble = new TEquipmentTrouble();
BeanUtils.copyProperties(query, trouble);
//Uid=null新增,Uid!=null 修改
if(StringUtils.isNoneBlank(query.getUid())){
equipmentTroubleMapper.updateById(trouble);
}else{
equipmentTroubleMapper.insert(trouble);
}
return R.ok();
}
}
package cn.wise.sc.acquisition.business.service.impl;
import cn.wise.sc.acquisition.business.entity.TProcessesTruck;
import cn.wise.sc.acquisition.business.mapper.TProcessesTruckMapper;
import cn.wise.sc.acquisition.business.service.ITProcessesTruckService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 服务实现类
* </p>
*
* @author ztw
* @since 2021-04-26
*/
@Service
public class TProcessesTruckServiceImpl extends ServiceImpl<TProcessesTruckMapper, TProcessesTruck> implements ITProcessesTruckService {
}
package cn.wise.sc.acquisition.business.service.impl;
import cn.wise.sc.acquisition.business.entity.TWeight;
import cn.wise.sc.acquisition.business.mapper.TWeightMapper;
import cn.wise.sc.acquisition.business.service.ITWeightService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 服务实现类
* </p>
*
* @author ztw
* @since 2021-04-26
*/
@Service
public class TWeightServiceImpl extends ServiceImpl<TWeightMapper, TWeight> implements ITWeightService {
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment