Skip to content

A
amos-boot-biz
Commit b147a245 authored by wanglong's avatar wanglong
Browse files
Options

监检任务表代码优化

parent e594f04e
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 309 deletions
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/TzUgpTaskDto.java → amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/TaskDto.java
View file @ b147a245
......@@ -12,7 +12,7 @@ import java.util.Date;
* @date 2022-10-19
*/
@Data
public class TzUgpTaskDto implements Serializable {
public class TaskDto implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -37,21 +37,6 @@ public class TzUgpTaskDto implements Serializable {
private String status;
@ApiModelProperty(value = "更新日期")
/**
* 更新日期
*/
private Date recDate;
@ApiModelProperty(value = "更新人员")
/**
* 更新人员
*/
private Integer recUserId;
@ApiModelProperty(value = "更新人员名称")
/**
* 更新人员名称
*/
private String recUserName;
@ApiModelProperty(value = "任务开始时间")
/**
* 任务开始时间
*/
private Date startTime;
......@@ -60,11 +45,6 @@ public class TzUgpTaskDto implements Serializable {
* 任务结束时间
*/
private Date overTime;
@ApiModelProperty(value = "是否删除（1删除，0未删除）")
/**
* 是否删除（1删除，0未删除）
*/
private String isDelete;
@ApiModelProperty(value = "项目id")
/**
* 项目id
......
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/WeldCraftDto.java 0 → 100644
View file @ b147a245
package com.yeejoin.amos.boot.module.ugp.api.dto;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
public class WeldCraftDto {
@ApiModelProperty(value = "项目id")
private Long projectId;
@ApiModelProperty(value = "项目名称")
private String name;
@ApiModelProperty(value = "项目编号")
private String projectCode;
@ApiModelProperty(value = "检验检测单位")
private String companyName;
@ApiModelProperty(value = "检验负责人")
private String usrName;
@ApiModelProperty(value = "检验员")
private String inspector;
@ApiModelProperty(value = "检验状态")
private String status;
@ApiModelProperty(value = "检验方式")
private String type;
@ApiModelProperty(value = "交检日期")
private Date submitTime;
@ApiModelProperty(value = "检验时间")
private Date verifyTime;
@ApiModelProperty(value = "app上传的数据")
private String targetInfo;
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/TzUgpTask.java → amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/Task.java
View file @ b147a245
......@@ -18,7 +18,7 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@ApiModel(value="TzUgpTask对象", description="监检任务表")
public class TzUgpTask extends BaseEntity {
public class Task extends BaseEntity {
private static final long serialVersionUID = 1L;
......@@ -35,23 +35,12 @@ public class TzUgpTask extends BaseEntity {
@ApiModelProperty(value = "任务状态（0：未开始 1：进行中 2：已结束）")
private String status;
@ApiModelProperty(value = "更新日期")
private Date recDate;
@ApiModelProperty(value = "更新人员")
private Integer recUserId;
@ApiModelProperty(value = "更新人员名称")
private String recUserName;
@ApiModelProperty(value = "任务开始时间")
private Date startTime;
@ApiModelProperty(value = "任务结束时间")
private Date overTime;
@ApiModelProperty(value = "是否删除（1删除，0未删除）")
private String isDelete;
@ApiModelProperty(value = "项目id")
private Long projectId;
......
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/IntelligentInspectionMapper.java deleted 100644 → 0
View file @ e594f04e
package com.yeejoin.amos.boot.module.ugp.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.ugp.api.Enum.StageEnum;
import com.yeejoin.amos.boot.module.ugp.api.entity.Verify;
import javafx.stage.Stage;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
public interface IntelligentInspectionMapper extends BaseMapper<Verify> {
/**
* 公共接口
* @param
* @return
*/
List<Verify> commonality();
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/TzUgpTaskMapper.java → amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/TaskMapper.java
View file @ b147a245
package com.yeejoin.amos.boot.module.ugp.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.ugp.api.entity.TzUgpTask;
import com.yeejoin.amos.boot.module.ugp.api.entity.Task;
/**
* 监检任务表 Mapper 接口
......@@ -9,6 +9,6 @@ import com.yeejoin.amos.boot.module.ugp.api.entity.TzUgpTask;
* @author duanwei
* @date 2022-10-19
*/
public interface TzUgpTaskMapper extends BaseMapper<TzUgpTask> {
public interface TaskMapper extends BaseMapper<Task> {
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/service/ITzUgpTaskService.java → amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/service/TaskService.java
View file @ b147a245
......@@ -6,6 +6,6 @@ package com.yeejoin.amos.boot.module.ugp.api.service;
* @author duanwei
* @date 2022-10-19
*/
public interface ITzUgpTaskService {
public interface TaskService {
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/IntelligentInspectionMapper.xml deleted 100644 → 0
View file @ e594f04e
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.ugp.api.mapper.IntelligentInspectionMapper">
<resultMap id="resultMap" type="com.yeejoin.amos.boot.module.ugp.api.entity.Verify">
<result property="sequenceNbr" column="sequence_nbr" jdbcType="INTEGER"/>
<result property="projectId" column="project_id" jdbcType="INTEGER"/>
<result property="code" column="code" jdbcType="VARCHAR"/>
<result property="stage" column="stage" jdbcType="VARCHAR"/>
<result property="targetInfo" column="target_info" jdbcType="VARCHAR"/>
<result property="status" column="status" jdbcType="VARCHAR"/>
<result property="type" column="type" jdbcType="VARCHAR"/>
<result property="submitTime" column="submit_time" jdbcType="TIMESTAMP"/>
<result property="verifyTime" column="verify_time" jdbcType="TIMESTAMP"/>
<result property="verifyUnitId" column="verify_unit_id" jdbcType="INTEGER"/>
<result property="chargerPersonId" column="charger_person_id" jdbcType="INTEGER"/>
<result property="inspectorId" column="inspector_id" jdbcType="INTEGER"/>
<result property="recDate" column="rec_date" jdbcType="TIMESTAMP"/>
<result property="recUserId" column="rec_user_id" jdbcType="INTEGER"/>
<result property="recUserName" column="rec_user_name" jdbcType="VARCHAR"/>
<result property="isDelete" column="is_delete" jdbcType="VARCHAR"/>
<association property="project" javaType="com.yeejoin.amos.boot.module.ugp.api.entity.Project">
<result property="name" column="name"></result>
<result property="code" column="code"></result>
</association>
</resultMap>
<select id="commonality" resultMap="resultMap">
select
vf.project_id,
vf.stage,
vf.status,
vf.target_info,
vf.type,
vf.submit_time,
vf.verify_time,
vf.verify_unit_id,
vf.charger_person_id,
vf.inspector_id,
pt.name,
pt.code
from
tz_ugp_verify vf,
tz_ugp_project pt
where
vf.project_id =pt.sequence_nbr
and
pt.is_delete='0'
</select>
</mapper>
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/IntelligentInspectionController.java deleted 100644 → 0
View file @ e594f04e
package com.yeejoin.amos.boot.module.ugp.biz.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.ugp.api.dto.BeforeDto;
import com.yeejoin.amos.boot.module.ugp.api.dto.IntelligentInspectionDto;
import com.yeejoin.amos.boot.module.ugp.api.dto.PercentOfPassDto;
import com.yeejoin.amos.boot.module.ugp.api.service.IIntelligentInspectionService;
import io.swagger.annotations.Api;
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.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
/**
* @Author cpp
* @Description 【智能监检与评价管理】【焊前准备校验】管材质量校验
* @Date 2022/10/13
*/@RestController
@Api(tags = "焊接管材检验信息列表Api")
@RequestMapping(value = "/intelligent-inspection")
public class IntelligentInspectionController {
@Autowired
IIntelligentInspectionService services;
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping(value = "/selectInspection")
@ApiOperation(httpMethod = "GET", value = "焊接管材检验信息列表", notes = "焊接管材检验信息列表")
public ResponseModel<Page<BeforeDto>> selectInspection(@RequestParam(value = "current") int current, @RequestParam
(value = "size") int size, BeforeDto dto) {
Page<BeforeDto> page = new Page<>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(services.selectInspection(page,dto));
}
}
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/TzUgpTaskController.java → amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/TaskController.java
View file @ b147a245
......@@ -4,14 +4,13 @@ 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.yeejoin.amos.boot.biz.common.utils.NameUtils;
import com.yeejoin.amos.boot.module.ugp.api.entity.TzUgpTask;
import com.yeejoin.amos.boot.module.ugp.biz.service.impl.TzUgpTaskServiceImpl;
import com.yeejoin.amos.boot.module.ugp.api.entity.Task;
import com.yeejoin.amos.boot.module.ugp.biz.service.impl.TaskServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
......@@ -26,11 +25,11 @@ import java.util.Arrays;
*/
@RestController
@Api(tags = "监检任务表Api")
@RequestMapping(value = "/tz-ugp-task", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public class TzUgpTaskController {
@RequestMapping(value = "/tz-ugp-task")
public class TaskController {
@Autowired
TzUgpTaskServiceImpl iTzUgpTaskService;
TaskServiceImpl iTzUgpTaskService;
/**
......@@ -39,8 +38,8 @@ public class TzUgpTaskController {
*/
@RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增监检任务表", notes = "新增监检任务表")
public boolean saveTzUgpTask(HttpServletRequest request, @RequestBody TzUgpTask tzUgpTask){
return iTzUgpTaskService.save(tzUgpTask);
public boolean saveTzUgpTask(HttpServletRequest request, @RequestBody Task task){
return iTzUgpTaskService.save(task);
}
/**
......@@ -63,8 +62,8 @@ public class TzUgpTaskController {
*/
@RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改监检任务表", notes = "修改监检任务表")
public boolean updateByIdTzUgpTask(HttpServletRequest request, @RequestBody TzUgpTask tzUgpTask){
return iTzUgpTaskService.updateById(tzUgpTask);
public boolean updateByIdTzUgpTask(HttpServletRequest request, @RequestBody Task task){
return iTzUgpTaskService.updateById(task);
}
......@@ -76,7 +75,7 @@ public class TzUgpTaskController {
*/
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public TzUgpTask selectById(HttpServletRequest request, @PathVariable Long id){
public Task selectById(HttpServletRequest request, @PathVariable Long id){
return iTzUgpTaskService.getById(id);
}
......@@ -88,37 +87,37 @@ public class TzUgpTaskController {
*/
@RequestMapping(value = "/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public IPage<TzUgpTask> listPage(String pageNum,String pageSize,
TzUgpTask tzUgpTask){
public IPage<Task> listPage(String pageNum, String pageSize,
Task task){
Page<TzUgpTask> pageBean;
QueryWrapper<TzUgpTask> tzUgpTaskQueryWrapper = new QueryWrapper<>();
Class<? extends TzUgpTask> aClass = tzUgpTask.getClass();
Page<Task> pageBean;
QueryWrapper<Task> tzUgpTaskQueryWrapper = new QueryWrapper<>();
Class<? extends Task> aClass = task.getClass();
Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
try {
field.setAccessible(true);
Object o = field.get(tzUgpTask);
Object o = field.get(task);
if (o != null) {
Class<?> type = field.getType();
String name = NameUtils.camel2Underline(field.getName());
if (type.equals(Integer.class)) {
Integer fileValue = (Integer) field.get(tzUgpTask);
Integer fileValue = (Integer) field.get(task);
tzUgpTaskQueryWrapper.eq(name, fileValue);
} else if (type.equals(Long.class)) {
Long fileValue = (Long) field.get(tzUgpTask);
Long fileValue = (Long) field.get(task);
tzUgpTaskQueryWrapper.eq(name, fileValue);
} else if (type.equals(String.class)) {
String fileValue = (String) field.get(tzUgpTask);
String fileValue = (String) field.get(task);
tzUgpTaskQueryWrapper.eq(name, fileValue);
} else {
String fileValue = (String) field.get(tzUgpTask);
String fileValue = (String) field.get(task);
tzUgpTaskQueryWrapper.eq(name, fileValue);
}
}
}catch (Exception e) {
}
});
IPage<TzUgpTask> page;
IPage<Task> page;
if (StringUtils.isBlank(pageNum) ||StringUtils.isBlank(pageSize)) {
pageBean = new Page<>(0, Long.MAX_VALUE);
}else{
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/IntelligentInspectionServiceImpl.java deleted 100644 → 0
View file @ e594f04e
package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.additional.query.impl.QueryChainWrapper;
import com.yeejoin.amos.boot.module.ugp.api.Enum.StageEnum;
import com.yeejoin.amos.boot.module.ugp.api.dto.BeforeDto;
import com.yeejoin.amos.boot.module.ugp.api.dto.IntelligentInspectionDto;
import com.yeejoin.amos.boot.module.ugp.api.dto.WeldDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
import com.yeejoin.amos.boot.module.ugp.api.entity.Verify;
import com.yeejoin.amos.boot.module.ugp.api.mapper.IntelligentInspectionMapper;
import com.yeejoin.amos.boot.module.ugp.api.service.IIntelligentInspectionService;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* @Author cpp
* @Description
* @Date 2022/10/13
*/
@Service
public class IntelligentInspectionServiceImpl extends BaseService<IntelligentInspectionDto, Verify, IntelligentInspectionMapper> implements IIntelligentInspectionService {
@Autowired
private IntelligentInspectionMapper mapper;
/**
* 校检阶段公共方法
* name: 那个阶段
*/
public JSONArray commonality(String name){
List<Verify> commonality = mapper.commonality();
if (!StringUtils.isEmpty(name)) {
if (name.equals(StageEnum.焊前.getName())) {
//进入焊前
List<BeforeDto> beforeDtoList =new ArrayList<>();
//获取项目信息
for (Verify verify : commonality) {
BeforeDto beforeDto = new BeforeDto( );
beforeDto.setProjectId(verify.getProjectId()); //项目id
beforeDto.setName(verify.getProject().getName());//项目名称
beforeDto.setProjectCode(verify.getProject().getCode());//项目编号
beforeDto.setStatus(verify.getStatus());//检验状态
beforeDto.setType(verify.getType());//检验方式
beforeDto.setSubmitTime(verify.getVerifyTime());//交检日期
beforeDto.setVerifyTime(verify.getVerifyTime());//检验时间
String targetInfo = verify.getTargetInfo( );//app上传数据
//塞数据(焊口编码,管材厂家,管材批号,质量许可,焊工编号,管材验证定位信息,检验检测单位,检验负责人,监检员)
beforeDtoList.add(beforeDto);
}
JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(beforeDtoList));
return jsonArray ;
}else if (name.equals(StageEnum.工艺.getName())) {
//进入工艺
return null;
}else if (name.equals(StageEnum.耐压.getName()) ) {
//进入耐压
return null;
}else if (name.equals(StageEnum.敷设.getName())) {
//进入敷压
return null;
}else if (name.equals(StageEnum.定位.getName()) ){
//进入定位
return null;
}
}
return null;
}
/**
* 查询焊接管材检验信息列表
* @param page
* @param dto
* @return
*/
@Override
public Page<BeforeDto> selectInspection(Page<BeforeDto> page, BeforeDto dto) {
JSONArray commonality = this.commonality("BEFORE-WELDING");
List<BeforeDto> beforeDtoList = JSONObject.parseArray(commonality.toJSONString( ), BeforeDto.class);
page.setRecords(beforeDtoList);
page.setTotal(beforeDtoList.size());
return page;
}
}
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/TzUgpTaskServiceImpl.java → amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/TaskServiceImpl.java
View file @ b147a245
package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
import com.yeejoin.amos.boot.module.ugp.api.dto.TzUgpTaskDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.TzUgpTask;
import com.yeejoin.amos.boot.module.ugp.api.mapper.TzUgpTaskMapper;
import com.yeejoin.amos.boot.module.ugp.api.service.ITzUgpTaskService;
import com.yeejoin.amos.boot.module.ugp.api.dto.TaskDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.Task;
import com.yeejoin.amos.boot.module.ugp.api.mapper.TaskMapper;
import com.yeejoin.amos.boot.module.ugp.api.service.TaskService;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
......@@ -14,6 +14,6 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
* @date 2022-10-19
*/
@Service
public class TzUgpTaskServiceImpl extends BaseService<TzUgpTaskDto, TzUgpTask,TzUgpTaskMapper> implements ITzUgpTaskService {
public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> implements TaskService {
}
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