Skip to content

A
amos-boot-biz
Commit 1eba123e authored by wujiang's avatar wujiang
Browse files
Options

Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

parents 75e1741c 52376274
Show whitespace changes
Inline Side-by-side
Showing with 315 additions and 242 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java
View file @ 1eba123e
......@@ -95,6 +95,7 @@ public class ControllerAop {
// 不需要校验token的接口直接返回
if (joinPoint.getSignature() instanceof MethodSignature) {
return;
}
// 平台studio配置的下载接口token从url里取
......
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/ProBlemProcessEnum.java → amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/ProblemProcessEnum.java
View file @ 1eba123e
......@@ -8,26 +8,28 @@ import java.util.Map;
@Getter
@AllArgsConstructor
public enum ProBlemProcessEnum {
流程开始("流程开始","1"),
确定问题("确定问题","2"),
重大问题发送短信("重大问题发送短信","3"),
编制处理方案("编制处理方案","4"),
审查处理方案("审查处理方案","5"),
提交整改书("提交整改书","6"),
审查整改过程("审查整改过程","7"),
超期整改发送短信("超期整改发送短信","8"),
问题分类("问题分类","9"),
转人工("转人工","10"),
结束("结束","11");
public enum ProblemProcessEnum {
流程开始("流程开始","1","LCKS"),
确定问题("确定问题","2","QDWT"),
重大问题发送短信("重大问题发送短信","3","ZDWTFSDX"),
编制处理方案("编制处理方案","4","BZCLFA"),
审查处理方案("审查处理方案","5","SCCLFA"),
提交整改书("提交整改书","6","TJZGGC"),
审查整改过程("审查整改过程","7","SCZGGC"),
超期整改发送短信("超期整改发送短信","8","CQZGFSDX"),
问题分类("问题分类","9","WTFL"),
转人工("转人工","10","ZRG"),
结束("结束","11","JS");
private String Name;
private String key;
private String Code;
public static Map<String,String> map = new HashMap<>();
static {
for (ProBlemProcessEnum proBlemProcessEnum : ProBlemProcessEnum.values()) {
for (ProblemProcessEnum proBlemProcessEnum : ProblemProcessEnum.values()) {
map.put(proBlemProcessEnum.getCode(),proBlemProcessEnum.getName());
}
}
......
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/ProblemTypeEnum.java
View file @ 1eba123e
......@@ -19,8 +19,8 @@ public enum ProblemTypeEnum {
public static Map<String,String> map = new HashMap<>();
static {
for (ProBlemProcessEnum proBlemProcessEnum : ProBlemProcessEnum.values()) {
map.put(proBlemProcessEnum.getCode(),proBlemProcessEnum.getName());
for (ProblemTypeEnum problemTypeEnum : ProblemTypeEnum.values()) {
map.put(problemTypeEnum.getCode(),problemTypeEnum.getName());
}
}
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/SMSEnum.java 0 → 100644
View file @ 1eba123e
package com.yeejoin.amos.boot.module.ugp.api.Enum;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public enum SMSEnum {
项目安装告知申请("项目安装告知申请","SMS_UGP_0001"),
项目立项驳回短信("项目立项驳回短信","SMS_UGP_0002"),
质量问题短信("质量问题短信","SMS_UGP_0003"),
重大质量问题短信("重大质量问题短信","SMS_UGP_0004"),
超期整改短信("超期整改短信","SMS_UGP_0005");
private String name;
private String code;
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/StageEnum.java
View file @ 1eba123e
......@@ -15,26 +15,27 @@ import java.util.Map;
@AllArgsConstructor
public enum StageEnum {
焊前人员("0","STAFF"),
焊前设备("1","EQUIPMENT"),
焊前管材质量("2","BEFORE-WELDING"),
焊接工艺("3","CRAFT"),
管道耐压("4","VOLTAGE"),
敷设质量("5","LAY"),
焊口定位("6","LOTCATION");
private String status;
焊前人员("人员确定","STAFF"),
焊前设备("设备确定","EQUIPMENT"),
焊前管材质量("管材确定","BEFORE-WELDING"),
焊接工艺("工艺确定","CRAFT"),
管道耐压("耐压确定","VOLTAGE"),
敷设质量("敷设确定","LAY"),
定位("定位确定","LOTCATION");
private String name;
private String stage;
public static Map<String,String> getNameByStatusMap = new HashMap<String,String>();
public static Map<String,String> getStatusByNameMap = new HashMap<String,String>();
public static Map<String,String> getNameByStatusMap = new HashMap<>();
public static Map<String,String> getStatusByNameMap = new HashMap<>();
static {
for(StageEnum enums:StageEnum.values()){
getNameByStatusMap.put(enums.status,enums.name);
getStatusByNameMap.put(enums.name, enums.status);
getNameByStatusMap.put(enums.stage,enums.name);
getStatusByNameMap.put(enums.name, enums.stage);
}
}
......
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/WeldCodeEnum.java
View file @ 1eba123e
package com.yeejoin.amos.boot.module.ugp.api.Enum;
import java.security.PublicKey;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.HashMap;
import java.util.Map;
/**
* 焊口编码赋码状态
* 焊口编码赋码状态赋码方式
*/
@Getter
@AllArgsConstructor
public enum WeldCodeEnum {
赋值状态1("未赋值","0","codingStatus"),
赋值状态2("已赋值","1","codingStatus");
//焊口编码赋码状态
未赋值("未赋值","0"),
已赋值("已赋值","1");
/**
* 焊口编码赋码方式
*/
private String status;
private String name;
private String state;
private String IState;
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getState() {
return state;
}
public void setState(String state) {
this.state = state;
}
public String getIState() {
return IState;
}
public void setIState(String IState) {
this.IState = IState;
}
WeldCodeEnum(String status, String state, String IState) {
this.status = status;
this.state = state;
this.IState = IState;
}
public static final Map<String,String> map=new HashMap<>();
static{
for (WeldCodeEnum weldCodeEnum:WeldCodeEnum.values()){
map.put(weldCodeEnum.getState(),weldCodeEnum.getStatus());
map.put(weldCodeEnum.getState(),weldCodeEnum.getName());
}
}
......
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/WeldMethodEnum.java
View file @ 1eba123e
package com.yeejoin.amos.boot.module.ugp.api.Enum;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.HashMap;
import java.util.Map;
/**
* 焊口编码赋码方式
*/
@Getter
@AllArgsConstructor
public enum WeldMethodEnum {
赋码方式1("自动赋码", "0", "codingMethod"),
赋码方式2("手动赋码", "1", "codingMethod");
private String status;
自动赋码("自动赋码", "0"),
手动赋码("手动赋码", "1");
private String name;
private String state;
private String IState;
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getState() {
return state;
}
public void setState(String state) {
this.state = state;
public static final Map<String,String> map=new HashMap<>();
static{
for (WeldMethodEnum weldMethodEnum:WeldMethodEnum.values()){
map.put(weldMethodEnum.getState(),weldMethodEnum.getName());
}
public String getIState() {
return IState;
}
public void setIState(String IState) {
this.IState = IState;
}
WeldMethodEnum(String status, String state, String IState) {
this.status = status;
this.state = state;
this.IState = IState;
}
public static final Map<String, String> map = new HashMap<>();
static {
for (WeldMethodEnum weldMethodEnum : WeldMethodEnum.values()) {
map.put(weldMethodEnum.getState(), weldMethodEnum.getStatus());
}
}
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/CompanyDto.java
View file @ 1eba123e
......@@ -23,7 +23,6 @@ public class CompanyDto extends BaseDto {
Company company;
@ApiModelProperty(value = "企业名称")
private String name;
......@@ -62,4 +61,31 @@ public class CompanyDto extends BaseDto {
@ApiModelProperty(value = "单位机构代码")
private String orgCode;
@ApiModelProperty(value = "企业管理员")
private String adminName;
@ApiModelProperty(value = "企业管理员电话")
private String adminTel;
@ApiModelProperty(value = "法人")
private String legalPerson;
@ApiModelProperty(value = "法人电话")
private String legalPersonTel;
@ApiModelProperty(value = "单位电话")
private String unitTel;
@ApiModelProperty(value = "成立日期")
private Date createTime;
@ApiModelProperty(value = "管理员身份证附件")
private String adminLincensePic;
@ApiModelProperty(value = "用户名")
private String adminLoginName;
@ApiModelProperty(value = "用户密码")
private String adminLoginPwd;
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/Company.java
View file @ 1eba123e
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.ugp.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -22,94 +23,69 @@ public class Company extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 企业名称
*/
@TableField("name")
@ApiModelProperty(value = "企业名称")
private String name;
/**
* 企业类型
*/
@TableField("type")
@ApiModelProperty(value = "企业类型")
private String type;
/**
* 统一信用代码
*/
@TableField("credit_code")
@ApiModelProperty(value = "统一信用代码")
private String creditCode;
/**
* 许可证号
*/
@TableField("license_number")
@ApiModelProperty(value = "许可证号")
private String licenseNumber;
/**
* 有效期至
*/
@TableField("expiration_date")
@ApiModelProperty(value = "有效期至")
private Date expirationDate;
/**
* 企业地址
*/
@TableField("address")
@ApiModelProperty(value = "企业地址")
private String address;
/**
* 联系方式
*/
@TableField("contact_phone")
@ApiModelProperty(value = "联系方式")
private String contactPhone;
/**
* 联系人
*/
@TableField("contact")
@ApiModelProperty(value = "联系人")
private String contact;
/**
*
*/
@TableField("remark")
private String remark;
/**
* 统一信用代码证书附件
*/
@TableField("credit_attch")
@ApiModelProperty(value = "统一信用代码证书附件")
private String creditAttch;
/**
* 许可证附件
*/
@TableField("license_attch")
@ApiModelProperty(value = "许可证附件")
private String licenseAttch;
/**
* 是否已审核（1已审核，0未审核）
*/
@TableField("approved")
@ApiModelProperty(value = "是否已审核（1已审核，0未审核）")
private String approved;
/**
* 单位机构代码
*/
@TableField("org_code")
@ApiModelProperty(value = "单位机构代码")
private String orgCode;
/**
* 企业管理员
*/
@TableField("admin")
private String admin;
@ApiModelProperty(value = "企业管理员")
private String adminName;
/**
* 企业管理员电话
*/
@TableField("admin_phone")
private String adminPhone;
@ApiModelProperty(value = "企业管理员电话")
private String adminTel;
@ApiModelProperty(value = "法人")
private String legalPerson;
@ApiModelProperty(value = "法人电话")
private String legalPersonTel;
@ApiModelProperty(value = "单位电话")
private String unitTel;
@ApiModelProperty(value = "成立日期")
private Date createTime;
@ApiModelProperty(value = "管理员身份证附件")
private String adminLincensePic;
@ApiModelProperty(value = "用户名")
private String adminLoginName;
@ApiModelProperty(value = "用户密码")
private String adminLoginPwd;
}
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/CompanyController.java
View file @ 1eba123e
......@@ -197,17 +197,18 @@ public class CompanyController extends BaseController {
CompanyModel companyModelFeignClient = Privilege.companyClient.create(companyModel).getResult();
//创建平台用户
String admin = company.getAdmin();
String adminPhone = company.getAdminPhone();
agencyUserModel.setRealName(admin);
agencyUserModel.setMobile(company.getContactPhone());
String adminName = company.getAdminName();
String adminLoginName = company.getAdminLoginName();
String adminPhone = company.getAdminTel();
String adminPassword = company.getAdminLoginPwd();
agencyUserModel.setRealName(adminName);
agencyUserModel.setAgencyCode("ugp");
agencyUserModel.setLockStatus("UNLOCK");
agencyUserModel.setMobile(adminPhone);
agencyUserModel.setCreateTime(new Date());
agencyUserModel.setUserName(admin);
agencyUserModel.setPassword(DesUtil.encode(adminPhone, secretKey));
agencyUserModel.setRePassword(DesUtil.encode(adminPhone, secretKey));
agencyUserModel.setUserName(adminLoginName);
agencyUserModel.setPassword(DesUtil.encode(adminPassword, secretKey));
agencyUserModel.setRePassword(DesUtil.encode(adminPassword, secretKey));
Privilege.agencyUserClient.create(agencyUserModel);
//企业动态表单存储
......@@ -218,7 +219,7 @@ public class CompanyController extends BaseController {
//企业管理员人员 动态表单存储
jsonObject = null;
jsonObject.put("name",admin);
jsonObject.put("name",adminName);
jsonObject.put("phone",adminPhone);
jsonObject.put("amosOrgId",agencyUserModel.getSequenceNbr());
jsonObject.put("amosOrgCode",agencyUserModel.getUserId());
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/VerifyController.java
View file @ 1eba123e
......@@ -211,10 +211,10 @@ public class VerifyController extends BaseController {
/**
* 焊接工艺效验
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@ApiOperation(httpMethod = "GET",value = "焊接工艺效验", notes = "焊接工艺效验")
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "焊接工艺效验", notes = "焊接工艺效验")
@PostMapping(value = "/weldeffect")
public ResponseModel<String> weldEffect(@RequestBody JSONObject jsonObject){
public ResponseModel<String> weldEffect(@RequestBody JSONObject jsonObject) {
return ResponseHelper.buildResponse(verifyServiceImpl.weldEffect(jsonObject));
}
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/WelderController.java
View file @ 1eba123e
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
import com.yeejoin.amos.boot.module.ugp.api.dto.WelderDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectMapper;
......@@ -13,6 +14,7 @@ import com.yeejoin.amos.boot.module.ugp.biz.service.impl.ProjectServiceImpl;
import com.yeejoin.amos.boot.module.ugp.biz.service.impl.WelderServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
......@@ -39,17 +41,20 @@ public class WelderController extends BaseController {
@Autowired
WelderServiceImpl welderServiceImpl;
@Autowired
OrgServiceImpl orgServiceImpl;
/**
* 新增焊工信息
* 新增/修改焊工信息
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/saveWelder", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增焊工信息", notes = "新增焊工信息")
public ResponseModel<Object> saveWelder(@RequestParam String isWelder, @RequestBody WelderDto welderDto) {
return ResponseHelper.buildResponse(null);
public ResponseModel<OrgUsrDto> saveWelder(@RequestBody JSONObject jsonObject, @RequestParam String bizOrgType ,
@RequestParam(required = false) String sequenceNbr) {
return ResponseHelper.buildResponse(orgServiceImpl.dataHandling(jsonObject,bizOrgType,sequenceNbr));
}
/**
......@@ -87,4 +92,48 @@ public class WelderController extends BaseController {
return ResponseHelper.buildResponse(welderServiceImpl.getpageInfo());
}
/**
* 当前登陆人所在公司/单位/企业 下的 所有焊工人员分页查询
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "当前登陆人所在公司/单位/企业下的所有焊工人员分页列表", notes = "当前登陆人所在公司/单位/企业下的所有焊工人员分页查询列表")
@GetMapping(value = "/getCompanyWelder")
public ResponseModel<IPage> getCompanyWelder(
@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size
){
Page page = new Page();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(orgServiceImpl.getCompanyWelder(page));
}
/**
* 根据sequenceNbr查询焊工信息
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询项目焊工信息表", notes = "根据sequenceNbr查询项目焊工信息表")
public ResponseModel<Map> selectOneById(@PathVariable String sequenceNbr) {
return ResponseHelper.buildResponse(orgServiceImpl.getdetialInfo(sequenceNbr));
}
/**
* 根据sequenceNbr删除焊工信息
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr删除项目焊工信息表", notes = "根据sequenceNbr删除项目焊工信息表")
public void deleteOneById(@PathVariable String sequenceNbr) throws Exception {
orgServiceImpl.delectInfo(sequenceNbr);
}
}
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/OrgServiceImpl.java
View file @ 1eba123e
......@@ -278,4 +278,43 @@ public class OrgServiceImpl {
}
return orgUsr;
}
/**
* 根据parentId获取OrgUsr表的详细信息列表
*/
public List<OrgUsr> getOrgUsrByParentId(String sequenceNbr){
OrgUsr orgUsr = getOrgUsrById(sequenceNbr);
LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
wrapper.like(OrgUsr :: getBizOrgCode,orgUsr.getBizOrgCode())
.eq(OrgUsr::getBizOrgType,OrgEnum.人员.getKey())
.ne(OrgUsr::getOrgExpandAttr1,OrgEnum.焊工.getKey());
List<OrgUsr> orgUsrList = orgUsrServiceImpl.list(wrapper);
return orgUsrList;
}
/**
* 根据OrgUsr表的sequenceNbr删除instance表的数据
* @param sequencenNbr
* @throws Exception
*/
public void delectInfo(String sequencenNbr) throws Exception {
OrgUsr orgUsr = getOrgUsrById(sequencenNbr);
LambdaQueryWrapper<DynamicFormInstance> dynamicWrapper = new LambdaQueryWrapper<>();
if(OrgEnum.人员.getKey().equals(orgUsr.getBizOrgType())){
dynamicWrapper.eq(DynamicFormInstance::getInstanceId,sequencenNbr);
alertFormValueServiceImpl.remove(dynamicWrapper);
}else{
LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(OrgUsr::getParentId,sequencenNbr);
List<OrgUsr> orgUsrList = orgUsrServiceImpl.list(wrapper);
if(ValidationUtil.isEmpty(orgUsrList)){
dynamicWrapper.eq(DynamicFormInstance::getInstanceId,sequencenNbr);
alertFormValueServiceImpl.remove(dynamicWrapper);
}else {
throw new Exception("该企业/部门下还有人员，不可删除！");
}
}
}
}
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProblemInitiationServiceImpl.java
View file @ 1eba123e
......@@ -7,8 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
import com.yeejoin.amos.boot.module.ugp.api.Enum.ProBlemProcessEnum;
import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectInitiationEnum;
import com.yeejoin.amos.boot.module.ugp.api.Enum.ProblemProcessEnum;
import com.yeejoin.amos.boot.module.ugp.api.entity.*;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
......@@ -18,10 +17,8 @@ import com.yeejoin.amos.feign.workflow.Workflow;
import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
import com.yeejoin.amos.feign.workflow.model.AjaxResult;
import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.parsing.Problem;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
......@@ -57,7 +54,7 @@ public class ProblemInitiationServiceImpl {
@Autowired
QualityProblemServiceImpl qualityProblemService;
private static String SMSCODE = "SMS_UGP_0002";
private static String SMSCODE = "SMS_UGP_0003";
@Value("${params.work.flow.problemDefinitionKey}")
private String problemDefinitionKey;
......@@ -97,7 +94,7 @@ public class ProblemInitiationServiceImpl {
projectInitiation.setTaskId(dataObject.getString("id"));
projectInitiation.setTaskName(dataObject.getString("name"));
if (ProBlemProcessEnum.重大问题发送短信.getName().equals(dataObject.getString("name"))) {
if (ProblemProcessEnum.重大问题发送短信.getName().equals(dataObject.getString("name"))) {
if(!ValidationUtil.isEmpty(objectd)) {
// sendSms(object);
}
......@@ -129,12 +126,12 @@ public class ProblemInitiationServiceImpl {
}
public void sendSms(JSONObject object){
public void sendSms(JSONObject object,String smsCode){
//设置短信发送的基本参数
HashMap<String, String> smsParams = new HashMap();
// smsParams.put("smsCode", SMSCODE);
// smsParams.put("companyName", object.getString("installationUnit"));
// smsParams.put("projectName", object.getString("name"));
smsParams.put("smsCode", smsCode);
smsParams.put("companyName", object.getString("installationUnit"));
smsParams.put("projectName", object.getString("name"));
//条件构造器 通过项目id查出来的项目详情信息中的区域代码，在监管区域规则表中拿到详细信息中的监察部门id，在使用监察部门id查找到该部门下的用户List。
QueryWrapper<SuperviseRule> wrapper = new QueryWrapper<>();
wrapper.eq("admin_region_code", projectServiceImpl.getById(object.getLong("projectId")).getInstallRegionCode());
......@@ -159,7 +156,6 @@ public class ProblemInitiationServiceImpl {
}
}
@Transactional(rollbackFor = Exception.class)
public SmsRecordModel sendSmsMassage(String smsCode, String mobile, HashMap<String, String> smsParams){
SmsRecordModel smsRecordModel = new SmsRecordModel();
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectInitiationServiceImpl.java
View file @ 1eba123e
......@@ -10,17 +10,16 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Maps;
import com.yeejoin.amos.boot.biz.common.service.impl.WorkflowExcuteServiceImpl;
import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectInitiationEnum;
import com.yeejoin.amos.boot.module.ugp.api.Enum.SMSEnum;
import com.yeejoin.amos.boot.module.ugp.api.Util.CommonResponse;
import com.yeejoin.amos.boot.module.ugp.api.Util.HttpUtil;
import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant;
import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectInitiationDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.InstallNoticeMsg;
import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
import com.yeejoin.amos.boot.module.ugp.api.entity.ProjectInitiation;
import com.yeejoin.amos.boot.module.ugp.api.entity.SuperviseRule;
import com.yeejoin.amos.boot.module.ugp.api.entity.*;
import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectInitiationMapper;
import com.yeejoin.amos.boot.module.ugp.api.service.IProjectInitiationService;
import com.yeejoin.amos.feign.privilege.Privilege;
......@@ -78,15 +77,15 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
@Autowired
OrgUsrServiceImpl orgUsrServiceImpl;
@Autowired
RectifyMsgServiceImpl rectifyMsgServiceImpl;
private final Logger logger = LoggerFactory.getLogger(ProjectInitiationServiceImpl.class);
@Value("${params.work.flow.processDefinitionKey}")
private String processDefinitionKey;
private static String SMSCODE = "SMS_UGP_0001";
@Override
@Transactional(rollbackFor = Exception.class)
public void start(Project project) {
String instanceId = null;
//启动流程
......@@ -118,7 +117,6 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
}
@Override
@Transactional(rollbackFor = Exception.class)
public void execute(String instanceId,Object objectd, String option){
JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(objectd));
JSONObject jsonObject = workflowFeignService.getTask(instanceId);
......@@ -146,29 +144,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
if (ProjectInitiationEnum.告知申请.getName().equals(dataObject.getString("name"))) {
if(!ValidationUtil.isEmpty(objectd)) {
//设置短信发送的基本参数
HashMap<String, String> smsParams = new HashMap();
smsParams.put("smsCode", SMSCODE);
smsParams.put("companyName", object.getString("installationUnit"));
smsParams.put("projectName", object.getString("name"));
//条件构造器 通过项目id查出来的项目详情信息中的区域代码，在监管区域规则表中拿到详细信息中的监察部门id，在使用监察部门id查找到该部门下的用户List。
QueryWrapper<SuperviseRule> wrapper = new QueryWrapper<>();
wrapper.eq("admin_region_code", projectServiceImpl.getById(object.getLong("projectId")).getInstallRegionCode());
List<AgencyUserModel> agencyUserModelList = Privilege.agencyUserClient.queryByDepartmentId(Long.valueOf(orgUsrServiceImpl.getById(superviseRuleServiceImpl.getOne(wrapper).getSuperviseDeptId()).getAmosOrgId()), null, null, null).getResult();
//遍历用户List，拿到用户手机号、userId,来发短信、存短信日志。
for (AgencyUserModel agencyUserModel : agencyUserModelList) {
SmsRecordModel smsRecordModel = sendSmsMassage(SMSCODE, agencyUserModel.getMobile(), smsParams);
InstallNoticeMsg installNoticeMsg = new InstallNoticeMsg();
if (ValidationUtil.isEmpty(smsRecordModel)) {
continue;
}
installNoticeMsg.setContent(smsRecordModel.getSmsContent());
installNoticeMsg.setInstallNoticeId(smsRecordModel.getSequenceNbr());
installNoticeMsg.setTargetUnitId(Long.valueOf(smsRecordModel.getAgencyCode()));
installNoticeMsg.setTargetPersonId(Long.valueOf(agencyUserModel.getUserId()));
installNoticeMsg.setSendTime(smsRecordModel.getSendTime());
installNoticeMsgService.save(installNoticeMsg);
}
sendSms(object, SMSEnum.项目安装告知申请.getCode());
}
}
if ("监检科室分配".equals(dataObject.getString("name"))) {
......@@ -236,4 +212,34 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
project.setStatus(getFlowTaskName(instanceId));
projectService.updateById(project);
}
public void sendSms(JSONObject object,String smsCode){
//设置短信发送的基本参数
HashMap<String, String> smsParams = new HashMap();
smsParams.put("smsCode", smsCode);
smsParams.put("companyName", object.getString("installationUnit"));
smsParams.put("projectName", object.getString("name"));
//条件构造器 通过项目id查出来的项目详情信息中的区域代码，在监管区域规则表中拿到详细信息中的监察部门id，在使用监察部门id查找到该部门下的用户List。
QueryWrapper<SuperviseRule> wrapper = new QueryWrapper<>();
wrapper.eq("admin_region_code", projectServiceImpl.getById(object.getLong("projectId")).getInstallRegionCode());
String noticeUnitId = orgUsrServiceImpl.getById(superviseRuleServiceImpl.getOne(wrapper).getSuperviseDeptId()).getAmosOrgId();
List<AgencyUserModel> agencyUserModelList = Privilege.agencyUserClient.queryByDepartmentId(Long.valueOf(noticeUnitId), null, null, null).getResult();
//遍历用户List，拿到用户手机号、userId,来发短信、存短信日志。
for (AgencyUserModel agencyUserModel : agencyUserModelList) {
LambdaQueryWrapper<OrgUsr> wrapperQueryWrapper = new LambdaQueryWrapper<>();
wrapperQueryWrapper.eq(OrgUsr::getAmosOrgCode,agencyUserModel.getUserId());
SmsRecordModel smsRecordModel = sendSmsMassage(smsCode, agencyUserModel.getMobile(), smsParams);
RectifyMsg rectifyMsg = new RectifyMsg();
if (ValidationUtil.isEmpty(smsRecordModel)) {
continue;
}
rectifyMsg.setContent(smsRecordModel.getSmsContent());
rectifyMsg.setProblemId(object.getLong("sequenceNbr"));
rectifyMsg.setNoticeUnitId(Long.valueOf(noticeUnitId));
rectifyMsg.setMsgReceiver(orgUsrServiceImpl.getOne(wrapperQueryWrapper).getSequenceNbr());
rectifyMsg.setSendTime(smsRecordModel.getSendTime());
rectifyMsgServiceImpl.save(rectifyMsg);
}
}
}
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/QualityProblemServiceImpl.java
View file @ 1eba123e
package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.module.ugp.api.Enum.ProBlemProcessEnum;
import com.yeejoin.amos.boot.module.ugp.api.Enum.ProblemProcessEnum;
import com.yeejoin.amos.boot.module.ugp.api.Enum.ProblemTypeEnum;
import com.yeejoin.amos.boot.module.ugp.api.entity.QualityProblem;
import com.yeejoin.amos.boot.module.ugp.api.mapper.QualityProblemMapper;
import com.yeejoin.amos.boot.module.ugp.api.service.IQualityProblemService;
import com.yeejoin.amos.boot.module.ugp.api.dto.QualityProblemDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......@@ -69,7 +68,7 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
public String updateItem(QualityProblem qualityProblem, Long sequenceNbr){
QualityProblem quality = this.getById(sequenceNbr);
if(ProBlemProcessEnum.确定问题.getName().equals(quality.getStatus())) {
if(ProblemProcessEnum.确定问题.getName().equals(quality.getStatus())) {
//监检机构确定问题
quality.setLevel(qualityProblem.getLevel());
quality.setReformLimitDate(qualityProblem.getReformLimitDate());
......@@ -82,16 +81,16 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
problemInitiationService.execute(quality.getInstanceId(),quality,"0");
problemInitiationService.execute(quality.getInstanceId(),quality,"1");
}
}else if(ProBlemProcessEnum.编制处理方案.getName().equals(quality.getStatus())) {
}else if(ProblemProcessEnum.编制处理方案.getName().equals(quality.getStatus())) {
//编制处理方案
quality.setSolution(qualityProblem.getSolution());
quality.setSolutionDesc(qualityProblem.getSolutionDesc());
//执行一次
problemInitiationService.execute(quality.getInstanceId(),quality,"1");
}else if (ProBlemProcessEnum.审查处理方案.getName().equals(quality.getStatus())){
}else if (ProblemProcessEnum.审查处理方案.getName().equals(quality.getStatus())){
//执行一次
problemInitiationService.execute(quality.getInstanceId(),quality,"1");
}else if(ProBlemProcessEnum.提交整改书.getName().equals(quality.getStatus())) {
}else if(ProblemProcessEnum.提交整改书.getName().equals(quality.getStatus())) {
//上传整改书
quality.setReformDoc(qualityProblem.getReformDoc());
quality.setReformDesc(qualityProblem.getReformDesc());
......@@ -105,7 +104,7 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
problemInitiationService.execute(quality.getInstanceId(),quality,"0");
problemInitiationService.execute(quality.getInstanceId(),quality,"1");
}
}else if(ProBlemProcessEnum.问题分类.getName().equals(quality.getProblemType())) {
}else if(ProblemProcessEnum.问题分类.getName().equals(quality.getProblemType())) {
quality.setHandingOpinion(qualityProblem.getHandingOpinion());
quality.setHandingOpinionDesc(qualityProblem.getHandingOpinionDesc());
//执行两次
......@@ -115,7 +114,7 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
problemInitiationService.execute(quality.getInstanceId(),quality,"1");
problemInitiationService.execute(quality.getInstanceId(),quality,"1");
}
}else if(ProBlemProcessEnum.审查整改过程.getName().equals(quality.getStatus())) {
}else if(ProblemProcessEnum.审查整改过程.getName().equals(quality.getStatus())) {
quality.setHandingOpinion(qualityProblem.getHandingOpinion());
quality.setHandingOpinionDesc(qualityProblem.getHandingOpinionDesc());
quality.setReviewStatus(qualityProblem.getReviewStatus());
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/VerifyServiceImpl.java
View file @ 1eba123e
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.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.module.ugp.api.Enum.StageEnum;
import com.yeejoin.amos.boot.module.ugp.api.Enum.VerifyEnum;
import com.yeejoin.amos.boot.module.ugp.api.Enum.WeldCodeEnum;
import com.yeejoin.amos.boot.module.ugp.api.dto.*;
import com.yeejoin.amos.boot.module.ugp.api.entity.QualityProblem;
import com.yeejoin.amos.boot.module.ugp.api.entity.Verify;
import com.yeejoin.amos.boot.module.ugp.api.entity.Weld;
import com.yeejoin.amos.boot.module.ugp.api.mapper.VerifyMapper;
import com.yeejoin.amos.boot.module.ugp.api.mapper.WeldMapper;
import com.yeejoin.amos.boot.module.ugp.api.service.IVerifyService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -30,6 +31,10 @@ import java.util.List;
public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper> implements IVerifyService {
@Autowired
InstallNoticeServiceImpl installNoticeService;
@Autowired
WeldServiceImpl weldService;
@Autowired
WeldMapper weldMapper;
@Autowired
VerifyMapper verifyMapper;
......@@ -201,15 +206,23 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
//判断前三次已经入库
if (verifies.stream().count() == 3) {
//获取效验接口
Boolean i = false;
Boolean i = true;
verify.setProjectId(jsonObject.getLong("projectId"));
verify.setCode(jsonObject.getString("code"));
verify.setTargetInfo(jsonObject.getString("target_info"));
verify.setStage(StageEnum.焊接工艺.getName());
verify.setStage(StageEnum.焊接工艺.getStage());
if (i) {
verify.setStatus(VerifyEnum.已通过.getStatus());
LambdaQueryWrapper<Weld> wrapperWeld = new LambdaQueryWrapper<>();
wrapperWeld.eq(Weld::getCode,jsonObject.getString("code"));
Weld weld = weldMapper.selectOne(wrapperWeld);
weld.setSuperInspecStatus(StageEnum.焊接工艺.getStage());
weldService.updateById(weld);
效验状态 = "已通过";
} else {
verify.setStatus(VerifyEnum.未通过.getStatus());
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/WeldServiceImpl.java
View file @ 1eba123e
......@@ -16,13 +16,11 @@ import com.yeejoin.amos.boot.module.ugp.api.mapper.WeldMapper;
import com.yeejoin.amos.boot.module.ugp.api.service.IWeldService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestParam;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
......@@ -162,8 +160,8 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
weld.setInstallCompany(project.getInstallationUnitId());
weld.setCode(code);
weld.setRegion(project.getAddress());
weld.setCodingMethod(WeldMethodEnum.赋码方式1.getState());
weld.setCodingStatus(WeldCodeEnum.赋值状态2.getState());
weld.setCodingMethod(WeldMethodEnum.自动赋码.getState());
weld.setCodingStatus(WeldCodeEnum.已赋值.getState());
weld.setCodingDate(new Date());
welds.add(weld);
}
......
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