Skip to content

A
amos-boot-biz
Commit 2546631b authored by suhuiguang's avatar suhuiguang
Browse files
Options

1.维保任务提交接口

2.配置连接修改为20
parent 1a8ff43c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 291 additions and 405 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/bo/ReginParams.java
View file @ 2546631b
......@@ -20,15 +20,25 @@ public class ReginParams implements Serializable {
public static class PersonIdentity {
private String identityType;
private String personSeq;
private String personName;
private String companyId;
public PersonIdentity(String identityType,String personName,String companyId){
public PersonIdentity(String identityType, String personSeq, String personName,String companyId){
this.identityType = identityType;
this.personSeq = personSeq;
this.personName = personName;
this.companyId = companyId;
}
public String getPersonSeq() {
return personSeq;
}
public void setPersonSeq(String personSeq) {
this.personSeq = personSeq;
}
public String getIdentityType() {
return identityType;
}
......
amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/dao/entity/Check.java
View file @ 2546631b
......@@ -178,8 +178,6 @@ public class Check extends BasicEntity {
@Column(name="error_classify")
private String errorClassify;
private List<CheckInput> checkInput;
private List<CheckShot> checkShot;
......@@ -372,14 +370,6 @@ public class Check extends BasicEntity {
}
@OneToMany(mappedBy = "check", cascade = {CascadeType.REMOVE,CascadeType.MERGE,CascadeType.PERSIST })
public List<CheckInput> getCheckInput() {
return checkInput;
}
public void setCheckInput(List<CheckInput > checkInput) {
this.checkInput = checkInput;
}
@OneToMany(mappedBy = "check", cascade = {CascadeType.REMOVE,CascadeType.MERGE,CascadeType.PERSIST })
public List<CheckShot> getCheckShot() {
return checkShot;
}
......
amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/dao/entity/CheckInput.java
View file @ 2546631b
package com.yeejoin.amos.maintenance.dao.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.persistence.*;
import java.util.List;
/**
* The persistent class for the p_check_input database table.
*
*/
@Entity
@Table(name="p_check_input")
@NamedQuery(name="CheckInput.findAll", query="SELECT c FROM CheckInput c")
@Table(name = "p_check_input")
@NamedQuery(name = "CheckInput.findAll", query = "SELECT c FROM CheckInput c")
public class CheckInput extends BasicEntity {
private static final long serialVersionUID = 1L;
/**
* 巡检记录id
*/
@Column(name="check_id")
private Long checkId;
/**
* 检查项id
*/
@Column(name="input_id")
private Long inputId;
/**
* 检查项名称
*/
@Column(name="input_name")
private String inputName;
/**
* 巡检点检查项
*/
@Column(name="route_point_item_id")
private Long routePointItemId;
/**
* 输入值
*/
@Column(name="input_value")
private String inputValue;
/**
* 是否合格
*/
@Column(name="is_ok")
private String isOk;
/**
* 序号
*/
@Column(name="order_no")
private int orderNo;
/**
* 权限系统org code
*/
@Column(name="org_code")
private String orgCode;
/**
* 检查点分类id
*/
@Column(name="point_classify_id")
private Long pointClassifyId;
/**
* 检查点分类名称
*/
@Column(name="point_classify_name")
private String pointClassifyName;
/**
* 评分
*/
private int score;
/**
* 备注
*/
private String remark;
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public CheckInput() {
}
private Check check;
public Long getCheckId() {
return this.checkId;
}
private static final long serialVersionUID = 1L;
/**
* 巡检记录id
*/
@Column(name = "check_id")
private Long checkId;
/**
* 检查项id
*/
@Column(name = "input_id")
private Long inputId;
/**
* 检查项名称
*/
@Column(name = "input_name")
private String inputName;
/**
* 巡检点检查项
*/
@Column(name = "route_point_item_id")
private Long routePointItemId;
/**
* 输入值
*/
@Column(name = "input_value")
private String inputValue;
/**
* 是否合格
*/
@Column(name = "is_ok")
private String isOk;
/**
* 序号
*/
@Column(name = "order_no")
private int orderNo;
/**
* 权限系统org code
*/
@Column(name = "org_code")
private String orgCode;
/**
* 检查点分类id
*/
@Column(name = "point_classify_id")
private Long pointClassifyId;
/**
* 检查点分类名称
*/
@Column(name = "point_classify_name")
private String pointClassifyName;
/**
* 评分
*/
private int score;
/**
* 备注
*/
private String remark;
@Transient
public List<CheckShot> getCheckShotList() {
return checkShotList;
}
public void setCheckShotList(List<CheckShot> checkShotList) {
this.checkShotList = checkShotList;
}
private List<CheckShot> checkShotList;
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public CheckInput() {
}
public Long getCheckId() {
return this.checkId;
}
public void setCheckId(Long checkId) {
this.checkId = checkId;
}
public Long getInputId() {
return this.inputId;
}
public void setInputId(Long inputId) {
this.inputId = inputId;
}
public String getInputValue() {
return this.inputValue;
}
public void setInputValue(String inputValue) {
this.inputValue = inputValue;
}
public String getIsOk() {
return this.isOk;
}
public void setIsOk(String isOk) {
this.isOk = isOk;
}
public int getOrderNo() {
return this.orderNo;
}
public void setCheckId(Long checkId) {
this.checkId = checkId;
}
public void setOrderNo(int orderNo) {
this.orderNo = orderNo;
}
public Long getInputId() {
return this.inputId;
}
public void setInputId(Long inputId) {
this.inputId = inputId;
}
public String getOrgCode() {
return this.orgCode;
}
public String getInputValue() {
return this.inputValue;
}
public void setOrgCode(String orgCode) {
this.orgCode = orgCode;
}
public void setInputValue(String inputValue) {
this.inputValue = inputValue;
}
public int getScore() {
return this.score;
}
public String getIsOk() {
return this.isOk;
}
public void setScore(int score) {
this.score = score;
}
public void setIsOk(String isOk) {
this.isOk = isOk;
}
public String getInputName() {
return inputName;
}
public int getOrderNo() {
return this.orderNo;
}
public void setInputName(String inputName) {
this.inputName = inputName;
}
public void setOrderNo(int orderNo) {
this.orderNo = orderNo;
}
public Long getRoutePointItemId() {
return routePointItemId;
}
public String getOrgCode() {
return this.orgCode;
}
public void setRoutePointItemId(Long routePointItemId) {
this.routePointItemId = routePointItemId;
}
public void setOrgCode(String orgCode) {
this.orgCode = orgCode;
}
public Long getPointClassifyId() {
return pointClassifyId;
}
public int getScore() {
return this.score;
}
public void setPointClassifyId(Long pointClassifyId) {
this.pointClassifyId = pointClassifyId;
}
public void setScore(int score) {
this.score = score;
}
public String getPointClassifyName() {
return pointClassifyName;
}
@ManyToOne
@JoinColumn(name = "checkId", referencedColumnName = "id", updatable = false, insertable = false)
public Check getCheck() {
return check;
}
public void setCheck(Check check) {
this.check = check;
}
public String getInputName() {
return inputName;
}
public void setInputName(String inputName) {
this.inputName = inputName;
}
public Long getRoutePointItemId() {
return routePointItemId;
}
public void setRoutePointItemId(Long routePointItemId) {
this.routePointItemId = routePointItemId;
}
public Long getPointClassifyId() {
return pointClassifyId;
}
public void setPointClassifyId(Long pointClassifyId) {
this.pointClassifyId = pointClassifyId;
}
public String getPointClassifyName() {
return pointClassifyName;
}
public void setPointClassifyName(String pointClassifyName) {
this.pointClassifyName = pointClassifyName;
}
public void setPointClassifyName(String pointClassifyName) {
this.pointClassifyName = pointClassifyName;
}
}
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/AbstractBaseController.java
View file @ 2546631b
......@@ -7,6 +7,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import org.springframework.cglib.beans.BeanMap;
import com.google.common.collect.Lists;
......@@ -653,4 +654,8 @@ public abstract class AbstractBaseController extends BaseController{
return map;
}
public ReginParams.PersonIdentity opIdentifyInfo(){
return getSelectedOrgInfo().getPersonIdentity();
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/PlanTaskController.java
View file @ 2546631b
......@@ -670,4 +670,4 @@ public class PlanTaskController extends AbstractBaseController {
public CommonResponse planTaskPointDetail(){
return CommonResponseUtil.success(PlanTaskDetailIsFinishEnum.getEnumList());
}
}
}
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/dao/mapper/CheckMapper.java
View file @ 2546631b
......@@ -36,7 +36,7 @@ public interface CheckMapper extends BaseMapper {
List<PointCheckDetailBo> findCheckPointInputItem(@Param(value="checkId") long checkId);
int checkHasRecord(CheckRecordParam requestParam);
int checkHasRecord(@Param(value = "planTaskId") Long planTaskId, @Param(value = "checkId") Long pointId);
List<Map<String, Object>> queryCheckPointImgs(@Param(value="planTaskId") int planTaskId, @Param(value="pointId") int pointId);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/dto/CheckShotDto.java 0 → 100644
View file @ 2546631b
package com.yeejoin.amos.maintenance.business.dto;
import lombok.Data;
/**
* @author DELL
*/
@Data
public class CheckShotDto {
private String shotType;
private String fileUrl;
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/param/CheckInputParam.java
View file @ 2546631b
package com.yeejoin.amos.maintenance.business.param;
import com.yeejoin.amos.maintenance.business.dto.CheckShotDto;
import lombok.Data;
import java.util.List;
/**
* @author DELL
*/
@Data
public class CheckInputParam {
private long inputItemId;
private String inputValue;
private String selectName;
private boolean isCheck;
private String remark;
private Long classifyIds;
private Long routePointItemId;
private List<String> checkInputImg;
public List<String> getCheckInputImg() {
return checkInputImg;
}
public CheckInputParam(String inputValue){
this.inputValue = inputValue;
}
public void setCheckInputImg(List<String> checkInputImg) {
this.checkInputImg = checkInputImg;
}
private List<CheckShotDto> checkInputShot;
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public long getInputItemId() {
return inputItemId;
}
public void setInputItemId(long inputItemId) {
this.inputItemId = inputItemId;
}
public String getInputValue() {
return inputValue;
}
public void setInputValue(String inputValue) {
public CheckInputParam(String inputValue) {
this.inputValue = inputValue;
}
public String getSelectName() {
return selectName;
}
public void setSelectName(String selectName) {
this.selectName = selectName;
}
public boolean getIsCheck() {
return isCheck;
}
public void setIsCheck(boolean isCheck) {
this.isCheck = isCheck;
}
public Long getClassifyIds() {
return classifyIds;
}
public void setClassifyIds(Long classifyIds) {
this.classifyIds = classifyIds;
}
public Long getRoutePointItemId() {
return routePointItemId;
}
public void setRoutePointItemId(Long routePointItemId) {
this.routePointItemId = routePointItemId;
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/param/CheckRecordParam.java
View file @ 2546631b
package com.yeejoin.amos.maintenance.business.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author DELL
*/
@Data
@ApiModel(value = "任务提交")
public class CheckRecordParam {
private Long planTaskId;
private Long pointId;
private String pointName;
private Long checkId;
private String remark;
private String userId;
private String orgCode;
private String checkDepartmentId;
private List<String> checkRecordImg;
/**
* 检查项分类
*/
private Long classId;
/**
* 路线id
*/
private Long routeId;
/**
* 检查时间
*/
private String checkTime;
private String checkMode;
/**
* 是否离线提交
*/
private Boolean isOffline = false;
private List<CheckInputParam> checkItems;
public Long getPointId() {
return pointId;
}
public void setPointId(Long pointId) {
this.pointId = pointId;
}
public Long getCheckId() {
return checkId;
}
public void setCheckId(Long checkId) {
this.checkId = checkId;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public List<CheckInputParam> getCheckItems() {
return checkItems;
}
public void setCheckItems(List<CheckInputParam> checkItems) {
this.checkItems = checkItems;
}
public Long getPlanTaskId() {
return planTaskId;
}
public void setPlanTaskId(Long planTaskId) {
this.planTaskId = planTaskId;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getOrgCode() {
return orgCode;
}
public void setOrgCode(String orgCode) {
this.orgCode = orgCode;
}
public String getCheckTime() {
return checkTime;
}
public String getCheckMode() {
return checkMode;
}
public void setCheckTime(String checkTime) {
this.checkTime = checkTime;
}
public Long getRouteId() {
return routeId;
}
public void setRouteId(Long routeId) {
this.routeId = routeId;
}
public String getPointName() {
return pointName;
}
@ApiModelProperty(value = "任务id",required = true)
private Long planTaskId;
public void setPointName(String pointName) {
this.pointName = pointName;
}
@ApiModelProperty(value = "点id",required = true)
private Long pointId;
public void setCheckMode(String checkMode) {
this.checkMode = checkMode;
}
@ApiModelProperty(value = "点名称")
private String pointName;
public Long getClassId() {
return classId;
}
@ApiModelProperty(value = "检查记录id")
private Long checkId;
public void setClassId(Long classId) {
this.classId = classId;
}
@ApiModelProperty(value = "执行人id")
private String userId;
public Boolean getIsOffline() {
return isOffline;
}
@ApiModelProperty(value = "任务id")
private String orgCode;
public void setIsOffline(Boolean isOffline) {
this.isOffline = isOffline;
}
@ApiModelProperty(value = "备注")
private String remark;
public String getCheckDepartmentId() {
return checkDepartmentId;
}
public void setCheckDepartmentId(String checkDepartmentId) {
this.checkDepartmentId = checkDepartmentId;
}
@ApiModelProperty(value = "路线id")
private Long routeId;
public List<String> getCheckRecordImg() {
return checkRecordImg;
}
@ApiModelProperty(value = "检查时间")
private String checkTime;
public void setCheckRecordImg(List<String> checkRecordImg) {
this.checkRecordImg = checkRecordImg;
}
/**
* 检查项
*/
@ApiModelProperty(value = "检查项",required = true)
private List<CheckInputParam> checkItems;
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/PlanTaskServiceImpl.java
View file @ 2546631b
......@@ -1037,7 +1037,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
Map<String,Object> facility = new LinkedHashMap<>();
facility.put("name",point.getName());
facility.put("pointId",point.getId());
facility.put("point_no",point.getPointNo());
facility.put("pointNo",point.getPointNo());
facility.put("position",point.getBuildingName() + point.getAddress());
facility.put("userName",planTask.getUserName());
facility.put("riskAndManage",point.getRemark());
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/intfc/ICheckService.java
View file @ 2546631b
......@@ -4,6 +4,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import org.springframework.data.domain.Page;
import org.springframework.transaction.annotation.Transactional;
......@@ -43,9 +44,13 @@ public interface ICheckService {
*/
Page<CheckInfoVo> getCheckInfo(String toke, String product, String appKey, CheckInfoPageParam param);
void saveCheckImg(List<CheckShot> imgList);
CheckDto saveCheckRecord(CheckRecordParam requestParam, AgencyUserModel user, DepartmentBo departmentModel, Toke token);
/**
* 保存检查记录
* @param recordParam 填写记录
* @param reginParams 权限信息
* @return CheckDto
*/
CheckDto saveCheckRecord(CheckRecordParam recordParam, ReginParams reginParams) throws Exception;
/**
* 巡检记录删除
......@@ -64,14 +69,6 @@ public interface ICheckService {
List<Map> queryUnqualifiedInputItem(int checkId);
/**
* 检查该店时候已经巡检完成
*
* @param requestParam
* @return
*/
int checkHasRecord(CheckRecordParam requestParam);
AppPointCheckRespone queryCheckPointDetail(String toke,String product,String appKey,long checkId);
AppPointCheckRespone queryCheckPointDetailInVersion2(String toke,String product,String appKey,long checkId);
......@@ -271,4 +268,12 @@ public interface ICheckService {
* @return CheckRecordDto
*/
Map<String,CheckRecordDto> obtainLastCheckRecord(String[] relationId);
/**
* 校验是否已经填写过
* @param planTaskId
* @param pointId
* @return
*/
int checkHasRecord(Long planTaskId, Long pointId);
}
amos-boot-system-maintenance/src/main/resources/application-dev.properties
View file @ 2546631b
#DB properties:
spring.datasource.url = jdbc:mysql://172.16.6.60:3306/amos-maintenance?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.url = jdbc:mysql://172.16.11.20:3306/amos_maintenance_v1.0?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username= root
spring.datasource.password= root_123
## eureka properties:
eureka.client.serviceUrl.defaultZone=http://172.16.10.72:10001/eureka/
eeureka.client.serviceUrl.defaultZone=http://172.16.11.20:10001/eureka/
security.password=a1234560
security.loginId=jc_wjk006
......@@ -12,10 +12,10 @@ security.productApp=STUDIO_APP_MOBILE
security.appKey=studio_normalapp_3168830
#redis 配置
spring.redis.database=0
spring.redis.host=172.16.10.85
spring.redis.database=1
spring.redis.host=172.16.11.20
spring.redis.port=6379
spring.redis.password=amos2019Redis
spring.redis.password=1234560
spring.redis.jedis.pool.max-active=200
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=10
......
amos-boot-system-maintenance/src/main/resources/db/changelog/mt-sql-task.xml
View file @ 2546631b
......@@ -5,5 +5,25 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
<changeSet author="suhuiguang" id="1628836692856-1" runOnChange="true">
<createProcedure procedureName="updatePlanTask" >
DROP PROCEDURE IF EXISTS `updatePlanTask`;
CREATE PROCEDURE `updatePlanTask`(IN `planTaskId` int,IN `pointId` int,IN `planTaskDetailId` int,IN `executorId` int)
BEGIN
declare num int ;
declare orgCode VARCHAR(50) ;
declare currentTaskNum int ;
update p_plan_task_detail set is_finish = 1 where id=planTaskDetailId;
select finish_num, org_code from p_plan_task where id = planTaskId into num, orgCode;
select count(1) into currentTaskNum from p_plan_task_detail where task_no = planTaskId and is_finish in(0,2);
UPDATE p_plan_task_detail SET executor_id = executorId,executor_date = current_timestamp where id = planTaskDetailId;
if currentTaskNum > 0 THEN
update p_plan_task set finish_num = (num + 1) where id = planTaskId;
ELSE
update p_plan_task set finish_num = (num + 1), finish_status = 2 where id = planTaskId;
end if;
END
</createProcedure>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_check.xml
View file @ 2546631b
......@@ -256,8 +256,7 @@
FROM
p_check c
WHERE
is_ok in (1,2)
and c.point_id = #{pointId}
c.point_id = #{pointId}
and c.plan_task_id = #{planTaskId}
</select>
......
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