Skip to content

D
data-acquisition
Commit 3cb27a4e authored by 罗贤顺's avatar 罗贤顺
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 48826518 f2328a9a
Hide whitespace changes
Inline Side-by-side
Showing with 985 additions and 310 deletions
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/DataStatisticsController.java
View file @ 3cb27a4e
......@@ -34,17 +34,16 @@ public class DataStatisticsController {
@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) {
public R countByPhoto(Integer type, String TruckID, String startDate, String endDate) {
Rcode.NOT_PARAM.assertNotNull(type);
if(type == 1){
return dataStatisticsService.countByPhoto(TruckID, cycle, startDate, endDate);
return dataStatisticsService.countByPhoto(TruckID, startDate, endDate);
}else if(type == 2){
return dataStatisticsService.countByTable(TruckID, cycle, startDate, endDate);
return dataStatisticsService.countByTable(TruckID, startDate, endDate);
}else{
return R.fail(402, "参数错误");
}
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentAccountController.java
View file @ 3cb27a4e
......@@ -47,7 +47,14 @@ public class TEquipmentAccountController {
}
@ApiOperation(value = "选择设备")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "ProcessesName", value = "工序名称:爆破、辅助、运输、破碎、装车、穿孔", paramType = "query", dataType = "ProcessesName")
})
@GetMapping("/getList")
public R getList(String ProcessesName) {
return equipmentAccountService.getList(ProcessesName);
}
}
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentCheckController.java
View file @ 3cb27a4e
......@@ -3,8 +3,8 @@ 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.model.query.TEquipmentCheckDetailQuery;
import cn.wise.sc.acquisition.business.model.query.TEquipmentCheckMainQuery;
import cn.wise.sc.acquisition.business.service.ITEquipmentCheckService;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -30,27 +30,52 @@ public class TEquipmentCheckController {
@Autowired
private ITEquipmentCheckService equipmentCheckService;
@ApiOperation(value = "设备点检分页")
@ApiOperation(value = "新增修改-设备点检主表&设备点检详情表")
@PostMapping("/checking")
public R update(@RequestBody TEquipmentCheckMainQuery query) {
return equipmentCheckService.checking(query);
}
@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);
public R getPage(PageQuery pageQuery, String EquipmentName, String selectMonth) {
return equipmentCheckService.getPage(pageQuery, EquipmentName, selectMonth);
}
@ApiOperation(value = "设备点检详情")
@GetMapping("/getDetail/{EquipmentID}")
public R getDetail(@PathVariable @NotBlank String EquipmentID) {
return equipmentCheckService.getDetail(EquipmentID);
@ApiOperation(value = "详情-设备点检主表")
@GetMapping("/getDetail/{mainUid}")
public R getDetail(@PathVariable @NotBlank String mainUid) {
return equipmentCheckService.getDetail(mainUid);
}
@ApiOperation(value = "保存设备点检结果")
@PostMapping("/checking")
public R update(@RequestBody TEquipmentCheckQuery query) {
return equipmentCheckService.checking(query);
@ApiOperation(value = "列表-设备点检详情表")
@GetMapping("/getDetailList/{mainUid}")
public R getDetailList(@PathVariable @NotBlank String mainUid) {
return equipmentCheckService.getDetailList(mainUid);
}
@ApiOperation(value = "详情-设备点检详情表")
@GetMapping("/getCheckDetail/{detailUid}")
public R getCheckDetail(@PathVariable @NotBlank String detailUid) {
return equipmentCheckService.getCheckDetail(detailUid);
}
@ApiOperation(value = "修改-设备点检详情表")
@PostMapping("/updateDetail")
public R updateDetail(@RequestBody TEquipmentCheckDetailQuery query) {
return equipmentCheckService.updateDetail(query);
}
/*@ApiOperation(value = "删除点检信息")
@PostMapping("/delete")
public R delete(@NotBlank String mainUid) {
return equipmentCheckService.delete(mainUid);
}*/
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesAuxiliaryController.java
View file @ 3cb27a4e
......@@ -12,11 +12,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
/**
* <p>
......@@ -63,7 +59,6 @@ public class TProcessesAuxiliaryController {
return itProcessesAuxiliaryService.updateByUid(tProcessesAuxiliaryQuery);
}
/**
* 增加辅助工序
*
......@@ -75,5 +70,12 @@ public class TProcessesAuxiliaryController {
public R insertTProcessesAuxiliary(@RequestBody TProcessesAuxiliaryQuery tProcessesAuxiliaryQuery) {
return itProcessesAuxiliaryService.insertTProcessesAuxiliary(tProcessesAuxiliaryQuery);
}
@ApiOperation(value = "查询最新的记录")
@GetMapping("/getLatest")
public cn.wise.im.common.http.R getLatest() {
return itProcessesAuxiliaryService.getLatest();
}
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesCrusherController.java
View file @ 3cb27a4e
......@@ -72,5 +72,14 @@ public class TProcessesCrusherController {
tProcessesCrusherQuery.setUid(uid);
return itProcessesCrusherService.getByUid(tProcessesCrusherQuery);
}
@ApiOperation(value = "查询最新的记录")
@GetMapping("/getLatest")
public cn.wise.im.common.http.R getLatest() {
return itProcessesCrusherService.getLatest();
}
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesDiggingController.java
View file @ 3cb27a4e
......@@ -69,6 +69,13 @@ public class TProcessesDiggingController {
}
@ApiOperation(value = "查询最新的记录")
@GetMapping("/getLatest")
public R getLatest() {
return processesDiggingService.getLatest();
}
}
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesTruckController.java
View file @ 3cb27a4e
......@@ -70,6 +70,11 @@ public class TProcessesTruckController {
return processesTruckService.getDetail(Uid);
}
@ApiOperation(value = "查询最新的记录")
@GetMapping("/getLatest")
public R getLatest() {
return processesTruckService.getLatest();
}
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSafeTroubleController.java
View file @ 3cb27a4e
......@@ -7,13 +7,17 @@ import cn.wise.sc.acquisition.business.model.query.TMaterialOutQuery;
import cn.wise.sc.acquisition.business.model.query.TSafeTroubleQuery;
import cn.wise.sc.acquisition.business.service.ITMaterialOutService;
import cn.wise.sc.acquisition.business.service.ITSafeTroubleService;
import cn.wise.sc.acquisition.business.util.ImageUtil;
import io.swagger.annotations.Api;
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 org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
/**
* <p>
......@@ -42,14 +46,14 @@ public class TSafeTroubleController {
@ApiOperation(value = "添加隐患")
@PostMapping("/save")
public R save(TSafeTroubleQuery query, HttpServletRequest request) {
return safeTroubleService.save(query, request);
public R save(@RequestBody TSafeTroubleQuery query) {
return safeTroubleService.save(query);
}
@ApiOperation(value = "隐患整改")
@PostMapping("/update")
public R update(TSafeTroubleQuery query, HttpServletRequest request) {
return safeTroubleService.update(query, request);
public R update(@RequestBody TSafeTroubleQuery query) {
return safeTroubleService.update(query);
}
@ApiOperation(value = "隐患详情")
......@@ -60,6 +64,16 @@ public class TSafeTroubleController {
@ApiOperation(value = "上传图片-获取byte[]")
@PostMapping("/upload")
public R upload(MultipartFile file) {
boolean ref = ImageUtil.checkFileSize( file.getSize(),30,"M");
if(!ref){
return R.fail(400, "文件不能大于30M");
}
byte[] photoByte = ImageUtil.transformByte(file);
return R.ok(photoByte) ;
}
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentCheckContent.java 0 → 100644
View file @ 3cb27a4e
package cn.wise.sc.acquisition.business.entity;
import com.baomidou.mybatisplus.annotation.IdType;
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 renchao
* @since 2021-06-01
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("T_Equipment_Check_Content")
public class TEquipmentCheckContent implements Serializable {
private static final long serialVersionUID=1L;
/**
* Uid号
*/
@TableId(value = "Uid", type = IdType.ASSIGN_UUID)
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("IsUsing")
private Boolean IsUsing;
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentCheck.java → acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentCheckDetail.java
View file @ 3cb27a4e
package cn.wise.sc.acquisition.business.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
......@@ -15,23 +14,29 @@ import lombok.experimental.Accessors;
*
* </p>
*
* @author ztw
* @since 2021-04-25
* @author renchao
* @since 2021-06-01
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("T_Equipment_Check")
public class TEquipmentCheck implements Serializable {
@TableName("T_Equipment_Check_Detail")
public class TEquipmentCheckDetail implements Serializable {
private static final long serialVersionUID=1L;
/**
* ID号
* Uid号
*/
@TableId(value = "Uid", type = IdType.ASSIGN_UUID)
@TableId("Uid")
private String Uid;
/**
* T_Equipment_Check_Main表中的Uid号
*/
@TableField("MainUid")
private String MainUid;
/**
* 设备编码
*/
......@@ -68,12 +73,6 @@ public class TEquipmentCheck implements Serializable {
@TableField("Djzq")
private Integer Djzq;
/**
* 周期类型,天、月等
*/
@TableField("Zqlx")
private String Zqlx;
/**
* 点检结果，正常、异常
*/
......@@ -98,5 +97,11 @@ public class TEquipmentCheck implements Serializable {
@TableField("Djrq")
private LocalDateTime Djrq;
/**
* 日期标记,如:2021年01月
*/
@TableField("Tag")
private String Tag;
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentCheckMain.java 0 → 100644
View file @ 3cb27a4e
package cn.wise.sc.acquisition.business.entity;
import com.baomidou.mybatisplus.annotation.IdType;
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_Main")
public class TEquipmentCheckMain implements Serializable {
private static final long serialVersionUID=1L;
/**
* ID号
*/
@TableId(value = "Uid", type = IdType.ASSIGN_UUID)
private String Uid;
/**
* 设备编码
*/
@TableField("EquipmentID")
private String EquipmentID;
/**
* 设备名称
*/
@TableField("EquipmentName")
private String EquipmentName;
/**
* 点检日期
*/
@TableField("Djrq")
private LocalDateTime Djrq;
/**
* 日期标记,如:2021年01月
*/
@TableField("Tag")
private String Tag;
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesAuxiliary.java
View file @ 3cb27a4e
......@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.EqualsAndHashCode;
......@@ -46,58 +47,51 @@ public class TProcessesAuxiliary implements Serializable {
private String EquipmentName;
/**
* 项目经理
* 加油日期
*/
@TableField("Manager")
private String Manager;
@TableField("ConsumeDate")
private LocalDateTime ConsumeDate;
/**
* 主管项目领导
*/
@TableField("Supervisor")
private String Supervisor;
/**
* 生产技术部
*/
@TableField("TechDepart")
private String TechDepart;
@TableField("Name")
private String Name;
/**
* 制表人
* 数量
*/
@TableField("Tabulator")
private String Tabulator;
@TableField("Amount")
private Float Amount;
/**
* 当月累计油量
* 金额
*/
@TableField("Ljyl")
private Float Ljyl;
@TableField("Total")
private Float Total;
/**
* 总价(元)
* 本次加油产量
*/
@TableField("Zj")
private Float Zj;
@TableField("Cl")
private Float Cl;
/**
* 当月累计产量
* 单耗=当月累计油量/当月产量 (Amount/cl)
*/
@TableField("Dyljcl")
private Float Dyljcl;
@TableField("Dh")
private Float Dh;
/**
* 单耗=当月累计油量/当月产量
* 材料领用人
*/
@TableField("Dh")
private Double Dh;
@TableField("Cllyr")
private String Cllyr;
/**
* 备注
* 是否从出库单传过来的，若是，则计算成本的时候，不在把它包含在内
*/
@TableField("Bz")
private String Bz;
@TableField("Flag")
private Boolean Flag;
/**
* 日期标记,如:2021年01月
......@@ -106,14 +100,11 @@ public class TProcessesAuxiliary implements Serializable {
private String Tag;
/**
* 司机
* 备注
*/
@TableField("Driver")
private String Driver;
@TableField("Bz")
private String Bz;
/**
* 作业日期
*/
@TableField("Zyrq")
private String Zyrq;
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentCheckContentMapper.java 0 → 100644
View file @ 3cb27a4e
package cn.wise.sc.acquisition.business.mapper;
import cn.wise.sc.acquisition.business.entity.TEquipmentCheckContent;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author renchao
* @since 2021-06-01
*/
public interface TEquipmentCheckContentMapper extends BaseMapper<TEquipmentCheckContent> {
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentCheckDetailMapper.java 0 → 100644
View file @ 3cb27a4e
package cn.wise.sc.acquisition.business.mapper;
import cn.wise.sc.acquisition.business.entity.TEquipmentCheckDetail;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author renchao
* @since 2021-06-01
*/
public interface TEquipmentCheckDetailMapper extends BaseMapper<TEquipmentCheckDetail> {
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentCheckMapper.java
View file @ 3cb27a4e
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 cn.wise.sc.acquisition.business.entity.TEquipmentCheckMain;
import cn.wise.sc.acquisition.business.model.vo.TEquipmentCheckMainVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......@@ -18,9 +17,9 @@ import java.util.Map;
* @author ztw
* @since 2021-04-25
*/
public interface TEquipmentCheckMapper extends BaseMapper<TEquipmentCheck> {
public interface TEquipmentCheckMapper extends BaseMapper<TEquipmentCheckMain> {
IPage<TEquipmentCheckVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
IPage<TEquipmentCheckMainVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentRunMapper.java
View file @ 3cb27a4e
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;
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentTroubleMapper.java
View file @ 3cb27a4e
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;
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/DataStatisticsMapper.xml
View file @ 3cb27a4e
......@@ -9,18 +9,6 @@
<if test="params.TruckID != null and params.TruckID != ''">
and tw.TruckID = #{params.TruckID}
</if>
<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 Convert(varchar(10),tw.Rq,120) <![CDATA[ >= ]]> #{params.startDate}
</if>
......@@ -42,18 +30,6 @@
<if test="params.TruckID != null and params.TruckID != ''">
and tw.TruckID = #{params.TruckID}
</if>
<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 Convert(varchar(10),tw.Rq,120) <![CDATA[ >= ]]> #{params.startDate}
</if>
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentCheckContentMapper.xml 0 → 100644
View file @ 3cb27a4e
<?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.TEquipmentCheckContentMapper">
</mapper>
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentCheckDetailMapper.xml 0 → 100644
View file @ 3cb27a4e
<?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.TEquipmentCheckDetailMapper">
<select id="getDetailList" resultType="cn.wise.sc.acquisition.business.model.vo.TEquipmentCheckMainVo">
select tecm.*
from T_Equipment_Check_Main tecm
<include refid="where"/>
order by tecm.Djrq desc
</select>
<sql id="where">
<where>
<if test="params.selectMonth != null and params.selectMonth != ''">
and tecm.Tag = #{params.selectMonth}
</if>
<if test="params.EquipmentName != null and params.EquipmentName != ''">
and tecm.EquipmentName like concat('%', #{params.EquipmentName}, '%')
</if>
</where>
</sql>
</mapper>
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentCheckMapper.xml
View file @ 3cb27a4e
......@@ -2,21 +2,19 @@
<!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
<select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TEquipmentCheckMainVo">
select tecm.*
from T_Equipment_Check_Main tecm
<include refid="where"/>
order by tea.Ccrq desc
order by tecm.Djrq desc
</select>
<sql id="where">
<where>
<if test="params.Djr != null and params.Djr != ''">
and tec.Djr = #{params.Djr}
<if test="params.selectMonth != null and params.selectMonth != ''">
and tecm.Tag = #{params.selectMonth}
</if>
<if test="params.EquipmentName != null and params.EquipmentName != ''">
and tea.EquipmentName like concat('%', #{params.EquipmentName}, '%')
and tecm.EquipmentName like concat('%', #{params.EquipmentName}, '%')
</if>
</where>
</sql>
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TEquipmentCheckDetailQuery.java 0 → 100644
View file @ 3cb27a4e
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-6-2
*/
@Data
@ApiModel("设备点检详情Query")
public class TEquipmentCheckDetailQuery {
/**
* ID号
*/
@ApiModelProperty("Uid")
private String uid;
/**
* 点检结果，正常、异常
*/
@ApiModelProperty("点检结果，正常、异常")
private String Djjg;
/**
* 异常记录
*/
@ApiModelProperty("异常记录")
private String Ycjl;
/**
* 点检人
*/
@ApiModelProperty("点检人")
private String Djr;
/**
* 点检日期
*/
@ApiModelProperty("点检日期")
private LocalDateTime Djrq;
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TEquipmentCheckQuery.java → acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TEquipmentCheckMainQuery.java
View file @ 3cb27a4e
package cn.wise.sc.acquisition.business.model.query;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -16,7 +17,7 @@ import java.time.LocalDateTime;
*/
@Data
@ApiModel("设备点检Query")
public class TEquipmentCheckQuery {
public class TEquipmentCheckMainQuery {
/**
......@@ -37,54 +38,6 @@ public class TEquipmentCheckQuery {
@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;
/**
* 点检日期
*/
......@@ -92,4 +45,6 @@ public class TEquipmentCheckQuery {
private LocalDateTime djrq;
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TMaterialOutQuery.java
View file @ 3cb27a4e
......@@ -39,7 +39,7 @@ public class TMaterialOutQuery {
/**
* 工序名称
*/
@ApiModelProperty("工序名称")
@ApiModelProperty("工序名称:爆破、辅助、运输、破碎、装车、穿孔")
private String processesName;
/**
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TProcessesDiggingQuery.java
View file @ 3cb27a4e
......@@ -41,12 +41,6 @@ public class TProcessesDiggingQuery {
@ApiModelProperty("爆区名称")
private String blastAreaName;
/**
* 装车日期
*/
@ApiModelProperty("装车日期")
private LocalDateTime digDate;
/**
* 项目经理
*/
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TSafeTroubleQuery.java
View file @ 3cb27a4e
......@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
/**
* <p>
......@@ -80,8 +81,12 @@ public class TSafeTroubleQuery {
private String fcr;
/* @ApiModelProperty("隐患照片")
private List<MultipartFile> photoList;*/
@ApiModelProperty("隐患图片数组集合")
private List<byte[]> bList;
@ApiModelProperty("整改图片数组集合")
private List<byte[]> zgbList;
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/vo/TEquipmentCheckVo.java → acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/vo/TEquipmentCheckMainVo.java
View file @ 3cb27a4e
package cn.wise.sc.acquisition.business.model.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -12,7 +13,7 @@ import java.time.LocalDateTime;
**/
@Data
@ApiModel("设备点检Vo")
public class TEquipmentCheckVo {
public class TEquipmentCheckMainVo {
@ApiModelProperty("Uid")
private String Uid;
......@@ -29,54 +30,6 @@ public class TEquipmentCheckVo {
@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;
/**
* 点检日期
*/
......@@ -84,4 +37,5 @@ public class TEquipmentCheckVo {
private LocalDateTime Djrq;
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/IDataStatisticsService.java
View file @ 3cb27a4e
......@@ -16,7 +16,7 @@ import java.util.List;
*/
public interface IDataStatisticsService {
R<List<DataStatisticsVo>> countByPhoto(String TruckID, Integer cycle, String startDate, String endDate);
R<List<DataStatisticsVo>> countByPhoto(String TruckID, String startDate, String endDate);
R<List<DataStatisticsTableVo>> countByTable(String TruckID, Integer cycle, String startDate, String endDate);
R<List<DataStatisticsTableVo>> countByTable(String TruckID, String startDate, String endDate);
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentAccountService.java
View file @ 3cb27a4e
......@@ -28,7 +28,7 @@ public interface ITEquipmentAccountService extends IService<TEquipmentAccount> {
R<TEquipmentAccount> getDetail(String EquipmentID);
R<List<TEquipmentAccount>> getList();
R<List<TEquipmentAccount>> getList(String ProcessesName);
R<TEquipmentAccount> delete(String EquipmentID);
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentCheckContentService.java 0 → 100644
View file @ 3cb27a4e
package cn.wise.sc.acquisition.business.service;
import cn.wise.sc.acquisition.business.entity.TEquipmentCheckContent;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author renchao
* @since 2021-06-01
*/
public interface ITEquipmentCheckContentService extends IService<TEquipmentCheckContent> {
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentCheckDetailService.java 0 → 100644
View file @ 3cb27a4e
package cn.wise.sc.acquisition.business.service;
import cn.wise.sc.acquisition.business.entity.TEquipmentCheckDetail;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author renchao
* @since 2021-06-01
*/
public interface ITEquipmentCheckDetailService extends IService<TEquipmentCheckDetail> {
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentCheckService.java
View file @ 3cb27a4e
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.entity.TEquipmentCheckDetail;
import cn.wise.sc.acquisition.business.entity.TEquipmentCheckMain;
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 cn.wise.sc.acquisition.business.model.query.TEquipmentCheckDetailQuery;
import cn.wise.sc.acquisition.business.model.query.TEquipmentCheckMainQuery;
import cn.wise.sc.acquisition.business.model.vo.TEquipmentCheckMainVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* <p>
* 服务类
......@@ -16,13 +20,23 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @author ztw
* @since 2021-04-25
*/
public interface ITEquipmentCheckService extends IService<TEquipmentCheck> {
public interface ITEquipmentCheckService extends IService<TEquipmentCheckMain> {
R checking(TEquipmentCheckMainQuery query);
R<IPage<TEquipmentCheckMainVo>> getPage(PageQuery pageQuery, String EquipmentName, String selectMonth);
R<TEquipmentCheckMain> getDetail(String mainUid);
R<List<TEquipmentCheckDetail>> getDetailList(String mainUid);
R<TEquipmentCheckDetail> getCheckDetail(String detailUid);
R updateDetail(TEquipmentCheckDetailQuery query);
R<IPage<TEquipmentCheckVo>> getPage(PageQuery pageQuery, String EquipmentName);
R delete(String mainUid);
R<TEquipmentCheck> getDetail(String EquipmentID);
R checking(TEquipmentCheckQuery query);
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentTroubleService.java
View file @ 3cb27a4e
......@@ -3,7 +3,6 @@ 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;
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesAuxiliaryService.java
View file @ 3cb27a4e
......@@ -22,4 +22,5 @@ public interface ITProcessesAuxiliaryService extends IService<TProcessesAuxiliar
R insertTProcessesAuxiliary(TProcessesAuxiliaryQuery query);
cn.wise.im.common.http.R<TProcessesAuxiliary> getLatest();
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesCrusherService.java
View file @ 3cb27a4e
......@@ -23,4 +23,6 @@ public interface ITProcessesCrusherService extends IService<TProcessesCrusher> {
R updateByUid(TProcessesCrusherQuery query);
R insertTProcessesCrusher(TProcessesCrusherQuery query);
cn.wise.im.common.http.R<TProcessesCrusher> getLatest();
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesDiggingService.java
View file @ 3cb27a4e
......@@ -27,6 +27,7 @@ public interface ITProcessesDiggingService extends IService<TProcessesDigging> {
R<TProcessesDigging> getDetail(String Uid);
R<TProcessesDigging> getLatest();
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesTruckService.java
View file @ 3cb27a4e
......@@ -27,4 +27,6 @@ public interface ITProcessesTruckService extends IService<TProcessesTruck> {
R<TProcessesTruck> getDetail(String Uid);
R<TProcessesTruck> getLatest();
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSafeTroubleService.java
View file @ 3cb27a4e
......@@ -24,9 +24,9 @@ public interface ITSafeTroubleService extends IService<TSafeTrouble> {
R<IPage<TSafeTrouble>> getPage(PageQuery pageQuery);
R save(TSafeTroubleQuery query, HttpServletRequest request);
R save(TSafeTroubleQuery query);
R update(TSafeTroubleQuery query,HttpServletRequest request);
R update(TSafeTroubleQuery query);
R<TSafeTroubleVo> getDetail(String Uid);
......@@ -37,4 +37,5 @@ public interface ITSafeTroubleService extends IService<TSafeTrouble> {
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/DataStatisticsServiceImpl.java
View file @ 3cb27a4e
......@@ -31,16 +31,14 @@ public class DataStatisticsServiceImpl implements IDataStatisticsService {
/**
* 产品产量统计-图
* @param TruckID
* @param cycle
* @param startDate
* @param endDate
* @return
*/
@Override
public R<List<DataStatisticsVo>> countByPhoto(String TruckID, Integer cycle, String startDate, String endDate){
public R<List<DataStatisticsVo>> countByPhoto(String TruckID, 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);
......@@ -50,16 +48,14 @@ public class DataStatisticsServiceImpl implements IDataStatisticsService {
/**
* 产品产量统计-表
* @param TruckID
* @param cycle
* @param startDate
* @param endDate
* @return
*/
@Override
public R<List<DataStatisticsTableVo>> countByTable(String TruckID, Integer cycle, String startDate, String endDate){
public R<List<DataStatisticsTableVo>> countByTable(String TruckID, 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);
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentAccountServiceImpl.java
View file @ 3cb27a4e
......@@ -104,9 +104,13 @@ public class TEquipmentAccountServiceImpl extends ServiceImpl<TEquipmentAccountM
* @return
*/
@Override
public R<List<TEquipmentAccount>> getList() {
List<TEquipmentAccount> list = this.list();
Rcode.NOT_FOUND.assertIsFalse(list!= null && list.size()>0);
public R<List<TEquipmentAccount>> getList(String ProcessesName) {
QueryWrapper<TEquipmentAccount> teaWrapper = new QueryWrapper<>();
if(StringUtils.isNotBlank(ProcessesName)){
teaWrapper.eq("ProcessesName", ProcessesName);
}
List<TEquipmentAccount> list = equipmentAccountMapper.selectList(teaWrapper);
Rcode.NOT_FOUND.assertIsFalse(list== null || list.size()<=0);
return R.ok(list);
}
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentCheckContentServiceImpl.java 0 → 100644
View file @ 3cb27a4e
package cn.wise.sc.acquisition.business.service.impl;
import cn.wise.sc.acquisition.business.entity.TEquipmentCheckContent;
import cn.wise.sc.acquisition.business.mapper.TEquipmentCheckContentMapper;
import cn.wise.sc.acquisition.business.service.ITEquipmentCheckContentService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 服务实现类
* </p>
*
* @author renchao
* @since 2021-06-01
*/
@Service
public class TEquipmentCheckContentServiceImpl extends ServiceImpl<TEquipmentCheckContentMapper, TEquipmentCheckContent> implements ITEquipmentCheckContentService {
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentCheckDetailServiceImpl.java 0 → 100644
View file @ 3cb27a4e
package cn.wise.sc.acquisition.business.service.impl;
import cn.wise.sc.acquisition.business.entity.TEquipmentCheckDetail;
import cn.wise.sc.acquisition.business.mapper.TEquipmentCheckDetailMapper;
import cn.wise.sc.acquisition.business.service.ITEquipmentCheckDetailService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 服务实现类
* </p>
*
* @author renchao
* @since 2021-06-01
*/
@Service
public class TEquipmentCheckDetailServiceImpl extends ServiceImpl<TEquipmentCheckDetailMapper, TEquipmentCheckDetail> implements ITEquipmentCheckDetailService {
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentCheckServiceImpl.java
View file @ 3cb27a4e
package cn.wise.sc.acquisition.business.service.impl;
import cn.wise.im.common.http.R;
import cn.wise.im.common.http.ResponseEnum;
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.entity.TEquipmentCheckContent;
import cn.wise.sc.acquisition.business.entity.TEquipmentCheckDetail;
import cn.wise.sc.acquisition.business.entity.TEquipmentCheckMain;
import cn.wise.sc.acquisition.business.mapper.TEquipmentCheckContentMapper;
import cn.wise.sc.acquisition.business.mapper.TEquipmentCheckDetailMapper;
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.model.query.TEquipmentCheckDetailQuery;
import cn.wise.sc.acquisition.business.model.query.TEquipmentCheckMainQuery;
import cn.wise.sc.acquisition.business.model.vo.TEquipmentCheckMainVo;
import cn.wise.sc.acquisition.business.service.ITEquipmentCheckService;
import cn.wise.sc.acquisition.business.wrapper.page.Query;
import cn.wise.sc.acquisition.business.service.ITSysDictService;
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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -37,94 +40,154 @@ import java.util.Map;
*/
@Service
@Transactional
public class TEquipmentCheckServiceImpl extends ServiceImpl<TEquipmentCheckMapper, TEquipmentCheck> implements ITEquipmentCheckService {
public class TEquipmentCheckServiceImpl extends ServiceImpl<TEquipmentCheckMapper, TEquipmentCheckMain> implements ITEquipmentCheckService {
@Resource
private TEquipmentCheckMapper equipmentCheckMapper;
@Resource
private TEquipmentAccountMapper equipmentAccountMapper;
private TEquipmentCheckContentMapper equipmentCheckContentMapper;
@Resource
private TEquipmentCheckDetailMapper equipmentCheckDetailMapper;
@Autowired
private ITSysDictService itSysDictService;
/**
* 新增修改-设备点检主表&设备点检详情表
* @param query
* @return
*/
@Override
public R checking(TEquipmentCheckMainQuery query) {
Rcode.NOT_PARAM.assertNotNull(query);
Rcode.NOT_PARAM.assertNotNull(query.getEquipmentID());
Rcode.NOT_PARAM.assertNotNull(query.getEquipmentName());
TEquipmentCheckMain checkMain = new TEquipmentCheckMain();
BeanUtils.copyProperties(query, checkMain);
com.baomidou.mybatisplus.extension.api.R<String> r = itSysDictService.getTagDate(null);
if (r.getCode()!=0){
return R.fail(ResponseEnum.FAIL,r.getMsg());
}
checkMain.setTag(r.getData());
//Uid=null新增，Uid！=null 修改
if(StringUtils.isNoneBlank(checkMain.getUid())){
equipmentCheckMapper.updateById(checkMain);
}else{
equipmentCheckMapper.insert(checkMain);
}
//根据设备id查找点检内容表信息，插入点检详情表
QueryWrapper<TEquipmentCheckContent> contentWrapper = new QueryWrapper<>();
contentWrapper.eq("EquipmentID", checkMain.getEquipmentID());
List<TEquipmentCheckContent> checkContentList = equipmentCheckContentMapper.selectList(contentWrapper);
if(checkContentList != null && checkContentList.size()>0){
for(TEquipmentCheckContent content : checkContentList){
TEquipmentCheckDetail checkDetail = new TEquipmentCheckDetail();
checkDetail.setMainUid(checkMain.getUid())
.setEquipmentID(checkMain.getEquipmentID())
.setEquipmentName(checkMain.getEquipmentName())
.setDjbw(content.getDjbw())
.setDjnr(content.getDjnr())
.setDjbz(content.getDjbz())
.setDjzq(content.getDjzq())
.setTag(checkMain.getTag());
equipmentCheckDetailMapper.insert(checkDetail);
}
}
return R.ok();
}
/**
* 设备点检分页
* 分页-设备点检主表
* @param pageQuery
* @param EquipmentName
* @return
*/
@Override
public R<IPage<TEquipmentCheckVo>> getPage(PageQuery pageQuery, String EquipmentName) {
public R<IPage<TEquipmentCheckMainVo>> getPage(PageQuery pageQuery, String EquipmentName, String selectMonth) {
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);
params.put("selectMonth", selectMonth);
Page<TEquipmentCheckMainVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
IPage<TEquipmentCheckMainVo> pages = equipmentCheckMapper.getPage(page, params);
return R.ok(pages);
}
/**
* 设备点检详情
* @param EquipmentID
* 详情-设备点检主表
* @param mainUid
* @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);
public R<TEquipmentCheckMain> getDetail(String mainUid) {
Rcode.NOT_PARAM.assertNotNull(mainUid);
TEquipmentCheckMain checkMain = equipmentCheckMapper.selectById(mainUid);
Rcode.NOT_FOUND.assertNotNull(checkMain);
return R.ok(checkMain);
}
/**
* 列表-设备点检详情表
* @param mainUid
* @return
*/
public R<List<TEquipmentCheckDetail>> getDetailList(String mainUid) {
Rcode.NOT_PARAM.assertNotNull(mainUid);
QueryWrapper<TEquipmentCheckDetail> detailWrapper = new QueryWrapper<>();
detailWrapper.eq("MainUid", mainUid);
List<TEquipmentCheckDetail> checkList = equipmentCheckDetailMapper.selectList(detailWrapper);
return R.ok(checkList);
}
/**
* 详情-设备点检详情表
* @param detailUid
* @return
*/
public R<TEquipmentCheckDetail> getCheckDetail(String detailUid) {
Rcode.NOT_PARAM.assertNotNull(detailUid);
TEquipmentCheckDetail checkDetail = equipmentCheckDetailMapper.selectById(detailUid);
Rcode.NOT_FOUND.assertNotNull(checkDetail);
return R.ok(checkDetail);
}
/**
* 保存设备点检结果
* 修改-设备点检详情表
* @param query
* @return
*/
@Override
public R checking(TEquipmentCheckQuery query) {
public R updateDetail(TEquipmentCheckDetailQuery 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);
}
Rcode.NOT_PARAM.assertNotNull(query.getUid());
Rcode.NOT_PARAM.assertNotNull(query.getDjjg());
Rcode.NOT_PARAM.assertNotNull(query.getDjrq());
TEquipmentCheckDetail checkDetail = equipmentCheckDetailMapper.selectById(query.getUid());
checkDetail.setDjjg(query.getDjjg())
.setYcjl(query.getYcjl())
.setDjr(query.getDjr())
.setDjrq(query.getDjrq());
equipmentCheckDetailMapper.updateById(checkDetail);
return R.ok();
}
/**
* 删除点检信息
* @param mainUid
* @return
*/
public R delete(String mainUid) {
Rcode.NOT_PARAM.assertNotNull(mainUid);
TEquipmentCheckMain checkMain = equipmentCheckMapper.selectById(mainUid);
Rcode.NOT_FOUND.assertNotNull(checkMain);
QueryWrapper<TEquipmentCheckDetail> detailWrapper = new QueryWrapper<>();
detailWrapper.eq("MainUid", mainUid);
equipmentCheckDetailMapper.delete(detailWrapper);
equipmentCheckMapper.deleteById(mainUid);
return R.ok();
}
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentRunServiceImpl.java
View file @ 3cb27a4e
......@@ -4,14 +4,11 @@ import cn.wise.im.common.http.R;
import cn.wise.im.common.http.ResponseEnum;
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 cn.wise.sc.acquisition.business.service.ITSysDictService;
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentTroubleServiceImpl.java
View file @ 3cb27a4e
......@@ -3,14 +3,11 @@ 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;
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMaterialOutServiceImpl.java
View file @ 3cb27a4e
......@@ -4,11 +4,14 @@ import cn.wise.im.common.http.R;
import cn.wise.im.common.http.ResponseEnum;
import cn.wise.sc.acquisition.business.constant.Rcode;
import cn.wise.sc.acquisition.business.entity.TMaterialOut;
import cn.wise.sc.acquisition.business.entity.TProcessesAuxiliary;
import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
import cn.wise.sc.acquisition.business.mapper.TMaterialOutMapper;
import cn.wise.sc.acquisition.business.model.PageQuery;
import cn.wise.sc.acquisition.business.model.query.TMaterialOutQuery;
import cn.wise.sc.acquisition.business.model.query.TProcessesAuxiliaryQuery;
import cn.wise.sc.acquisition.business.service.ITMaterialOutService;
import cn.wise.sc.acquisition.business.service.ITProcessesAuxiliaryService;
import cn.wise.sc.acquisition.business.service.ITSysDictService;
import cn.wise.sc.acquisition.business.util.DateUtil;
import com.alibaba.fastjson.JSON;
......@@ -18,12 +21,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.tomcat.util.descriptor.tagplugin.TagPluginParser;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
......@@ -45,6 +51,10 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
@Autowired
private ITSysDictService itSysDictService;
@Autowired
private ITProcessesAuxiliaryService itProcessesAuxiliaryService;
/**
* 分页列表
......@@ -84,6 +94,27 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
}
out.setTag(r.getData());
materialOutMapper.insert(out);
//如果出库单的工序为辅助工序，品名为汽油或者柴油的时候，生成出库单的同时还需要在辅助工序里面生成对应的记录。
//但是再附中工序中只能修改产量和备注信息，其他信息不能修改，也不能删除
List<TProcessesAuxiliary> tpaList = new ArrayList<>();
if(out.getProcessesName().contains("辅助") && (out.getName().contains("柴油") || out.getName().contains("汽油"))){
TProcessesAuxiliary processesAuxiliary = new TProcessesAuxiliary();
processesAuxiliary.setEquipmentID(out.getEquipmentID());
processesAuxiliary.setEquipmentName(out.getEquipmentName());
processesAuxiliary.setConsumeDate(LocalDateTime.now());
processesAuxiliary.setName(out.getName());
processesAuxiliary.setAmount(out.getAmount());
processesAuxiliary.setTotal(out.getAmount() * out.getPrice());
processesAuxiliary.setCl(null); //辅助工序的时候再存入 本次加油产量 和 单耗=Amount/cl
processesAuxiliary.setDh(null);
processesAuxiliary.setCllyr(out.getCllyr());
processesAuxiliary.setFlag(true);
processesAuxiliary.setTag(out.getTag());
processesAuxiliary.setBz(null);
tpaList.add(processesAuxiliary);
}
itProcessesAuxiliaryService.saveBatch(tpaList);
return R.ok();
}
......@@ -105,6 +136,22 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
Rcode.NOT_FOUND.assertNotNull(out);
BeanUtils.copyProperties(query, out);
materialOutMapper.updateById(out);
return R.ok();
}
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesAuxiliaryServiceImpl.java
View file @ 3cb27a4e
......@@ -2,6 +2,7 @@ package cn.wise.sc.acquisition.business.service.impl;
import cn.wise.sc.acquisition.business.constant.Rcode;
import cn.wise.sc.acquisition.business.entity.TProcessesAuxiliary;
import cn.wise.sc.acquisition.business.entity.TProcessesDigging;
import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
import cn.wise.sc.acquisition.business.mapper.TProcessesAuxiliaryMapper;
import cn.wise.sc.acquisition.business.model.query.TProcessesAuxiliaryQuery;
......@@ -20,6 +21,9 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
* <p>
* 服务实现类
......@@ -34,6 +38,8 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili
@Autowired
private ITSysDictService itSysDictService;
@Resource
private TProcessesAuxiliaryMapper processesAuxiliaryMapper;
@Override
public R getPage(TProcessesAuxiliaryQuery tProcessesAuxiliaryQuery, Query query) {
......@@ -89,8 +95,9 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili
QueryWrapper<TProcessesAuxiliary> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(ProjectEnum.TProcessesAuxiliary.UID.getLabel(), query.getUid());
//计算单耗 防止失去精度，先转成字符串
float dh = temp.getLjyl() / temp.getDyljcl();
temp.setDh(Double.valueOf(String.valueOf(dh)));
float dh = temp.getAmount() / temp.getCl();
temp.setDh(Float.valueOf(String.valueOf(dh)));
//修改
int update = baseMapper.update(temp, queryWrapper);
if (update > 0) {
......@@ -137,11 +144,11 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili
tProcessesAuxiliary.setTag(r1.getData());
//设置单耗
if (query.getLjyl() == 0) {
tProcessesAuxiliary.setDh(0D);
tProcessesAuxiliary.setDh(0f);
} else {
//强转失去精度，借助字符串
float dh = query.getLjyl() / query.getDyljcl();
tProcessesAuxiliary.setDh(Double.valueOf(String.valueOf(dh)));
tProcessesAuxiliary.setDh(Float.valueOf(String.valueOf(dh)));
}
//增加
log.info(JSON.toJSONString(tProcessesAuxiliary));
......@@ -153,4 +160,29 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili
return R.failed("辅助工序中->增加失败");
}
}
/**
* 查询最新的记录
* @return
*/
@Override
public cn.wise.im.common.http.R<TProcessesAuxiliary> getLatest(){
QueryWrapper<TProcessesAuxiliary> qw = new QueryWrapper<>();
qw.orderByDesc("DigDate");
List<TProcessesAuxiliary> list = processesAuxiliaryMapper.selectList(qw);
if(list != null && list.size()>0){
TProcessesAuxiliary processesAuxiliary = list.get(0);
return cn.wise.im.common.http.R.ok(processesAuxiliary);
}else{
return cn.wise.im.common.http.R.ok(null);
}
}
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesCrusherServiceImpl.java
View file @ 3cb27a4e
......@@ -2,6 +2,7 @@ package cn.wise.sc.acquisition.business.service.impl;
import cn.wise.sc.acquisition.business.constant.Rcode;
import cn.wise.sc.acquisition.business.entity.TProcessesCrusher;
import cn.wise.sc.acquisition.business.entity.TProcessesDigging;
import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
import cn.wise.sc.acquisition.business.mapper.TProcessesCrusherMapper;
import cn.wise.sc.acquisition.business.model.query.TProcessesCrusherQuery;
......@@ -20,6 +21,9 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
* <p>
* 服务实现类
......@@ -34,6 +38,8 @@ public class TProcessesCrusherServiceImpl extends ServiceImpl<TProcessesCrusherM
@Autowired
private ITSysDictService itSysDictService;
@Resource
private TProcessesCrusherMapper processesCrusherMapper;
@Override
public R getPage(TProcessesCrusherQuery tProcessesCrusherQuery, Query query) {
......@@ -129,5 +135,22 @@ public class TProcessesCrusherServiceImpl extends ServiceImpl<TProcessesCrusherM
}
}
/**
* 查询最新的记录
* @return
*/
@Override
public cn.wise.im.common.http.R<TProcessesCrusher> getLatest(){
QueryWrapper<TProcessesCrusher> qw = new QueryWrapper<>();
qw.orderByDesc("CrushDate");
List<TProcessesCrusher> list = processesCrusherMapper.selectList(qw);
if(list != null && list.size()>0){
TProcessesCrusher processesCrusher = list.get(0);
return cn.wise.im.common.http.R.ok(processesCrusher);
}else{
return cn.wise.im.common.http.R.ok(null);
}
}
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDiggingServiceImpl.java
View file @ 3cb27a4e
......@@ -3,11 +3,9 @@ package cn.wise.sc.acquisition.business.service.impl;
import cn.wise.im.common.http.R;
import cn.wise.im.common.http.ResponseEnum;
import cn.wise.sc.acquisition.business.constant.Rcode;
import cn.wise.sc.acquisition.business.entity.TEquipmentAccount;
import cn.wise.sc.acquisition.business.entity.TProcessesDigging;
import cn.wise.sc.acquisition.business.mapper.TProcessesDiggingMapper;
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.TProcessesDiggingQuery;
import cn.wise.sc.acquisition.business.service.ITProcessesDiggingService;
import cn.wise.sc.acquisition.business.service.ITSysDictService;
......@@ -15,7 +13,6 @@ 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 io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -116,6 +113,7 @@ public class TProcessesDiggingServiceImpl extends ServiceImpl<TProcessesDiggingM
}
TProcessesDigging digging = new TProcessesDigging();
BeanUtils.copyProperties(query, digging);
digging.setDigDate(LocalDateTime.now()); //装车日期 系统自动生成
//设置tag
com.baomidou.mybatisplus.extension.api.R<String> r = itSysDictService.getTagDate(null);
if (r.getCode() != 0) {
......@@ -160,5 +158,31 @@ public class TProcessesDiggingServiceImpl extends ServiceImpl<TProcessesDiggingM
return R.ok(digging);
}
/**
* 查询最新的记录
* @return
*/
@Override
public R<TProcessesDigging> getLatest(){
QueryWrapper<TProcessesDigging> qw = new QueryWrapper<>();
qw.orderByDesc("DigDate");
List<TProcessesDigging> list = processesDiggingMapper.selectList(qw);
if(list != null && list.size()>0){
TProcessesDigging processesDigging = list.get(0);
return R.ok(processesDigging);
}else{
return R.ok(null);
}
}
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesTruckServiceImpl.java
View file @ 3cb27a4e
......@@ -3,6 +3,7 @@ package cn.wise.sc.acquisition.business.service.impl;
import cn.wise.im.common.http.R;
import cn.wise.im.common.http.ResponseEnum;
import cn.wise.sc.acquisition.business.constant.Rcode;
import cn.wise.sc.acquisition.business.entity.TProcessesDigging;
import cn.wise.sc.acquisition.business.entity.TProcessesTruck;
import cn.wise.sc.acquisition.business.entity.TProcessesTruck;
import cn.wise.sc.acquisition.business.mapper.TProcessesTruckMapper;
......@@ -154,4 +155,23 @@ public class TProcessesTruckServiceImpl extends ServiceImpl<TProcessesTruckMappe
}
/**
* 查询最新的记录
* @return
*/
@Override
public R<TProcessesTruck> getLatest(){
QueryWrapper<TProcessesTruck> qw = new QueryWrapper<>();
qw.orderByDesc("DeliveryDate");
List<TProcessesTruck> list = processesTruckMapper.selectList(qw);
if(list != null && list.size()>0){
TProcessesTruck processesTruck = list.get(0);
return R.ok(processesTruck);
}else{
return R.ok(null);
}
}
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSafeTroubleServiceImpl.java
View file @ 3cb27a4e
......@@ -64,6 +64,28 @@ public class TSafeTroubleServiceImpl extends ServiceImpl<TSafeTroubleMapper, TSa
qw.orderByDesc("Fxrq");
IPage<TSafeTrouble> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
page = safeTroubleMapper.selectPage(page, qw);
/* QueryWrapper<TSafeTroubleImg> imgWrapper = new QueryWrapper<>();
List<TSafeTroubleImg> checkList = safeTroubleImgMapper.selectList(imgWrapper);
List<TSafeTroubleVo> voList = new ArrayList<>();
List<TSafeTrouble> list = page.getRecords();
for(TSafeTrouble safeTrouble : list){
TSafeTroubleVo safeTroubleVo = new TSafeTroubleVo();
BeanUtils.copyProperties(safeTrouble, safeTroubleVo);
//整改前照片
List<TSafeTroubleImg> oldImgs = checkList.stream()
.filter(arg -> arg.getTroubleUid().equals(safeTrouble.getUid()) && arg.getImgType().equals(TSafeTroubleImg.ImgType.YH)).collect(Collectors.toList());
safeTroubleVo.setOldImgs(oldImgs);
//整改后照片
List<TSafeTroubleImg> newImgs = checkList.stream()
.filter(arg -> arg.getTroubleUid().equals(safeTrouble.getUid()) && arg.getImgType().equals(TSafeTroubleImg.ImgType.ZG)).collect(Collectors.toList());
safeTroubleVo.setNewImgs(newImgs);
voList.add(safeTroubleVo);
}
IPage<TSafeTroubleVo> pagevo = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
pagevo.setRecords(voList);*/
return R.ok(page);
}
......@@ -74,76 +96,78 @@ public class TSafeTroubleServiceImpl extends ServiceImpl<TSafeTroubleMapper, TSa
* @return
*/
@Override
public R save(TSafeTroubleQuery query, HttpServletRequest request) {
@Transactional
public R save(TSafeTroubleQuery query) {
Rcode.NOT_PARAM.assertNotNull(query);
TSafeTrouble safeTrouble = new TSafeTrouble();
BeanUtils.copyProperties(query, safeTrouble);
safeTroubleMapper.insert(safeTrouble);
Boolean ret = ServletFileUpload.isMultipartContent(request);
//保存隐患图片 变量名称只能用file 不能修改
if(ret){
List<MultipartFile> photos = ((MultipartHttpServletRequest) request).getFiles("file");
if (photos != null && photos.size() > 0) {
return saveImg(TSafeTroubleImg.ImgType.YH, safeTrouble.getUid(), photos);
if(query.getBList()!=null && query.getBList().size()>0){
for (byte[] bytes : query.getBList()) {
TSafeTroubleImg safeTroubleImg = new TSafeTroubleImg();
safeTroubleImg.setTroubleUid(safeTrouble.getUid())
.setImg(bytes)
.setImgType(TSafeTroubleImg.ImgType.YH);
safeTroubleImgMapper.insert(safeTroubleImg);
}
}
return R.ok();
}
/**
* 隐患整改
* @param query
* @return
*/
@Override
public R update(TSafeTroubleQuery query,HttpServletRequest request) {
public R update(TSafeTroubleQuery query) {
Rcode.NOT_PARAM.assertNotNull(query);
Rcode.NOT_PARAM.assertNotNull(query.getUid());
TSafeTrouble safeTrouble = safeTroubleMapper.selectById(query.getUid());
Rcode.NOT_FOUND.assertNotNull(safeTrouble);
BeanUtils.copyProperties(query, safeTrouble);
safeTroubleMapper.updateById(safeTrouble);
Boolean ret = ServletFileUpload.isMultipartContent(request);
//保存隐患图片 变量名称只能用file 不能修改
if(ret){
List<MultipartFile> photos = ((MultipartHttpServletRequest) request).getFiles("file");
if (photos != null && photos.size() > 0) {
return saveImg(TSafeTroubleImg.ImgType.ZG, safeTrouble.getUid(), photos);
if(query.getBList()!=null && query.getBList().size()>0){
//删除之前的所有图片
QueryWrapper<TSafeTroubleImg> stiWrapper = new QueryWrapper<>();
stiWrapper.eq("TroubleUid", safeTrouble.getUid());
stiWrapper.eq("ImgType", TSafeTroubleImg.ImgType.YH);
safeTroubleImgMapper.delete(stiWrapper);
//保存没有删除的 和新添加的图片
for (byte[] bytes : query.getBList()) {
TSafeTroubleImg safeTroubleImg = new TSafeTroubleImg();
safeTroubleImg.setTroubleUid(safeTrouble.getUid())
.setImg(bytes)
.setImgType(TSafeTroubleImg.ImgType.YH);
safeTroubleImgMapper.insert(safeTroubleImg);
}
}
return R.ok();
}
if(query.getZgbList()!=null && query.getZgbList().size()>0){
//删除之前的所有图片
QueryWrapper<TSafeTroubleImg> stiWrapper = new QueryWrapper<>();
stiWrapper.eq("TroubleUid", safeTrouble.getUid());
stiWrapper.eq("ImgType", TSafeTroubleImg.ImgType.ZG);
safeTroubleImgMapper.delete(stiWrapper);
/**
* 保存隐患图片信息
* @param imgType 隐患图片类型 ,分为隐患照片和整改后照片两类
* @param Uid 隐患表id
* @param photos 相片列表
* @return
*/
private R saveImg(String imgType, String Uid, List<MultipartFile> photos){
if (photos != null && photos.size() > 0) {
for (MultipartFile file : photos) {
boolean ref = ImageUtil.checkFileSize( file.getSize(),30,"M");
if(!ref){
return R.fail(400, "文件不能大于30M");
}
//保存没有删除的 和新添加的图片
for (byte[] bytes : query.getZgbList()) {
TSafeTroubleImg safeTroubleImg = new TSafeTroubleImg();
safeTroubleImg.setTroubleUid(Uid)
.setImg(ImageUtil.transformByte(file))
.setImgType(imgType);
safeTroubleImg.setTroubleUid(safeTrouble.getUid())
.setImg(bytes)
.setImgType(TSafeTroubleImg.ImgType.ZG);
safeTroubleImgMapper.insert(safeTroubleImg);
}
}
return R.ok();
}
/**
* 隐患详情
* @param Uid
......@@ -169,13 +193,8 @@ public class TSafeTroubleServiceImpl extends ServiceImpl<TSafeTroubleMapper, TSa
List<TSafeTroubleImg> newImgs = checkList.stream()
.filter(arg -> arg.getImgType().equals(TSafeTroubleImg.ImgType.ZG)).collect(Collectors.toList());
safeTroubleVo.setNewImgs(newImgs);
return R.ok(safeTroubleVo);
}
}
acquisition-business/target/classes/application-dev.yml
View file @ 3cb27a4e
......@@ -7,14 +7,10 @@ spring:
profiles:
active: dev
datasource:
# 192.168.110.85 fpsn CementMine fupingc@556
# url: jdbc:sqlserver://192.168.110.85:1433;DatabaseName=fpsn
# username: sa
# password: admin!@#123
#正式环境部署
url: jdbc:sqlserver://192.168.10.16:1433;DatabaseName=CementMine
# 192.168.110.85 fpsn CementMine
url: jdbc:sqlserver://192.168.110.85:1433;DatabaseName=fpsn
username: sa
password: fupingc@556
password: admin!@#123
driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
hikari:
minimum-idle: 3
......
acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/DataStatisticsMapper.xml
View file @ 3cb27a4e
......@@ -9,18 +9,6 @@
<if test="params.TruckID != null and params.TruckID != ''">
and tw.TruckID = #{params.TruckID}
</if>
<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 Convert(varchar(10),tw.Rq,120) <![CDATA[ >= ]]> #{params.startDate}
</if>
......@@ -42,18 +30,6 @@
<if test="params.TruckID != null and params.TruckID != ''">
and tw.TruckID = #{params.TruckID}
</if>
<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 Convert(varchar(10),tw.Rq,120) <![CDATA[ >= ]]> #{params.startDate}
</if>
......
acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TEquipmentCheckMapper.xml
View file @ 3cb27a4e
......@@ -2,21 +2,19 @@
<!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
<select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TEquipmentCheckMainVo">
select tecm.*
from T_Equipment_Check_Main tecm
<include refid="where"/>
order by tea.Ccrq desc
order by tecm.Djrq desc
</select>
<sql id="where">
<where>
<if test="params.Djr != null and params.Djr != ''">
and tec.Djr = #{params.Djr}
<if test="params.selectMonth != null and params.selectMonth != ''">
and tecm.Tag = #{params.selectMonth}
</if>
<if test="params.EquipmentName != null and params.EquipmentName != ''">
and tea.EquipmentName like concat('%', #{params.EquipmentName}, '%')
and tecm.EquipmentName like concat('%', #{params.EquipmentName}, '%')
</if>
</where>
</sql>
......
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